From ccc70aef07f0765eb78f69cae5099ecd156cb853 Mon Sep 17 00:00:00 2001
From: Minemoder5000 <minemoder50000@gmail.com>
Date: Thu, 18 Dec 2025 13:25:16 -0700
Subject: [PATCH 001/134] Re-work Arrivals Shuttle to have un-interactable
 substation and APC (#41884)

* power fixes

* no interactions

* fix

---------

Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com>
---
 Resources/Maps/Shuttles/arrivals.yml          | 793 +++++-------------
 .../Power/Generation/generators.yml           |  18 +
 2 files changed, 220 insertions(+), 591 deletions(-)

diff --git a/Resources/Maps/Shuttles/arrivals.yml b/Resources/Maps/Shuttles/arrivals.yml
index f419f26a1f..041a5662c8 100644
--- a/Resources/Maps/Shuttles/arrivals.yml
+++ b/Resources/Maps/Shuttles/arrivals.yml
@@ -1,6 +1,17 @@
 meta:
-  format: 6
-  postmapinit: false
+  format: 7
+  category: Grid
+  engineVersion: 268.0.0
+  forkId: ""
+  forkVersion: ""
+  time: 12/18/2025 20:05:32
+  entityCount: 252
+maps: []
+grids:
+- 292
+orphans:
+- 292
+nullspace: []
 tilemap:
   0: Space
   47: FloorGrass
@@ -22,20 +33,20 @@ entities:
       chunks:
         -1,-1:
           ind: -1,-1
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAVQAAAAAAVQAAAAAAVQAAAAAAVQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUgAAAAAAUQAAAAAAUQAAAAAAUQAAAAAAUQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAVQAAAAAAUQAAAAAAVQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAVQAAAAAAUQAAAAAAVQAAAAAALwAAAAAA
-          version: 6
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB5AAAAAAAAVQAAAAAAAFUAAAAAAABVAAAAAAAAVQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUgAAAAAAAFEAAAAAAABRAAAAAAAAUQAAAAAAAFEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHkAAAAAAABVAAAAAAAAUQAAAAAAAFUAAAAAAAB5AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB5AAAAAAAAVQAAAAAAAFEAAAAAAABVAAAAAAAALwAAAAAAAA==
+          version: 7
         0,0:
           ind: 0,0
-          tiles: VQAAAAAAUQAAAAAAVQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVQAAAAAAUQAAAAAAVQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVQAAAAAAUQAAAAAAVQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVQAAAAAAUQAAAAAAVQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUQAAAAAAUQAAAAAAUQAAAAAAUgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVQAAAAAAVQAAAAAAVQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVQAAAAAAeQAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-          version: 6
+          tiles: VQAAAAAAAFEAAAAAAABVAAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFUAAAAAAABRAAAAAAAAVQAAAAAAAHkAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABVAAAAAAAAUQAAAAAAAFUAAAAAAAB5AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVQAAAAAAAFEAAAAAAABVAAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFEAAAAAAABRAAAAAAAAUQAAAAAAAFIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABVAAAAAAAAVQAAAAAAAFUAAAAAAAB5AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFUAAAAAAAB5AAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABVAAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAAHkAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHkAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==
+          version: 7
         -1,0:
           ind: -1,0
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAVQAAAAAAUQAAAAAAVQAAAAAALwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAVQAAAAAAUQAAAAAAVQAAAAAALwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAVQAAAAAAUQAAAAAAVQAAAAAALwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAVQAAAAAAUQAAAAAAVQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUgAAAAAAUQAAAAAAUQAAAAAAUQAAAAAAUQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAVQAAAAAAVQAAAAAAVQAAAAAAUQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAUQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeQAAAAAAVQAAAAAAUQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAVQAAAAAAUQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAVQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-          version: 6
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB5AAAAAAAAVQAAAAAAAFEAAAAAAABVAAAAAAAALwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAAFUAAAAAAABRAAAAAAAAVQAAAAAAAC8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHkAAAAAAABVAAAAAAAAUQAAAAAAAFUAAAAAAAAvAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB5AAAAAAAAVQAAAAAAAFEAAAAAAABVAAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUgAAAAAAAFEAAAAAAABRAAAAAAAAUQAAAAAAAFEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHkAAAAAAABVAAAAAAAAVQAAAAAAAFUAAAAAAABRAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAUQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgAAAAAAAB5AAAAAAAAVQAAAAAAAFEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAAFUAAAAAAABRAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHkAAAAAAAB5AAAAAAAAVQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAAHkAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==
+          version: 7
         0,-1:
           ind: 0,-1
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVQAAAAAAVQAAAAAAVQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUQAAAAAAUQAAAAAAUQAAAAAAUgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVQAAAAAAUQAAAAAAVQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVQAAAAAAUQAAAAAAVQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-          version: 6
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVQAAAAAAAFUAAAAAAABVAAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFEAAAAAAABRAAAAAAAAUQAAAAAAAFIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABVAAAAAAAAUQAAAAAAAFUAAAAAAAB5AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVQAAAAAAAFEAAAAAAABVAAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==
+          version: 7
     - type: Broadphase
     - type: Physics
       bodyStatus: InAir
@@ -49,6 +60,7 @@ entities:
       id: Empty
     - type: OccluderTree
     - type: Shuttle
+      dampingModifier: 0.25
     - type: DeviceNetwork
       configurators: []
       deviceLists: []
@@ -160,39 +172,21 @@ entities:
         - volume: 2500
           temperature: 293.15
           moles:
-          - 20.078888
-          - 75.53487
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
+            Oxygen: 20.078888
+            Nitrogen: 75.53487
         - volume: 2500
           temperature: 293.15
           moles:
-          - 21.824879
-          - 82.10312
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
+            Oxygen: 21.824879
+            Nitrogen: 82.10312
         chunkSize: 4
     - type: GasTileOverlay
     - type: RadiationGridResistance
     - type: SpreaderGrid
     - type: GridPathfinding
     - type: Godmode
+    - type: ImplicitRoof
+    - type: ExplosionAirtightGrid
 - proto: AirCanister
   entities:
   - uid: 214
@@ -203,7 +197,7 @@ entities:
       parent: 292
     - type: Physics
       bodyType: Static
-- proto: AirlockCommandGlassLocked
+- proto: AirlockCentralCommandGlassLocked
   entities:
   - uid: 278
     components:
@@ -226,7 +220,7 @@ entities:
       pos: 3.5,-2.5
       parent: 292
     - type: Door
-      secondsUntilStateChange: -623.03485
+      secondsUntilStateChange: -1723.8751
       state: Opening
     - type: DeviceLinkSource
       lastSignals:
@@ -243,7 +237,7 @@ entities:
       pos: 3.5,4.5
       parent: 292
     - type: Door
-      secondsUntilStateChange: -624.7682
+      secondsUntilStateChange: -1725.6085
       state: Opening
     - type: DeviceLinkSource
       lastSignals:
@@ -260,7 +254,7 @@ entities:
       pos: -4.5,4.5
       parent: 292
     - type: Door
-      secondsUntilStateChange: -619.23486
+      secondsUntilStateChange: -1720.0752
       state: Opening
     - type: DeviceLinkSource
       lastSignals:
@@ -277,7 +271,7 @@ entities:
       pos: -4.5,-2.5
       parent: 292
     - type: Door
-      secondsUntilStateChange: -621.1349
+      secondsUntilStateChange: -1721.9752
       state: Opening
     - type: DeviceLinkSource
       lastSignals:
@@ -287,19 +281,72 @@ entities:
     - Construction
     - RCDDeconstructable
     - Destructible
-- proto: APCBasic
+- proto: AlwaysPoweredWallLight
   entities:
-  - uid: 116
+  - uid: 279
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -0.5,3.5
+      rot: -1.5707963267948966 rad
+      pos: 2.5,5.5
       parent: 292
-    - type: BatterySelfRecharger
-      autoRechargeRate: 50000
+    - type: ApcPowerReceiver
+      powerLoad: 0
     - type: Godmode
     missingComponents:
     - Construction
+    - RCDDeconstructable
+    - Destructible
+  - uid: 280
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -3.5,3.5
+      parent: 292
+    - type: ApcPowerReceiver
+      powerLoad: 0
+    - type: Godmode
+    missingComponents:
+    - Construction
+    - RCDDeconstructable
+    - Destructible
+  - uid: 281
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 2.5,-1.5
+      parent: 292
+    - type: ApcPowerReceiver
+      powerLoad: 0
+    - type: Godmode
+    missingComponents:
+    - Construction
+    - RCDDeconstructable
+    - Destructible
+  - uid: 282
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -3.5,-3.5
+      parent: 292
+    - type: ApcPowerReceiver
+      powerLoad: 0
+    - type: Godmode
+    missingComponents:
+    - Construction
+    - RCDDeconstructable
+    - Destructible
+  - uid: 283
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -1.5,7.5
+      parent: 292
+    - type: ApcPowerReceiver
+      powerLoad: 0
+    - type: Godmode
+    missingComponents:
+    - Construction
+    - RCDDeconstructable
     - Destructible
 - proto: ArrivalsShuttleTimer
   entities:
@@ -309,16 +356,16 @@ entities:
       pos: -4.5,3.5
       parent: 292
     - type: Godmode
-    missingComponents:
-    - Construction
+    - type: Fixtures
+      fixtures: {}
   - uid: 295
     components:
     - type: Transform
       pos: 3.5,3.5
       parent: 292
     - type: Godmode
-    missingComponents:
-    - Construction
+    - type: Fixtures
+      fixtures: {}
 - proto: AtmosDeviceFanDirectional
   entities:
   - uid: 164
@@ -364,6 +411,16 @@ entities:
     - Destructible
 - proto: CableApcExtensionUncuttable
   entities:
+  - uid: 76
+    components:
+    - type: Transform
+      pos: 0.5,7.5
+      parent: 292
+  - uid: 78
+    components:
+    - type: Transform
+      pos: 1.5,7.5
+      parent: 292
   - uid: 123
     components:
     - type: Transform
@@ -733,383 +790,6 @@ entities:
     missingComponents:
     - Destructible
     - RCDDeconstructable
-- proto: CableHVUncuttable
-  entities:
-  - uid: 79
-    components:
-    - type: Transform
-      pos: 0.5,7.5
-      parent: 292
-    - type: Godmode
-    missingComponents:
-    - Destructible
-    - RCDDeconstructable
-  - uid: 80
-    components:
-    - type: Transform
-      pos: 1.5,7.5
-      parent: 292
-    - type: Godmode
-    missingComponents:
-    - Destructible
-    - RCDDeconstructable
-  - uid: 81
-    components:
-    - type: Transform
-      pos: 1.5,6.5
-      parent: 292
-    - type: Godmode
-    missingComponents:
-    - Destructible
-    - RCDDeconstructable
-  - uid: 82
-    components:
-    - type: Transform
-      pos: -0.5,7.5
-      parent: 292
-    - type: Godmode
-    missingComponents:
-    - Destructible
-    - RCDDeconstructable
-  - uid: 83
-    components:
-    - type: Transform
-      pos: -0.5,6.5
-      parent: 292
-    - type: Godmode
-    missingComponents:
-    - Destructible
-    - RCDDeconstructable
-  - uid: 85
-    components:
-    - type: Transform
-      pos: -0.5,5.5
-      parent: 292
-    - type: Godmode
-    missingComponents:
-    - Destructible
-    - RCDDeconstructable
-  - uid: 86
-    components:
-    - type: Transform
-      pos: -0.5,4.5
-      parent: 292
-    - type: Godmode
-    missingComponents:
-    - Destructible
-    - RCDDeconstructable
-  - uid: 87
-    components:
-    - type: Transform
-      pos: -1.5,4.5
-      parent: 292
-    - type: Godmode
-    missingComponents:
-    - Destructible
-    - RCDDeconstructable
-  - uid: 88
-    components:
-    - type: Transform
-      pos: -2.5,4.5
-      parent: 292
-    - type: Godmode
-    missingComponents:
-    - Destructible
-    - RCDDeconstructable
-  - uid: 89
-    components:
-    - type: Transform
-      pos: -2.5,3.5
-      parent: 292
-    - type: Godmode
-    missingComponents:
-    - Destructible
-    - RCDDeconstructable
-  - uid: 90
-    components:
-    - type: Transform
-      pos: -2.5,2.5
-      parent: 292
-    - type: Godmode
-    missingComponents:
-    - Destructible
-    - RCDDeconstructable
-  - uid: 91
-    components:
-    - type: Transform
-      pos: -2.5,1.5
-      parent: 292
-    - type: Godmode
-    missingComponents:
-    - Destructible
-    - RCDDeconstructable
-  - uid: 92
-    components:
-    - type: Transform
-      pos: -2.5,0.5
-      parent: 292
-    - type: Godmode
-    missingComponents:
-    - Destructible
-    - RCDDeconstructable
-  - uid: 93
-    components:
-    - type: Transform
-      pos: -2.5,-0.5
-      parent: 292
-    - type: Godmode
-    missingComponents:
-    - Destructible
-    - RCDDeconstructable
-  - uid: 94
-    components:
-    - type: Transform
-      pos: -2.5,-1.5
-      parent: 292
-    - type: Godmode
-    missingComponents:
-    - Destructible
-    - RCDDeconstructable
-  - uid: 95
-    components:
-    - type: Transform
-      pos: -2.5,-2.5
-      parent: 292
-    - type: Godmode
-    missingComponents:
-    - Destructible
-    - RCDDeconstructable
-  - uid: 96
-    components:
-    - type: Transform
-      pos: -1.5,-2.5
-      parent: 292
-    - type: Godmode
-    missingComponents:
-    - Destructible
-    - RCDDeconstructable
-  - uid: 97
-    components:
-    - type: Transform
-      pos: -0.5,-2.5
-      parent: 292
-    - type: Godmode
-    missingComponents:
-    - Destructible
-    - RCDDeconstructable
-  - uid: 98
-    components:
-    - type: Transform
-      pos: 0.5,-2.5
-      parent: 292
-    - type: Godmode
-    missingComponents:
-    - Destructible
-    - RCDDeconstructable
-  - uid: 99
-    components:
-    - type: Transform
-      pos: 1.5,-2.5
-      parent: 292
-    - type: Godmode
-    missingComponents:
-    - Destructible
-    - RCDDeconstructable
-  - uid: 100
-    components:
-    - type: Transform
-      pos: 1.5,-1.5
-      parent: 292
-    - type: Godmode
-    missingComponents:
-    - Destructible
-    - RCDDeconstructable
-  - uid: 101
-    components:
-    - type: Transform
-      pos: 1.5,-0.5
-      parent: 292
-    - type: Godmode
-    missingComponents:
-    - Destructible
-    - RCDDeconstructable
-  - uid: 102
-    components:
-    - type: Transform
-      pos: 1.5,0.5
-      parent: 292
-    - type: Godmode
-    missingComponents:
-    - Destructible
-    - RCDDeconstructable
-  - uid: 103
-    components:
-    - type: Transform
-      pos: 1.5,1.5
-      parent: 292
-    - type: Godmode
-    missingComponents:
-    - Destructible
-    - RCDDeconstructable
-  - uid: 104
-    components:
-    - type: Transform
-      pos: 1.5,2.5
-      parent: 292
-    - type: Godmode
-    missingComponents:
-    - Destructible
-    - RCDDeconstructable
-  - uid: 105
-    components:
-    - type: Transform
-      pos: 1.5,3.5
-      parent: 292
-    - type: Godmode
-    missingComponents:
-    - Destructible
-    - RCDDeconstructable
-  - uid: 106
-    components:
-    - type: Transform
-      pos: 1.5,4.5
-      parent: 292
-    - type: Godmode
-    missingComponents:
-    - Destructible
-    - RCDDeconstructable
-  - uid: 107
-    components:
-    - type: Transform
-      pos: 0.5,4.5
-      parent: 292
-    - type: Godmode
-    missingComponents:
-    - Destructible
-    - RCDDeconstructable
-  - uid: 108
-    components:
-    - type: Transform
-      pos: -1.5,-3.5
-      parent: 292
-    - type: Godmode
-    missingComponents:
-    - Destructible
-    - RCDDeconstructable
-  - uid: 109
-    components:
-    - type: Transform
-      pos: -1.5,-4.5
-      parent: 292
-    - type: Godmode
-    missingComponents:
-    - Destructible
-    - RCDDeconstructable
-  - uid: 110
-    components:
-    - type: Transform
-      pos: -1.5,-5.5
-      parent: 292
-    - type: Godmode
-    missingComponents:
-    - Destructible
-    - RCDDeconstructable
-  - uid: 111
-    components:
-    - type: Transform
-      pos: 0.5,-5.5
-      parent: 292
-    - type: Godmode
-    missingComponents:
-    - Destructible
-    - RCDDeconstructable
-  - uid: 112
-    components:
-    - type: Transform
-      pos: 0.5,-4.5
-      parent: 292
-    - type: Godmode
-    missingComponents:
-    - Destructible
-    - RCDDeconstructable
-  - uid: 113
-    components:
-    - type: Transform
-      pos: 0.5,-3.5
-      parent: 292
-    - type: Godmode
-    missingComponents:
-    - Destructible
-    - RCDDeconstructable
-- proto: CableMVUncuttable
-  entities:
-  - uid: 117
-    components:
-    - type: Transform
-      pos: 1.5,6.5
-      parent: 292
-    - type: Godmode
-    missingComponents:
-    - Destructible
-    - RCDDeconstructable
-  - uid: 118
-    components:
-    - type: Transform
-      pos: 1.5,5.5
-      parent: 292
-    - type: Godmode
-    missingComponents:
-    - Destructible
-    - RCDDeconstructable
-  - uid: 119
-    components:
-    - type: Transform
-      pos: 1.5,4.5
-      parent: 292
-    - type: Godmode
-    missingComponents:
-    - Destructible
-    - RCDDeconstructable
-  - uid: 120
-    components:
-    - type: Transform
-      pos: 0.5,4.5
-      parent: 292
-    - type: Godmode
-    missingComponents:
-    - Destructible
-    - RCDDeconstructable
-  - uid: 121
-    components:
-    - type: Transform
-      pos: -0.5,4.5
-      parent: 292
-    - type: Godmode
-    missingComponents:
-    - Destructible
-    - RCDDeconstructable
-  - uid: 122
-    components:
-    - type: Transform
-      pos: -0.5,3.5
-      parent: 292
-    - type: Godmode
-    missingComponents:
-    - Destructible
-    - RCDDeconstructable
-- proto: CableTerminalUncuttable
-  entities:
-  - uid: 84
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -0.5,7.5
-      parent: 292
-    - type: Godmode
-    missingComponents:
-    - RCDDeconstructable
-    - Destructible
-    - Construction
 - proto: ChairPilotSeat
   entities:
   - uid: 223
@@ -1352,19 +1032,11 @@ entities:
         immutable: False
         temperature: 293.14963
         moles:
-        - 1.7459903
-        - 6.568249
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
+          Oxygen: 1.7459903
+          Nitrogen: 6.568249
     - type: Godmode
+    - type: Fixtures
+      fixtures: {}
     missingComponents:
     - Destructible
     - Construction
@@ -1379,19 +1051,11 @@ entities:
         immutable: False
         temperature: 293.14963
         moles:
-        - 1.7459903
-        - 6.568249
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
+          Oxygen: 1.7459903
+          Nitrogen: 6.568249
     - type: Godmode
+    - type: Fixtures
+      fixtures: {}
     missingComponents:
     - Destructible
     - Construction
@@ -1408,19 +1072,11 @@ entities:
         immutable: False
         temperature: 293.14963
         moles:
-        - 1.7459903
-        - 6.568249
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
+          Oxygen: 1.7459903
+          Nitrogen: 6.568249
     - type: Godmode
+    - type: Fixtures
+      fixtures: {}
     missingComponents:
     - Destructible
     - Construction
@@ -1436,19 +1092,11 @@ entities:
         immutable: False
         temperature: 293.14963
         moles:
-        - 1.7459903
-        - 6.568249
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
+          Oxygen: 1.7459903
+          Nitrogen: 6.568249
     - type: Godmode
+    - type: Fixtures
+      fixtures: {}
     missingComponents:
     - Destructible
     - Construction
@@ -1510,6 +1158,8 @@ entities:
       pos: -0.5,-4.5
       parent: 292
     - type: Godmode
+    - type: Fixtures
+      fixtures: {}
     missingComponents:
     - Destructible
 - proto: GasPassiveGate
@@ -1519,6 +1169,8 @@ entities:
     - type: Transform
       pos: -0.5,7.5
       parent: 292
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
     - type: Godmode
     missingComponents:
     - Construction
@@ -1532,6 +1184,8 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -1.5,8.5
       parent: 292
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
     - type: Godmode
     missingComponents:
     - Construction
@@ -1542,6 +1196,8 @@ entities:
     - type: Transform
       pos: -0.5,8.5
       parent: 292
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
     - type: Godmode
     missingComponents:
     - Construction
@@ -1553,6 +1209,8 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -2.5,5.5
       parent: 292
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
     - type: Godmode
     missingComponents:
     - Construction
@@ -1563,6 +1221,8 @@ entities:
     - type: Transform
       pos: 1.5,5.5
       parent: 292
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
     - type: Godmode
     missingComponents:
     - Construction
@@ -1574,6 +1234,8 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 1.5,-3.5
       parent: 292
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
     - type: Godmode
     missingComponents:
     - Construction
@@ -1585,6 +1247,8 @@ entities:
       rot: 3.141592653589793 rad
       pos: -2.5,-3.5
       parent: 292
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
     - type: Godmode
     missingComponents:
     - Construction
@@ -1597,6 +1261,8 @@ entities:
     - type: Transform
       pos: -0.5,5.5
       parent: 292
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
     - type: Godmode
     missingComponents:
     - Construction
@@ -1609,6 +1275,8 @@ entities:
     - type: Transform
       pos: -0.5,6.5
       parent: 292
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
     - type: Godmode
     missingComponents:
     - Construction
@@ -1620,6 +1288,8 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 0.5,5.5
       parent: 292
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
     - type: Godmode
     missingComponents:
     - Construction
@@ -1631,6 +1301,8 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -1.5,5.5
       parent: 292
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
     - type: Godmode
     missingComponents:
     - Construction
@@ -1642,6 +1314,8 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -1.5,-3.5
       parent: 292
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
     - type: Godmode
     missingComponents:
     - Construction
@@ -1653,6 +1327,8 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 0.5,-3.5
       parent: 292
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
     - type: Godmode
     missingComponents:
     - Construction
@@ -1663,6 +1339,8 @@ entities:
     - type: Transform
       pos: 1.5,-2.5
       parent: 292
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
     - type: Godmode
     missingComponents:
     - Construction
@@ -1673,6 +1351,8 @@ entities:
     - type: Transform
       pos: 1.5,-1.5
       parent: 292
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
     - type: Godmode
     missingComponents:
     - Construction
@@ -1683,6 +1363,8 @@ entities:
     - type: Transform
       pos: 1.5,-0.5
       parent: 292
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
     - type: Godmode
     missingComponents:
     - Construction
@@ -1693,6 +1375,8 @@ entities:
     - type: Transform
       pos: 1.5,0.5
       parent: 292
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
     - type: Godmode
     missingComponents:
     - Construction
@@ -1703,6 +1387,8 @@ entities:
     - type: Transform
       pos: 1.5,1.5
       parent: 292
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
     - type: Godmode
     missingComponents:
     - Construction
@@ -1713,6 +1399,8 @@ entities:
     - type: Transform
       pos: 1.5,2.5
       parent: 292
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
     - type: Godmode
     missingComponents:
     - Construction
@@ -1723,6 +1411,8 @@ entities:
     - type: Transform
       pos: 1.5,3.5
       parent: 292
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
     - type: Godmode
     missingComponents:
     - Construction
@@ -1733,6 +1423,8 @@ entities:
     - type: Transform
       pos: 1.5,4.5
       parent: 292
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
     - type: Godmode
     missingComponents:
     - Construction
@@ -1743,6 +1435,8 @@ entities:
     - type: Transform
       pos: -2.5,-2.5
       parent: 292
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
     - type: Godmode
     missingComponents:
     - Construction
@@ -1753,6 +1447,8 @@ entities:
     - type: Transform
       pos: -2.5,-1.5
       parent: 292
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
     - type: Godmode
     missingComponents:
     - Construction
@@ -1763,6 +1459,8 @@ entities:
     - type: Transform
       pos: -2.5,-0.5
       parent: 292
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
     - type: Godmode
     missingComponents:
     - Construction
@@ -1773,6 +1471,8 @@ entities:
     - type: Transform
       pos: -2.5,0.5
       parent: 292
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
     - type: Godmode
     missingComponents:
     - Construction
@@ -1783,6 +1483,8 @@ entities:
     - type: Transform
       pos: -2.5,1.5
       parent: 292
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
     - type: Godmode
     missingComponents:
     - Construction
@@ -1793,6 +1495,8 @@ entities:
     - type: Transform
       pos: -2.5,2.5
       parent: 292
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
     - type: Godmode
     missingComponents:
     - Construction
@@ -1803,6 +1507,8 @@ entities:
     - type: Transform
       pos: -2.5,3.5
       parent: 292
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
     - type: Godmode
     missingComponents:
     - Construction
@@ -1813,6 +1519,8 @@ entities:
     - type: Transform
       pos: -2.5,4.5
       parent: 292
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
     - type: Godmode
     missingComponents:
     - Construction
@@ -1826,6 +1534,8 @@ entities:
       rot: 3.141592653589793 rad
       pos: -0.5,-3.5
       parent: 292
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
     - type: Godmode
     missingComponents:
     - Construction
@@ -1839,6 +1549,8 @@ entities:
       rot: 3.141592653589793 rad
       pos: -1.5,7.5
       parent: 292
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
     - type: Godmode
     missingComponents:
     - Construction
@@ -1851,6 +1563,8 @@ entities:
     - type: Transform
       pos: -0.5,-2.5
       parent: 292
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
     - type: Godmode
     missingComponents:
     - Construction
@@ -1862,43 +1576,20 @@ entities:
       rot: 3.141592653589793 rad
       pos: -0.5,4.5
       parent: 292
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
     - type: Godmode
     missingComponents:
     - Construction
     - Anchorable
     - Destructible
-- proto: GeneratorBasic15kW
+- proto: GeneratorWallmountAPULV
   entities:
-  - uid: 114
-    components:
-    - type: Transform
-      pos: -1.5,-5.5
-      parent: 292
-    - type: Godmode
-    missingComponents:
-    - Anchorable
-    - Destructible
-  - uid: 115
-    components:
-    - type: Transform
-      pos: 0.5,-5.5
-      parent: 292
-    - type: Godmode
-    missingComponents:
-    - Anchorable
-    - Destructible
-- proto: GeneratorWallmountAPU
-  entities:
-  - uid: 78
+  - uid: 77
     components:
     - type: Transform
       pos: 1.5,7.5
       parent: 292
-    - type: Godmode
-    missingComponents:
-    - Construction
-    - Anchorable
-    - Destructible
 - proto: GravityGeneratorMini
   entities:
   - uid: 291
@@ -2165,6 +1856,8 @@ entities:
     - type: EncryptionKeyHolder
       keysUnlocked: False
     - type: Godmode
+    - type: Fixtures
+      fixtures: {}
     missingComponents:
     - Construction
     - Destructible
@@ -2209,10 +1902,18 @@ entities:
       pos: -2.5,6.5
       parent: 292
     - type: Godmode
+    - type: Fixtures
+      fixtures: {}
     missingComponents:
     - Destructible
 - proto: PottedPlantRandom
   entities:
+  - uid: 81
+    components:
+    - type: Transform
+      pos: 0.5,7.5
+      parent: 292
+    - type: Godmode
   - uid: 254
     components:
     - type: Transform
@@ -2249,73 +1950,6 @@ entities:
     - Anchorable
     - Destructible
     - Construction
-- proto: AlwaysPoweredWallLight
-  entities:
-  - uid: 279
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 2.5,5.5
-      parent: 292
-    - type: ApcPowerReceiver
-      powerLoad: 0
-    - type: Godmode
-    missingComponents:
-    - Construction
-    - RCDDeconstructable
-    - Destructible
-  - uid: 280
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -3.5,3.5
-      parent: 292
-    - type: ApcPowerReceiver
-      powerLoad: 0
-    - type: Godmode
-    missingComponents:
-    - Construction
-    - RCDDeconstructable
-    - Destructible
-  - uid: 281
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 2.5,-1.5
-      parent: 292
-    - type: ApcPowerReceiver
-      powerLoad: 0
-    - type: Godmode
-    missingComponents:
-    - Construction
-    - RCDDeconstructable
-    - Destructible
-  - uid: 282
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -3.5,-3.5
-      parent: 292
-    - type: ApcPowerReceiver
-      powerLoad: 0
-    - type: Godmode
-    missingComponents:
-    - Construction
-    - RCDDeconstructable
-    - Destructible
-  - uid: 283
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -1.5,7.5
-      parent: 292
-    - type: ApcPowerReceiver
-      powerLoad: 0
-    - type: Godmode
-    missingComponents:
-    - Construction
-    - RCDDeconstructable
-    - Destructible
 - proto: Rack
   entities:
   - uid: 262
@@ -2570,18 +2204,6 @@ entities:
     - Destructible
     - Construction
     - RCDDeconstructable
-- proto: SMESBasic
-  entities:
-  - uid: 76
-    components:
-    - type: Transform
-      pos: 0.5,7.5
-      parent: 292
-    - type: Godmode
-    missingComponents:
-    - Anchorable
-    - Destructible
-    - Construction
 - proto: SpaceVillainArcadeFilled
   entities:
   - uid: 259
@@ -2595,17 +2217,6 @@ entities:
     - Anchorable
     - Construction
     - Destructible
-- proto: SubstationWallBasic
-  entities:
-  - uid: 77
-    components:
-    - type: Transform
-      pos: 1.5,6.5
-      parent: 292
-    - type: Godmode
-    missingComponents:
-    - Destructible
-    - Construction
 - proto: TableReinforced
   entities:
   - uid: 243
diff --git a/Resources/Prototypes/Entities/Structures/Power/Generation/generators.yml b/Resources/Prototypes/Entities/Structures/Power/Generation/generators.yml
index dfb273a5e8..8c1682b39e 100644
--- a/Resources/Prototypes/Entities/Structures/Power/Generation/generators.yml
+++ b/Resources/Prototypes/Entities/Structures/Power/Generation/generators.yml
@@ -210,6 +210,24 @@
     guides:
     - ShuttleCraft
 
+- type: entity
+  parent: BaseGeneratorWallmount
+  id: GeneratorWallmountAPULV
+  name: shuttle LV APU
+  description: An advanced auxiliary power unit for a shuttle.
+  components:
+  - type: NodeContainer
+    examinable: true
+    nodes:
+      output:
+        !type:CableDeviceNode
+        nodeGroupID: Apc
+  - type: PowerSupplier
+    voltage: Apc
+    supplyRate: 20000
+    supplyRampRate: 500
+    supplyRampTolerance: 500
+
 # RTG - no fuel requirement
 
 - type: entity

From a095c61ba49f046c6f846ab4ef87f06ccc573c4b Mon Sep 17 00:00:00 2001
From: PJBot <pieterjan.briers+bot@gmail.com>
Date: Thu, 18 Dec 2025 20:38:33 +0000
Subject: [PATCH 002/134] Automatic changelog update

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

diff --git a/Resources/Changelog/Maps.yml b/Resources/Changelog/Maps.yml
index 76c5d8ac3d..93bc8f7280 100644
--- a/Resources/Changelog/Maps.yml
+++ b/Resources/Changelog/Maps.yml
@@ -939,4 +939,12 @@
   id: 114
   time: '2025-12-09T06:54:33.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/41806
+- author: Minemoder
+  changes:
+  - message: The Arrivals Shuttle had its powernet changed to not rely on generators
+      and become more tamper proof.
+    type: Tweak
+  id: 115
+  time: '2025-12-18T20:37:25.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/41884
 Order: 2

From a21983d5aac19eda4c8773b799aa6b8684a13653 Mon Sep 17 00:00:00 2001
From: Unkn0wn_Gh0st <shadowstalkermll@gmail.com>
Date: Thu, 18 Dec 2025 14:37:31 -0600
Subject: [PATCH 003/134] Syndicate Wall Lockers and Secure Storage (#33251)

Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com>
---
 .../Prototypes/Catalog/Fills/Lockers/misc.yml |  25 +++++++++-
 .../Storage/Closets/Lockers/lockers.yml       |   7 ++-
 .../Structures/Storage/Closets/closets.yml    |   6 +--
 .../Storage/Closets/wall_lockers.yml          |  15 ++++++
 .../Structures/Storage/Crates/crates.yml      |  15 +++++-
 .../Crates/syndicate_secure.rsi/base.png      | Bin 0 -> 403 bytes
 .../Crates/syndicate_secure.rsi/closed.png    | Bin 0 -> 599 bytes
 .../Crates/syndicate_secure.rsi/icon.png      | Bin 0 -> 457 bytes
 .../Crates/syndicate_secure.rsi/locked.png    | Bin 0 -> 147 bytes
 .../Crates/syndicate_secure.rsi/meta.json     |  45 ++++++++++++++++++
 .../Crates/syndicate_secure.rsi/open.png      | Bin 0 -> 630 bytes
 .../Crates/syndicate_secure.rsi/sparking.png  | Bin 0 -> 206 bytes
 .../Crates/syndicate_secure.rsi/unlocked.png  | Bin 0 -> 142 bytes
 .../Crates/syndicate_secure.rsi/welded.png    | Bin 0 -> 294 bytes
 .../Storage/closet.rsi/syndicate_door.png     | Bin 210 -> 425 bytes
 .../Storage/closet.rsi/syndicate_open.png     | Bin 207 -> 333 bytes
 .../Storage/wall_locker.rsi/meta.json         |   8 +++-
 .../wall_locker.rsi/syndicate_closed.png      | Bin 0 -> 417 bytes
 .../wall_locker.rsi/syndicate_open.png        | Bin 0 -> 375 bytes
 19 files changed, 113 insertions(+), 8 deletions(-)
 create mode 100644 Resources/Textures/Structures/Storage/Crates/syndicate_secure.rsi/base.png
 create mode 100644 Resources/Textures/Structures/Storage/Crates/syndicate_secure.rsi/closed.png
 create mode 100644 Resources/Textures/Structures/Storage/Crates/syndicate_secure.rsi/icon.png
 create mode 100644 Resources/Textures/Structures/Storage/Crates/syndicate_secure.rsi/locked.png
 create mode 100644 Resources/Textures/Structures/Storage/Crates/syndicate_secure.rsi/meta.json
 create mode 100644 Resources/Textures/Structures/Storage/Crates/syndicate_secure.rsi/open.png
 create mode 100644 Resources/Textures/Structures/Storage/Crates/syndicate_secure.rsi/sparking.png
 create mode 100644 Resources/Textures/Structures/Storage/Crates/syndicate_secure.rsi/unlocked.png
 create mode 100644 Resources/Textures/Structures/Storage/Crates/syndicate_secure.rsi/welded.png
 create mode 100644 Resources/Textures/Structures/Storage/wall_locker.rsi/syndicate_closed.png
 create mode 100644 Resources/Textures/Structures/Storage/wall_locker.rsi/syndicate_open.png

diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/misc.yml b/Resources/Prototypes/Catalog/Fills/Lockers/misc.yml
index 18c0d00712..95b0dab390 100644
--- a/Resources/Prototypes/Catalog/Fills/Lockers/misc.yml
+++ b/Resources/Prototypes/Catalog/Fills/Lockers/misc.yml
@@ -1,8 +1,31 @@
 - type: entity
   id: LockerSyndicatePersonalFilled
-  suffix: Filled
+  suffix: Nukie, Filled
   parent: LockerSyndicatePersonal
+  description: It's a personal storage unit for operative gear.
   components:
+  - type: AccessReader
+    access: [["NuclearOperative"]]
+  - type: EntityTableContainerFill
+    containers:
+      entity_storage: !type:AllSelector
+        children:
+        - id: ClothingBeltMilitaryWebbing
+        - id: ClothingHandsGlovesCombat
+        - id: JetpackBlackFilled
+        - id: ClothingUniformJumpsuitOperative
+        - id: ClothingUniformJumpskirtOperative
+        - id: ClothingHeadsetAltSyndicate
+        - id: ClothingEyesHudSyndicate
+
+- type: entity
+  id: LockerSyndicateWallFilled
+  suffix: Nukie, Filled
+  parent: LockerWallSyndicate
+  description: It's a personal storage unit for operative gear.
+  components:
+  - type: AccessReader
+    access: [["NuclearOperative"]]
   - type: EntityTableContainerFill
     containers:
       entity_storage: !type:AllSelector
diff --git a/Resources/Prototypes/Entities/Structures/Storage/Closets/Lockers/lockers.yml b/Resources/Prototypes/Entities/Structures/Storage/Closets/Lockers/lockers.yml
index 0fd9f1fab5..8f22f8d68c 100644
--- a/Resources/Prototypes/Entities/Structures/Storage/Closets/Lockers/lockers.yml
+++ b/Resources/Prototypes/Entities/Structures/Storage/Closets/Lockers/lockers.yml
@@ -533,15 +533,18 @@
 # Syndicate
 - type: entity
   id: LockerSyndicatePersonal
-  name: armory closet
+  name: blood-red locker
   parent: LockerBaseSecure
-  description: It's a personal storage unit for operative gear.
+  description: It's a personal storage unit with a blood-red design.
+  suffix: "Locked"
   components:
   - type: Appearance
   - type: EntityStorageVisuals
     stateBaseClosed: syndicate
     stateDoorOpen: syndicate_open
     stateDoorClosed: syndicate_door
+  - type: AccessReader
+    access: [["SyndicateAgent"]]
 
 # Bluespace
 - type: entity
diff --git a/Resources/Prototypes/Entities/Structures/Storage/Closets/closets.yml b/Resources/Prototypes/Entities/Structures/Storage/Closets/closets.yml
index e00a8627e1..052ff93e53 100644
--- a/Resources/Prototypes/Entities/Structures/Storage/Closets/closets.yml
+++ b/Resources/Prototypes/Entities/Structures/Storage/Closets/closets.yml
@@ -1,4 +1,4 @@
-# Tool closet
+# Tool closet
 - type: entity
   id: ClosetTool
   name: tool closet
@@ -164,9 +164,9 @@
 # Syndicate
 - type: entity
   id: LockerSyndicate
-  name: armory closet
+  name: blood-red closet
   parent: ClosetSteelBase
-  description: It's a storage unit.
+  description: It's a storage unit with a blood-red design.
   components:
   - type: Appearance
   - type: EntityStorageVisuals
diff --git a/Resources/Prototypes/Entities/Structures/Storage/Closets/wall_lockers.yml b/Resources/Prototypes/Entities/Structures/Storage/Closets/wall_lockers.yml
index 7943e74e94..1e90d332d1 100644
--- a/Resources/Prototypes/Entities/Structures/Storage/Closets/wall_lockers.yml
+++ b/Resources/Prototypes/Entities/Structures/Storage/Closets/wall_lockers.yml
@@ -237,3 +237,18 @@
   components:
   - type: EntityStorageVisuals
     stateDoorClosed: genpop_door_8
+
+- type: entity
+  id: LockerWallSyndicate
+  parent: BaseWallLocker
+  name: blood-red wall locker
+  description: It's a wall storage unit with a blood-red design.
+  suffix: "Locked"
+  components:
+  - type: Appearance
+  - type: EntityStorageVisuals
+    stateBaseClosed: generic
+    stateDoorOpen: syndicate_open
+    stateDoorClosed: syndicate_closed
+  - type: AccessReader
+    access: [["SyndicateAgent"]]
diff --git a/Resources/Prototypes/Entities/Structures/Storage/Crates/crates.yml b/Resources/Prototypes/Entities/Structures/Storage/Crates/crates.yml
index 55a0c72e7c..c622ad8961 100644
--- a/Resources/Prototypes/Entities/Structures/Storage/Crates/crates.yml
+++ b/Resources/Prototypes/Entities/Structures/Storage/Crates/crates.yml
@@ -332,6 +332,19 @@
   - type: AccessReader
     access: [["Command"]]
 
+- type: entity
+  parent: CrateBaseSecure
+  id: CrateSyndicateSecure
+  name: secure syndicate crate
+  description: A dark steel crate with red bands and a letter S embossed on the front.
+  components:
+  - type: Icon
+    sprite: Structures/Storage/Crates/syndicate_secure.rsi
+  - type: Sprite
+    sprite: Structures/Storage/Crates/syndicate_secure.rsi
+  - type: AccessReader
+    access: [["SyndicateAgent", "NuclearOperative"]]
+
 - type: entity
   parent: CrateGeneric
   id: CrateLivestock
@@ -822,7 +835,7 @@
 - type: entity
   parent: CrateGenericSteel
   id: CrateSyndicate
-  name: Syndicate crate
+  name: syndicate crate
   description: A dark steel crate with red bands and a letter S embossed on the front.
   components:
   - type: Icon
diff --git a/Resources/Textures/Structures/Storage/Crates/syndicate_secure.rsi/base.png b/Resources/Textures/Structures/Storage/Crates/syndicate_secure.rsi/base.png
new file mode 100644
index 0000000000000000000000000000000000000000..393e370d51e9996088798c3570b930ebfaaf84c0
GIT binary patch
literal 403
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^T<zMd|QArbD$
zDG~_>EDn4#?y*WRVR3VY5Fc6?#Ko`IS6$=2zps|LT278hfjuKD>(Wu)>+9pw54>zp
z_n&v+ilC8^5l@9|!TWo*v#cCEJu|N`{%~dxv48XCjY((QeEWK%1|h3^CJd97s2+ID
zpsA_JR##WI;jiX;`Ncbu`&Q`8;4fOx(7?bfE-v2nXM6sA3A>sf4Br&({>t0erBr--
zBl#_-Bd6fb?sN??9id50pB>p6t|&22c&fmEfI;uCL3@%edq*k5iAj&*=Lg7KIDL%$
zd2vxuQt#3C_xCr~@bPJO$u_)kesY2FCQnhr(xs}0KR!M#na5t-EW3EuH*MxnSq3AK
zXB>fYa%^7&7(^`=IO%@=>AZn?nfIyS>x@4xakvIDbldztpC9n3P<cIv=T71Ib#pQs
vRHQXRdM0vcn)K(qZC>u`vQ1p$3I~I;(j!Iw4PI)%P-gIS^>bP0l+XkK8JnBP

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Structures/Storage/Crates/syndicate_secure.rsi/closed.png b/Resources/Textures/Structures/Storage/Crates/syndicate_secure.rsi/closed.png
new file mode 100644
index 0000000000000000000000000000000000000000..625914054bea61f33e94308f248f198fc76ce005
GIT binary patch
literal 599
zcmV-d0;v6oP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80004nX+uL$Nkc;*
zaB^>EX>4Tx04R}tkv&MmKpe$iQ>7vmhjtJZ$xxlFh>AE$6^me@v=v%)FuC+YXws0R
zxHt-~1qVMCs}3&Cx;nTDg5U>;tBaGOi<J1kq|hS9gX4a@yZ5+z2MF~tQ_YTXK-DZG
z6_1J8+=>`@MF2wxVGIKjGxbDzAp_6xbq^n3@1i`*``n+SN6DKE@QK8;OgAjzb>itw
zOXs{#9A+g+AwDM_HRyuGk6f2se&bwpSm2pqBa@mV4ik&THkR9%l?;`5ia4UE8s!UF
zmle)ioYiubHSft^7|d(SX|B^8L>!AqAPEsNs@Omo7NWFjq?kz2e$2z)@A#AClF79J
zMvi$@ph9x|;D7MDTeC1Z;U)!RK<A5Xe+&bGU7%63?eAmTZkz!AXW&X}`73o`=9BbV
zON$%<z1zUWbxV`?fXf}A?@5;o$&vgtg+c*%KcjET0ij!<d)4i&xsTHaAVXa(-2exN
zz(|p@*F4_c)!y5`XPW)}0Mu4;&IkMX_W%F@jY&j7R9J=WlrahfAq++T3|pnjUA+Gh
zJcn&6+nFk&&dNey$L7CE@`8NO1R#Wv%^ZFZk?UJSt@T*>sO$X@Af+@k<(#3a001*X
z@1xGW2lz~>9!W){T{Qcs>p7R^B^ZDK+7zg2`?-B><)hAPJ{c{5nW2<2G@2P!KI&$_
l{Rw`q;(y_rkPt%1c5byvXPkc43IG5A002ovPDHLkV1mkf5k&w1

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Structures/Storage/Crates/syndicate_secure.rsi/icon.png b/Resources/Textures/Structures/Storage/Crates/syndicate_secure.rsi/icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..c6c6bffa7ebd4b05d5495fc81212ae578130d012
GIT binary patch
literal 457
zcmV;)0XF`LP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px$gGod|R9Hvtmc2^EKoH008X@sCLA=5R5fUs?r^-`U*jw3H`yAFbR`wP?MXIY)
zNCG0Pg(8XK25e4dWsY6l9Ng|<QY2mWpPBh(zSs%${7ia|4<o>sfiVNa$$;<s3)4;z
zLP$uHZmXd`vR!5X1EguHG0f+42*XgG)pZT3ZmXd$v^4@GNumK1MFEU4dB!;hRkzj9
z7ut>hV+Mwo0mj%Oj$>^K%Cf}ymuEr<P<2}keW5MqT&@6Z575XF1&*G&2UOiwqmee2
zpm%`(yq<MtAP54<asKk8@!ZS~<vVUMEDQApeS|%N>zcM@mwnSTa;q8vRL5s;Tm!h>
z`&r3UL+TAW!{BNOyX*<n2>^p$e!XjeS6jQwchB>T)oj~VP7}g91E_zfW(Ol9K$c~Y
z=Q%u_ZcCWsyHD6C06Haz*>noOGY~})R8<8R&yNz|`rv4@0IPb$sRUHKlaE)ej`utJ
zYfb4Y`_3L%D}v+4f11$IpSAgLZpGHW;Ar>_jZ&sCNT*#U00000NkvXXu0mjfl4Hiy

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Structures/Storage/Crates/syndicate_secure.rsi/locked.png b/Resources/Textures/Structures/Storage/Crates/syndicate_secure.rsi/locked.png
new file mode 100644
index 0000000000000000000000000000000000000000..aceacfce597de2a7dd34974d00c7324fdb3a34f5
GIT binary patch
literal 147
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}zMd|QArY-_
zFD~S5a1d#J*mS&nYVt3wh^K#|8Jd+i&O8<RRKL#Cb+Q*wEyF*Z&Qp1*+f~-jO?}d^
sY4(!GeZQ~${`qE&GP}?Br%VaExV7ztORjCbvI3;o)78&qol`;+09;Nt6951J

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Structures/Storage/Crates/syndicate_secure.rsi/meta.json b/Resources/Textures/Structures/Storage/Crates/syndicate_secure.rsi/meta.json
new file mode 100644
index 0000000000..4ea4f66637
--- /dev/null
+++ b/Resources/Textures/Structures/Storage/Crates/syndicate_secure.rsi/meta.json
@@ -0,0 +1,45 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-4.0",
+    "copyright": "Created by Hyenh#6078 (313846233099927552), edited by Unkn0wnGh0st333 on github",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "base"
+        },
+        {
+            "name": "closed"
+        },
+        {
+            "name": "open"
+        },
+        {
+            "name": "welded"
+        },
+        {
+            "name": "sparking",
+            "delays": [
+                [
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1
+                ]
+            ]
+        },
+        {
+            "name": "locked"
+        },
+        {
+            "name": "unlocked"
+        }
+    ]
+}
diff --git a/Resources/Textures/Structures/Storage/Crates/syndicate_secure.rsi/open.png b/Resources/Textures/Structures/Storage/Crates/syndicate_secure.rsi/open.png
new file mode 100644
index 0000000000000000000000000000000000000000..faef025ed9fc7ac53168e763ee54e04b2b9f4337
GIT binary patch
literal 630
zcmV-+0*U>JP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80004nX+uL$Nkc;*
zaB^>EX>4Tx04R}tkv&MmKpe$iQ>7vmhjtJZ$xxlFh>AE$6^me@v=v%)FuC+YXws0R
zxHt-~1qVMCs}3&Cx;nTDg5U>;tBaGOi<J1kq|hS9gX4a@yZ5+z2MF~tQ_YTXK-DZG
z6_1J8+=>`@MF2wxVGIKjGxbDzAp_6xbq^n3@1i`*``n+SN6DKE@QK8;OgAjzb>itw
zOXs{#9A+g+AwDM_HRyuGk6f2se&bwpSm2pqBa@mV4ik&THkR9%l?;`5ia4UE8s!UF
zmle)ioYiubHSft^7|d(SX|B^8L>!AqAPEsNs@Omo7NWFjq?kz2e$2z)@A#AClF79J
zMvi$@ph9x|;D7MDTeC1Z;U)!RK<A5Xe+&bGU7%63?eAmTZkz!AXW&X}`73o`=9BbV
zON$%<z1zUWbxV`?fXf}A?@5;o$&vgtg+c*%KcjET0ij!<d)4i&xsTHaAVXa(-2exN
zz(|p@*F4_c)!y5`XPW)}0Mu4;&IkMX_W%F@tVu*cR9J=Wlrav&APhyFszSmN11mS+
z{)gcPtPDu@NS7uGfmSUE%HlTx-@;Eq7~p1>bz!Y7y@Hg|@+lw9_W34&h{bzf6@?J0
z{XQSf)|`l10q0y#_Hts3o51rJ5)m--l*U?XK*Z{-5nyIeN=*@9=0@N#rPCjXfC$_!
zP<=xp0;LofW2Q9AIRg>>R{Wlf1rfWm{Hi;?KEZKl3`(57Ll6W(5CmZ=FZ}OAIQ&tI
QVE_OC07*qoM6N<$g6k<6H2?qr

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Structures/Storage/Crates/syndicate_secure.rsi/sparking.png b/Resources/Textures/Structures/Storage/Crates/syndicate_secure.rsi/sparking.png
new file mode 100644
index 0000000000000000000000000000000000000000..87b78b9b4653d54a703643d161f7f8bf353995df
GIT binary patch
literal 206
zcmeAS@N?(olHy`uVBq!ia0vp^2|(<?$P6U!|9apHq&N#aB8wRqxP?HN@zUM8KR`jY
z0G|+7ApQUUOh%6A4L}xSNswPKgTu2MX+Tb*r;B5V#`)v~iN*%b)hn0<iW?-j0@yqn
z4l<t-bPUtt2wuhz${5C!WO85%2SXwECOO7A=K>QXSZ^$5X5FCBs<N0_$7N#k)QyZ%
w!U;<~FT4n7bY0A#vqqd@>LJs@fG2hgpXAxzo?UdK185n8r>mdKI;Vst0DN#gB>(^b

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Structures/Storage/Crates/syndicate_secure.rsi/unlocked.png b/Resources/Textures/Structures/Storage/Crates/syndicate_secure.rsi/unlocked.png
new file mode 100644
index 0000000000000000000000000000000000000000..94b89fa655da949cd72a05f4ca4438bb89764b66
GIT binary patch
literal 142
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}9-c0aArY-_
zFCOG%P!w>!nBl!LLFdle1Jma0)vpjq{rP@YBa0goP~nI2d3^rIwe)wN4!xr4xzg-a
n#Xj@W=MCBxvgf{XH$0BhzQQx>vT)Q^pi%};S3j3^P6<r_f5$LJ

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Structures/Storage/Crates/syndicate_secure.rsi/welded.png b/Resources/Textures/Structures/Storage/Crates/syndicate_secure.rsi/welded.png
new file mode 100644
index 0000000000000000000000000000000000000000..311739a2701db289577b99dbe6910bad2a1f9010
GIT binary patch
literal 294
zcmV+>0oneEP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px#;7LS5R9J=W&@pPmFcik|zaXFl(jeJ6O@`tl=oZdmyk;mg&>^$8<QBd}hwL44
zfj|PqF-gJW>rgN@rKUr+ydP+h^u7-Xlu}A5rBsKA++{7(RQ}s(h7P+y+uhDA(^O99
zGi6z}b0Gxr&S9-(?meHE3v=%QxHV0i6?xC=di|@fw-G`R06QAt<G2m_I2-_|>l)`=
zFW~EXWjdPy@Vr=1Rn<>n6!E^_1CS(1ZzjvKws-IcUREpVzT#;z;np-1MPc$h7l708
sh>v6Jc-*`9w%PodZOmY;Qc69TZ;Wzr1AKHN?EnA(07*qoM6N<$f;^dk6951J

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Structures/Storage/closet.rsi/syndicate_door.png b/Resources/Textures/Structures/Storage/closet.rsi/syndicate_door.png
index 3011253d03629719007205a1c697d1e4662f766b..0136eefe65acdf554dc259544c74f1b6b0c01ffb 100644
GIT binary patch
delta 411
zcmV;M0c8Ht0jUF!7=H)`0001UdV2H#0004VQb$4nuFf3k0004FNkl<ZSVv=I7+}CS
z!1gnYI$$&eMniz;5STo9@_$mYY;JBYQDzgR2xKwH0k`JQC&~?KiHQs}b$~oKH-i8>
zJA)7h2iQUHe*9qg@bf3b!>?b#e40Dp#FsA&FP}eW5SNsM(|;g~EqHin=YYPhuK)K}
ztN>d;C<GKEA{dIw%7}_yq7;EF&Ck#O|L^c&umeCL00N*;fB{fwz(Rn@)|O%7#EC?i
zO_U;Z2M`JYnmYiN20#u2`5YD+{;H~AHq9MCC@<2)0U7D(|5;C;#%uS9r%&PXr(eD#
zDtd`h1TxiAL4V=DijWXN2fY0DjX_&jm|^>a2Sk}ol%i1wfI=W3AmG33qeldz0H%QI
zX#m*)gvx=(a&inCHf$g&dWlkm9s=lf0jxZLm4q~Rz<`Iq#@n~SQ4K2v(M!VN9|GvL
zAuJ^5mIesb1vHBSLKY*-Q#~7!VmT>li7p37F_aXw02EhR1TeLD4;laf002ovPDHLk
FV1n%$sRaN4

delta 194
zcmZ3<e2H;_L_G^L0|P^2NcwRgr5NB7;tHhYczI35#XS`i0s;au($jN|jPmpI`?|U&
zPoBKa$7iAJ<j+7wj3q&S!3+-1ZlnP@@t!V@AsXkC6C`{R)Fc!*eY}~Qd{P?Mgsz^p
zkVA!wt4oo4OJhii0_T**kR{684IxV&hca#wi&U`YIpH7VBxJzM$uU{wL0ev%^a)wb
r6HE%_O9G-<Pw1au(o1ki>0w}~S#8*vaQ}T3&@Ki~S3j3^P6<r_0Bb!U

diff --git a/Resources/Textures/Structures/Storage/closet.rsi/syndicate_open.png b/Resources/Textures/Structures/Storage/closet.rsi/syndicate_open.png
index a879eb63c1b684b93f2b5a6898fcc19e216cdc14..d44f89f7eeca482b563a30a1c377a0f08b2d9856 100644
GIT binary patch
delta 318
zcmV-E0m1&y0nGxC7=H)`0001UdV2H#0004VQb$4nuFf3k00038Nkl<ZSVv=I7+}CS
z!1gnYI$$&e24@INo;>+Ka_-2@&83+`8PP2RS^Rg+8kF2waPS~)9e{4(r4JwA4$u=2
zV4#ZwkS%@x=@Zxif_!`obaepC;wPU!gB_qNElpnsTz>i#Y=5x~FYgEnf&BdZ{{p8@
zF+BeEjR9K-$Z~NpG#)=ryIg?m0BmW1t`2~O04VXn09_q`t!*$e9Pnt<CUBvH3(UKC
zk+z9&WIG@rAmG2y{rkAvroVnM%)5S_c2NL!z|ETs3~X$0M<7>54D@sWwt|SR4!~9v
z)71f^Auwn{KsQ%Z6eU~ICmSMJdG^g46bD><{hGGr0D393VZ#QRS%_{I08ys~FnsA-
QT>t<807*qoM6N<$g7fo&O#lD@

delta 191
zcmX@hbe?g7L_G^L0|P^2NcwRgB@y5g;tHhoMMX_TL;@8RlQcDx^!4j4EhpI9cU_rK
z3zTCl3GxeOaCmkj4aiCLba4#PIG>y#p>aS%qv4FGh={(vgP4H6KCi1N2d^2BFbe__
zL23(}cvdJex-zU_3RUnh6$w=^nbOc;5TIbuV8R%<pn-W)1ILBp6-*B83%MBP`t9Tr
l6%Sz)cmI;%@X&~XLDpV|bNwgzy+9ioJYD@<);T3K0RUF|Gjsp|

diff --git a/Resources/Textures/Structures/Storage/wall_locker.rsi/meta.json b/Resources/Textures/Structures/Storage/wall_locker.rsi/meta.json
index f5b67de849..bab87904fb 100644
--- a/Resources/Textures/Structures/Storage/wall_locker.rsi/meta.json
+++ b/Resources/Textures/Structures/Storage/wall_locker.rsi/meta.json
@@ -1,7 +1,7 @@
 {
     "version": 1,
     "license": "CC-BY-SA-3.0",
-    "copyright": "Taken from shiptest at commmit https://github.com/shiptest-ss13/Shiptest/commit/440a15fb476a20d77ba28c1fe315c1b659032ce8, edited by Alekshhh, N2 lockers edited by Lamrr, Evac lockers by EmoGarbage404 (GitHub), genpop* derived from Wizards Den SS14 by K-Dynamic (github)",
+    "copyright": "Taken from shiptest at commmit https://github.com/shiptest-ss13/Shiptest/commit/440a15fb476a20d77ba28c1fe315c1b659032ce8, edited by Alekshhh, N2 lockers edited by Lamrr, syndicate lockers by Unkn0wnGh0st333 (GitHub) based on N2 lockers, Evac lockers by EmoGarbage404 (GitHub), genpop* derived from Wizards Den SS14 by K-Dynamic (github)",
     "size": {
         "x": 32,
         "y": 32
@@ -135,6 +135,12 @@
         },
         {
             "name": "genpop_door_8"
+        },
+        {
+            "name": "syndicate_closed"
+        },
+        {
+            "name": "syndicate_open"
         }
     ]
 }
diff --git a/Resources/Textures/Structures/Storage/wall_locker.rsi/syndicate_closed.png b/Resources/Textures/Structures/Storage/wall_locker.rsi/syndicate_closed.png
new file mode 100644
index 0000000000000000000000000000000000000000..adeccb400fe009b7e38ca82339ece489cc171179
GIT binary patch
literal 417
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^T<(Vi}jArbD$
zDG~_>EDn4#?y*WRVQF*Yc=G)De{mrZ70ttYs{hYRd~~Ff#nvN$@x--bZEgSa&2p7a
zGAh;8@qFdwWjU+9f+0m)gXN#B9Zz|Kjk$R<gSB<D06Tlco4ft;Jo0t_QYwCY)sEqv
zyjJ(C6T@9b^?fyo6+i!2Ht$%XGJ}m#;C54cyB(i|iDJVXjTcf(N0zwFTE@7``arPb
z!~I<o1mddeXG$zSaer5Bd*c6pe_4tp9a$BEI|~n(Iy$zU_up^)!K>IPW=BQm!JhWn
ziNBlKK`v?#VejbdG~845wd)rj2M5Ow{ogMH?`bf!GVnAwIrxXSR|N{l34MxxbI*1U
z-;F=-WV`n4?BqOr$~2p!%>ZQnMdyYYO)oaikvZJPE6p*>KY-DUT_9NG@)gErHI@&e
zM@@Jclf0Z(SvN>{U%VQiD>y0Ha${A;Db^!WZhgA~*?Za;7?dI}DeiRjGXaJ<gQu&X
J%Q~loCIHqLpqT&w

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Structures/Storage/wall_locker.rsi/syndicate_open.png b/Resources/Textures/Structures/Storage/wall_locker.rsi/syndicate_open.png
new file mode 100644
index 0000000000000000000000000000000000000000..5b6c8883f6855b7bdf8d82d326b3fb82d3861dd4
GIT binary patch
literal 375
zcmV--0f_#IP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px$F-b&0R9Hvtmah)NFc8KMBoY!FIG_%JK+OSDfZfxOg*RAuk%5{=&5+=lObsM|
z^c0XQlr&p|yBlIPT_*PZ?z`)^)}Z87D_I{ZfXacN4hSKhIHXcaGN%e3)}kovd7e5X
zzVFikn1ZG#KHqjbXe}1>0J>5wYGwl)09K1@*leo(c)zQi6#&K8ajb-wy&gZnHc4PL
z9`ifkx-LBSdu4y#fx6>B5CpWRKm(uy+Il^RtN^w@BMZRgdV|??0%@AUD9Z{Qo5O*&
z1%ClB=)aF$DGp?Y?ek9%nSCH{!L-r%>gAL0-0eabhO{#vgn-WJWX%Cq09z8W0@#v}
z6~LB+NxKbE6!FXeP9j#U7tRHn16ou{Sx7?CJ7NAxMtup*S4Y-c+mFrmt^z3Cffv=~
V!XaT->K*_9002ovPDHLkV1jlXn?V2o

literal 0
HcmV?d00001


From 24887dc7d52fb799a879258358ef3bce725e8fb7 Mon Sep 17 00:00:00 2001
From: PJBot <pieterjan.briers+bot@gmail.com>
Date: Thu, 18 Dec 2025 20:56:23 +0000
Subject: [PATCH 004/134] 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 61ab5cef3f..4718fd9482 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -1,11 +1,4 @@
 Entries:
-- author: K-Dynamic
-  changes:
-  - message: Quartermaster job and ID icons are now based on Cargo Technicians.
-    type: Tweak
-  id: 8816
-  time: '2025-07-29T07:34:47.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/39259
 - author: Alkheemist
   changes:
   - message: Protected Grids can now again have their hull and tiles repaired (Evac,
@@ -3918,3 +3911,13 @@
   id: 9315
   time: '2025-12-18T19:53:29.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/41902
+- author: Unkn0wnGh0st333
+  changes:
+  - message: Syndicate Wall Lockers and Secure Crates have been added! Mappers Rejoice!
+    type: Add
+  - message: Armory lockers have changed name to Blood-Red Lockers and locked variants
+      are now actually locked behind syndicate access.
+    type: Tweak
+  id: 9316
+  time: '2025-12-18T20:55:15.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/33251

From 2b356f64bdfa4f8d444c7999f23b534fd48f5025 Mon Sep 17 00:00:00 2001
From: BruhIsaac <dodgerike@yahoo.com>
Date: Thu, 18 Dec 2025 13:39:41 -0700
Subject: [PATCH 005/134] Rebalance the Ghost Role Raffles (#33157)

* Up raffle time/no-add time

* upd

---------

Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com>
---
 Resources/Prototypes/GhostRoleRaffles/settings.yml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/Resources/Prototypes/GhostRoleRaffles/settings.yml b/Resources/Prototypes/GhostRoleRaffles/settings.yml
index 73700404f2..2e8a060bde 100644
--- a/Resources/Prototypes/GhostRoleRaffles/settings.yml
+++ b/Resources/Prototypes/GhostRoleRaffles/settings.yml
@@ -2,14 +2,14 @@
 - type: ghostRoleRaffleSettings
   id: default
   settings:
-    initialDuration: 30
-    joinExtendsDurationBy: 10
-    maxDuration: 90
+    initialDuration: 45
+    joinExtendsDurationBy: 2
+    maxDuration: 45
 
 # for roles that don't matter too much or are available plentifully (e.g. space carp)
 - type: ghostRoleRaffleSettings
   id: short
   settings:
-    initialDuration: 10
-    joinExtendsDurationBy: 2
+    initialDuration: 15
+    joinExtendsDurationBy: 0
     maxDuration: 15

From fcf82072193a90f9301813002bb72edbc6b535c4 Mon Sep 17 00:00:00 2001
From: PJBot <pieterjan.briers+bot@gmail.com>
Date: Thu, 18 Dec 2025 21:09:59 +0000
Subject: [PATCH 006/134] 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 4718fd9482..f3a63ba392 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -1,14 +1,4 @@
 Entries:
-- author: Alkheemist
-  changes:
-  - message: Protected Grids can now again have their hull and tiles repaired (Evac,
-      ATS, etc)
-    type: Fix
-  - message: Protected Grids can no longer be expanded outside of their original size.
-    type: Fix
-  id: 8817
-  time: '2025-07-29T12:01:40.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/39271
 - author: Admiral-Obvious-001
   changes:
   - message: Several advanced chemicals now act slower, but with raised OD thresholds
@@ -3921,3 +3911,10 @@
   id: 9316
   time: '2025-12-18T20:55:15.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/33251
+- author: Empoleon4444
+  changes:
+  - message: Changed Ghost Role Raffles to be shorter overall
+    type: Tweak
+  id: 9317
+  time: '2025-12-18T21:08:51.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/33157

From 1f2d80297cb81e8dbbd1c1f46aeb531a2624204c Mon Sep 17 00:00:00 2001
From: Fildrance <fildrance@gmail.com>
Date: Fri, 19 Dec 2025 00:06:24 +0300
Subject: [PATCH 007/134] feat: RnD tech research console now have reroll
 feature (#32931)

* feat: RnD tech research console now have reroll feature

* fix: disable Rediscover button when there is not enough currency or user have no access

* refactor: xml-doc, extract method, minor simplify xaml

* minor cleanup after review

* refactor: change sending research server points amount into BUI from state to  ResearchServerComponent (using AfterAutoHandleStateEvent)

* feat: now tech rerolls will have cooldown to ensure no one can spam-spend all dept budget instantly

* refactor: revert unneeded code

* refactor: whitespaces

---------

Co-authored-by: pa.pecherskij <pa.pecherskij@interfax.ru>
---
 Content.Client/Research/ResearchSystem.cs     |  7 +--
 .../UI/ResearchConsoleBoundUserInterface.cs   | 16 ++---
 .../Research/UI/ResearchConsoleMenu.xaml      |  3 +-
 .../Research/UI/ResearchConsoleMenu.xaml.cs   | 63 ++++++++++++++++++-
 .../Systems/ResearchSystem.Console.cs         | 61 +++++++++++++++---
 .../Systems/ResearchSystem.Technology.cs      |  8 +--
 .../Components/ResearchServerComponent.cs     | 35 +++++++----
 .../SharedResearchConsoleComponent.cs         | 24 ++++---
 .../Components/TechnologyDatabaseComponent.cs |  9 ++-
 .../components/research-console-component.ftl |  2 +
 10 files changed, 168 insertions(+), 60 deletions(-)

diff --git a/Content.Client/Research/ResearchSystem.cs b/Content.Client/Research/ResearchSystem.cs
index 55d9535272..7086fc928b 100644
--- a/Content.Client/Research/ResearchSystem.cs
+++ b/Content.Client/Research/ResearchSystem.cs
@@ -1,8 +1,5 @@
-using Content.Shared.Research.Systems;
+using Content.Shared.Research.Systems;
 
 namespace Content.Client.Research;
 
-public sealed class ResearchSystem : SharedResearchSystem
-{
-
-}
+public sealed class ResearchSystem : SharedResearchSystem;
diff --git a/Content.Client/Research/UI/ResearchConsoleBoundUserInterface.cs b/Content.Client/Research/UI/ResearchConsoleBoundUserInterface.cs
index 2895ada61f..d5202eea5d 100644
--- a/Content.Client/Research/UI/ResearchConsoleBoundUserInterface.cs
+++ b/Content.Client/Research/UI/ResearchConsoleBoundUserInterface.cs
@@ -7,23 +7,22 @@ using Robust.Shared.Prototypes;
 namespace Content.Client.Research.UI;
 
 [UsedImplicitly]
-public sealed class ResearchConsoleBoundUserInterface : BoundUserInterface
+public sealed class ResearchConsoleBoundUserInterface(EntityUid owner, Enum uiKey) : BoundUserInterface(owner, uiKey)
 {
     [ViewVariables]
     private ResearchConsoleMenu? _consoleMenu;
 
-    public ResearchConsoleBoundUserInterface(EntityUid owner, Enum uiKey) : base(owner, uiKey)
-    {
-    }
-
     protected override void Open()
     {
         base.Open();
 
-        var owner = Owner;
-
         _consoleMenu = this.CreateWindow<ResearchConsoleMenu>();
-        _consoleMenu.SetEntity(owner);
+        _consoleMenu.SetEntity(Owner);
+
+        _consoleMenu.OnTechnologyRediscoverPressed += () =>
+        {
+            SendMessage(new ConsoleRediscoverTechnologyMessage());
+        };
 
         _consoleMenu.OnTechnologyCardPressed += id =>
         {
@@ -56,6 +55,7 @@ public sealed class ResearchConsoleBoundUserInterface : BoundUserInterface
 
         if (state is not ResearchConsoleBoundInterfaceState castState)
             return;
+
         _consoleMenu?.UpdatePanels(castState);
         _consoleMenu?.UpdateInformationPanel(castState);
     }
diff --git a/Content.Client/Research/UI/ResearchConsoleMenu.xaml b/Content.Client/Research/UI/ResearchConsoleMenu.xaml
index 8de9827c0c..8e3a74f933 100644
--- a/Content.Client/Research/UI/ResearchConsoleMenu.xaml
+++ b/Content.Client/Research/UI/ResearchConsoleMenu.xaml
@@ -1,4 +1,4 @@
-<controls:FancyWindow xmlns="https://spacestation14.io"
+<controls:FancyWindow xmlns="https://spacestation14.io"
                       xmlns:gfx="clr-namespace:Robust.Client.Graphics;assembly=Robust.Client"
                       xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls"
                       xmlns:customControls="clr-namespace:Content.Client.Administration.UI.CustomControls"
@@ -22,6 +22,7 @@
             </BoxContainer>
             <BoxContainer Orientation="Vertical" VerticalExpand="True" HorizontalAlignment="Right">
                 <Button Name="ServerButton" Text="{Loc 'research-console-menu-server-selection-button'}" MinHeight="40"/>
+                <Button Name="RediscoverButton" Margin="0 5 0 0" ToolTip="{Loc 'research-console-menu-server-rediscover-tooltip'}" MinHeight="40"/>
             </BoxContainer>
         </BoxContainer>
         <BoxContainer Orientation="Horizontal"
diff --git a/Content.Client/Research/UI/ResearchConsoleMenu.xaml.cs b/Content.Client/Research/UI/ResearchConsoleMenu.xaml.cs
index eafbe75fbb..e0e6029667 100644
--- a/Content.Client/Research/UI/ResearchConsoleMenu.xaml.cs
+++ b/Content.Client/Research/UI/ResearchConsoleMenu.xaml.cs
@@ -12,6 +12,7 @@ using Robust.Client.UserInterface;
 using Robust.Client.UserInterface.Controls;
 using Robust.Client.UserInterface.XAML;
 using Robust.Shared.Prototypes;
+using Robust.Shared.Timing;
 using Robust.Shared.Utility;
 
 namespace Content.Client.Research.UI;
@@ -20,15 +21,26 @@ namespace Content.Client.Research.UI;
 public sealed partial class ResearchConsoleMenu : FancyWindow
 {
     public Action<string>? OnTechnologyCardPressed;
+    public Action? OnTechnologyRediscoverPressed;
     public Action? OnServerButtonPressed;
 
     [Dependency] private readonly IEntityManager _entity = default!;
     [Dependency] private readonly IPrototypeManager _prototype = default!;
     [Dependency] private readonly IPlayerManager _player = default!;
+    [Dependency] private readonly IGameTiming _timing = default!;
+
     private readonly ResearchSystem _research;
     private readonly SpriteSystem _sprite;
     private readonly AccessReaderSystem _accessReader;
 
+    // if set to null  - we are waiting for server info and should not let rerolls
+    private TimeSpan? _nextRediscover;
+    private int _rediscoverCost;
+    private int _serverPoints;
+
+    private TimeSpan _nextUpdate;
+    private readonly TimeSpan _updateInterval = TimeSpan.FromMilliseconds(500);
+
     public EntityUid Entity;
 
     public ResearchConsoleMenu()
@@ -41,6 +53,7 @@ public sealed partial class ResearchConsoleMenu : FancyWindow
         _accessReader = _entity.System<AccessReaderSystem>();
 
         ServerButton.OnPressed += _ => OnServerButtonPressed?.Invoke();
+        RediscoverButton.OnPressed += OnRediscoverPressed;
     }
 
     public void SetEntity(EntityUid entity)
@@ -64,9 +77,7 @@ public sealed partial class ResearchConsoleMenu : FancyWindow
             MinHeight = 10
         });
 
-        var hasAccess = _player.LocalEntity is not { } local ||
-                        !_entity.TryGetComponent<AccessReaderComponent>(Entity, out var access) ||
-                        _accessReader.IsAllowed(local, Entity, access);
+        var hasAccess = HasAccess();
         foreach (var techId in database.CurrentTechnologyCards)
         {
             var tech = _prototype.Index<TechnologyPrototype>(techId);
@@ -79,6 +90,12 @@ public sealed partial class ResearchConsoleMenu : FancyWindow
         SyncTechnologyList(UnlockedCardsContainer, unlockedTech);
     }
 
+    private void UpdateRediscoverButton()
+    {
+        RediscoverButton.Disabled = !HasAccess() || _serverPoints < _rediscoverCost || _timing.CurTime < _nextRediscover;
+        RediscoverButton.Text = Loc.GetString("research-console-menu-server-rediscover-button", ("cost", _rediscoverCost));
+    }
+
     public void UpdateInformationPanel(ResearchConsoleBoundInterfaceState state)
     {
         var amountMsg = new FormattedMessage();
@@ -137,6 +154,27 @@ public sealed partial class ResearchConsoleMenu : FancyWindow
             };
             TierDisplayContainer.AddChild(control);
         }
+
+        _serverPoints = state.Points;
+        _rediscoverCost = state.RediscoverCost;
+        _nextRediscover = state.NextRediscover;
+
+        UpdateRediscoverButton();
+    }
+
+    private void OnRediscoverPressed(BaseButton.ButtonEventArgs args)
+    {
+        RediscoverButton.Disabled = true;
+        _nextRediscover = null;
+
+        OnTechnologyRediscoverPressed?.Invoke();
+    }
+
+    private bool HasAccess()
+    {
+        return _player.LocalEntity is not { } local
+               || !_entity.TryGetComponent<AccessReaderComponent>(Entity, out var access)
+               || _accessReader.IsAllowed(local, Entity, access);
     }
 
     /// <summary>
@@ -179,5 +217,24 @@ public sealed partial class ResearchConsoleMenu : FancyWindow
             container.Children.Remove(techControl);
         }
     }
+
+    /// <inheritdoc />
+    protected override void FrameUpdate(FrameEventArgs args)
+    {
+        base.FrameUpdate(args);
+
+        if(_nextUpdate > _timing.CurTime)
+            return;
+
+        _nextUpdate = _timing.CurTime + _updateInterval;
+
+        if (!RediscoverButton.Disabled)
+            return;
+
+        if (_nextRediscover == null || _nextRediscover > _timing.CurTime)
+            return;
+
+        UpdateRediscoverButton();
+    }
 }
 
diff --git a/Content.Server/Research/Systems/ResearchSystem.Console.cs b/Content.Server/Research/Systems/ResearchSystem.Console.cs
index baaf06ea71..0458408143 100644
--- a/Content.Server/Research/Systems/ResearchSystem.Console.cs
+++ b/Content.Server/Research/Systems/ResearchSystem.Console.cs
@@ -17,6 +17,7 @@ public sealed partial class ResearchSystem
     private void InitializeConsole()
     {
         SubscribeLocalEvent<ResearchConsoleComponent, ConsoleUnlockTechnologyMessage>(OnConsoleUnlock);
+        SubscribeLocalEvent<ResearchConsoleComponent, ConsoleRediscoverTechnologyMessage>(OnRediscoverTechnology);
         SubscribeLocalEvent<ResearchConsoleComponent, BeforeActivatableUIOpenEvent>(OnConsoleBeforeUiOpened);
         SubscribeLocalEvent<ResearchConsoleComponent, ResearchServerPointsChangedEvent>(OnPointsChanged);
         SubscribeLocalEvent<ResearchConsoleComponent, ResearchRegistrationChangedEvent>(OnConsoleRegistrationChanged);
@@ -25,6 +26,41 @@ public sealed partial class ResearchSystem
         SubscribeLocalEvent<ResearchConsoleComponent, GotEmaggedEvent>(OnEmagged);
     }
 
+    private void OnRediscoverTechnology(
+        EntityUid uid,
+        ResearchConsoleComponent console,
+        ConsoleRediscoverTechnologyMessage args
+    )
+    {
+        var act = args.Actor;
+
+        if (!this.IsPowered(uid, EntityManager))
+            return;
+
+        if (!HasAccess(uid, act))
+        {
+            _popup.PopupEntity(Loc.GetString("research-console-no-access-popup"), act);
+            return;
+        }
+
+        if (!TryGetClientServer(uid, out var serverEnt, out var serverComponent))
+            return;
+
+        if(serverComponent.NextRediscover > _timing.CurTime)
+            return;
+
+        var rediscoverCost = serverComponent.RediscoverCost;
+        if (rediscoverCost > serverComponent.Points)
+            return;
+
+        serverComponent.NextRediscover = _timing.CurTime + serverComponent.RediscoverInterval;
+
+        ModifyServerPoints(serverEnt.Value, -rediscoverCost);
+        UpdateTechnologyCards(serverEnt.Value);
+        SyncClientWithServer(uid);
+        UpdateConsoleInterface(uid);
+    }
+
     private void OnConsoleUnlock(EntityUid uid, ResearchConsoleComponent component, ConsoleUnlockTechnologyMessage args)
     {
         var act = args.Actor;
@@ -35,7 +71,7 @@ public sealed partial class ResearchSystem
         if (!PrototypeManager.TryIndex<TechnologyPrototype>(args.Id, out var technologyPrototype))
             return;
 
-        if (TryComp<AccessReaderComponent>(uid, out var access) && !_accessReader.IsAllowed(act, uid, access))
+        if (!HasAccess(uid, act))
         {
             _popup.PopupEntity(Loc.GetString("research-console-no-access-popup"), act);
             return;
@@ -72,17 +108,17 @@ public sealed partial class ResearchSystem
         if (!Resolve(uid, ref component, ref clientComponent, false))
             return;
 
-        ResearchConsoleBoundInterfaceState state;
-
-        if (TryGetClientServer(uid, out _, out var serverComponent, clientComponent))
+        
+        var points = 0;
+        var nextRediscover = TimeSpan.MaxValue;
+        var rediscoverCost = 0;
+        if (TryGetClientServer(uid, out _, out var serverComponent, clientComponent) && clientComponent.ConnectedToServer)
         {
-            var points = clientComponent.ConnectedToServer ? serverComponent.Points : 0;
-            state = new ResearchConsoleBoundInterfaceState(points);
-        }
-        else
-        {
-            state = new ResearchConsoleBoundInterfaceState(default);
+            points = serverComponent.Points;
+            nextRediscover = serverComponent.NextRediscover;
+            rediscoverCost = serverComponent.RediscoverCost;
         }
+        var state = new ResearchConsoleBoundInterfaceState(points, nextRediscover, rediscoverCost);
 
         _uiSystem.SetUiState(uid, ResearchConsoleUiKey.Key, state);
     }
@@ -121,4 +157,9 @@ public sealed partial class ResearchSystem
 
         args.Handled = true;
     }
+
+    private bool HasAccess(EntityUid uid, EntityUid act)
+    {
+        return TryComp<AccessReaderComponent>(uid, out var access) && _accessReader.IsAllowed(act, uid, access);
+    }
 }
diff --git a/Content.Server/Research/Systems/ResearchSystem.Technology.cs b/Content.Server/Research/Systems/ResearchSystem.Technology.cs
index 3e8888276f..0c871c8071 100644
--- a/Content.Server/Research/Systems/ResearchSystem.Technology.cs
+++ b/Content.Server/Research/Systems/ResearchSystem.Technology.cs
@@ -165,10 +165,10 @@ public sealed partial class ResearchSystem
         if (args.Server != null)
             return;
         component.MainDiscipline = null;
-        component.CurrentTechnologyCards = new List<string>();
-        component.SupportedDisciplines = new List<ProtoId<TechDisciplinePrototype>>();
-        component.UnlockedTechnologies = new List<ProtoId<TechnologyPrototype>>();
-        component.UnlockedRecipes = new List<ProtoId<LatheRecipePrototype>>();
+        component.CurrentTechnologyCards = new();
+        component.SupportedDisciplines = new();
+        component.UnlockedTechnologies = new();
+        component.UnlockedRecipes = new();
         Dirty(uid, component);
     }
 }
diff --git a/Content.Shared/Research/Components/ResearchServerComponent.cs b/Content.Shared/Research/Components/ResearchServerComponent.cs
index 3663e760f1..dab33f062d 100644
--- a/Content.Shared/Research/Components/ResearchServerComponent.cs
+++ b/Content.Shared/Research/Components/ResearchServerComponent.cs
@@ -1,26 +1,32 @@
 using Robust.Shared.GameStates;
-using Robust.Shared.Serialization;
 using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom;
 
 namespace Content.Shared.Research.Components;
 
-[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState, AutoGenerateComponentPause]
 public sealed partial class ResearchServerComponent : Component
 {
     /// <summary>
     /// The name of the server
     /// </summary>
     [AutoNetworkedField]
-    [DataField("serverName"), ViewVariables(VVAccess.ReadWrite)]
+    [DataField]
     public string ServerName = "RDSERVER";
 
     /// <summary>
     /// The amount of points on the server.
     /// </summary>
     [AutoNetworkedField]
-    [DataField("points"), ViewVariables(VVAccess.ReadWrite)]
+    [DataField]
     public int Points;
 
+    /// <summary>
+    /// Cost of technology research options reroll.
+    /// </summary>
+    [AutoNetworkedField]
+    [DataField]
+    public int RediscoverCost = 2000;
+
     /// <summary>
     /// A unique numeric id representing the server
     /// </summary>
@@ -37,27 +43,34 @@ public sealed partial class ResearchServerComponent : Component
     [ViewVariables(VVAccess.ReadOnly)]
     public List<EntityUid> Clients = new();
 
-    [DataField("nextUpdateTime", customTypeSerializer: typeof(TimeOffsetSerializer))]
+    [DataField(customTypeSerializer: typeof(TimeOffsetSerializer))]
     public TimeSpan NextUpdateTime = TimeSpan.Zero;
 
-    [DataField("researchConsoleUpdateTime"), ViewVariables(VVAccess.ReadWrite)]
+    [DataField]
     public TimeSpan ResearchConsoleUpdateTime = TimeSpan.FromSeconds(1);
+
+    /// <summary>
+    /// Time when next reroll for tech to research will be available.
+    /// </summary>
+    [DataField(customTypeSerializer: typeof(TimeOffsetSerializer)), AutoPausedField]
+    public TimeSpan NextRediscover;
+
+    /// <summary>
+    /// Minimal interval between rediscover actions.
+    /// </summary>
+    [DataField]
+    public TimeSpan RediscoverInterval = TimeSpan.FromSeconds(1);
 }
 
 /// <summary>
 /// Event raised on a server's clients when the point value of the server is changed.
 /// </summary>
-/// <param name="Server"></param>
-/// <param name="Total"></param>
-/// <param name="Delta"></param>
 [ByRefEvent]
 public readonly record struct ResearchServerPointsChangedEvent(EntityUid Server, int Total, int Delta);
 
 /// <summary>
 /// Event raised every second to calculate the amount of points added to the server.
 /// </summary>
-/// <param name="Server"></param>
-/// <param name="Points"></param>
 [ByRefEvent]
 public record struct ResearchServerGetPointsPerSecondEvent(EntityUid Server, int Points);
 
diff --git a/Content.Shared/Research/Components/SharedResearchConsoleComponent.cs b/Content.Shared/Research/Components/SharedResearchConsoleComponent.cs
index 6b7a210ecb..bf1269ad01 100644
--- a/Content.Shared/Research/Components/SharedResearchConsoleComponent.cs
+++ b/Content.Shared/Research/Components/SharedResearchConsoleComponent.cs
@@ -9,16 +9,14 @@ namespace Content.Shared.Research.Components
     }
 
     [Serializable, NetSerializable]
-    public sealed class ConsoleUnlockTechnologyMessage : BoundUserInterfaceMessage
+    public sealed class ConsoleUnlockTechnologyMessage(string id) : BoundUserInterfaceMessage
     {
-        public string Id;
-
-        public ConsoleUnlockTechnologyMessage(string id)
-        {
-            Id = id;
-        }
+        public string Id = id;
     }
 
+    [Serializable, NetSerializable]
+    public sealed class ConsoleRediscoverTechnologyMessage : BoundUserInterfaceMessage;
+
     [Serializable, NetSerializable]
     public sealed class ConsoleServerSelectionMessage : BoundUserInterfaceMessage
     {
@@ -26,12 +24,12 @@ namespace Content.Shared.Research.Components
     }
 
     [Serializable, NetSerializable]
-    public sealed class ResearchConsoleBoundInterfaceState : BoundUserInterfaceState
+    public sealed class ResearchConsoleBoundInterfaceState(int points, TimeSpan nextRediscover, int rediscoverCost) : BoundUserInterfaceState
     {
-        public int Points;
-        public ResearchConsoleBoundInterfaceState(int points)
-        {
-            Points = points;
-        }
+        public int Points = points;
+
+        public TimeSpan NextRediscover = nextRediscover;
+
+        public int RediscoverCost = rediscoverCost;
     }
 }
diff --git a/Content.Shared/Research/Components/TechnologyDatabaseComponent.cs b/Content.Shared/Research/Components/TechnologyDatabaseComponent.cs
index f00338aac7..89411a05c0 100644
--- a/Content.Shared/Research/Components/TechnologyDatabaseComponent.cs
+++ b/Content.Shared/Research/Components/TechnologyDatabaseComponent.cs
@@ -3,7 +3,6 @@ using Content.Shared.Research.Prototypes;
 using Content.Shared.Research.Systems;
 using Robust.Shared.GameStates;
 using Robust.Shared.Prototypes;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
 
 namespace Content.Shared.Research.Components;
 
@@ -14,12 +13,12 @@ public sealed partial class TechnologyDatabaseComponent : Component
     /// A main discipline that locks out other discipline technology past a certain tier.
     /// </summary>
     [AutoNetworkedField]
-    [DataField("mainDiscipline", customTypeSerializer: typeof(PrototypeIdSerializer<TechDisciplinePrototype>))]
-    public string? MainDiscipline;
+    [DataField]
+    public ProtoId<TechDisciplinePrototype>? MainDiscipline;
 
     [AutoNetworkedField]
-    [DataField("currentTechnologyCards")]
-    public List<string> CurrentTechnologyCards = new();
+    [DataField]
+    public List<ProtoId<TechnologyPrototype>> CurrentTechnologyCards = new();
 
     /// <summary>
     /// Which research disciplines are able to be unlocked
diff --git a/Resources/Locale/en-US/research/components/research-console-component.ftl b/Resources/Locale/en-US/research/components/research-console-component.ftl
index 5a1e074f4d..3094b4e773 100644
--- a/Resources/Locale/en-US/research/components/research-console-component.ftl
+++ b/Resources/Locale/en-US/research/components/research-console-component.ftl
@@ -6,6 +6,8 @@ research-console-menu-main-discipline = Main Discipline: [color={$color}]{$name}
 research-console-menu-server-selection-button = Server list
 research-console-menu-server-sync-button = Sync
 research-console-menu-server-research-button = Research
+research-console-menu-server-rediscover-button = Rediscover ({$cost})
+research-console-menu-server-rediscover-tooltip = Reroll list of technologies to research
 research-console-available-text = Researchable Technologies
 research-console-unlocked-text = Unlocked Technologies
 research-console-tier-discipline-info = Tier {$tier}, [color={$color}]{$discipline}[/color]

From d88bc489ae185ba2afa230d86e9acef1305e1a60 Mon Sep 17 00:00:00 2001
From: PJBot <pieterjan.briers+bot@gmail.com>
Date: Thu, 18 Dec 2025 21:23:53 +0000
Subject: [PATCH 008/134] 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 f3a63ba392..6f1c01bceb 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -1,15 +1,4 @@
 Entries:
-- author: Admiral-Obvious-001
-  changes:
-  - message: Several advanced chemicals now act slower, but with raised OD thresholds
-      and lowered OD damage. The healing per unit remains largely the same.
-    type: Tweak
-  - message: Bicaradine no longer makes razorium when mixed with advanced brute chems.
-      Advanced brute chems still mix and create razorium when combined.
-    type: Tweak
-  id: 8818
-  time: '2025-07-29T18:52:42.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/38811
 - author: aada
   changes:
   - message: Lipolicide now continues to poison at 0 hunger.
@@ -3918,3 +3907,10 @@
   id: 9317
   time: '2025-12-18T21:08:51.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/33157
+- author: Fildrance
+  changes:
+  - message: reroll feature for RnD research console
+    type: Add
+  id: 9318
+  time: '2025-12-18T21:22:45.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/32931

From 444991fbd0ca1b26e4acf4279c20e57a3a4e5b01 Mon Sep 17 00:00:00 2001
From: Hitlinemoss <209321380+Hitlinemoss@users.noreply.github.com>
Date: Fri, 19 Dec 2025 01:51:27 -0500
Subject: [PATCH 009/134] Cleanup of circuit tote / stamp box prototypes +
 added small cardboard boxes as a general item (#41335)

* Cleanup of circuit tote / stamp box prototypes

* New BoxCardboardSmall abstract prototype, stamp box uses this as a parent now

* Removed stamp box whitelist

* Whitelist fix

* We love scope creep! Small cardboard boxes are a general thing now.

* Box description updates

* Box description updates 2!

* Prototype order cleanup

* Comment updates

* Desc touchup

* Review updates

* StorageFill -> ContainerFill

* code  comment update

* decapitalized labels

* Code comment update

* Whoops! Forgot to update one ContainerFill to EntityTableContainerFill when fixing merge conflict

* Whoops! EntityTableContainerFill items were all formatted wrong

* Departmental box names

* Misc fixes

* Whoops, forgot to remove some labels
---
 .../en-US/construction/recipes/crates.ftl     |   3 +-
 .../Catalog/Fills/Boxes/general.yml           |  49 ++++-
 .../Prototypes/Catalog/Fills/Boxes/heads.yml  | 199 +++++++-----------
 .../Prototypes/Entities/Objects/Misc/box.yml  |  31 +--
 .../Crafting/Graphs/storage/cardboardbox.yml  |  16 +-
 .../Prototypes/Recipes/Crafting/crates.yml    |   9 +
 6 files changed, 166 insertions(+), 141 deletions(-)

diff --git a/Resources/Locale/en-US/construction/recipes/crates.ftl b/Resources/Locale/en-US/construction/recipes/crates.ftl
index c5b2b47c32..ea4ce93609 100644
--- a/Resources/Locale/en-US/construction/recipes/crates.ftl
+++ b/Resources/Locale/en-US/construction/recipes/crates.ftl
@@ -1,4 +1,5 @@
 construction-recipe-crate-freezer = crate freezer
 construction-recipe-big-box = large cardboard box
-construction-recipe-box-cardboard = small cardboard box
+construction-recipe-box-cardboard = cardboard box
+construction-recipe-box-cardboard-small = small cardboard box
 construction-recipe-box-tote = circuit tote
diff --git a/Resources/Prototypes/Catalog/Fills/Boxes/general.yml b/Resources/Prototypes/Catalog/Fills/Boxes/general.yml
index 4618fb6653..326afa6d4a 100644
--- a/Resources/Prototypes/Catalog/Fills/Boxes/general.yml
+++ b/Resources/Prototypes/Catalog/Fills/Boxes/general.yml
@@ -1,17 +1,37 @@
 - type: entity
-  name: cardboard box
   parent: BoxBase
   id: BoxCardboard
+  name: cardboard box
   description: A cardboard box for storing things.
   components:
-  - type: Item
-    size: Large
-    shape:
-    - 0,0,2,2
-  - type: Storage
-    maxItemSize: Small
-    grid:
-    - 0,0,2,2
+  - type: Construction
+    graph: BoxCardboard
+    node: boxcardboard
+    containers:
+      - storagebase
+  - type: PhysicalComposition
+    materialComposition:
+      Cardboard: 100
+  - type: Sprite
+    state: box
+  - type: Tag
+    tags:
+    - BoxCardboard
+
+- type: entity
+  parent: BoxBaseSmall
+  id: BoxCardboardSmall
+  name: small cardboard box
+  description: A small cardboard box for storing things.
+  components:
+  - type: Construction
+    graph: BoxCardboardSmall # Half the material cost of the "regular" cardboardbox
+    node: boxcardboardsmall
+    containers:
+      - storagebase
+  - type: PhysicalComposition # Half of the "regular" cardboard box
+    materialComposition:
+      Cardboard: 50
   - type: Sprite
     state: box
   - type: Tag
@@ -161,6 +181,17 @@
       - state: box
       - state: headset
 
+- type: entity
+  parent: BoxCardboardSmall
+  id: BoxStamps
+  name: stamp box
+  description: A small box containing stamps.
+  components: # Baking a "default" EntityTableContainerFill into this prototype seems like bad practice, so this is currently an empty box. If you need a new type of prefilled stamp box, create a new child prototype with the appropriate stamps!
+  - type: Sprite
+    layers:
+      - state: box
+      - state: stamp
+
 - type: entity
   name: meson box
   parent: BoxCardboard
diff --git a/Resources/Prototypes/Catalog/Fills/Boxes/heads.yml b/Resources/Prototypes/Catalog/Fills/Boxes/heads.yml
index fac72c6338..98c4c667fb 100644
--- a/Resources/Prototypes/Catalog/Fills/Boxes/heads.yml
+++ b/Resources/Prototypes/Catalog/Fills/Boxes/heads.yml
@@ -1,8 +1,84 @@
 - type: entity
-  name: circuit tote [QM]
+  parent: ToteBase
+  id: BoxCaptainCircuitboards
+  name: bridge circuit tote
+  components:
+  - type: EntityTableContainerFill
+    containers:
+      storagebase: !type:AllSelector
+        children:
+        - id: CommsComputerCircuitboard
+        - id: StationRecordsComputerCircuitboard
+
+- type: entity
+  parent: ToteBase
+  id: BoxCECircuitboards
+  name: engineering circuit tote
+  components:
+  - type: EntityTableContainerFill
+    containers:
+      storagebase: !type:AllSelector
+        children:
+        - id: CargoRequestEngineeringComputerCircuitboard
+        - id: AlertsComputerCircuitboard
+        - id: AtmosMonitoringComputerCircuitboard
+        - id: PowerComputerCircuitboard
+        - id: SolarControlComputerCircuitboard
+
+- type: entity
+  parent: ToteBase
+  id: BoxCMOCircuitboards
+  name: medical circuit tote
+  components:
+  - type: EntityTableContainerFill
+    containers:
+      storagebase: !type:AllSelector
+        children:
+        - id: MedicalTechFabCircuitboard
+        - id: CargoRequestMedicalComputerCircuitboard
+
+- type: entity
+  parent: ToteBase
+  id: BoxHoPCircuitboards
+  name: head of personnel circuit tote
+  components:
+  - type: EntityTableContainerFill
+    containers:
+      storagebase: !type:AllSelector
+        children:
+        - id: IDComputerCircuitboard
+        - id: FundingAllocationComputerCircuitboard
+        - id: CargoRequestServiceComputerCircuitboard
+
+- type: entity
+  parent: BoxStamps
+  id: BoxHoPStamps
+  name: head of personnel's stamp box
+  components:
+  - type: EntityTableContainerFill
+    containers:
+      storagebase: !type:AllSelector
+        children:
+        - id: RubberStampApproved
+        - id: RubberStampDenied
+        - id: RubberStampHop
+
+- type: entity
+  parent: ToteBase
+  id: BoxHoSCircuitboards
+  name: security circuit tote
+  components:
+  - type: EntityTableContainerFill
+    containers:
+      storagebase: !type:AllSelector
+        children:
+        - id: SecurityTechFabCircuitboard
+        - id: CargoRequestSecurityComputerCircuitboard
+
+- type: entity
   parent: ToteBase
   id: BoxQMCircuitboards
-  description: A Tote filled with QM's Circuit boards.
+  name: cargo circuit tote
   components:
   - type: EntityTableContainerFill
     containers:
@@ -17,15 +93,10 @@
         - id: MailTeleporterMachineCircuitboard
 
 - type: entity
-  name: stamp box [QM]
-  parent: BoxCardboard
+  parent: BoxStamps
   id: BoxQMStamps
-  description: A box filled with QM's Stamps. Stamped of course.
+  name: quartermaster's stamp box
   components:
-  - type: Item
-    size: Small
-    shape:
-    - 0,0,1,1
   - type: EntityTableContainerFill
     containers:
       storagebase: !type:AllSelector
@@ -33,106 +104,11 @@
         - id: RubberStampApproved
         - id: RubberStampDenied
         - id: RubberStampQm
-  - type: Storage
-    grid:
-    - 0,0,1,1
-    whitelist:
-      components:
-      - Stamp
-  - type: Sprite
-    layers:
-      - state: box
-      - state: stamp
 
 - type: entity
-  name: circuit tote [HoP]
-  parent: ToteBase
-  id: BoxHoPCircuitboards
-  description: A Tote filled with HoP's Circuit boards.
-  components:
-  - type: EntityTableContainerFill
-    containers:
-      storagebase: !type:AllSelector
-        children:
-        - id: IDComputerCircuitboard
-        - id: FundingAllocationComputerCircuitboard
-        - id: CargoRequestServiceComputerCircuitboard
-
-- type: entity
-  name: stamp box [HoP]
-  parent: BoxCardboard
-  id: BoxHoPStamps
-  description: A box filled with HoP's Stamps. Stamped of course.
-  components:
-  - type: Item
-    size: Small
-    shape:
-    - 0,0,1,1
-  - type: EntityTableContainerFill
-    containers:
-      storagebase: !type:AllSelector
-        children:
-        - id: RubberStampApproved
-        - id: RubberStampDenied
-        - id: RubberStampHop
-  - type: Storage
-    grid:
-    - 0,0,1,1
-    whitelist:
-      components:
-      - Stamp
-  - type: Sprite
-    layers:
-      - state: box
-      - state: stamp
-
-- type: entity
-  name: circuit tote [CE]
-  parent: ToteBase
-  id: BoxCECircuitboards
-  description: A Tote filled with CE's Circuit boards.
-  components:
-  - type: EntityTableContainerFill
-    containers:
-      storagebase: !type:AllSelector
-        children:
-        - id: CargoRequestEngineeringComputerCircuitboard
-        - id: AlertsComputerCircuitboard
-        - id: AtmosMonitoringComputerCircuitboard
-        - id: PowerComputerCircuitboard
-        - id: SolarControlComputerCircuitboard
-
-- type: entity
-  name: circuit tote [Captain]
-  parent: ToteBase
-  id: BoxCaptainCircuitboards
-  description: A Tote filled with Captain's Circuit boards.
-  components:
-  - type: EntityTableContainerFill
-    containers:
-      storagebase: !type:AllSelector
-        children:
-        - id: CommsComputerCircuitboard
-        - id: StationRecordsComputerCircuitboard
-
-- type: entity
-  name: circuit tote [CMO]
-  parent: ToteBase
-  id: BoxCMOCircuitboards
-  description: A Tote filled with CMO's Circuit boards.
-  components:
-  - type: EntityTableContainerFill
-    containers:
-      storagebase: !type:AllSelector
-        children:
-        - id: MedicalTechFabCircuitboard
-        - id: CargoRequestMedicalComputerCircuitboard
-
-- type: entity
-  name: circuit tote [RD]
   parent: ToteBase
   id: BoxRDCircuitboards
-  description: A Tote filled with RD's Circuit boards.
+  name: science circuit tote
   components:
   - type: EntityTableContainerFill
     containers:
@@ -146,16 +122,3 @@
         - id: AnalysisComputerCircuitboard #Because sometimes round start artis just fucking explode on the pad.
         - id: ArtifactAnalyzerMachineCircuitboard
         - id: StationAiFixerCircuitboard
-
-- type: entity
-  name: circuit tote [HoS]
-  parent: ToteBase
-  id: BoxHoSCircuitboards
-  description: A Tote filled with HoS's Circuit boards.
-  components:
-  - type: EntityTableContainerFill
-    containers:
-      storagebase: !type:AllSelector
-        children:
-        - id: SecurityTechFabCircuitboard
-        - id: CargoRequestSecurityComputerCircuitboard
diff --git a/Resources/Prototypes/Entities/Objects/Misc/box.yml b/Resources/Prototypes/Entities/Objects/Misc/box.yml
index 6a26b3d900..6692936f40 100644
--- a/Resources/Prototypes/Entities/Objects/Misc/box.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/box.yml
@@ -1,7 +1,7 @@
 - type: entity
-  id: BoxBase
-  parent: BaseStorageItem
   abstract: true
+  parent: BaseStorageItem
+  id: BoxBase
   components:
   - type: Sprite
     sprite: Objects/Storage/boxes.rsi
@@ -17,21 +17,28 @@
   - type: ContainerContainer
     containers:
       storagebase: !type:Container
-  - type: Construction
-    graph: BoxCardboard
-    node: boxcardboard
-    containers:
-      - storagebase
-  - type: PhysicalComposition
-    materialComposition:
-      Cardboard: 100
   - type: StaticPrice
     price: 10
 
 - type: entity
-  name: circuit tote
-  id: ToteBase
+  abstract: true
   parent: BoxBase
+  id: BoxBaseSmall
+  components:
+  - type: Item
+    size: Small
+    shape:
+    - 0,0,1,1
+  - type: Storage
+    grid:
+    - 0,0,1,1
+  - type: StaticPrice # Half of the "regular" box
+    price: 5
+
+- type: entity
+  parent: BoxBase
+  id: ToteBase
+  name: circuit tote
   description: A large tote for carrying circuit boards.
   components:
   - type: Sprite
diff --git a/Resources/Prototypes/Recipes/Crafting/Graphs/storage/cardboardbox.yml b/Resources/Prototypes/Recipes/Crafting/Graphs/storage/cardboardbox.yml
index 9cabb7e441..edfd66353a 100644
--- a/Resources/Prototypes/Recipes/Crafting/Graphs/storage/cardboardbox.yml
+++ b/Resources/Prototypes/Recipes/Crafting/Graphs/storage/cardboardbox.yml
@@ -7,11 +7,25 @@
     - to: boxcardboard
       steps:
       - material: Cardboard
-        amount: 1
+        amount: 2
         doAfter: 4
   - node: boxcardboard
     entity: BoxCardboard
 
+- type: constructionGraph
+  id: BoxCardboardSmall
+  start: start
+  graph:
+  - node: start
+    edges:
+    - to: boxcardboardsmall
+      steps:
+      - material: Cardboard
+        amount: 1
+        doAfter: 4
+  - node: boxcardboardsmall
+    entity: BoxCardboardSmall
+
 - type: constructionGraph
   id: ToteBase
   start: start
diff --git a/Resources/Prototypes/Recipes/Crafting/crates.yml b/Resources/Prototypes/Recipes/Crafting/crates.yml
index 0ba076b36b..eb18c4a354 100644
--- a/Resources/Prototypes/Recipes/Crafting/crates.yml
+++ b/Resources/Prototypes/Recipes/Crafting/crates.yml
@@ -57,6 +57,15 @@
   category: construction-category-storage
   objectType: Item
 
+- type: construction
+  id: BoxCardboardSmall
+  name: construction-recipe-box-cardboard-small
+  graph: BoxCardboardSmall
+  startNode: start
+  targetNode: boxcardboardsmall
+  category: construction-category-storage
+  objectType: Item
+
 - type: construction
   id: ToteBase
   name: construction-recipe-box-tote

From c97ffb006e57990a520d8ab8b8c3f9eb6b7f4a45 Mon Sep 17 00:00:00 2001
From: PJBot <pieterjan.briers+bot@gmail.com>
Date: Fri, 19 Dec 2025 07:05:17 +0000
Subject: [PATCH 010/134] Automatic changelog update

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

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index 6f1c01bceb..aff07648a4 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -1,14 +1,4 @@
 Entries:
-- author: aada
-  changes:
-  - message: Lipolicide now continues to poison at 0 hunger.
-    type: Fix
-  - message: Tricordrazine now also heals at exactly 50 damage instead of needing
-      to be below 50. Similar thresholds on other reagents tweaked the same.
-    type: Tweak
-  id: 8819
-  time: '2025-07-30T06:44:46.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/36289
 - author: Disp-Dev
   changes:
   - message: A new recipe has been added, moth-edible cotton cakes.
@@ -3914,3 +3904,16 @@
   id: 9318
   time: '2025-12-18T21:22:45.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/32931
+- author: Hitlinemoss
+  changes:
+  - message: Small cardboard boxes have been added (2x2 instead of 3x3), and can be
+      made in the crafting menu for 1 cardboard each.
+    type: Add
+  - message: Cardboard boxes now require 2 cardboard to make (from 1).
+    type: Tweak
+  - message: The names and descriptions of stamp boxes and circuit totes have been
+      adjusted.
+    type: Tweak
+  id: 9319
+  time: '2025-12-19T07:04:09.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/41335

From 3266c94eac0dea5bdfc4b8cd814ed7b0a980b580 Mon Sep 17 00:00:00 2001
From: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
Date: Fri, 19 Dec 2025 19:18:12 +0100
Subject: [PATCH 011/134] Unify BatteryComponent and PredictedBatteryComponent
 (#41867)

* unify

* cleanup and merge conflicts

* floating points

---------

Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
---
 .../Silicons/Borgs/BorgMenu.xaml.cs           |   4 +-
 Content.Client/Silicons/Borgs/BorgSystem.cs   |   2 +-
 .../Tests/Power/PowerTest.cs                  |  62 ++++--
 .../Tests/Power/StationPowerTests.cs          |   5 +-
 .../Systems/AdminVerbSystem.Tools.cs          |  57 +-----
 .../Construction/Completions/BuildMech.cs     |   2 +-
 .../EntitySystems/EmergencyLightSystem.cs     |   2 +-
 .../EntitySystems/HandheldLightSystem.cs      |   4 +-
 Content.Server/Mech/Systems/MechSystem.cs     |  10 +-
 .../Ninja/Systems/BatteryDrainerSystem.cs     |  18 +-
 .../Ninja/Systems/ItemCreatorSystem.cs        |   2 +-
 .../Ninja/Systems/NinjaSuitSystem.cs          |   6 +-
 .../Ninja/Systems/SpaceNinjaSystem.cs         |   4 +-
 .../Ninja/Systems/StunProviderSystem.cs       |   2 +-
 .../EntitySystems/BatteryInterfaceSystem.cs   |   9 +-
 .../Power/EntitySystems/BatterySystem.API.cs  | 155 --------------
 .../Power/EntitySystems/BatterySystem.cs      | 113 +++--------
 .../PowerMonitoringConsoleSystem.cs           |   4 +-
 .../Power/EntitySystems/PowerNetSystem.cs     |   7 +-
 .../Power/EntitySystems/RiggableSystem.cs     |  27 +--
 Content.Server/Power/SMES/SmesSystem.cs       |   5 +-
 .../Power/SetBatteryPercentCommand.cs         |   6 +-
 Content.Server/PowerSink/PowerSinkSystem.cs   |   4 +-
 .../Radio/EntitySystems/JammerSystem.cs       |   4 +-
 .../SensorMonitoring/BatterySensorSystem.cs   |   5 +-
 Content.Server/Silicons/Borgs/BorgSystem.cs   |   2 +-
 .../Silicons/StationAi/StationAiSystem.cs     |   9 +-
 .../DamagedSiliconAccentSystem.cs             |   2 +-
 .../Stunnable/Systems/StunbatonSystem.cs      |  16 +-
 .../Tesla/EntitySystem/TeslaCoilSystem.cs     |   2 +-
 .../Artifact/XAE/XAEChargeBatterySystem.cs    |   9 -
 Content.Shared/Power/ChargeEvents.cs          |  44 +---
 .../Power/Components/BatteryComponent.cs      |  92 +++++++--
 .../BatterySelfRechargerComponent.cs          |  23 +--
 ...omponent.cs => BatteryVisualsComponent.cs} |  10 +-
 .../Components/ExaminableBatteryComponent.cs  |   2 +-
 .../Components/PredictedBatteryComponent.cs   |  94 ---------
 .../PredictedBatterySelfRechargerComponent.cs |  33 ---
 .../Power/EntitySystems/ChargerSystem.cs      |   6 +-
 .../EntitySystems/PredictedBatterySystem.cs   | 182 -----------------
 ...stem.API.cs => SharedBatterySystem.API.cs} |  46 ++---
 .../EntitySystems/SharedBatterySystem.cs      | 192 +++++++++++++-----
 .../Components/PowerCellComponent.cs          |   2 +-
 .../PowerCell/PowerCellSystem.API.cs          |  16 +-
 .../PowerCell/PowerCellSystem.Relay.cs        |   4 +-
 Content.Shared/PowerCell/PowerCellSystem.cs   |  14 +-
 .../ActivatableUISystem.Power.cs              |   4 +-
 .../BatteryAmmoProviderComponent.cs           |   2 +-
 .../Ranged/Systems/SharedGunSystem.Battery.cs |  24 +--
 .../Prototypes/Catalog/Bounties/bounties.yml  |   1 -
 .../Entities/Clothing/Hands/gloves.yml        |   2 +-
 .../Clothing/Head/base_clothinghead.yml       |   4 +-
 .../Entities/Clothing/OuterClothing/armor.yml |   4 +-
 .../Entities/Debugging/debug_sweps.yml        |   2 +-
 .../Entities/Mobs/NPCs/behonker.yml           |   4 +-
 .../Entities/Mobs/NPCs/lavaland.yml           |   4 +-
 .../Entities/Mobs/NPCs/living_light.yml       |   4 +-
 .../Entities/Mobs/NPCs/miscellaneous.yml      |   4 +-
 .../Entities/Mobs/Player/silicon.yml          |   5 +
 .../Entities/Objects/Power/powercells.yml     |  46 ++---
 .../Entities/Objects/Power/powersink.yml      |   5 +
 .../Specific/Medical/healthanalyzer.yml       |   2 +-
 .../Objects/Tools/handheld_mass_scanner.yml   |   2 +-
 .../Weapons/Guns/Battery/battery_guns.yml     |  24 +--
 .../Weapons/Guns/Turrets/turrets_base.yml     |   5 +
 .../Objects/Weapons/Guns/pneumatic_cannon.yml |   4 +-
 .../Objects/Weapons/Melee/stunprod.yml        |   2 +-
 .../Entities/Objects/Weapons/security.yml     |   2 +-
 .../Structures/Lighting/base_lighting.yml     |   5 +
 .../Power/Generation/Tesla/coil.yml           |   5 +
 .../Entities/Structures/Power/apc.yml         |   5 +
 .../Entities/Structures/Power/debug_power.yml |  10 +
 .../Entities/Structures/Power/smes.yml        |   5 +
 .../Entities/Structures/Power/substation.yml  |   5 +
 74 files changed, 550 insertions(+), 960 deletions(-)
 delete mode 100644 Content.Server/Power/EntitySystems/BatterySystem.API.cs
 rename Content.Shared/Power/Components/{PredictedBatteryVisualsComponent.cs => BatteryVisualsComponent.cs} (75%)
 delete mode 100644 Content.Shared/Power/Components/PredictedBatteryComponent.cs
 delete mode 100644 Content.Shared/Power/Components/PredictedBatterySelfRechargerComponent.cs
 delete mode 100644 Content.Shared/Power/EntitySystems/PredictedBatterySystem.cs
 rename Content.Shared/Power/EntitySystems/{PredictedBatterySystem.API.cs => SharedBatterySystem.API.cs} (79%)

diff --git a/Content.Client/Silicons/Borgs/BorgMenu.xaml.cs b/Content.Client/Silicons/Borgs/BorgMenu.xaml.cs
index 0acc3a2646..eee45bacc8 100644
--- a/Content.Client/Silicons/Borgs/BorgMenu.xaml.cs
+++ b/Content.Client/Silicons/Borgs/BorgMenu.xaml.cs
@@ -21,7 +21,7 @@ public sealed partial class BorgMenu : FancyWindow
     [Dependency] private readonly IEntityManager _entity = default!;
     private readonly NameModifierSystem _nameModifier;
     private readonly PowerCellSystem _powerCell;
-    private readonly PredictedBatterySystem _battery;
+    private readonly SharedBatterySystem _battery;
 
     public Action? BrainButtonPressed;
     public Action? EjectBatteryButtonPressed;
@@ -44,7 +44,7 @@ public sealed partial class BorgMenu : FancyWindow
 
         _nameModifier = _entity.System<NameModifierSystem>();
         _powerCell = _entity.System<PowerCellSystem>();
-        _battery = _entity.System<PredictedBatterySystem>();
+        _battery = _entity.System<SharedBatterySystem>();
 
         _maxNameLength = _cfgManager.GetCVar(CCVars.MaxNameLength);
 
diff --git a/Content.Client/Silicons/Borgs/BorgSystem.cs b/Content.Client/Silicons/Borgs/BorgSystem.cs
index a4ca3725dc..517027d082 100644
--- a/Content.Client/Silicons/Borgs/BorgSystem.cs
+++ b/Content.Client/Silicons/Borgs/BorgSystem.cs
@@ -18,7 +18,7 @@ public sealed partial class BorgSystem : SharedBorgSystem
     [Dependency] private readonly SpriteSystem _sprite = default!;
     [Dependency] private readonly UserInterfaceSystem _ui = default!;
     [Dependency] private readonly PowerCellSystem _powerCell = default!;
-    [Dependency] private readonly PredictedBatterySystem _battery = default!;
+    [Dependency] private readonly SharedBatterySystem _battery = default!;
     [Dependency] private readonly AlertsSystem _alerts = default!;
     [Dependency] private readonly IGameTiming _timing = default!;
     [Dependency] private readonly IPlayerManager _player = default!;
diff --git a/Content.IntegrationTests/Tests/Power/PowerTest.cs b/Content.IntegrationTests/Tests/Power/PowerTest.cs
index 85bd366697..a28f646ef8 100644
--- a/Content.IntegrationTests/Tests/Power/PowerTest.cs
+++ b/Content.IntegrationTests/Tests/Power/PowerTest.cs
@@ -54,6 +54,7 @@ namespace Content.IntegrationTests.Tests.Power
         nodeGroupID: HVPower
   - type: PowerNetworkBattery
   - type: Battery
+    netsync: false
   - type: BatteryCharger
 
 - type: entity
@@ -68,6 +69,7 @@ namespace Content.IntegrationTests.Tests.Power
         nodeGroupID: HVPower
   - type: PowerNetworkBattery
   - type: Battery
+    netsync: false
   - type: BatteryDischarger
 
 - type: entity
@@ -85,6 +87,7 @@ namespace Content.IntegrationTests.Tests.Power
         nodeGroupID: HVPower
   - type: PowerNetworkBattery
   - type: Battery
+    netsync: false
   - type: BatteryDischarger
     node: output
   - type: BatteryCharger
@@ -110,6 +113,7 @@ namespace Content.IntegrationTests.Tests.Power
     maxSupply: 1000
     supplyRampTolerance: 1000
   - type: Battery
+    netsync: false
     maxCharge: 1000
     startingCharge: 1000
   - type: Transform
@@ -119,6 +123,7 @@ namespace Content.IntegrationTests.Tests.Power
   id: ApcDummy
   components:
   - type: Battery
+    netsync: false
     maxCharge: 10000
     startingCharge: 10000
   - type: PowerNetworkBattery
@@ -380,6 +385,8 @@ namespace Content.IntegrationTests.Tests.Power
             const float startingCharge = 100_000;
 
             PowerNetworkBatteryComponent netBattery = default!;
+            EntityUid generatorEnt = default!;
+            EntityUid consumerEnt = default!;
             BatteryComponent battery = default!;
             PowerConsumerComponent consumer = default!;
 
@@ -395,8 +402,8 @@ namespace Content.IntegrationTests.Tests.Power
                     entityManager.SpawnEntity("CableHV", grid.Owner.ToCoordinates(0, i));
                 }
 
-                var generatorEnt = entityManager.SpawnEntity("DischargingBatteryDummy", grid.Owner.ToCoordinates());
-                var consumerEnt = entityManager.SpawnEntity("ConsumerDummy", grid.Owner.ToCoordinates(0, 2));
+                generatorEnt = entityManager.SpawnEntity("DischargingBatteryDummy", grid.Owner.ToCoordinates());
+                consumerEnt = entityManager.SpawnEntity("ConsumerDummy", grid.Owner.ToCoordinates(0, 2));
 
                 netBattery = entityManager.GetComponent<PowerNetworkBatteryComponent>(generatorEnt);
                 battery = entityManager.GetComponent<BatteryComponent>(generatorEnt);
@@ -441,7 +448,8 @@ namespace Content.IntegrationTests.Tests.Power
 
                     // Trivial integral to calculate expected power spent.
                     const double spentExpected = (200 + 100) / 2.0 * 0.25;
-                    Assert.That(battery.CurrentCharge, Is.EqualTo(startingCharge - spentExpected).Within(tickDev));
+                    var currentCharge = batterySys.GetCharge((generatorEnt, battery));
+                    Assert.That(currentCharge, Is.EqualTo(startingCharge - spentExpected).Within(tickDev));
                 });
             });
 
@@ -460,7 +468,8 @@ namespace Content.IntegrationTests.Tests.Power
 
                     // Trivial integral to calculate expected power spent.
                     const double spentExpected = (400 + 100) / 2.0 * 0.75 + 400 * 0.25;
-                    Assert.That(battery.CurrentCharge, Is.EqualTo(startingCharge - spentExpected).Within(tickDev));
+                    var currentCharge = batterySys.GetCharge((generatorEnt, battery));
+                    Assert.That(currentCharge, Is.EqualTo(startingCharge - spentExpected).Within(tickDev));
                 });
             });
 
@@ -576,6 +585,8 @@ namespace Content.IntegrationTests.Tests.Power
             var entityManager = server.ResolveDependency<IEntityManager>();
             var batterySys = entityManager.System<BatterySystem>();
             var mapSys = entityManager.System<SharedMapSystem>();
+            EntityUid generatorEnt = default!;
+            EntityUid batteryEnt = default!;
             PowerSupplierComponent supplier = default!;
             BatteryComponent battery = default!;
 
@@ -591,8 +602,8 @@ namespace Content.IntegrationTests.Tests.Power
                     entityManager.SpawnEntity("CableHV", grid.Owner.ToCoordinates(0, i));
                 }
 
-                var generatorEnt = entityManager.SpawnEntity("GeneratorDummy", grid.Owner.ToCoordinates());
-                var batteryEnt = entityManager.SpawnEntity("ChargingBatteryDummy", grid.Owner.ToCoordinates(0, 2));
+                generatorEnt = entityManager.SpawnEntity("GeneratorDummy", grid.Owner.ToCoordinates());
+                batteryEnt = entityManager.SpawnEntity("ChargingBatteryDummy", grid.Owner.ToCoordinates(0, 2));
 
                 supplier = entityManager.GetComponent<PowerSupplierComponent>(generatorEnt);
                 var netBattery = entityManager.GetComponent<PowerNetworkBatteryComponent>(batteryEnt);
@@ -615,7 +626,8 @@ namespace Content.IntegrationTests.Tests.Power
                 {
                     // half a second @ 500 W = 250
                     // 50% efficiency, so 125 J stored total.
-                    Assert.That(battery.CurrentCharge, Is.EqualTo(125).Within(0.1));
+                    var currentCharge = batterySys.GetCharge((batteryEnt, battery));
+                    Assert.That(currentCharge, Is.EqualTo(125).Within(0.1));
                     Assert.That(supplier.CurrentSupply, Is.EqualTo(500).Within(0.1));
                 });
             });
@@ -633,6 +645,9 @@ namespace Content.IntegrationTests.Tests.Power
             var gameTiming = server.ResolveDependency<IGameTiming>();
             var batterySys = entityManager.System<BatterySystem>();
             var mapSys = entityManager.System<SharedMapSystem>();
+            EntityUid batteryEnt = default!;
+            EntityUid supplyEnt = default!;
+            EntityUid consumerEnt = default!;
             PowerConsumerComponent consumer = default!;
             PowerSupplierComponent supplier = default!;
             PowerNetworkBatteryComponent netBattery = default!;
@@ -653,9 +668,9 @@ namespace Content.IntegrationTests.Tests.Power
                 var terminal = entityManager.SpawnEntity("CableTerminal", grid.Owner.ToCoordinates(0, 1));
                 entityManager.GetComponent<TransformComponent>(terminal).LocalRotation = Angle.FromDegrees(180);
 
-                var batteryEnt = entityManager.SpawnEntity("FullBatteryDummy", grid.Owner.ToCoordinates(0, 2));
-                var supplyEnt = entityManager.SpawnEntity("GeneratorDummy", grid.Owner.ToCoordinates(0, 0));
-                var consumerEnt = entityManager.SpawnEntity("ConsumerDummy", grid.Owner.ToCoordinates(0, 3));
+                batteryEnt = entityManager.SpawnEntity("FullBatteryDummy", grid.Owner.ToCoordinates(0, 2));
+                supplyEnt = entityManager.SpawnEntity("GeneratorDummy", grid.Owner.ToCoordinates(0, 0));
+                consumerEnt = entityManager.SpawnEntity("ConsumerDummy", grid.Owner.ToCoordinates(0, 3));
 
                 consumer = entityManager.GetComponent<PowerConsumerComponent>(consumerEnt);
                 supplier = entityManager.GetComponent<PowerSupplierComponent>(supplyEnt);
@@ -694,7 +709,8 @@ namespace Content.IntegrationTests.Tests.Power
                     Assert.That(netBattery.SupplyRampPosition, Is.EqualTo(200).Within(0.1));
 
                     const int expectedSpent = 200;
-                    Assert.That(battery.CurrentCharge, Is.EqualTo(battery.MaxCharge - expectedSpent).Within(tickDev));
+                    var currentCharge = batterySys.GetCharge((batteryEnt, battery));
+                    Assert.That(currentCharge, Is.EqualTo(battery.MaxCharge - expectedSpent).Within(tickDev));
                 });
             });
 
@@ -711,6 +727,9 @@ namespace Content.IntegrationTests.Tests.Power
             var gameTiming = server.ResolveDependency<IGameTiming>();
             var batterySys = entityManager.System<BatterySystem>();
             var mapSys = entityManager.System<SharedMapSystem>();
+            EntityUid batteryEnt = default!;
+            EntityUid supplyEnt = default!;
+            EntityUid consumerEnt = default!;
             PowerConsumerComponent consumer = default!;
             PowerSupplierComponent supplier = default!;
             PowerNetworkBatteryComponent netBattery = default!;
@@ -731,9 +750,9 @@ namespace Content.IntegrationTests.Tests.Power
                 var terminal = entityManager.SpawnEntity("CableTerminal", grid.Owner.ToCoordinates(0, 1));
                 entityManager.GetComponent<TransformComponent>(terminal).LocalRotation = Angle.FromDegrees(180);
 
-                var batteryEnt = entityManager.SpawnEntity("FullBatteryDummy", grid.Owner.ToCoordinates(0, 2));
-                var supplyEnt = entityManager.SpawnEntity("GeneratorDummy", grid.Owner.ToCoordinates(0, 0));
-                var consumerEnt = entityManager.SpawnEntity("ConsumerDummy", grid.Owner.ToCoordinates(0, 3));
+                batteryEnt = entityManager.SpawnEntity("FullBatteryDummy", grid.Owner.ToCoordinates(0, 2));
+                supplyEnt = entityManager.SpawnEntity("GeneratorDummy", grid.Owner.ToCoordinates(0, 0));
+                consumerEnt = entityManager.SpawnEntity("ConsumerDummy", grid.Owner.ToCoordinates(0, 3));
 
                 consumer = entityManager.GetComponent<PowerConsumerComponent>(consumerEnt);
                 supplier = entityManager.GetComponent<PowerSupplierComponent>(supplyEnt);
@@ -772,7 +791,8 @@ namespace Content.IntegrationTests.Tests.Power
                     Assert.That(netBattery.SupplyRampPosition, Is.EqualTo(400).Within(0.1));
 
                     const int expectedSpent = 400;
-                    Assert.That(battery.CurrentCharge, Is.EqualTo(battery.MaxCharge - expectedSpent).Within(tickDev));
+                    var currentCharge = batterySys.GetCharge((batteryEnt, battery));
+                    Assert.That(currentCharge, Is.EqualTo(battery.MaxCharge - expectedSpent).Within(tickDev));
                 });
             });
 
@@ -1223,6 +1243,9 @@ namespace Content.IntegrationTests.Tests.Power
             var entityManager = server.ResolveDependency<IEntityManager>();
             var batterySys = entityManager.System<BatterySystem>();
             var mapSys = entityManager.System<SharedMapSystem>();
+            EntityUid generatorEnt = default!;
+            EntityUid substationEnt = default!;
+            EntityUid apcEnt = default!;
             PowerNetworkBatteryComponent substationNetBattery = default!;
             BatteryComponent apcBattery = default!;
 
@@ -1242,9 +1265,9 @@ namespace Content.IntegrationTests.Tests.Power
                 entityManager.SpawnEntity("CableMV", grid.Owner.ToCoordinates(0, 1));
                 entityManager.SpawnEntity("CableMV", grid.Owner.ToCoordinates(0, 2));
 
-                var generatorEnt = entityManager.SpawnEntity("GeneratorDummy", grid.Owner.ToCoordinates(0, 0));
-                var substationEnt = entityManager.SpawnEntity("SubstationDummy", grid.Owner.ToCoordinates(0, 1));
-                var apcEnt = entityManager.SpawnEntity("ApcDummy", grid.Owner.ToCoordinates(0, 2));
+                generatorEnt = entityManager.SpawnEntity("GeneratorDummy", grid.Owner.ToCoordinates(0, 0));
+                substationEnt = entityManager.SpawnEntity("SubstationDummy", grid.Owner.ToCoordinates(0, 1));
+                apcEnt = entityManager.SpawnEntity("ApcDummy", grid.Owner.ToCoordinates(0, 2));
 
                 var generatorSupplier = entityManager.GetComponent<PowerSupplierComponent>(generatorEnt);
                 substationNetBattery = entityManager.GetComponent<PowerNetworkBatteryComponent>(substationEnt);
@@ -1262,8 +1285,9 @@ namespace Content.IntegrationTests.Tests.Power
             {
                 Assert.Multiple(() =>
                 {
+                    var currentCharge = batterySys.GetCharge((apcEnt, apcBattery));
                     Assert.That(substationNetBattery.CurrentSupply, Is.GreaterThan(0)); //substation should be providing power
-                    Assert.That(apcBattery.CurrentCharge, Is.GreaterThan(0)); //apc battery should have gained charge
+                    Assert.That(currentCharge, Is.GreaterThan(0)); //apc battery should have gained charge
                 });
             });
 
diff --git a/Content.IntegrationTests/Tests/Power/StationPowerTests.cs b/Content.IntegrationTests/Tests/Power/StationPowerTests.cs
index 542a4645c6..9d79abf480 100644
--- a/Content.IntegrationTests/Tests/Power/StationPowerTests.cs
+++ b/Content.IntegrationTests/Tests/Power/StationPowerTests.cs
@@ -2,6 +2,7 @@ using System.Collections.Generic;
 using System.Linq;
 using Content.Server.GameTicking;
 using Content.Server.Power.Components;
+using Content.Server.Power.EntitySystems;
 using Content.Server.Power.NodeGroups;
 using Content.Server.Power.Pow3r;
 using Content.Shared.Maps;
@@ -48,6 +49,7 @@ public sealed class StationPowerTests
         var entMan = server.EntMan;
         var protoMan = server.ProtoMan;
         var ticker = entMan.System<GameTicker>();
+        var batterySys = entMan.System<BatterySystem>();
 
         // Load the map
         await server.WaitAssertion(() =>
@@ -71,7 +73,8 @@ public sealed class StationPowerTests
             if (node.NodeGroup is not IBasePowerNet group)
                 continue;
             networks.TryGetValue(group.NetworkNode, out var charge);
-            networks[group.NetworkNode] = charge + battery.CurrentCharge;
+            var currentCharge = batterySys.GetCharge((uid, battery));
+            networks[group.NetworkNode] = charge + currentCharge;
         }
         var totalStartingCharge = networks.MaxBy(n => n.Value).Value;
 
diff --git a/Content.Server/Administration/Systems/AdminVerbSystem.Tools.cs b/Content.Server/Administration/Systems/AdminVerbSystem.Tools.cs
index bd214578ea..f30e0ef728 100644
--- a/Content.Server/Administration/Systems/AdminVerbSystem.Tools.cs
+++ b/Content.Server/Administration/Systems/AdminVerbSystem.Tools.cs
@@ -4,7 +4,6 @@ using System.Numerics;
 using Content.Server.Cargo.Components;
 using Content.Server.Doors.Systems;
 using Content.Server.Hands.Systems;
-using Content.Server.Power.EntitySystems;
 using Content.Server.Stack;
 using Content.Server.Station.Systems;
 using Content.Server.Weapons.Ranged.Systems;
@@ -51,8 +50,7 @@ public sealed partial class AdminVerbSystem
     [Dependency] private readonly AdminTestArenaSystem _adminTestArenaSystem = default!;
     [Dependency] private readonly StationJobsSystem _stationJobsSystem = default!;
     [Dependency] private readonly JointSystem _jointSystem = default!;
-    [Dependency] private readonly BatterySystem _batterySystem = default!;
-    [Dependency] private readonly PredictedBatterySystem _predictedBatterySystem = default!;
+    [Dependency] private readonly SharedBatterySystem _batterySystem = default!;
     [Dependency] private readonly MetaDataSystem _metaSystem = default!;
     [Dependency] private readonly GunSystem _gun = default!;
 
@@ -161,57 +159,6 @@ public sealed partial class AdminVerbSystem
             args.Verbs.Add(makeVulnerable);
         }
 
-        if (TryComp<PredictedBatteryComponent>(args.Target, out var pBattery))
-        {
-            Verb refillBattery = new()
-            {
-                Text = Loc.GetString("admin-verbs-refill-battery"),
-                Category = VerbCategory.Tricks,
-                Icon = new SpriteSpecifier.Texture(new("/Textures/Interface/AdminActions/fill_battery.png")),
-                Act = () =>
-                {
-                    _predictedBatterySystem.SetCharge((args.Target, pBattery), pBattery.MaxCharge);
-                },
-                Impact = LogImpact.Medium,
-                Message = Loc.GetString("admin-trick-refill-battery-description"),
-                Priority = (int)TricksVerbPriorities.RefillBattery,
-            };
-            args.Verbs.Add(refillBattery);
-
-            Verb drainBattery = new()
-            {
-                Text = Loc.GetString("admin-verbs-drain-battery"),
-                Category = VerbCategory.Tricks,
-                Icon = new SpriteSpecifier.Texture(new("/Textures/Interface/AdminActions/drain_battery.png")),
-                Act = () =>
-                {
-                    _predictedBatterySystem.SetCharge((args.Target, pBattery), 0);
-                },
-                Impact = LogImpact.Medium,
-                Priority = (int)TricksVerbPriorities.DrainBattery,
-            };
-            args.Verbs.Add(drainBattery);
-
-            Verb infiniteBattery = new()
-            {
-                Text = Loc.GetString("admin-verbs-infinite-battery"),
-                Category = VerbCategory.Tricks,
-                Icon = new SpriteSpecifier.Texture(new("/Textures/Interface/AdminActions/infinite_battery.png")),
-                Act = () =>
-                {
-                    var recharger = EnsureComp<PredictedBatterySelfRechargerComponent>(args.Target);
-                    recharger.AutoRechargeRate = pBattery.MaxCharge; // Instant refill.
-                    recharger.AutoRechargePauseTime = TimeSpan.Zero; // No delay.
-                    Dirty(args.Target, recharger);
-                    _predictedBatterySystem.RefreshChargeRate((args.Target, pBattery));
-                },
-                Impact = LogImpact.Medium,
-                Message = Loc.GetString("admin-trick-infinite-battery-object-description"),
-                Priority = (int)TricksVerbPriorities.InfiniteBattery,
-            };
-            args.Verbs.Add(infiniteBattery);
-        }
-
         if (TryComp<BatteryComponent>(args.Target, out var battery))
         {
             Verb refillBattery = new()
@@ -254,6 +201,8 @@ public sealed partial class AdminVerbSystem
                     var recharger = EnsureComp<BatterySelfRechargerComponent>(args.Target);
                     recharger.AutoRechargeRate = battery.MaxCharge; // Instant refill.
                     recharger.AutoRechargePauseTime = TimeSpan.Zero; // No delay.
+                    Dirty(args.Target, recharger);
+                    _batterySystem.RefreshChargeRate((args.Target, battery));
                 },
                 Impact = LogImpact.Medium,
                 Message = Loc.GetString("admin-trick-infinite-battery-object-description"),
diff --git a/Content.Server/Construction/Completions/BuildMech.cs b/Content.Server/Construction/Completions/BuildMech.cs
index 5f1e40c347..c0b5921db9 100644
--- a/Content.Server/Construction/Completions/BuildMech.cs
+++ b/Content.Server/Construction/Completions/BuildMech.cs
@@ -48,7 +48,7 @@ public sealed partial class BuildMech : IGraphAction
 
         var cell = container.ContainedEntities[0];
 
-        if (!entityManager.TryGetComponent<PredictedBatteryComponent>(cell, out var batteryComponent))
+        if (!entityManager.TryGetComponent<BatteryComponent>(cell, out var batteryComponent))
         {
             Logger.Warning($"Mech construct entity {uid} had an invalid entity in container \"{Container}\"! Aborting build mech action.");
             return;
diff --git a/Content.Server/Light/EntitySystems/EmergencyLightSystem.cs b/Content.Server/Light/EntitySystems/EmergencyLightSystem.cs
index eddef87853..824afbc789 100644
--- a/Content.Server/Light/EntitySystems/EmergencyLightSystem.cs
+++ b/Content.Server/Light/EntitySystems/EmergencyLightSystem.cs
@@ -153,7 +153,7 @@ public sealed class EmergencyLightSystem : SharedEmergencyLightSystem
         }
         else
         {
-            _battery.SetCharge((entity.Owner, battery), battery.CurrentCharge + entity.Comp.ChargingWattage * frameTime * entity.Comp.ChargingEfficiency);
+            _battery.ChangeCharge((entity.Owner, battery), entity.Comp.ChargingWattage * frameTime * entity.Comp.ChargingEfficiency);
             if (_battery.IsFull((entity.Owner, battery)))
             {
                 if (TryComp<ApcPowerReceiverComponent>(entity.Owner, out var receiver))
diff --git a/Content.Server/Light/EntitySystems/HandheldLightSystem.cs b/Content.Server/Light/EntitySystems/HandheldLightSystem.cs
index da024ee075..e4e947b548 100644
--- a/Content.Server/Light/EntitySystems/HandheldLightSystem.cs
+++ b/Content.Server/Light/EntitySystems/HandheldLightSystem.cs
@@ -24,7 +24,7 @@ namespace Content.Server.Light.EntitySystems
         [Dependency] private readonly ActionContainerSystem _actionContainer = default!;
         [Dependency] private readonly PopupSystem _popup = default!;
         [Dependency] private readonly PowerCellSystem _powerCell = default!;
-        [Dependency] private readonly PredictedBatterySystem _battery = default!;
+        [Dependency] private readonly SharedBatterySystem _battery = default!;
         [Dependency] private readonly SharedAppearanceSystem _appearance = default!;
         [Dependency] private readonly SharedAudioSystem _audio = default!;
         [Dependency] private readonly SharedPointLightSystem _lights = default!;
@@ -147,7 +147,7 @@ namespace Content.Server.Light.EntitySystems
         }
 
         // TODO: Very important: Make this charge rate based instead of instantly removing charge each update step.
-        // See PredictedBatteryComponent
+        // See BatteryComponent
         public override void Update(float frameTime)
         {
             var toRemove = new RemQueue<Entity<HandheldLightComponent>>();
diff --git a/Content.Server/Mech/Systems/MechSystem.cs b/Content.Server/Mech/Systems/MechSystem.cs
index 80169cb2ed..61aa1aa1cc 100644
--- a/Content.Server/Mech/Systems/MechSystem.cs
+++ b/Content.Server/Mech/Systems/MechSystem.cs
@@ -33,7 +33,7 @@ public sealed partial class MechSystem : SharedMechSystem
 {
     [Dependency] private readonly ActionBlockerSystem _actionBlocker = default!;
     [Dependency] private readonly AtmosphereSystem _atmosphere = default!;
-    [Dependency] private readonly PredictedBatterySystem _battery = default!;
+    [Dependency] private readonly SharedBatterySystem _battery = default!;
     [Dependency] private readonly ContainerSystem _container = default!;
     [Dependency] private readonly DamageableSystem _damageable = default!;
     [Dependency] private readonly SharedDoAfterSystem _doAfter = default!;
@@ -88,7 +88,7 @@ public sealed partial class MechSystem : SharedMechSystem
         if (TryComp<WiresPanelComponent>(uid, out var panel) && !panel.Open)
             return;
 
-        if (component.BatterySlot.ContainedEntity == null && TryComp<PredictedBatteryComponent>(args.Used, out var battery))
+        if (component.BatterySlot.ContainedEntity == null && TryComp<BatteryComponent>(args.Used, out var battery))
         {
             InsertBattery(uid, args.Used, component, battery);
             _actionBlocker.UpdateCanMove(uid);
@@ -109,7 +109,7 @@ public sealed partial class MechSystem : SharedMechSystem
 
     private void OnInsertBattery(EntityUid uid, MechComponent component, EntInsertedIntoContainerMessage args)
     {
-        if (args.Container != component.BatterySlot || !TryComp<PredictedBatteryComponent>(args.Entity, out var battery))
+        if (args.Container != component.BatterySlot || !TryComp<BatteryComponent>(args.Entity, out var battery))
             return;
 
         component.Energy = _battery.GetCharge((args.Entity, battery));
@@ -337,7 +337,7 @@ public sealed partial class MechSystem : SharedMechSystem
         if (battery == null)
             return false;
 
-        if (!TryComp<PredictedBatteryComponent>(battery, out var batteryComp))
+        if (!TryComp<BatteryComponent>(battery, out var batteryComp))
             return false;
 
         _battery.SetCharge((battery.Value, batteryComp), _battery.GetCharge((battery.Value, batteryComp)) + delta.Float());
@@ -353,7 +353,7 @@ public sealed partial class MechSystem : SharedMechSystem
         return true;
     }
 
-    public void InsertBattery(EntityUid uid, EntityUid toInsert, MechComponent? component = null, PredictedBatteryComponent? battery = null)
+    public void InsertBattery(EntityUid uid, EntityUid toInsert, MechComponent? component = null, BatteryComponent? battery = null)
     {
         if (!Resolve(uid, ref component, false))
             return;
diff --git a/Content.Server/Ninja/Systems/BatteryDrainerSystem.cs b/Content.Server/Ninja/Systems/BatteryDrainerSystem.cs
index f6d9d7bec7..98fae3ae13 100644
--- a/Content.Server/Ninja/Systems/BatteryDrainerSystem.cs
+++ b/Content.Server/Ninja/Systems/BatteryDrainerSystem.cs
@@ -1,6 +1,5 @@
 using Content.Server.Ninja.Events;
 using Content.Server.Power.Components;
-using Content.Server.Power.EntitySystems;
 using Content.Shared.DoAfter;
 using Content.Shared.Interaction;
 using Content.Shared.Ninja.Components;
@@ -17,8 +16,7 @@ namespace Content.Server.Ninja.Systems;
 /// </summary>
 public sealed class BatteryDrainerSystem : SharedBatteryDrainerSystem
 {
-    [Dependency] private readonly BatterySystem _battery = default!;
-    [Dependency] private readonly PredictedBatterySystem _predictedBattery = default!;
+    [Dependency] private readonly SharedBatterySystem _battery = default!;
     [Dependency] private readonly SharedAudioSystem _audio = default!;
     [Dependency] private readonly SharedDoAfterSystem _doAfter = default!;
     [Dependency] private readonly SharedPopupSystem _popup = default!;
@@ -80,20 +78,20 @@ public sealed class BatteryDrainerSystem : SharedBatteryDrainerSystem
     protected override bool TryDrainPower(Entity<BatteryDrainerComponent> ent, EntityUid target)
     {
         var (uid, comp) = ent;
-        if (comp.BatteryUid == null || !TryComp<PredictedBatteryComponent>(comp.BatteryUid.Value, out var battery))
+        if (comp.BatteryUid == null || !TryComp<BatteryComponent>(comp.BatteryUid.Value, out var battery))
             return false;
 
         if (!TryComp<BatteryComponent>(target, out var targetBattery) || !TryComp<PowerNetworkBatteryComponent>(target, out var pnb))
             return false;
 
-        if (MathHelper.CloseToPercent(targetBattery.CurrentCharge, 0))
+        var available = _battery.GetCharge((target, targetBattery));
+        if (MathHelper.CloseToPercent(available, 0))
         {
             _popup.PopupEntity(Loc.GetString("battery-drainer-empty", ("battery", target)), uid, uid, PopupType.Medium);
             return false;
         }
 
-        var available = targetBattery.CurrentCharge;
-        var required = battery.MaxCharge - _predictedBattery.GetCharge((comp.BatteryUid.Value, battery));
+        var required = battery.MaxCharge - _battery.GetCharge((comp.BatteryUid.Value, battery));
         // higher tier storages can charge more
         var maxDrained = pnb.MaxSupply * comp.DrainTime;
         var input = Math.Min(Math.Min(available, required / comp.DrainEfficiency), maxDrained);
@@ -101,15 +99,13 @@ public sealed class BatteryDrainerSystem : SharedBatteryDrainerSystem
             return false;
 
         var output = input * comp.DrainEfficiency;
-        // PowerCells use PredictedBatteryComponent
-        // SMES, substations and APCs use BatteryComponent
-        _predictedBattery.ChangeCharge((comp.BatteryUid.Value, battery), output);
+        _battery.ChangeCharge((comp.BatteryUid.Value, battery), output);
         // TODO: create effect message or something
         Spawn("EffectSparks", Transform(target).Coordinates);
         _audio.PlayPvs(comp.SparkSound, target);
         _popup.PopupEntity(Loc.GetString("battery-drainer-success", ("battery", target)), uid, uid);
 
         // repeat the doafter until battery is full
-        return !_predictedBattery.IsFull((comp.BatteryUid.Value, battery));
+        return !_battery.IsFull((comp.BatteryUid.Value, battery));
     }
 }
diff --git a/Content.Server/Ninja/Systems/ItemCreatorSystem.cs b/Content.Server/Ninja/Systems/ItemCreatorSystem.cs
index 227fdea789..cca80f2e42 100644
--- a/Content.Server/Ninja/Systems/ItemCreatorSystem.cs
+++ b/Content.Server/Ninja/Systems/ItemCreatorSystem.cs
@@ -9,7 +9,7 @@ namespace Content.Server.Ninja.Systems;
 
 public sealed class ItemCreatorSystem : SharedItemCreatorSystem
 {
-    [Dependency] private readonly PredictedBatterySystem _battery = default!;
+    [Dependency] private readonly SharedBatterySystem _battery = default!;
     [Dependency] private readonly SharedHandsSystem _hands = default!;
     [Dependency] private readonly SharedPopupSystem _popup = default!;
 
diff --git a/Content.Server/Ninja/Systems/NinjaSuitSystem.cs b/Content.Server/Ninja/Systems/NinjaSuitSystem.cs
index 8ebd56ea7c..f6c4643cad 100644
--- a/Content.Server/Ninja/Systems/NinjaSuitSystem.cs
+++ b/Content.Server/Ninja/Systems/NinjaSuitSystem.cs
@@ -62,7 +62,7 @@ public sealed class NinjaSuitSystem : SharedNinjaSuitSystem
         if (!_powerCell.TryGetBatteryFromSlot(uid, out var battery))
             return;
 
-        if (!TryComp<PredictedBatteryComponent>(args.EntityUid, out var inserting))
+        if (!TryComp<BatteryComponent>(args.EntityUid, out var inserting))
         {
             args.Cancel();
             return;
@@ -88,11 +88,11 @@ public sealed class NinjaSuitSystem : SharedNinjaSuitSystem
     }
 
     // this function assigns a score to a power cell depending on the capacity, to be used when comparing which cell is better.
-    private float GetCellScore(EntityUid uid, PredictedBatteryComponent battcomp)
+    private float GetCellScore(EntityUid uid, BatteryComponent battcomp)
     {
         // if a cell is able to automatically recharge, boost the score drastically depending on the recharge rate,
         // this is to ensure a ninja can still upgrade to a micro reactor cell even if they already have a medium or high.
-        if (TryComp<PredictedBatterySelfRechargerComponent>(uid, out var selfcomp))
+        if (TryComp<BatterySelfRechargerComponent>(uid, out var selfcomp))
             return battcomp.MaxCharge + selfcomp.AutoRechargeRate * AutoRechargeValue;
         return battcomp.MaxCharge;
     }
diff --git a/Content.Server/Ninja/Systems/SpaceNinjaSystem.cs b/Content.Server/Ninja/Systems/SpaceNinjaSystem.cs
index f2fc9abfcc..4f3a1873f5 100644
--- a/Content.Server/Ninja/Systems/SpaceNinjaSystem.cs
+++ b/Content.Server/Ninja/Systems/SpaceNinjaSystem.cs
@@ -24,7 +24,7 @@ namespace Content.Server.Ninja.Systems;
 public sealed class SpaceNinjaSystem : SharedSpaceNinjaSystem
 {
     [Dependency] private readonly AlertsSystem _alerts = default!;
-    [Dependency] private readonly PredictedBatterySystem _battery = default!;
+    [Dependency] private readonly SharedBatterySystem _battery = default!;
     [Dependency] private readonly CodeConditionSystem _codeCondition = default!;
     [Dependency] private readonly PowerCellSystem _powerCell = default!;
     [Dependency] private readonly SharedMindSystem _mind = default!;
@@ -91,7 +91,7 @@ public sealed class SpaceNinjaSystem : SharedSpaceNinjaSystem
     /// <summary>
     /// Get the battery component in a ninja's suit, if it's worn.
     /// </summary>
-    public bool GetNinjaBattery(EntityUid user, [NotNullWhen(true)] out EntityUid? batteryUid, [NotNullWhen(true)] out PredictedBatteryComponent? batteryComp)
+    public bool GetNinjaBattery(EntityUid user, [NotNullWhen(true)] out EntityUid? batteryUid, [NotNullWhen(true)] out BatteryComponent? batteryComp)
     {
         if (TryComp<SpaceNinjaComponent>(user, out var ninja)
             && ninja.Suit != null
diff --git a/Content.Server/Ninja/Systems/StunProviderSystem.cs b/Content.Server/Ninja/Systems/StunProviderSystem.cs
index 49d7ab5e85..387844b6b1 100644
--- a/Content.Server/Ninja/Systems/StunProviderSystem.cs
+++ b/Content.Server/Ninja/Systems/StunProviderSystem.cs
@@ -17,7 +17,7 @@ namespace Content.Server.Ninja.Systems;
 /// </summary>
 public sealed class StunProviderSystem : SharedStunProviderSystem
 {
-    [Dependency] private readonly PredictedBatterySystem _battery = default!;
+    [Dependency] private readonly SharedBatterySystem _battery = default!;
     [Dependency] private readonly DamageableSystem _damageable = default!;
     [Dependency] private readonly EntityWhitelistSystem _whitelist = default!;
     [Dependency] private readonly SharedAudioSystem _audio = default!;
diff --git a/Content.Server/Power/EntitySystems/BatteryInterfaceSystem.cs b/Content.Server/Power/EntitySystems/BatteryInterfaceSystem.cs
index 83ff28646d..d2c95065db 100644
--- a/Content.Server/Power/EntitySystems/BatteryInterfaceSystem.cs
+++ b/Content.Server/Power/EntitySystems/BatteryInterfaceSystem.cs
@@ -3,6 +3,7 @@ using Content.Server.Power.Components;
 using Content.Shared.Database;
 using Content.Shared.Power;
 using Content.Shared.Power.Components;
+using Content.Shared.Power.EntitySystems;
 using Robust.Server.GameObjects;
 
 namespace Content.Server.Power.EntitySystems;
@@ -24,6 +25,7 @@ public sealed class BatteryInterfaceSystem : EntitySystem
 {
     [Dependency] private readonly IAdminLogManager _adminLog = default!;
     [Dependency] private readonly UserInterfaceSystem _uiSystem = null!;
+    [Dependency] private readonly SharedBatterySystem _battery = null!;
 
     public override void Initialize()
     {
@@ -48,7 +50,7 @@ public sealed class BatteryInterfaceSystem : EntitySystem
         var netBattery = Comp<PowerNetworkBatteryComponent>(ent);
         netBattery.CanCharge = args.On;
 
-        _adminLog.Add(LogType.Action,$"{ToPrettyString(args.Actor):actor} set input breaker to {args.On} on {ToPrettyString(ent):target}");
+        _adminLog.Add(LogType.Action, $"{ToPrettyString(args.Actor):actor} set input breaker to {args.On} on {ToPrettyString(ent):target}");
     }
 
     private void HandleSetOutputBreaker(Entity<BatteryInterfaceComponent> ent, ref BatterySetOutputBreakerMessage args)
@@ -56,7 +58,7 @@ public sealed class BatteryInterfaceSystem : EntitySystem
         var netBattery = Comp<PowerNetworkBatteryComponent>(ent);
         netBattery.CanDischarge = args.On;
 
-        _adminLog.Add(LogType.Action,$"{ToPrettyString(args.Actor):actor} set output breaker to {args.On} on {ToPrettyString(ent):target}");
+        _adminLog.Add(LogType.Action, $"{ToPrettyString(args.Actor):actor} set output breaker to {args.On} on {ToPrettyString(ent):target}");
     }
 
     private void HandleSetChargeRate(Entity<BatteryInterfaceComponent> ent, ref BatterySetChargeRateMessage args)
@@ -90,13 +92,14 @@ public sealed class BatteryInterfaceSystem : EntitySystem
         if (!_uiSystem.IsUiOpen(uid, BatteryUiKey.Key))
             return;
 
+        var currentCharge = _battery.GetCharge((uid, battery));
         _uiSystem.SetUiState(
             uid,
             BatteryUiKey.Key,
             new BatteryBuiState
             {
                 Capacity = battery.MaxCharge,
-                Charge = battery.CurrentCharge,
+                Charge = currentCharge,
                 CanCharge = netBattery.CanCharge,
                 CanDischarge = netBattery.CanDischarge,
                 CurrentReceiving = netBattery.CurrentReceiving,
diff --git a/Content.Server/Power/EntitySystems/BatterySystem.API.cs b/Content.Server/Power/EntitySystems/BatterySystem.API.cs
deleted file mode 100644
index 5995758d3d..0000000000
--- a/Content.Server/Power/EntitySystems/BatterySystem.API.cs
+++ /dev/null
@@ -1,155 +0,0 @@
-using Content.Shared.Power;
-using Content.Shared.Power.Components;
-using Content.Shared.Power.EntitySystems;
-
-namespace Content.Server.Power.EntitySystems;
-
-/// <summary>
-/// Responsible for <see cref="BatteryComponent"/>.
-/// Unpredicted equivalent of <see cref="PredictedBatterySystem"/>.
-/// If you make changes to this make sure to keep the two consistent.
-/// </summary>
-public sealed partial class BatterySystem
-{
-    public override float ChangeCharge(Entity<BatteryComponent?> ent, float amount)
-    {
-        if (!Resolve(ent, ref ent.Comp))
-            return 0;
-
-        var newValue = Math.Clamp(ent.Comp.CurrentCharge + amount, 0, ent.Comp.MaxCharge);
-        var delta = newValue - ent.Comp.CurrentCharge;
-
-        if (delta == 0f)
-            return delta;
-
-        ent.Comp.CurrentCharge = newValue;
-
-        TrySetChargeCooldown(ent.Owner);
-
-        var ev = new ChargeChangedEvent(ent.Comp.CurrentCharge, delta, ent.Comp.MaxCharge);
-        RaiseLocalEvent(ent, ref ev);
-        return delta;
-    }
-
-    public override float UseCharge(Entity<BatteryComponent?> ent, float amount)
-    {
-        if (amount <= 0f || !Resolve(ent, ref ent.Comp) || ent.Comp.CurrentCharge == 0)
-            return 0f;
-
-        return ChangeCharge(ent, -amount);
-    }
-
-    public override bool TryUseCharge(Entity<BatteryComponent?> ent, float amount)
-    {
-        if (!Resolve(ent, ref ent.Comp, false) || amount > ent.Comp.CurrentCharge)
-            return false;
-
-        UseCharge(ent, amount);
-        return true;
-    }
-
-    public override void SetCharge(Entity<BatteryComponent?> ent, float value)
-    {
-        if (!Resolve(ent, ref ent.Comp))
-            return;
-
-        var oldCharge = ent.Comp.CurrentCharge;
-        ent.Comp.CurrentCharge = MathHelper.Clamp(value, 0, ent.Comp.MaxCharge);
-        if (MathHelper.CloseTo(ent.Comp.CurrentCharge, oldCharge) &&
-            !(oldCharge != ent.Comp.CurrentCharge && ent.Comp.CurrentCharge == ent.Comp.MaxCharge))
-        {
-            return;
-        }
-
-        var ev = new ChargeChangedEvent(ent.Comp.CurrentCharge, ent.Comp.CurrentCharge - oldCharge, ent.Comp.MaxCharge);
-        RaiseLocalEvent(ent, ref ev);
-    }
-
-    public override void SetMaxCharge(Entity<BatteryComponent?> ent, float value)
-    {
-        if (!Resolve(ent, ref ent.Comp))
-            return;
-
-        var old = ent.Comp.MaxCharge;
-        var oldCharge = ent.Comp.CurrentCharge;
-        ent.Comp.MaxCharge = Math.Max(value, 0);
-        ent.Comp.CurrentCharge = Math.Min(ent.Comp.CurrentCharge, ent.Comp.MaxCharge);
-        if (MathHelper.CloseTo(ent.Comp.MaxCharge, old))
-            return;
-
-        var ev = new ChargeChangedEvent(ent.Comp.CurrentCharge, ent.Comp.CurrentCharge - oldCharge, ent.Comp.MaxCharge);
-        RaiseLocalEvent(ent, ref ev);
-    }
-
-    /// <summary>
-    /// Gets the battery's current charge.
-    /// </summary>
-    public float GetCharge(Entity<BatteryComponent?> ent)
-    {
-        if (!Resolve(ent, ref ent.Comp, false))
-            return 0f;
-
-        return ent.Comp.CurrentCharge;
-    }
-
-    /// <summary>
-    /// Gets number of remaining uses for the given charge cost.
-    /// </summary>
-    public int GetRemainingUses(Entity<BatteryComponent?> ent, float cost)
-    {
-        if (cost <= 0)
-            return 0;
-
-        if (!Resolve(ent, ref ent.Comp))
-            return 0;
-
-        return (int)(ent.Comp.CurrentCharge / cost);
-    }
-
-    /// <summary>
-    /// Gets number of maximum uses at full charge for the given charge cost.
-    /// </summary>
-    public int GetMaxUses(Entity<BatteryComponent?> ent, float cost)
-    {
-        if (cost <= 0)
-            return 0;
-
-        if (!Resolve(ent, ref ent.Comp))
-            return 0;
-
-        return (int)(ent.Comp.MaxCharge / cost);
-    }
-
-    public override void TrySetChargeCooldown(Entity<BatterySelfRechargerComponent?> ent)
-    {
-        if (!Resolve(ent, ref ent.Comp, false))
-            return;
-
-        if (ent.Comp.AutoRechargePauseTime == TimeSpan.Zero)
-            return; // no recharge pause
-
-        if (_timing.CurTime + ent.Comp.AutoRechargePauseTime <= ent.Comp.NextAutoRecharge)
-            return; // the current pause is already longer
-
-        SetChargeCooldown(ent, ent.Comp.AutoRechargePauseTime);
-    }
-
-    public override void SetChargeCooldown(Entity<BatterySelfRechargerComponent?> ent, TimeSpan cooldown)
-    {
-        if (!Resolve(ent, ref ent.Comp))
-            return;
-
-        ent.Comp.NextAutoRecharge = _timing.CurTime + cooldown;
-    }
-
-    /// <summary>
-    /// Returns whether the battery is full.
-    /// </summary>
-    public bool IsFull(Entity<BatteryComponent?> ent)
-    {
-        if (!Resolve(ent, ref ent.Comp))
-            return false;
-
-        return ent.Comp.CurrentCharge >= ent.Comp.MaxCharge;
-    }
-}
diff --git a/Content.Server/Power/EntitySystems/BatterySystem.cs b/Content.Server/Power/EntitySystems/BatterySystem.cs
index 1a88672bc9..a9b750b6d4 100644
--- a/Content.Server/Power/EntitySystems/BatterySystem.cs
+++ b/Content.Server/Power/EntitySystems/BatterySystem.cs
@@ -1,85 +1,58 @@
 using Content.Server.Power.Components;
-using Content.Shared.Cargo;
-using Content.Shared.Examine;
-using Content.Shared.Power;
 using Content.Shared.Power.Components;
 using Content.Shared.Power.EntitySystems;
 using Content.Shared.Rejuvenate;
-using JetBrains.Annotations;
 using Robust.Shared.Utility;
-using Robust.Shared.Timing;
 
 namespace Content.Server.Power.EntitySystems;
 
-/// <summary>
-/// Responsible for <see cref="BatteryComponent"/>.
-/// Unpredicted equivalent of <see cref="PredictedBatterySystem"/>.
-/// If you make changes to this make sure to keep the two consistent.
-/// </summary>
-[UsedImplicitly]
-public sealed partial class BatterySystem : SharedBatterySystem
+public sealed class BatterySystem : SharedBatterySystem
 {
-    [Dependency] private readonly IGameTiming _timing = default!;
-
     public override void Initialize()
     {
         base.Initialize();
 
-        SubscribeLocalEvent<BatteryComponent, ComponentInit>(OnInit);
-        SubscribeLocalEvent<BatteryComponent, ExaminedEvent>(OnExamine);
-        SubscribeLocalEvent<BatteryComponent, RejuvenateEvent>(OnBatteryRejuvenate);
         SubscribeLocalEvent<PowerNetworkBatteryComponent, RejuvenateEvent>(OnNetBatteryRejuvenate);
-        SubscribeLocalEvent<BatteryComponent, PriceCalculationEvent>(CalculateBatteryPrice);
-        SubscribeLocalEvent<BatteryComponent, ChangeChargeEvent>(OnChangeCharge);
-        SubscribeLocalEvent<BatteryComponent, GetChargeEvent>(OnGetCharge);
-
         SubscribeLocalEvent<NetworkBatteryPreSync>(PreSync);
         SubscribeLocalEvent<NetworkBatteryPostSync>(PostSync);
     }
 
-    private void OnInit(Entity<BatteryComponent> ent, ref ComponentInit args)
+    protected override void OnStartup(Entity<BatteryComponent> ent, ref ComponentStartup args)
     {
-        DebugTools.Assert(!HasComp<PredictedBatteryComponent>(ent), $"{ent} has both BatteryComponent and PredictedBatteryComponent");
+        // Debug assert to prevent anyone from killing their networking performance by dirtying a battery's charge every single tick.
+        // This checks for components that interact with the power network, have a charge rate that ramps up over time and therefore
+        // have to set the charge in an update loop instead of using a <see cref="RefreshChargeRateEvent"/> subscription.
+        // This is usually the case for APCs, SMES, battery powered turrets or similar.
+        // For those entities you should disable net sync for the battery in your prototype, using
+        /// <code>
+        /// - type: Battery
+        ///   netSync: false
+        /// </code>
+        /// This disables networking and prediction for this battery.
+        if (!ent.Comp.NetSyncEnabled)
+            return;
+
+        DebugTools.Assert(!HasComp<ApcPowerReceiverBatteryComponent>(ent), $"{ToPrettyString(ent.Owner)} has a predicted battery connected to the power net. Disable net sync!");
+        DebugTools.Assert(!HasComp<PowerNetworkBatteryComponent>(ent), $"{ToPrettyString(ent.Owner)} has a predicted battery connected to the power net. Disable net sync!");
+        DebugTools.Assert(!HasComp<PowerConsumerComponent>(ent), $"{ToPrettyString(ent.Owner)} has a predicted battery connected to the power net. Disable net sync!");
     }
+
+
     private void OnNetBatteryRejuvenate(Entity<PowerNetworkBatteryComponent> ent, ref RejuvenateEvent args)
     {
         ent.Comp.NetworkBattery.CurrentStorage = ent.Comp.NetworkBattery.Capacity;
     }
-    private void OnBatteryRejuvenate(Entity<BatteryComponent> ent, ref RejuvenateEvent args)
-    {
-        SetCharge(ent.AsNullable(), ent.Comp.MaxCharge);
-    }
-
-    private void OnExamine(Entity<BatteryComponent> ent, ref ExaminedEvent args)
-    {
-        if (!args.IsInDetailsRange)
-            return;
-
-        if (!HasComp<ExaminableBatteryComponent>(ent))
-            return;
-
-        var chargePercentRounded = 0;
-        if (ent.Comp.MaxCharge != 0)
-            chargePercentRounded = (int)(100 * ent.Comp.CurrentCharge / ent.Comp.MaxCharge);
-
-        args.PushMarkup(
-            Loc.GetString(
-                "examinable-battery-component-examine-detail",
-                ("percent", chargePercentRounded),
-                ("markupPercentColor", "green")
-            )
-        );
-    }
 
     private void PreSync(NetworkBatteryPreSync ev)
     {
         // Ignoring entity pausing. If the entity was paused, neither component's data should have been changed.
         var enumerator = AllEntityQuery<PowerNetworkBatteryComponent, BatteryComponent>();
-        while (enumerator.MoveNext(out var netBat, out var bat))
+        while (enumerator.MoveNext(out var uid, out var netBat, out var bat))
         {
-            DebugTools.Assert(bat.CurrentCharge <= bat.MaxCharge && bat.CurrentCharge >= 0);
+            var currentCharge = GetCharge((uid, bat));
+            DebugTools.Assert(currentCharge <= bat.MaxCharge && currentCharge >= 0);
             netBat.NetworkBattery.Capacity = bat.MaxCharge;
-            netBat.NetworkBattery.CurrentStorage = bat.CurrentCharge;
+            netBat.NetworkBattery.CurrentStorage = currentCharge;
         }
     }
 
@@ -92,42 +65,4 @@ public sealed partial class BatterySystem : SharedBatterySystem
             SetCharge((uid, bat), netBat.NetworkBattery.CurrentStorage);
         }
     }
-
-    /// <summary>
-    /// Gets the price for the power contained in an entity's battery.
-    /// </summary>
-    private void CalculateBatteryPrice(Entity<BatteryComponent> ent, ref PriceCalculationEvent args)
-    {
-        args.Price += ent.Comp.CurrentCharge * ent.Comp.PricePerJoule;
-    }
-
-    private void OnChangeCharge(Entity<BatteryComponent> ent, ref ChangeChargeEvent args)
-    {
-        if (args.ResidualValue == 0)
-            return;
-
-        args.ResidualValue -= ChangeCharge(ent.AsNullable(), args.ResidualValue);
-    }
-
-    private void OnGetCharge(Entity<BatteryComponent> entity, ref GetChargeEvent args)
-    {
-        args.CurrentCharge += entity.Comp.CurrentCharge;
-        args.MaxCharge += entity.Comp.MaxCharge;
-    }
-
-    public override void Update(float frameTime)
-    {
-        var query = EntityQueryEnumerator<BatterySelfRechargerComponent, BatteryComponent>();
-        var curTime = _timing.CurTime;
-        while (query.MoveNext(out var uid, out var comp, out var bat))
-        {
-            if (!comp.AutoRecharge || IsFull((uid, bat)))
-                continue;
-
-            if (comp.NextAutoRecharge > curTime)
-                continue;
-
-            SetCharge((uid, bat), bat.CurrentCharge + comp.AutoRechargeRate * frameTime);
-        }
-    }
 }
diff --git a/Content.Server/Power/EntitySystems/PowerMonitoringConsoleSystem.cs b/Content.Server/Power/EntitySystems/PowerMonitoringConsoleSystem.cs
index 25757360b3..e0344f4d6c 100644
--- a/Content.Server/Power/EntitySystems/PowerMonitoringConsoleSystem.cs
+++ b/Content.Server/Power/EntitySystems/PowerMonitoringConsoleSystem.cs
@@ -8,6 +8,7 @@ using Content.Shared.Pinpointer;
 using Content.Shared.Station.Components;
 using Content.Shared.Power;
 using Content.Shared.Power.Components;
+using Content.Shared.Power.EntitySystems;
 using JetBrains.Annotations;
 using Robust.Server.GameObjects;
 using Robust.Shared.Map.Components;
@@ -22,6 +23,7 @@ internal sealed partial class PowerMonitoringConsoleSystem : SharedPowerMonitori
 {
     [Dependency] private readonly UserInterfaceSystem _userInterfaceSystem = default!;
     [Dependency] private readonly SharedMapSystem _sharedMapSystem = default!;
+    [Dependency] private readonly SharedBatterySystem _battery = default!;
 
     // Note: this data does not need to be saved
     private Dictionary<EntityUid, Dictionary<Vector2i, PowerCableChunk>> _gridPowerCableChunks = new();
@@ -510,7 +512,7 @@ internal sealed partial class PowerMonitoringConsoleSystem : SharedPowerMonitori
         if (effectiveMax == 0)
             effectiveMax = 1;
 
-        return battery.CurrentCharge / effectiveMax;
+        return _battery.GetCharge((uid, battery)) / effectiveMax;
     }
 
     private void GetSourcesForNode(EntityUid uid, Node node, out List<PowerMonitoringConsoleEntry> sources)
diff --git a/Content.Server/Power/EntitySystems/PowerNetSystem.cs b/Content.Server/Power/EntitySystems/PowerNetSystem.cs
index 5b6b922ddf..1c3f76fdee 100644
--- a/Content.Server/Power/EntitySystems/PowerNetSystem.cs
+++ b/Content.Server/Power/EntitySystems/PowerNetSystem.cs
@@ -358,17 +358,18 @@ namespace Content.Server.Power.EntitySystems
 
                     if (requireBattery)
                     {
-                        _battery.SetCharge((uid, battery), battery.CurrentCharge - apcBattery.IdleLoad * frameTime);
+                        _battery.ChangeCharge((uid, battery), -apcBattery.IdleLoad * frameTime);
                     }
                     // Otherwise try to charge the battery
                     else if (powered && !_battery.IsFull((uid, battery)))
                     {
                         apcReceiver.Load += apcBattery.BatteryRechargeRate * apcBattery.BatteryRechargeEfficiency;
-                        _battery.SetCharge((uid, battery), battery.CurrentCharge + apcBattery.BatteryRechargeRate * frameTime);
+                        _battery.ChangeCharge((uid, battery), apcBattery.BatteryRechargeRate * frameTime);
                     }
 
                     // Enable / disable the battery if the state changed
-                    var enableBattery = requireBattery && battery.CurrentCharge > 0;
+                    var currentCharge = _battery.GetCharge((uid, battery));
+                    var enableBattery = requireBattery && currentCharge > 0;
 
                     if (apcBattery.Enabled != enableBattery)
                     {
diff --git a/Content.Server/Power/EntitySystems/RiggableSystem.cs b/Content.Server/Power/EntitySystems/RiggableSystem.cs
index 390e75eeb8..0bff0f4ba8 100644
--- a/Content.Server/Power/EntitySystems/RiggableSystem.cs
+++ b/Content.Server/Power/EntitySystems/RiggableSystem.cs
@@ -18,7 +18,7 @@ public sealed class RiggableSystem : EntitySystem
 {
     [Dependency] private readonly ExplosionSystem _explosionSystem = default!;
     [Dependency] private readonly IAdminLogManager _adminLogger = default!;
-    [Dependency] private readonly PredictedBatterySystem _predictedBattery = default!;
+    [Dependency] private readonly SharedBatterySystem _battery = default!;
 
     public override void Initialize()
     {
@@ -27,7 +27,6 @@ public sealed class RiggableSystem : EntitySystem
         SubscribeLocalEvent<RiggableComponent, BeingMicrowavedEvent>(OnMicrowaved);
         SubscribeLocalEvent<RiggableComponent, SolutionContainerChangedEvent>(OnSolutionChanged);
         SubscribeLocalEvent<RiggableComponent, ChargeChangedEvent>(OnChargeChanged);
-        SubscribeLocalEvent<RiggableComponent, PredictedBatteryChargeChangedEvent>(OnChargeChanged);
     }
 
     private void OnRejuvenate(Entity<RiggableComponent> entity, ref RejuvenateEvent args)
@@ -39,16 +38,7 @@ public sealed class RiggableSystem : EntitySystem
     {
         if (TryComp<BatteryComponent>(entity, out var batteryComponent))
         {
-            if (batteryComponent.CurrentCharge == 0f)
-                return;
-
-            Explode(entity, batteryComponent.CurrentCharge);
-            args.Handled = true;
-        }
-
-        if (TryComp<PredictedBatteryComponent>(entity, out var predictedBatteryComponent))
-        {
-            var charge = _predictedBattery.GetCharge((entity, predictedBatteryComponent));
+            var charge = _battery.GetCharge((entity, batteryComponent));
             if (charge == 0f)
                 return;
 
@@ -80,20 +70,7 @@ public sealed class RiggableSystem : EntitySystem
         QueueDel(uid);
     }
 
-    // non-predicted batteries
     private void OnChargeChanged(Entity<RiggableComponent> ent, ref ChargeChangedEvent args)
-    {
-        if (!ent.Comp.IsRigged)
-            return;
-
-        if (args.Charge == 0f)
-            return; // No charge to cause an explosion.
-
-        Explode(ent, args.Charge);
-    }
-
-    // predicted batteries
-    private void OnChargeChanged(Entity<RiggableComponent> ent, ref PredictedBatteryChargeChangedEvent args)
     {
         if (!ent.Comp.IsRigged)
             return;
diff --git a/Content.Server/Power/SMES/SmesSystem.cs b/Content.Server/Power/SMES/SmesSystem.cs
index 15c40b3c92..5a8169e1c9 100644
--- a/Content.Server/Power/SMES/SmesSystem.cs
+++ b/Content.Server/Power/SMES/SmesSystem.cs
@@ -2,6 +2,7 @@ using Content.Server.Power.Components;
 using Content.Server.Power.EntitySystems;
 using Content.Shared.Power;
 using Content.Shared.Power.Components;
+using Content.Shared.Power.EntitySystems;
 using Content.Shared.Rounding;
 using Content.Shared.SMES;
 using JetBrains.Annotations;
@@ -14,6 +15,7 @@ internal sealed class SmesSystem : EntitySystem
 {
     [Dependency] private readonly IGameTiming _gameTiming = default!;
     [Dependency] private readonly SharedAppearanceSystem _appearance = default!;
+    [Dependency] private readonly SharedBatterySystem _battery = default!;
 
     public override void Initialize()
     {
@@ -61,7 +63,8 @@ internal sealed class SmesSystem : EntitySystem
         if (!Resolve(uid, ref battery, false))
             return 0;
 
-        return ContentHelpers.RoundToLevels(battery.CurrentCharge, battery.MaxCharge, 6);
+        var currentCharge = _battery.GetCharge((uid, battery));
+        return ContentHelpers.RoundToLevels(currentCharge, battery.MaxCharge, 6);
     }
 
     private ChargeState CalcChargeState(EntityUid uid, PowerNetworkBatteryComponent? netBattery = null)
diff --git a/Content.Server/Power/SetBatteryPercentCommand.cs b/Content.Server/Power/SetBatteryPercentCommand.cs
index bd48e6cd97..f13a1b820e 100644
--- a/Content.Server/Power/SetBatteryPercentCommand.cs
+++ b/Content.Server/Power/SetBatteryPercentCommand.cs
@@ -1,5 +1,4 @@
 using Content.Server.Administration;
-using Content.Server.Power.EntitySystems;
 using Content.Shared.Administration;
 using Content.Shared.Power.Components;
 using Content.Shared.Power.EntitySystems;
@@ -10,8 +9,7 @@ namespace Content.Server.Power
     [AdminCommand(AdminFlags.Debug)]
     public sealed class SetBatteryPercentCommand : LocalizedEntityCommands
     {
-        [Dependency] private readonly BatterySystem _batterySystem = default!;
-        [Dependency] private readonly PredictedBatterySystem _predictedBatterySystem = default!;
+        [Dependency] private readonly SharedBatterySystem _batterySystem = default!;
 
         public override string Command => "setbatterypercent";
 
@@ -39,8 +37,6 @@ namespace Content.Server.Power
 
             if (EntityManager.TryGetComponent<BatteryComponent>(id, out var battery))
                 _batterySystem.SetCharge((id.Value, battery), battery.MaxCharge * percent / 100);
-            else if (EntityManager.TryGetComponent<PredictedBatteryComponent>(id, out var pBattery))
-                _predictedBatterySystem.SetCharge((id.Value, pBattery), pBattery.MaxCharge * percent / 100);
             else
             {
                 shell.WriteLine(Loc.GetString($"cmd-setbatterypercent-battery-not-found", ("id", id)));
diff --git a/Content.Server/PowerSink/PowerSinkSystem.cs b/Content.Server/PowerSink/PowerSinkSystem.cs
index 328bff89f4..c8ea58a395 100644
--- a/Content.Server/PowerSink/PowerSinkSystem.cs
+++ b/Content.Server/PowerSink/PowerSinkSystem.cs
@@ -68,7 +68,7 @@ namespace Content.Server.PowerSink
 
                 _battery.ChangeCharge((entity, battery), networkLoad.NetworkLoad.ReceivingPower * frameTime);
 
-                var currentBatteryThreshold = battery.CurrentCharge / battery.MaxCharge;
+                var currentBatteryThreshold = _battery.GetChargeLevel((entity, battery));
 
                 // Check for warning message threshold
                 if (!component.SentImminentExplosionWarningMessage &&
@@ -90,7 +90,7 @@ namespace Content.Server.PowerSink
                 }
 
                 // Check for explosion
-                if (battery.CurrentCharge < battery.MaxCharge)
+                if (!_battery.IsFull((entity, battery)))
                     continue;
 
                 if (component.ExplosionTime == null)
diff --git a/Content.Server/Radio/EntitySystems/JammerSystem.cs b/Content.Server/Radio/EntitySystems/JammerSystem.cs
index eaa42d744c..dead85f51f 100644
--- a/Content.Server/Radio/EntitySystems/JammerSystem.cs
+++ b/Content.Server/Radio/EntitySystems/JammerSystem.cs
@@ -11,7 +11,7 @@ namespace Content.Server.Radio.EntitySystems;
 public sealed class JammerSystem : SharedJammerSystem
 {
     [Dependency] private readonly PowerCellSystem _powerCell = default!;
-    [Dependency] private readonly PredictedBatterySystem _battery = default!;
+    [Dependency] private readonly SharedBatterySystem _battery = default!;
     [Dependency] private readonly SharedTransformSystem _transform = default!;
     [Dependency] private readonly SharedDeviceNetworkJammerSystem _jammer = default!;
 
@@ -25,7 +25,7 @@ public sealed class JammerSystem : SharedJammerSystem
     }
 
     // TODO: Very important: Make this charge rate based instead of updating every single tick
-    // See PredictedBatteryComponent
+    // See BatteryComponent
     public override void Update(float frameTime)
     {
         var query = EntityQueryEnumerator<ActiveRadioJammerComponent, RadioJammerComponent>();
diff --git a/Content.Server/SensorMonitoring/BatterySensorSystem.cs b/Content.Server/SensorMonitoring/BatterySensorSystem.cs
index bd94868c5f..2c7666ba96 100644
--- a/Content.Server/SensorMonitoring/BatterySensorSystem.cs
+++ b/Content.Server/SensorMonitoring/BatterySensorSystem.cs
@@ -3,6 +3,7 @@ using Content.Server.Power.Components;
 using Content.Shared.DeviceNetwork;
 using Content.Shared.DeviceNetwork.Events;
 using Content.Shared.Power.Components;
+using Content.Shared.Power.EntitySystems;
 
 namespace Content.Server.SensorMonitoring;
 
@@ -11,6 +12,7 @@ public sealed class BatterySensorSystem : EntitySystem
     public const string DeviceNetworkCommandSyncData = "bat_sync_data";
 
     [Dependency] private readonly DeviceNetworkSystem _deviceNetwork = default!;
+    [Dependency] private readonly SharedBatterySystem _battery = default!;
 
     public override void Initialize()
     {
@@ -26,13 +28,14 @@ public sealed class BatterySensorSystem : EntitySystem
         {
             case DeviceNetworkCommandSyncData:
                 var battery = Comp<BatteryComponent>(uid);
+                var currentCharge = _battery.GetCharge((uid, battery));
                 var netBattery = Comp<PowerNetworkBatteryComponent>(uid);
 
                 var payload = new NetworkPayload
                 {
                     [DeviceNetworkConstants.Command] = DeviceNetworkCommandSyncData,
                     [DeviceNetworkCommandSyncData] = new BatterySensorData(
-                        battery.CurrentCharge,
+                        currentCharge,
                         battery.MaxCharge,
                         netBattery.CurrentReceiving,
                         netBattery.MaxChargeRate,
diff --git a/Content.Server/Silicons/Borgs/BorgSystem.cs b/Content.Server/Silicons/Borgs/BorgSystem.cs
index 6f37d55013..925050f28e 100644
--- a/Content.Server/Silicons/Borgs/BorgSystem.cs
+++ b/Content.Server/Silicons/Borgs/BorgSystem.cs
@@ -25,7 +25,7 @@ public sealed partial class BorgSystem : SharedBorgSystem
     [Dependency] private readonly TriggerSystem _trigger = default!;
     [Dependency] private readonly MobStateSystem _mobState = default!;
     [Dependency] private readonly SharedContainerSystem _container = default!;
-    [Dependency] private readonly PredictedBatterySystem _battery = default!;
+    [Dependency] private readonly SharedBatterySystem _battery = default!;
     [Dependency] private readonly EmagSystem _emag = default!;
     [Dependency] private readonly MobThresholdSystem _mobThresholdSystem = default!;
     [Dependency] private readonly ItemSlotsSystem _itemSlotsSystem = default!;
diff --git a/Content.Server/Silicons/StationAi/StationAiSystem.cs b/Content.Server/Silicons/StationAi/StationAiSystem.cs
index e52400d3de..c4afd83b2d 100644
--- a/Content.Server/Silicons/StationAi/StationAiSystem.cs
+++ b/Content.Server/Silicons/StationAi/StationAiSystem.cs
@@ -4,7 +4,6 @@ using Content.Server.Destructible;
 using Content.Server.Ghost;
 using Content.Server.Mind;
 using Content.Server.Power.Components;
-using Content.Server.Power.EntitySystems;
 using Content.Server.Roles;
 using Content.Server.Spawners.Components;
 using Content.Server.Spawners.EntitySystems;
@@ -21,6 +20,7 @@ using Content.Shared.Mobs;
 using Content.Shared.Mobs.Systems;
 using Content.Shared.Popups;
 using Content.Shared.Power;
+using Content.Shared.Power.EntitySystems;
 using Content.Shared.Power.Components;
 using Content.Shared.Rejuvenate;
 using Content.Shared.Roles;
@@ -49,7 +49,7 @@ public sealed class StationAiSystem : SharedStationAiSystem
     [Dependency] private readonly GhostSystem _ghost = default!;
     [Dependency] private readonly AlertsSystem _alerts = default!;
     [Dependency] private readonly DestructibleSystem _destructible = default!;
-    [Dependency] private readonly BatterySystem _battery = default!;
+    [Dependency] private readonly SharedBatterySystem _battery = default!;
     [Dependency] private readonly DamageableSystem _damageable = default!;
     [Dependency] private readonly SharedPopupSystem _popups = default!;
     [Dependency] private readonly StationSystem _station = default!;
@@ -220,6 +220,7 @@ public sealed class StationAiSystem : SharedStationAiSystem
         UpdateDamagedAccent(entity);
     }
 
+    // TODO: This should just read the current damage and charge when speaking instead of updating the component all the time even if we don't even use it.
     private void UpdateDamagedAccent(Entity<StationAiCoreComponent> ent)
     {
         if (!TryGetHeld((ent.Owner, ent.Comp), out var held))
@@ -229,7 +230,7 @@ public sealed class StationAiSystem : SharedStationAiSystem
             return;
 
         if (TryComp<BatteryComponent>(ent, out var battery))
-            accent.OverrideChargeLevel = battery.CurrentCharge / battery.MaxCharge;
+            accent.OverrideChargeLevel = _battery.GetChargeLevel((ent.Owner, battery));
 
         if (TryComp<DamageableComponent>(ent, out var damageable))
             accent.OverrideTotalDamage = damageable.TotalDamage;
@@ -251,7 +252,7 @@ public sealed class StationAiSystem : SharedStationAiSystem
         if (!_proto.TryIndex(_batteryAlert, out var proto))
             return;
 
-        var chargePercent = battery.CurrentCharge / battery.MaxCharge;
+        var chargePercent = _battery.GetChargeLevel((ent.Owner, battery));
         var chargeLevel = Math.Round(chargePercent * proto.MaxSeverity);
 
         _alerts.ShowAlert(held.Value, _batteryAlert, (short)Math.Clamp(chargeLevel, 0, proto.MaxSeverity));
diff --git a/Content.Server/Speech/EntitySystems/DamagedSiliconAccentSystem.cs b/Content.Server/Speech/EntitySystems/DamagedSiliconAccentSystem.cs
index e5db13ca84..e9bbfdf528 100644
--- a/Content.Server/Speech/EntitySystems/DamagedSiliconAccentSystem.cs
+++ b/Content.Server/Speech/EntitySystems/DamagedSiliconAccentSystem.cs
@@ -13,7 +13,7 @@ namespace Content.Server.Speech.EntitySystems;
 public sealed class DamagedSiliconAccentSystem : EntitySystem
 {
     [Dependency] private readonly IRobustRandom _random = default!;
-    [Dependency] private readonly PredictedBatterySystem _battery = default!;
+    [Dependency] private readonly SharedBatterySystem _battery = default!;
     [Dependency] private readonly PowerCellSystem _powerCell = default!;
     [Dependency] private readonly DestructibleSystem _destructibleSystem = default!;
 
diff --git a/Content.Server/Stunnable/Systems/StunbatonSystem.cs b/Content.Server/Stunnable/Systems/StunbatonSystem.cs
index b1bae0127c..90d2dc7588 100644
--- a/Content.Server/Stunnable/Systems/StunbatonSystem.cs
+++ b/Content.Server/Stunnable/Systems/StunbatonSystem.cs
@@ -18,7 +18,7 @@ namespace Content.Server.Stunnable.Systems
     {
         [Dependency] private readonly RiggableSystem _riggableSystem = default!;
         [Dependency] private readonly SharedPopupSystem _popup = default!;
-        [Dependency] private readonly PredictedBatterySystem _battery = default!;
+        [Dependency] private readonly SharedBatterySystem _battery = default!;
         [Dependency] private readonly ItemToggleSystem _itemToggle = default!;
 
         public override void Initialize()
@@ -28,13 +28,13 @@ namespace Content.Server.Stunnable.Systems
             SubscribeLocalEvent<StunbatonComponent, ExaminedEvent>(OnExamined);
             SubscribeLocalEvent<StunbatonComponent, SolutionContainerChangedEvent>(OnSolutionChange);
             SubscribeLocalEvent<StunbatonComponent, StaminaDamageOnHitAttemptEvent>(OnStaminaHitAttempt);
-            SubscribeLocalEvent<StunbatonComponent, PredictedBatteryChargeChangedEvent>(OnChargeChanged);
+            SubscribeLocalEvent<StunbatonComponent, ChargeChangedEvent>(OnChargeChanged);
         }
 
         private void OnStaminaHitAttempt(Entity<StunbatonComponent> entity, ref StaminaDamageOnHitAttemptEvent args)
         {
             if (!_itemToggle.IsActivated(entity.Owner) ||
-            !TryComp<PredictedBatteryComponent>(entity.Owner, out var battery) || !_battery.TryUseCharge((entity.Owner, battery), entity.Comp.EnergyPerUse))
+            !TryComp<BatteryComponent>(entity.Owner, out var battery) || !_battery.TryUseCharge((entity.Owner, battery), entity.Comp.EnergyPerUse))
             {
                 args.Cancelled = true;
             }
@@ -47,7 +47,7 @@ namespace Content.Server.Stunnable.Systems
             : Loc.GetString("comp-stunbaton-examined-off");
             args.PushMarkup(onMsg);
 
-            if (TryComp<PredictedBatteryComponent>(entity.Owner, out var battery))
+            if (TryComp<BatteryComponent>(entity.Owner, out var battery))
             {
                 var count = _battery.GetRemainingUses((entity.Owner, battery), entity.Comp.EnergyPerUse);
                 args.PushMarkup(Loc.GetString("melee-battery-examine", ("color", "yellow"), ("count", count)));
@@ -58,7 +58,7 @@ namespace Content.Server.Stunnable.Systems
         {
             base.TryTurnOn(entity, ref args);
 
-            if (!TryComp<PredictedBatteryComponent>(entity, out var battery) || _battery.GetCharge((entity, battery)) < entity.Comp.EnergyPerUse)
+            if (!TryComp<BatteryComponent>(entity, out var battery) || _battery.GetCharge((entity, battery)) < entity.Comp.EnergyPerUse)
             {
                 args.Cancelled = true;
                 if (args.User != null)
@@ -79,7 +79,7 @@ namespace Content.Server.Stunnable.Systems
         {
             // Explode if baton is activated and rigged.
             if (!TryComp<RiggableComponent>(entity, out var riggable) ||
-                !TryComp<PredictedBatteryComponent>(entity, out var battery))
+                !TryComp<BatteryComponent>(entity, out var battery))
                 return;
 
             if (_itemToggle.IsActivated(entity.Owner) && riggable.IsRigged)
@@ -96,9 +96,9 @@ namespace Content.Server.Stunnable.Systems
             });
         }
 
-        private void OnChargeChanged(Entity<StunbatonComponent> entity, ref PredictedBatteryChargeChangedEvent args)
+        private void OnChargeChanged(Entity<StunbatonComponent> entity, ref ChargeChangedEvent args)
         {
-            if (TryComp<PredictedBatteryComponent>(entity.Owner, out var battery) &&
+            if (TryComp<BatteryComponent>(entity.Owner, out var battery) &&
                 _battery.GetCharge((entity.Owner, battery)) < entity.Comp.EnergyPerUse)
             {
                 _itemToggle.TryDeactivate(entity.Owner, predicted: false);
diff --git a/Content.Server/Tesla/EntitySystem/TeslaCoilSystem.cs b/Content.Server/Tesla/EntitySystem/TeslaCoilSystem.cs
index 988ade86ce..d418ea5a18 100644
--- a/Content.Server/Tesla/EntitySystem/TeslaCoilSystem.cs
+++ b/Content.Server/Tesla/EntitySystem/TeslaCoilSystem.cs
@@ -24,7 +24,7 @@ public sealed class TeslaCoilSystem : EntitySystem
     {
         if (TryComp<BatteryComponent>(coil, out var batteryComponent))
         {
-            _battery.SetCharge((coil, batteryComponent), batteryComponent.CurrentCharge + coil.Comp.ChargeFromLightning);
+            _battery.ChangeCharge((coil, batteryComponent), coil.Comp.ChargeFromLightning);
         }
     }
 }
diff --git a/Content.Server/Xenoarchaeology/Artifact/XAE/XAEChargeBatterySystem.cs b/Content.Server/Xenoarchaeology/Artifact/XAE/XAEChargeBatterySystem.cs
index c3f4926a12..437e082581 100644
--- a/Content.Server/Xenoarchaeology/Artifact/XAE/XAEChargeBatterySystem.cs
+++ b/Content.Server/Xenoarchaeology/Artifact/XAE/XAEChargeBatterySystem.cs
@@ -13,29 +13,20 @@ namespace Content.Server.Xenoarchaeology.Artifact.XAE;
 public sealed class XAEChargeBatterySystem : BaseXAESystem<XAEChargeBatteryComponent>
 {
     [Dependency] private readonly BatterySystem _battery = default!;
-    [Dependency] private readonly PredictedBatterySystem _predictedBattery = default!;
     [Dependency] private readonly EntityLookupSystem _lookup = default!;
 
     /// <summary> Pre-allocated and re-used collection.</summary>
     private readonly HashSet<Entity<BatteryComponent>> _batteryEntities = new();
-    private readonly HashSet<Entity<PredictedBatteryComponent>> _pBatteryEntities = new();
 
     /// <inheritdoc />
     protected override void OnActivated(Entity<XAEChargeBatteryComponent> ent, ref XenoArtifactNodeActivatedEvent args)
     {
         _batteryEntities.Clear();
-        _pBatteryEntities.Clear();
 
         _lookup.GetEntitiesInRange(args.Coordinates, ent.Comp.Radius, _batteryEntities);
         foreach (var battery in _batteryEntities)
         {
             _battery.SetCharge(battery.AsNullable(), battery.Comp.MaxCharge);
         }
-
-        _lookup.GetEntitiesInRange(args.Coordinates, ent.Comp.Radius, _pBatteryEntities);
-        foreach (var pBattery in _pBatteryEntities)
-        {
-            _predictedBattery.SetCharge(pBattery.AsNullable(), pBattery.Comp.MaxCharge);
-        }
     }
 }
diff --git a/Content.Shared/Power/ChargeEvents.cs b/Content.Shared/Power/ChargeEvents.cs
index d6a9c66071..ff602f9dcb 100644
--- a/Content.Shared/Power/ChargeEvents.cs
+++ b/Content.Shared/Power/ChargeEvents.cs
@@ -1,40 +1,17 @@
 using Content.Shared.Power.Components;
+using Content.Shared.Power.EntitySystems;
 using Content.Shared.PowerCell.Components;
 
 namespace Content.Shared.Power;
 
 /// <summary>
-/// Raised when a battery's charge or capacity changes (capacity affects relative charge percentage).
-/// Only raised for entities with <see cref="BatteryComponent"/>.
+/// Raised when a battery's charge, charge rate or capacity was updated (capacity affects relative charge percentage).
+/// If a battery uses <see cref="BatteryComponent.ChargeRate"/> to (dis)charge this is NOT raised every single tick, but only when the charge rate is updated.
+/// For instantaneous charge changes using <see cref="SharedBatterySystem.SetCharge"/>, <see cref="SharedBatterySystem.ChangeCharge"/> or similar this DOES get raised, but
+/// you should avoid doing so in update loops if the component has net sync enabled.
 /// </summary>
 [ByRefEvent]
-public readonly record struct ChargeChangedEvent(float Charge, float Delta, float MaxCharge)
-{
-    /// <summary>
-    /// The new charge of the battery.
-    /// </summary>
-    public readonly float Charge = Charge;
-
-    /// <summary>
-    /// The amount the charge was changed by.
-    /// </summary>
-    public readonly float Delta = Delta;
-
-    /// <summary>
-    /// The maximum charge of the battery.
-    /// </summary>
-    public readonly float MaxCharge = MaxCharge;
-}
-
-/// <summary>
-/// Raised when a predicted battery's charge or capacity changes (capacity affects relative charge percentage).
-/// Unlike <see cref="ChargeChangedEvent"/> this is not raised repeatedly each time the charge changes, but only when the charge rate is changed
-/// or a charge amount was added or removed instantaneously. The current charge can be inferred from the time of the last update and the charge and
-/// charge rate at that time.
-/// Only raised for entities with <see cref="PredictedBatteryComponent"/>.
-/// </summary>
-[ByRefEvent]
-public readonly record struct PredictedBatteryChargeChangedEvent(float CurrentCharge, float Delta, float CurrentChargeRate, float MaxCharge)
+public readonly record struct ChargeChangedEvent(float CurrentCharge, float Delta, float CurrentChargeRate, float MaxCharge)
 {
     /// <summary>
     /// The new charge of the battery.
@@ -60,15 +37,14 @@ public readonly record struct PredictedBatteryChargeChangedEvent(float CurrentCh
 
 /// <summary>
 /// Raised when a battery changes its state between full, empty, or neither.
-/// Used only for <see cref="PredictedBatteryComponent"/>.
+/// Useful to detect when a battery is empty or fully charged (since ChargeChangedEvent does not get raised every tick for batteries with a constant charge rate).
 /// </summary>
 [ByRefEvent]
-public record struct PredictedBatteryStateChangedEvent(BatteryState OldState, BatteryState NewState);
+public record struct BatteryStateChangedEvent(BatteryState OldState, BatteryState NewState);
 
 /// <summary>
 /// Raised to calculate a predicted battery's recharge rate.
 /// Subscribe to this to offset its current charge rate.
-/// Used only for <see cref="PredictedBatteryComponent"/>.
 /// </summary>
 [ByRefEvent]
 public record struct RefreshChargeRateEvent(float MaxCharge)
@@ -80,7 +56,7 @@ public record struct RefreshChargeRateEvent(float MaxCharge)
 /// <summary>
 /// Event that supports multiple battery types.
 /// Raised when it is necessary to get information about battery charges.
-/// Works with either <see cref="BatteryComponent"/>, <see cref="PredictedBatteryComponent"/>, or <see cref="PowerCellSlotComponent"/>.
+/// Works with either <see cref="BatteryComponent"/> or <see cref="PowerCellSlotComponent"/>.
 /// If there are multiple batteries then the results will be summed up.
 /// </summary>
 [ByRefEvent]
@@ -93,7 +69,7 @@ public record struct GetChargeEvent
 /// <summary>
 /// Method event that supports multiple battery types.
 /// Raised when it is necessary to change the current battery charge by some value.
-/// Works with either <see cref="BatteryComponent"/>, <see cref="PredictedBatteryComponent"/>, or <see cref="PowerCellSlotComponent"/>.
+/// Works with either <see cref="BatteryComponent"/> or <see cref="PowerCellSlotComponent"/>.
 /// If there are multiple batteries then they will be changed in order of subscription until the total value was reached.
 /// </summary>
 [ByRefEvent]
diff --git a/Content.Shared/Power/Components/BatteryComponent.cs b/Content.Shared/Power/Components/BatteryComponent.cs
index 396896a6c5..343333f6db 100644
--- a/Content.Shared/Power/Components/BatteryComponent.cs
+++ b/Content.Shared/Power/Components/BatteryComponent.cs
@@ -1,34 +1,98 @@
 using Content.Shared.Power.EntitySystems;
+using Content.Shared.PowerCell.Components;
 using Content.Shared.Guidebook;
+using Robust.Shared.GameStates;
+using Robust.Shared.Serialization;
+using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom;
 
 namespace Content.Shared.Power.Components;
 
 /// <summary>
-/// Battery node on the pow3r network. Needs other components to connect to actual networks.
-/// Use this for batteries that cannot be predicted.
-/// Use <see cref="PredictedBatteryComponent"/> otherwise.
+/// Used for any sort of battery that stores electical power.
+/// Can be used as a battery node on the pow3r network. Needs other components to connect to actual networks, see PowerNetworkBatteryComponent.
+/// Also used for power cells using <see cref="PowerCellComponent"/> or battery powered guns with intrinsic battery.
 /// </summary>
-[RegisterComponent]
-[Virtual]
+/// <remarks>
+/// IMPORTANT: If your battery has an update loop setting the charge every single tick you should set <see cref="Component.NetSyncEnabled"> to false
+/// in your prototype to prevent it from getting networked every single tick. However, this will disable prediction.
+/// This is mostly needed for anything connected to the power network (APCs, SMES, turrets with battery), as their power supply ramps up over time.
+/// Everything else that only has a constant charge rate (e.g. charging/discharging a battery at a certain wattage) or instantaneous power draw (e.g. shooting a gun) is fine being networked.
+/// However, you should write your systems to avoid using update loops and instead change the battery's charge rate using <see cref="SharedBatterySystem.RefreshChargeRate"/> and
+/// the current charge will automatically be inferred if you use <see cref="SharedBatterySystem.GetCharge"/>.
+/// </remarks>
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState, AutoGenerateComponentPause]
 [Access(typeof(SharedBatterySystem))]
-public partial class BatteryComponent : Component
+public sealed partial class BatteryComponent : Component
 {
     /// <summary>
-    /// Maximum charge of the battery in joules (i.e. watt seconds)
+    /// Maximum charge of the battery in joules (ie. watt seconds)
     /// </summary>
-    [DataField]
+    [DataField, AutoNetworkedField, ViewVariables]
     [GuidebookData]
     public float MaxCharge;
 
-    /// <summary>
-    /// Current charge of the battery in joules (ie. watt seconds)
-    /// </summary>
-    [DataField("startingCharge")] // TODO: rename this datafield to currentCharge
-    public float CurrentCharge;
-
     /// <summary>
     /// The price per one joule. Default is 1 speso for 10kJ.
     /// </summary>
     [DataField]
     public float PricePerJoule = 0.0001f;
+
+    /// <summary>
+    /// Time stamp of the last networked update.
+    /// </summary>
+    [DataField(customTypeSerializer: typeof(TimeOffsetSerializer))]
+    [AutoNetworkedField, AutoPausedField, ViewVariables]
+    public TimeSpan LastUpdate = TimeSpan.Zero;
+
+    /// <summary>
+    /// The intial charge to be set on map init.
+    /// </summary>
+    [DataField]
+    public float StartingCharge;
+
+    /// <summary>
+    /// The charge at the last update in joules (i.e. watt seconds).
+    /// </summary>
+    [DataField, AutoNetworkedField, ViewVariables]
+    public float LastCharge;
+
+    /// <summary>
+    /// The current charge rate in watt.
+    /// </summary>
+    /// <remarks>
+    /// Not a datafield as this is only cached and recalculated on component startup.
+    /// </remarks>
+    [ViewVariables, AutoNetworkedField]
+    public float ChargeRate;
+
+    /// <summary>
+    /// The current charge state of the battery.
+    /// Used to track state changes for raising <see cref="BatteryStateChangedEvent"/>.
+    /// </summary>
+    /// <remarks>
+    /// Not a datafield as this is only cached and recalculated in an update loop.
+    /// </remarks>
+    [ViewVariables, AutoNetworkedField]
+    public BatteryState State = BatteryState.Neither;
 }
+
+/// <summary>
+/// Charge level status of the battery.
+/// </summary>
+[Serializable, NetSerializable]
+public enum BatteryState : byte
+{
+    /// <summary>
+    /// Full charge.
+    /// </summary>
+    Full,
+    /// <summary>
+    /// No charge.
+    /// </summary>
+    Empty,
+    /// <summary>
+    /// Neither full nor empty.
+    /// </summary>
+    Neither,
+}
+
diff --git a/Content.Shared/Power/Components/BatterySelfRechargerComponent.cs b/Content.Shared/Power/Components/BatterySelfRechargerComponent.cs
index 7a5665ae82..e18ad9d3b0 100644
--- a/Content.Shared/Power/Components/BatterySelfRechargerComponent.cs
+++ b/Content.Shared/Power/Components/BatterySelfRechargerComponent.cs
@@ -1,3 +1,4 @@
+using Robust.Shared.GameStates;
 using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom;
 
 namespace Content.Shared.Power.Components;
@@ -5,33 +6,27 @@ namespace Content.Shared.Power.Components;
 /// <summary>
 /// Self-recharging battery.
 /// To be used in combination with <see cref="BatteryComponent"/>.
-/// For <see cref="PredictedBatteryComponent"/> use <see cref="PredictedBatterySelfRechargerComponent"/> instead.
 /// </summary>
-[RegisterComponent, AutoGenerateComponentPause]
+[RegisterComponent, NetworkedComponent]
+[AutoGenerateComponentState, AutoGenerateComponentPause]
 public sealed partial class BatterySelfRechargerComponent : Component
 {
-    /// <summary>
-    /// Is the component currently enabled?
-    /// </summary>
-    [DataField]
-    public bool AutoRecharge = true;
-
     /// <summary>
     /// At what rate does the entity automatically recharge? In watts.
     /// </summary>
-    [DataField]
+    [DataField, AutoNetworkedField, ViewVariables]
     public float AutoRechargeRate;
 
     /// <summary>
-    /// How long should the entity stop automatically recharging if charge is used?
+    /// How long should the entity stop automatically recharging if a charge is used?
     /// </summary>
-    [DataField]
-    public TimeSpan AutoRechargePauseTime = TimeSpan.FromSeconds(0);
+    [DataField, AutoNetworkedField]
+    public TimeSpan AutoRechargePauseTime = TimeSpan.Zero;
 
     /// <summary>
     /// Do not auto recharge if this timestamp has yet to happen, set for the auto recharge pause system.
     /// </summary>
     [DataField(customTypeSerializer: typeof(TimeOffsetSerializer))]
-    [AutoPausedField]
-    public TimeSpan NextAutoRecharge = TimeSpan.FromSeconds(0);
+    [AutoNetworkedField, AutoPausedField, ViewVariables]
+    public TimeSpan? NextAutoRecharge = TimeSpan.FromSeconds(0);
 }
diff --git a/Content.Shared/Power/Components/PredictedBatteryVisualsComponent.cs b/Content.Shared/Power/Components/BatteryVisualsComponent.cs
similarity index 75%
rename from Content.Shared/Power/Components/PredictedBatteryVisualsComponent.cs
rename to Content.Shared/Power/Components/BatteryVisualsComponent.cs
index f7ea9338ab..120dd8591f 100644
--- a/Content.Shared/Power/Components/PredictedBatteryVisualsComponent.cs
+++ b/Content.Shared/Power/Components/BatteryVisualsComponent.cs
@@ -5,11 +5,11 @@ using Robust.Shared.Serialization;
 namespace Content.Shared.Power.Components;
 
 /// <summary>
-/// Marker component that makes an entity with <see cref="PredictedBatteryComponent"/> update its appearance data for use with visualizers.
+/// Marker component that makes an entity with <see cref="BatteryComponent"/> update its appearance data for use with visualizers.
 /// Also works with an entity with <see cref="PowerCellSlotComponent"/> and will relay the state of the inserted powercell.
 /// </summary>
 [RegisterComponent, NetworkedComponent]
-public sealed partial class PredictedBatteryVisualsComponent : Component;
+public sealed partial class BatteryVisualsComponent : Component;
 
 /// <summary>
 /// Keys for the appearance data.
@@ -37,15 +37,15 @@ public enum BatteryVisuals : byte
 public enum BatteryChargingState : byte
 {
     /// <summary>
-    /// PredictedBatteryComponent.ChargeRate &gt; 0
+    /// BatteryComponent.ChargeRate &gt; 0
     /// </summary>
     Charging,
     /// <summary>
-    /// PredictedBatteryComponent.ChargeRate &lt; 0
+    /// BatteryComponent.ChargeRate &lt; 0
     /// </summary>
     Decharging,
     /// <summary>
-    /// PredictedBatteryComponent.ChargeRate == 0
+    /// BatteryComponent.ChargeRate == 0
     /// </summary>
     Constant,
 }
diff --git a/Content.Shared/Power/Components/ExaminableBatteryComponent.cs b/Content.Shared/Power/Components/ExaminableBatteryComponent.cs
index 59d0b8792b..b49680db0d 100644
--- a/Content.Shared/Power/Components/ExaminableBatteryComponent.cs
+++ b/Content.Shared/Power/Components/ExaminableBatteryComponent.cs
@@ -4,7 +4,7 @@ namespace Content.Shared.Power.Components;
 
 /// <summary>
 /// Allows the charge of a battery to be seen by examination.
-/// Works with either  <see cref="BatteryComponent"/> or <see cref="PredictedBatteryComponent"/>.
+/// Requires <see cref="BatteryComponent"/>.
 /// </summary>
 [RegisterComponent, NetworkedComponent]
 public sealed partial class ExaminableBatteryComponent : Component;
diff --git a/Content.Shared/Power/Components/PredictedBatteryComponent.cs b/Content.Shared/Power/Components/PredictedBatteryComponent.cs
deleted file mode 100644
index 0db53245eb..0000000000
--- a/Content.Shared/Power/Components/PredictedBatteryComponent.cs
+++ /dev/null
@@ -1,94 +0,0 @@
-using Content.Shared.Power.EntitySystems;
-using Content.Shared.Guidebook;
-using Robust.Shared.GameStates;
-using Robust.Shared.Serialization;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom;
-
-namespace Content.Shared.Power.Components;
-
-/// <summary>
-/// Predicted equivalent to <see cref="BatteryComponent"/>.
-/// Use this for electrical power storages that only have a constant charge rate or instantaneous power draw.
-/// Devices being directly charged by the power network do not fulfill that requirement as their power supply ramps up over time.
-/// </summary>
-/// <remarks>
-/// We cannot simply network <see cref="BatteryComponent"/> since it would get dirtied every single tick when it updates.
-/// This component solves this by requiring a constant charge rate and having the client infer the current charge from the rate
-/// and the timestamp the charge was last networked at. This can possibly be expanded in the future by adding a second time derivative.
-/// </remarks>
-[RegisterComponent, NetworkedComponent, AutoGenerateComponentState, AutoGenerateComponentPause]
-[Access(typeof(PredictedBatterySystem))]
-public sealed partial class PredictedBatteryComponent : Component
-{
-    /// <summary>
-    /// Maximum charge of the battery in joules (ie. watt seconds)
-    /// </summary>
-    [DataField, AutoNetworkedField, ViewVariables]
-    [GuidebookData]
-    public float MaxCharge;
-
-    /// <summary>
-    /// The price per one joule. Default is 1 speso for 10kJ.
-    /// </summary>
-    [DataField]
-    public float PricePerJoule = 0.0001f;
-
-    /// <summary>
-    /// Time stamp of the last networked update.
-    /// </summary>
-    [DataField(customTypeSerializer: typeof(TimeOffsetSerializer))]
-    [AutoNetworkedField, AutoPausedField, ViewVariables]
-    public TimeSpan LastUpdate = TimeSpan.Zero;
-
-    /// <summary>
-    /// The intial charge to be set on map init.
-    /// </summary>
-    [DataField]
-    public float StartingCharge;
-
-    /// <summary>
-    /// The charge at the last update in joules (i.e. watt seconds).
-    /// </summary>
-    [DataField, AutoNetworkedField, ViewVariables]
-    public float LastCharge;
-
-    /// <summary>
-    /// The current charge rate in watt.
-    /// </summary>
-    /// <remarks>
-    /// Not a datafield as this is only cached and recalculated on component startup.
-    /// </remarks>
-    [ViewVariables, AutoNetworkedField]
-    public float ChargeRate;
-
-    /// <summary>
-    /// The current charge state of the battery.
-    /// Used to track state changes for raising <see cref="PredictedBatteryStateChangedEvent"/>.
-    /// </summary>
-    /// <remarks>
-    /// Not a datafield as this is only cached and recalculated in an update loop.
-    /// </remarks>
-    [ViewVariables, AutoNetworkedField]
-    public BatteryState State = BatteryState.Neither;
-}
-
-/// <summary>
-/// Charge level status of the battery.
-/// </summary>
-[Serializable, NetSerializable]
-public enum BatteryState : byte
-{
-    /// <summary>
-    /// Full charge.
-    /// </summary>
-    Full,
-    /// <summary>
-    /// No charge.
-    /// </summary>
-    Empty,
-    /// <summary>
-    /// Neither full nor empty.
-    /// </summary>
-    Neither,
-}
-
diff --git a/Content.Shared/Power/Components/PredictedBatterySelfRechargerComponent.cs b/Content.Shared/Power/Components/PredictedBatterySelfRechargerComponent.cs
deleted file mode 100644
index 449a4e1dc6..0000000000
--- a/Content.Shared/Power/Components/PredictedBatterySelfRechargerComponent.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-using Robust.Shared.GameStates;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom;
-
-namespace Content.Shared.Power.Components;
-
-/// <summary>
-/// Self-recharging battery.
-/// To be used in combination with <see cref="PredictedBatteryComponent"/>.
-/// For <see cref="BatteryComponent"/> use <see cref="BatterySelfRechargerComponent"/> instead.
-/// </summary>
-[RegisterComponent, NetworkedComponent]
-[AutoGenerateComponentState, AutoGenerateComponentPause]
-public sealed partial class PredictedBatterySelfRechargerComponent : Component
-{
-    /// <summary>
-    /// At what rate does the entity automatically recharge? In watts.
-    /// </summary>
-    [DataField, AutoNetworkedField, ViewVariables]
-    public float AutoRechargeRate;
-
-    /// <summary>
-    /// How long should the entity stop automatically recharging if a charge is used?
-    /// </summary>
-    [DataField, AutoNetworkedField]
-    public TimeSpan AutoRechargePauseTime = TimeSpan.Zero;
-
-    /// <summary>
-    /// Do not auto recharge if this timestamp has yet to happen, set for the auto recharge pause system.
-    /// </summary>
-    [DataField(customTypeSerializer: typeof(TimeOffsetSerializer))]
-    [AutoNetworkedField, AutoPausedField, ViewVariables]
-    public TimeSpan? NextAutoRecharge = TimeSpan.FromSeconds(0);
-}
diff --git a/Content.Shared/Power/EntitySystems/ChargerSystem.cs b/Content.Shared/Power/EntitySystems/ChargerSystem.cs
index b561eedcbb..00429067c4 100644
--- a/Content.Shared/Power/EntitySystems/ChargerSystem.cs
+++ b/Content.Shared/Power/EntitySystems/ChargerSystem.cs
@@ -13,7 +13,7 @@ namespace Content.Shared.Power.EntitySystems;
 
 public sealed class ChargerSystem : EntitySystem
 {
-    [Dependency] private readonly PredictedBatterySystem _battery = default!;
+    [Dependency] private readonly SharedBatterySystem _battery = default!;
     [Dependency] private readonly SharedPowerReceiverSystem _receiver = default!;
     [Dependency] private readonly EntityWhitelistSystem _whitelist = default!;
     [Dependency] private readonly SharedContainerSystem _container = default!;
@@ -35,7 +35,7 @@ public sealed class ChargerSystem : EntitySystem
         SubscribeLocalEvent<ChargerComponent, EmpPulseEvent>(OnEmpPulse);
         SubscribeLocalEvent<ChargerComponent, EmpDisabledRemovedEvent>(OnEmpRemoved);
         SubscribeLocalEvent<InsideChargerComponent, RefreshChargeRateEvent>(OnRefreshChargeRate);
-        SubscribeLocalEvent<InsideChargerComponent, PredictedBatteryStateChangedEvent>(OnStatusChanged);
+        SubscribeLocalEvent<InsideChargerComponent, BatteryStateChangedEvent>(OnStatusChanged);
     }
 
     private void OnStartup(Entity<ChargerComponent> ent, ref ComponentStartup args)
@@ -176,7 +176,7 @@ public sealed class ChargerSystem : EntitySystem
 
         args.NewChargeRate += chargerComp.ChargeRate;
     }
-    private void OnStatusChanged(Entity<InsideChargerComponent> ent, ref PredictedBatteryStateChangedEvent args)
+    private void OnStatusChanged(Entity<InsideChargerComponent> ent, ref BatteryStateChangedEvent args)
     {
         // If the battery is full update the visuals and power draw of the charger.
 
diff --git a/Content.Shared/Power/EntitySystems/PredictedBatterySystem.cs b/Content.Shared/Power/EntitySystems/PredictedBatterySystem.cs
deleted file mode 100644
index 760d7277c6..0000000000
--- a/Content.Shared/Power/EntitySystems/PredictedBatterySystem.cs
+++ /dev/null
@@ -1,182 +0,0 @@
-using Content.Shared.Cargo;
-using Content.Shared.Emp;
-using Content.Shared.Examine;
-using Content.Shared.Power.Components;
-using Content.Shared.Rejuvenate;
-using Robust.Shared.Timing;
-using Robust.Shared.Utility;
-
-namespace Content.Shared.Power.EntitySystems;
-
-/// <summary>
-/// Responsible for <see cref="PredictedBatteryComponent"/>.
-/// Predicted equivalent of <see cref="Content.Server.Power.EntitySystems.BatterySystem"/>.
-/// If you make changes to this make sure to keep the two consistent.
-/// </summary>
-public sealed partial class PredictedBatterySystem : EntitySystem
-{
-    [Dependency] private readonly IGameTiming _timing = default!;
-    [Dependency] private readonly SharedAppearanceSystem _appearance = default!;
-
-    public override void Initialize()
-    {
-        base.Initialize();
-
-        SubscribeLocalEvent<PredictedBatteryComponent, ComponentInit>(OnInit);
-        SubscribeLocalEvent<PredictedBatteryComponent, ComponentStartup>(OnStartup);
-        SubscribeLocalEvent<PredictedBatteryComponent, MapInitEvent>(OnMapInit);
-        SubscribeLocalEvent<PredictedBatteryComponent, EmpPulseEvent>(OnEmpPulse);
-        SubscribeLocalEvent<PredictedBatteryComponent, RejuvenateEvent>(OnRejuvenate);
-        SubscribeLocalEvent<PredictedBatteryComponent, ExaminedEvent>(OnExamine);
-        SubscribeLocalEvent<PredictedBatteryComponent, PriceCalculationEvent>(CalculateBatteryPrice);
-        SubscribeLocalEvent<PredictedBatteryComponent, ChangeChargeEvent>(OnChangeCharge);
-        SubscribeLocalEvent<PredictedBatteryComponent, GetChargeEvent>(OnGetCharge);
-        SubscribeLocalEvent<PredictedBatterySelfRechargerComponent, RefreshChargeRateEvent>(OnRefreshChargeRate);
-        SubscribeLocalEvent<PredictedBatterySelfRechargerComponent, ComponentStartup>(OnRechargerStartup);
-        SubscribeLocalEvent<PredictedBatterySelfRechargerComponent, ComponentRemove>(OnRechargerRemove);
-        SubscribeLocalEvent<PredictedBatteryVisualsComponent, PredictedBatteryChargeChangedEvent>(OnVisualsChargeChanged);
-        SubscribeLocalEvent<PredictedBatteryVisualsComponent, PredictedBatteryStateChangedEvent>(OnVisualsStateChanged);
-    }
-
-    private void OnInit(Entity<PredictedBatteryComponent> ent, ref ComponentInit args)
-    {
-        DebugTools.Assert(!HasComp<BatteryComponent>(ent), $"{ent} has both BatteryComponent and PredictedBatteryComponent");
-    }
-
-    private void OnStartup(Entity<PredictedBatteryComponent> ent, ref ComponentStartup args)
-    {
-        // In case a recharging component was added before the battery component itself.
-        // Doing this only on map init is not enough because the charge rate is not a datafield, but cached, so it would get lost when reloading the game.
-        // If we would make it a datafield then the integration tests would complain about modifying it before map init.
-        RefreshChargeRate(ent.AsNullable());
-    }
-
-    private void OnMapInit(Entity<PredictedBatteryComponent> ent, ref MapInitEvent args)
-    {
-        SetCharge(ent.AsNullable(), ent.Comp.StartingCharge);
-        RefreshChargeRate(ent.AsNullable());
-    }
-
-    private void OnRejuvenate(Entity<PredictedBatteryComponent> ent, ref RejuvenateEvent args)
-    {
-        SetCharge(ent.AsNullable(), ent.Comp.MaxCharge);
-    }
-
-    private void OnEmpPulse(Entity<PredictedBatteryComponent> ent, ref EmpPulseEvent args)
-    {
-        args.Affected = true;
-        UseCharge(ent.AsNullable(), args.EnergyConsumption);
-    }
-
-    private void OnExamine(Entity<PredictedBatteryComponent> ent, ref ExaminedEvent args)
-    {
-        if (!args.IsInDetailsRange)
-            return;
-
-        if (!HasComp<ExaminableBatteryComponent>(ent))
-            return;
-
-        var chargePercentRounded = 0;
-        var currentCharge = GetCharge(ent.AsNullable());
-        if (ent.Comp.MaxCharge != 0)
-            chargePercentRounded = (int)(100 * currentCharge / ent.Comp.MaxCharge);
-        args.PushMarkup(
-            Loc.GetString(
-                "examinable-battery-component-examine-detail",
-                ("percent", chargePercentRounded),
-                ("markupPercentColor", "green")
-            )
-        );
-    }
-
-    /// <summary>
-    /// Gets the price for the power contained in an entity's battery.
-    /// </summary>
-    private void CalculateBatteryPrice(Entity<PredictedBatteryComponent> ent, ref PriceCalculationEvent args)
-    {
-        args.Price += GetCharge(ent.AsNullable()) * ent.Comp.PricePerJoule;
-    }
-
-    private void OnChangeCharge(Entity<PredictedBatteryComponent> ent, ref ChangeChargeEvent args)
-    {
-        if (args.ResidualValue == 0)
-            return;
-
-        args.ResidualValue -= ChangeCharge(ent.AsNullable(), args.ResidualValue);
-    }
-
-    private void OnGetCharge(Entity<PredictedBatteryComponent> ent, ref GetChargeEvent args)
-    {
-        args.CurrentCharge += GetCharge(ent.AsNullable());
-        args.MaxCharge += ent.Comp.MaxCharge;
-    }
-
-    private void OnRefreshChargeRate(Entity<PredictedBatterySelfRechargerComponent> ent, ref RefreshChargeRateEvent args)
-    {
-        if (_timing.CurTime < ent.Comp.NextAutoRecharge)
-            return; // Still on cooldown
-
-        args.NewChargeRate += ent.Comp.AutoRechargeRate;
-    }
-
-    public override void Update(float frameTime)
-    {
-        var curTime = _timing.CurTime;
-
-        // Update self-recharging cooldowns.
-        var rechargerQuery = EntityQueryEnumerator<PredictedBatterySelfRechargerComponent, PredictedBatteryComponent>();
-        while (rechargerQuery.MoveNext(out var uid, out var recharger, out var battery))
-        {
-            if (recharger.NextAutoRecharge == null || curTime < recharger.NextAutoRecharge)
-                continue;
-
-            recharger.NextAutoRecharge = null; // Don't refresh every tick.
-            Dirty(uid, recharger);
-            RefreshChargeRate((uid, battery)); // Cooldown is over, apply the new recharge rate.
-        }
-
-        // Raise events when the battery is full or empty so that other systems can react and visuals can get updated.
-        // This is not doing that many calculations, it only has to get the current charge and only raises events if something did change.
-        // If this turns out to be too expensive and shows up on grafana consider updating it less often.
-        var batteryQuery = EntityQueryEnumerator<PredictedBatteryComponent>();
-        while (batteryQuery.MoveNext(out var uid, out var battery))
-        {
-            if (battery.ChargeRate == 0f)
-                continue; // No need to check if it's constant.
-
-            UpdateState((uid, battery));
-        }
-    }
-
-    private void OnRechargerStartup(Entity<PredictedBatterySelfRechargerComponent> ent, ref ComponentStartup args)
-    {
-        // In case this component is added after the battery component.
-        RefreshChargeRate(ent.Owner);
-    }
-
-    private void OnRechargerRemove(Entity<PredictedBatterySelfRechargerComponent> ent, ref ComponentRemove args)
-    {
-        // We use ComponentRemove to make sure this component no longer subscribes to the refresh event.
-        RefreshChargeRate(ent.Owner);
-    }
-
-    private void OnVisualsChargeChanged(Entity<PredictedBatteryVisualsComponent> ent, ref PredictedBatteryChargeChangedEvent args)
-    {
-        // Update the appearance data for the charge rate.
-        // We have a separate component for this to not duplicate the networking cost unless we actually use it.
-        var state = BatteryChargingState.Constant;
-        if (args.CurrentChargeRate > 0f)
-            state = BatteryChargingState.Charging;
-        else if (args.CurrentChargeRate < 0f)
-            state = BatteryChargingState.Decharging;
-
-        _appearance.SetData(ent.Owner, BatteryVisuals.Charging, state);
-    }
-
-    private void OnVisualsStateChanged(Entity<PredictedBatteryVisualsComponent> ent, ref PredictedBatteryStateChangedEvent args)
-    {
-        // Update the appearance data for the fill level (empty, full, in-between).
-        // We have a separate component for this to not duplicate the networking cost unless we actually use it.
-        _appearance.SetData(ent.Owner, BatteryVisuals.State, args.NewState);
-    }
-}
diff --git a/Content.Shared/Power/EntitySystems/PredictedBatterySystem.API.cs b/Content.Shared/Power/EntitySystems/SharedBatterySystem.API.cs
similarity index 79%
rename from Content.Shared/Power/EntitySystems/PredictedBatterySystem.API.cs
rename to Content.Shared/Power/EntitySystems/SharedBatterySystem.API.cs
index e1d685daeb..d51023f3eb 100644
--- a/Content.Shared/Power/EntitySystems/PredictedBatterySystem.API.cs
+++ b/Content.Shared/Power/EntitySystems/SharedBatterySystem.API.cs
@@ -4,11 +4,11 @@ using JetBrains.Annotations;
 namespace Content.Shared.Power.EntitySystems;
 
 /// <summary>
-/// Responsible for <see cref="PredictedBatteryComponent"/>.
+/// Responsible for <see cref="BatteryComponent"/>.
 /// Predicted equivalent of <see cref="Content.Server.Power.EntitySystems.BatterySystem"/>.
 /// If you make changes to this make sure to keep the two consistent.
 /// </summary>
-public sealed partial class PredictedBatterySystem
+public abstract partial class SharedBatterySystem
 {
     /// <summary>
     /// Changes the battery's charge by the given amount
@@ -17,7 +17,7 @@ public sealed partial class PredictedBatterySystem
     /// </summary>
     /// <returns>The actually changed amount.</returns>
     [PublicAPI]
-    public float ChangeCharge(Entity<PredictedBatteryComponent?> ent, float amount)
+    public float ChangeCharge(Entity<BatteryComponent?> ent, float amount)
     {
         if (!Resolve(ent, ref ent.Comp))
             return 0;
@@ -36,7 +36,7 @@ public sealed partial class PredictedBatterySystem
 
         TrySetChargeCooldown(ent.Owner);
 
-        var changedEv = new PredictedBatteryChargeChangedEvent(newValue, delta, ent.Comp.ChargeRate, ent.Comp.MaxCharge);
+        var changedEv = new ChargeChangedEvent(newValue, delta, ent.Comp.ChargeRate, ent.Comp.MaxCharge);
         RaiseLocalEvent(ent, ref changedEv);
 
         // Raise events if the battery status changed between full, empty, or neither.
@@ -50,7 +50,7 @@ public sealed partial class PredictedBatterySystem
     /// </summary>
     /// <returns>The actually changed amount.</returns>
     [PublicAPI]
-    public float UseCharge(Entity<PredictedBatteryComponent?> ent, float amount)
+    public float UseCharge(Entity<BatteryComponent?> ent, float amount)
     {
         if (amount <= 0f)
             return 0f;
@@ -65,7 +65,7 @@ public sealed partial class PredictedBatterySystem
     /// </summary>
     /// <returns>If the full amount was able to be removed.</returns>
     [PublicAPI]
-    public bool TryUseCharge(Entity<PredictedBatteryComponent?> ent, float amount)
+    public bool TryUseCharge(Entity<BatteryComponent?> ent, float amount)
     {
         if (!Resolve(ent, ref ent.Comp, false) || amount > GetCharge(ent))
             return false;
@@ -78,7 +78,7 @@ public sealed partial class PredictedBatterySystem
     /// Sets the battery's charge.
     /// </summary>
     [PublicAPI]
-    public void SetCharge(Entity<PredictedBatteryComponent?> ent, float value)
+    public void SetCharge(Entity<BatteryComponent?> ent, float value)
     {
         if (!Resolve(ent, ref ent.Comp))
             return;
@@ -95,7 +95,7 @@ public sealed partial class PredictedBatterySystem
         ent.Comp.LastUpdate = curTime;
         Dirty(ent);
 
-        var ev = new PredictedBatteryChargeChangedEvent(newValue, delta, ent.Comp.ChargeRate, ent.Comp.MaxCharge);
+        var ev = new ChargeChangedEvent(newValue, delta, ent.Comp.ChargeRate, ent.Comp.MaxCharge);
         RaiseLocalEvent(ent, ref ev);
 
         // Raise events if the battery status changed between full, empty, or neither.
@@ -106,7 +106,7 @@ public sealed partial class PredictedBatterySystem
     /// Sets the battery's maximum charge.
     /// </summary>
     [PublicAPI]
-    public void SetMaxCharge(Entity<PredictedBatteryComponent?> ent, float value)
+    public void SetMaxCharge(Entity<BatteryComponent?> ent, float value)
     {
         if (!Resolve(ent, ref ent.Comp))
             return;
@@ -122,7 +122,7 @@ public sealed partial class PredictedBatterySystem
         ent.Comp.LastUpdate = curTime;
         Dirty(ent);
 
-        var ev = new PredictedBatteryChargeChangedEvent(ent.Comp.LastCharge, ent.Comp.LastCharge - oldCharge, ent.Comp.ChargeRate, ent.Comp.MaxCharge);
+        var ev = new ChargeChangedEvent(ent.Comp.LastCharge, ent.Comp.LastCharge - oldCharge, ent.Comp.ChargeRate, ent.Comp.MaxCharge);
         RaiseLocalEvent(ent, ref ev);
 
         // Raise events if the battery status changed between full, empty, or neither.
@@ -133,7 +133,7 @@ public sealed partial class PredictedBatterySystem
     /// Updates the battery's charge state and sends an event if it changed.
     /// </summary>
     [PublicAPI]
-    public void UpdateState(Entity<PredictedBatteryComponent?> ent)
+    public void UpdateState(Entity<BatteryComponent?> ent)
     {
         if (!Resolve(ent, ref ent.Comp))
             return;
@@ -144,7 +144,7 @@ public sealed partial class PredictedBatterySystem
 
         var charge = GetCharge(ent);
 
-        if (charge == ent.Comp.MaxCharge)
+        if (charge >= ent.Comp.MaxCharge)
             newState = BatteryState.Full;
         else if (charge == 0f)
             newState = BatteryState.Empty;
@@ -155,7 +155,7 @@ public sealed partial class PredictedBatterySystem
         ent.Comp.State = newState;
         Dirty(ent);
 
-        var changedEv = new PredictedBatteryStateChangedEvent(oldState, newState);
+        var changedEv = new BatteryStateChangedEvent(oldState, newState);
         RaiseLocalEvent(ent, ref changedEv);
     }
 
@@ -163,7 +163,7 @@ public sealed partial class PredictedBatterySystem
     /// Gets the battery's current charge.
     /// </summary>
     [PublicAPI]
-    public float GetCharge(Entity<PredictedBatteryComponent?> ent)
+    public float GetCharge(Entity<BatteryComponent?> ent)
     {
         if (!Resolve(ent, ref ent.Comp, false))
             return 0f;
@@ -179,7 +179,7 @@ public sealed partial class PredictedBatterySystem
     /// Gets the fraction of charge remaining (0–1).
     /// </summary>
     [PublicAPI]
-    public float GetChargeLevel(Entity<PredictedBatteryComponent?> ent)
+    public float GetChargeLevel(Entity<BatteryComponent?> ent)
     {
         if (!Resolve(ent, ref ent.Comp, false))
             return 0f;
@@ -194,7 +194,7 @@ public sealed partial class PredictedBatterySystem
     /// Gets number of remaining uses for the given charge cost.
     /// </summary>
     [PublicAPI]
-    public int GetRemainingUses(Entity<PredictedBatteryComponent?> ent, float cost)
+    public int GetRemainingUses(Entity<BatteryComponent?> ent, float cost)
     {
         if (cost <= 0)
             return 0;
@@ -209,7 +209,7 @@ public sealed partial class PredictedBatterySystem
     /// Gets number of maximum uses at full charge for the given charge cost.
     /// </summary>
     [PublicAPI]
-    public int GetMaxUses(Entity<PredictedBatteryComponent?> ent, float cost)
+    public int GetMaxUses(Entity<BatteryComponent?> ent, float cost)
     {
         if (cost <= 0)
             return 0;
@@ -220,13 +220,13 @@ public sealed partial class PredictedBatterySystem
         return (int)(ent.Comp.MaxCharge / cost);
     }
 
-
     /// <summary>
     /// Refreshes the battery's current charge rate by raising a <see cref="RefreshChargeRateEvent"/>.
+    /// Subscribe to that event to add to or subtract from the total charge rate.
     /// </summary>
     /// <returns>The new charge rate.</returns>
     [PublicAPI]
-    public float RefreshChargeRate(Entity<PredictedBatteryComponent?> ent)
+    public float RefreshChargeRate(Entity<BatteryComponent?> ent)
     {
         if (!Resolve(ent, ref ent.Comp, false))
             return 0f;
@@ -241,7 +241,7 @@ public sealed partial class PredictedBatterySystem
         Dirty(ent);
 
         // Inform other systems about the new rate;
-        var changedEv = new PredictedBatteryChargeChangedEvent(ent.Comp.LastCharge, 0f, ent.Comp.ChargeRate, ent.Comp.MaxCharge);
+        var changedEv = new ChargeChangedEvent(ent.Comp.LastCharge, 0f, ent.Comp.ChargeRate, ent.Comp.MaxCharge);
         RaiseLocalEvent(ent, ref changedEv);
 
         return refreshEv.NewChargeRate;
@@ -252,7 +252,7 @@ public sealed partial class PredictedBatterySystem
     /// Uses the cooldown time given in the component.
     /// </summary>
     [PublicAPI]
-    public void TrySetChargeCooldown(Entity<PredictedBatterySelfRechargerComponent?> ent)
+    public void TrySetChargeCooldown(Entity<BatterySelfRechargerComponent?> ent)
     {
         if (!Resolve(ent, ref ent.Comp, false))
             return;
@@ -270,7 +270,7 @@ public sealed partial class PredictedBatterySystem
     /// Puts the entity's self recharge on cooldown for the specified time.
     /// </summary>
     [PublicAPI]
-    public void SetChargeCooldown(Entity<PredictedBatterySelfRechargerComponent?> ent, TimeSpan cooldown)
+    public void SetChargeCooldown(Entity<BatterySelfRechargerComponent?> ent, TimeSpan cooldown)
     {
         if (!Resolve(ent, ref ent.Comp))
             return;
@@ -284,7 +284,7 @@ public sealed partial class PredictedBatterySystem
     /// Returns whether the battery is full.
     /// </summary>
     [PublicAPI]
-    public bool IsFull(Entity<PredictedBatteryComponent?> ent)
+    public bool IsFull(Entity<BatteryComponent?> ent)
     {
         if (!Resolve(ent, ref ent.Comp))
             return false;
diff --git a/Content.Shared/Power/EntitySystems/SharedBatterySystem.cs b/Content.Shared/Power/EntitySystems/SharedBatterySystem.cs
index 317dcb129e..e150fd60d8 100644
--- a/Content.Shared/Power/EntitySystems/SharedBatterySystem.cs
+++ b/Content.Shared/Power/EntitySystems/SharedBatterySystem.cs
@@ -1,83 +1,177 @@
+using Content.Shared.Cargo;
 using Content.Shared.Emp;
+using Content.Shared.Examine;
 using Content.Shared.Power.Components;
-using JetBrains.Annotations;
+using Content.Shared.Rejuvenate;
+using Robust.Shared.Timing;
 
 namespace Content.Shared.Power.EntitySystems;
 
-public abstract class SharedBatterySystem : EntitySystem
+/// <summary>
+/// Responsible for <see cref="BatteryComponent"/>.
+/// </summary>
+public abstract partial class SharedBatterySystem : EntitySystem
 {
+    [Dependency] private readonly IGameTiming _timing = default!;
+    [Dependency] private readonly SharedAppearanceSystem _appearance = default!;
+
     public override void Initialize()
     {
         base.Initialize();
 
+        SubscribeLocalEvent<BatteryComponent, ComponentStartup>(OnStartup);
+        SubscribeLocalEvent<BatteryComponent, MapInitEvent>(OnMapInit);
         SubscribeLocalEvent<BatteryComponent, EmpPulseEvent>(OnEmpPulse);
+        SubscribeLocalEvent<BatteryComponent, RejuvenateEvent>(OnRejuvenate);
+        SubscribeLocalEvent<BatteryComponent, ExaminedEvent>(OnExamine);
+        SubscribeLocalEvent<BatteryComponent, PriceCalculationEvent>(CalculateBatteryPrice);
+        SubscribeLocalEvent<BatteryComponent, ChangeChargeEvent>(OnChangeCharge);
+        SubscribeLocalEvent<BatteryComponent, GetChargeEvent>(OnGetCharge);
+        SubscribeLocalEvent<BatterySelfRechargerComponent, RefreshChargeRateEvent>(OnRefreshChargeRate);
+        SubscribeLocalEvent<BatterySelfRechargerComponent, ComponentStartup>(OnRechargerStartup);
+        SubscribeLocalEvent<BatterySelfRechargerComponent, ComponentRemove>(OnRechargerRemove);
+        SubscribeLocalEvent<BatteryVisualsComponent, ChargeChangedEvent>(OnVisualsChargeChanged);
+        SubscribeLocalEvent<BatteryVisualsComponent, BatteryStateChangedEvent>(OnVisualsStateChanged);
+    }
+
+    protected virtual void OnStartup(Entity<BatteryComponent> ent, ref ComponentStartup args)
+    {
+        // In case a recharging component was added before the battery component itself.
+        // Doing this only on map init is not enough because the charge rate is not a datafield, but cached, so it would get lost when reloading the game.
+        // If we would make it a datafield then the integration tests would complain about modifying it before map init.
+        // Don't do this in case the battery is not net synced, because then the client would raise events overwriting the networked server state on spawn.
+        if (ent.Comp.NetSyncEnabled)
+            RefreshChargeRate(ent.AsNullable());
+    }
+
+    private void OnMapInit(Entity<BatteryComponent> ent, ref MapInitEvent args)
+    {
+        SetCharge(ent.AsNullable(), ent.Comp.StartingCharge);
+        RefreshChargeRate(ent.AsNullable());
+    }
+
+    private void OnRejuvenate(Entity<BatteryComponent> ent, ref RejuvenateEvent args)
+    {
+        SetCharge(ent.AsNullable(), ent.Comp.MaxCharge);
     }
 
     private void OnEmpPulse(Entity<BatteryComponent> ent, ref EmpPulseEvent args)
     {
         args.Affected = true;
         UseCharge(ent.AsNullable(), args.EnergyConsumption);
-        // Apply a cooldown to the entity's self recharge if needed to avoid it immediately self recharging after an EMP.
-        TrySetChargeCooldown(ent.Owner);
     }
 
-    /// <summary>
-    /// Changes the battery's charge by the given amount
-    /// and resets the self-recharge cooldown if it exists.
-    /// A positive value will add charge, a negative value will remove charge.
-    /// </summary>
-    /// <returns>The actually changed amount.</returns>
-    [PublicAPI]
-    public virtual float ChangeCharge(Entity<BatteryComponent?> ent, float amount)
+    private void OnExamine(Entity<BatteryComponent> ent, ref ExaminedEvent args)
     {
-        return 0f;
+        if (!args.IsInDetailsRange)
+            return;
+
+        if (!HasComp<ExaminableBatteryComponent>(ent))
+            return;
+
+        var chargePercentRounded = 0;
+        var currentCharge = GetCharge(ent.AsNullable());
+        if (ent.Comp.MaxCharge != 0)
+            chargePercentRounded = (int)(100 * currentCharge / ent.Comp.MaxCharge);
+        args.PushMarkup(
+            Loc.GetString(
+                "examinable-battery-component-examine-detail",
+                ("percent", chargePercentRounded),
+                ("markupPercentColor", "green")
+            )
+        );
     }
 
     /// <summary>
-    /// Removes the given amount of charge from the battery
-    /// and resets the self-recharge cooldown if it exists.
+    /// Gets the price for the power contained in an entity's battery.
     /// </summary>
-    /// <returns>The actually changed amount.</returns>
-    [PublicAPI]
-    public virtual float UseCharge(Entity<BatteryComponent?> ent, float amount)
+    private void CalculateBatteryPrice(Entity<BatteryComponent> ent, ref PriceCalculationEvent args)
     {
-        return 0f;
+        args.Price += GetCharge(ent.AsNullable()) * ent.Comp.PricePerJoule;
     }
 
-    /// <summary>
-    /// If sufficient charge is available on the battery, use it. Otherwise, don't.
-    /// Resets the self-recharge cooldown if it exists.
-    /// Always returns false on the client.
-    /// </summary>
-    /// <returns>If the full amount was able to be removed.</returns>
-    [PublicAPI]
-    public virtual bool TryUseCharge(Entity<BatteryComponent?> ent, float amount)
+    private void OnChangeCharge(Entity<BatteryComponent> ent, ref ChangeChargeEvent args)
     {
-        return false;
+        if (args.ResidualValue == 0)
+            return;
+
+        args.ResidualValue -= ChangeCharge(ent.AsNullable(), args.ResidualValue);
     }
 
-    /// <summary>
-    /// Sets the battery's charge.
-    /// </summary>
-    [PublicAPI]
-    public virtual void SetCharge(Entity<BatteryComponent?> ent, float value) { }
+    private void OnGetCharge(Entity<BatteryComponent> ent, ref GetChargeEvent args)
+    {
+        args.CurrentCharge += GetCharge(ent.AsNullable());
+        args.MaxCharge += ent.Comp.MaxCharge;
+    }
 
-    /// <summary>
-    /// Sets the battery's maximum charge.
-    /// </summary>
-    [PublicAPI]
-    public virtual void SetMaxCharge(Entity<BatteryComponent?> ent, float value) { }
+    private void OnRefreshChargeRate(Entity<BatterySelfRechargerComponent> ent, ref RefreshChargeRateEvent args)
+    {
+        if (_timing.CurTime < ent.Comp.NextAutoRecharge)
+            return; // Still on cooldown
 
-    /// <summary>
-    /// Checks if the entity has a self recharge and puts it on cooldown if applicable.
-    /// Uses the cooldown time given in the component.
-    /// </summary>
-    [PublicAPI]
-    public virtual void TrySetChargeCooldown(Entity<BatterySelfRechargerComponent?> ent) { }
+        args.NewChargeRate += ent.Comp.AutoRechargeRate;
+    }
 
-    /// <summary>
-    /// Puts the entity's self recharge on cooldown for the specified time.
-    /// </summary>
-    [PublicAPI]
-    public virtual void SetChargeCooldown(Entity<BatterySelfRechargerComponent?> ent, TimeSpan cooldown) { }
+    public override void Update(float frameTime)
+    {
+        var curTime = _timing.CurTime;
+
+        // Update self-recharging cooldowns.
+        var rechargerQuery = EntityQueryEnumerator<BatterySelfRechargerComponent, BatteryComponent>();
+        while (rechargerQuery.MoveNext(out var uid, out var recharger, out var battery))
+        {
+            if (recharger.NextAutoRecharge == null || curTime < recharger.NextAutoRecharge)
+                continue;
+
+            recharger.NextAutoRecharge = null; // Don't refresh every tick.
+            Dirty(uid, recharger);
+            RefreshChargeRate((uid, battery)); // Cooldown is over, apply the new recharge rate.
+        }
+
+        // Raise events when the battery is full or empty so that other systems can react and visuals can get updated.
+        // This is not doing that many calculations, it only has to get the current charge and only raises events if something did change.
+        // If this turns out to be too expensive and shows up on grafana consider updating it less often.
+        var batteryQuery = EntityQueryEnumerator<BatteryComponent>();
+        while (batteryQuery.MoveNext(out var uid, out var battery))
+        {
+            if (battery.ChargeRate == 0f)
+                continue; // No need to check if it's constant.
+
+            UpdateState((uid, battery));
+        }
+    }
+
+    private void OnRechargerStartup(Entity<BatterySelfRechargerComponent> ent, ref ComponentStartup args)
+    {
+        // In case this component is added after the battery component.
+        // Don't do this in case the battery is not net synced, because then the client would raise events overwriting the networked server state on spawn.
+        if (ent.Comp.NetSyncEnabled)
+            RefreshChargeRate(ent.Owner);
+    }
+
+    private void OnRechargerRemove(Entity<BatterySelfRechargerComponent> ent, ref ComponentRemove args)
+    {
+        // We use ComponentRemove to make sure this component no longer subscribes to the refresh event.
+        RefreshChargeRate(ent.Owner);
+    }
+
+    private void OnVisualsChargeChanged(Entity<BatteryVisualsComponent> ent, ref ChargeChangedEvent args)
+    {
+        // Update the appearance data for the charge rate.
+        // We have a separate component for this to not duplicate the networking cost unless we actually use it.
+        var state = BatteryChargingState.Constant;
+        if (args.CurrentChargeRate > 0f)
+            state = BatteryChargingState.Charging;
+        else if (args.CurrentChargeRate < 0f)
+            state = BatteryChargingState.Decharging;
+
+        _appearance.SetData(ent.Owner, BatteryVisuals.Charging, state);
+    }
+
+    private void OnVisualsStateChanged(Entity<BatteryVisualsComponent> ent, ref BatteryStateChangedEvent args)
+    {
+        // Update the appearance data for the fill level (empty, full, in-between).
+        // We have a separate component for this to not duplicate the networking cost unless we actually use it.
+        _appearance.SetData(ent.Owner, BatteryVisuals.State, args.NewState);
+    }
 }
diff --git a/Content.Shared/PowerCell/Components/PowerCellComponent.cs b/Content.Shared/PowerCell/Components/PowerCellComponent.cs
index fdada10958..8db75f63ba 100644
--- a/Content.Shared/PowerCell/Components/PowerCellComponent.cs
+++ b/Content.Shared/PowerCell/Components/PowerCellComponent.cs
@@ -5,7 +5,7 @@ namespace Content.Shared.PowerCell.Components;
 
 /// <summary>
 /// This component enables power-cell related interactions (e.g. EntityWhitelists, cell sizes, examine, rigging).
-/// The actual power functionality is provided by the <see cref="PredictedBatteryComponent"/>.
+/// The actual power functionality is provided by the <see cref="BatteryComponent"/>.
 /// </summary>
 [RegisterComponent, NetworkedComponent]
 public sealed partial class PowerCellComponent : Component;
diff --git a/Content.Shared/PowerCell/PowerCellSystem.API.cs b/Content.Shared/PowerCell/PowerCellSystem.API.cs
index 15376bda89..36590c7983 100644
--- a/Content.Shared/PowerCell/PowerCellSystem.API.cs
+++ b/Content.Shared/PowerCell/PowerCellSystem.API.cs
@@ -31,7 +31,7 @@ public sealed partial class PowerCellSystem
     [PublicAPI]
     public bool TryGetBatteryFromSlot(
         Entity<PowerCellSlotComponent?> ent,
-        [NotNullWhen(true)] out Entity<PredictedBatteryComponent>? battery)
+        [NotNullWhen(true)] out Entity<BatteryComponent>? battery)
     {
         if (!Resolve(ent, ref ent.Comp, false))
         {
@@ -45,7 +45,7 @@ public sealed partial class PowerCellSystem
             return false;
         }
 
-        if (!TryComp<PredictedBatteryComponent>(slot.Item, out var batteryComp))
+        if (!TryComp<BatteryComponent>(slot.Item, out var batteryComp))
         {
             battery = null;
             return false;
@@ -57,15 +57,15 @@ public sealed partial class PowerCellSystem
 
     /// <summary>
     /// First tries to get a battery from the entity's power cell slot.
-    /// If that fails check if the entity itself is a battery with <see cref="PredictedBatteryComponent"/>.
+    /// If that fails check if the entity itself is a battery with <see cref="BatteryComponent"/>.
     /// </summary>
     [PublicAPI]
-    public bool TryGetBatteryFromSlotOrEntity(Entity<PowerCellSlotComponent?> ent, [NotNullWhen(true)] out Entity<PredictedBatteryComponent>? battery)
+    public bool TryGetBatteryFromSlotOrEntity(Entity<PowerCellSlotComponent?> ent, [NotNullWhen(true)] out Entity<BatteryComponent>? battery)
     {
         if (TryGetBatteryFromSlot(ent, out battery))
             return true;
 
-        if (TryComp<PredictedBatteryComponent>(ent, out var batteryComp))
+        if (TryComp<BatteryComponent>(ent, out var batteryComp))
         {
             battery = (ent.Owner, batteryComp);
             return true;
@@ -76,13 +76,13 @@ public sealed partial class PowerCellSystem
     }
 
     /// <summary>
-    /// First checks if the entity itself is a battery with <see cref="PredictedBatteryComponent"/>.
+    /// First checks if the entity itself is a battery with <see cref="BatteryComponent"/>.
     /// If that fails it will try to get a battery from the entity's power cell slot instead.
     /// </summary>
     [PublicAPI]
-    public bool TryGetBatteryFromEntityOrSlot(Entity<PowerCellSlotComponent?> ent, [NotNullWhen(true)] out Entity<PredictedBatteryComponent>? battery)
+    public bool TryGetBatteryFromEntityOrSlot(Entity<PowerCellSlotComponent?> ent, [NotNullWhen(true)] out Entity<BatteryComponent>? battery)
     {
-        if (TryComp<PredictedBatteryComponent>(ent, out var batteryComp))
+        if (TryComp<BatteryComponent>(ent, out var batteryComp))
         {
             battery = (ent.Owner, batteryComp);
             return true;
diff --git a/Content.Shared/PowerCell/PowerCellSystem.Relay.cs b/Content.Shared/PowerCell/PowerCellSystem.Relay.cs
index ca4bc2a661..75e436becc 100644
--- a/Content.Shared/PowerCell/PowerCellSystem.Relay.cs
+++ b/Content.Shared/PowerCell/PowerCellSystem.Relay.cs
@@ -16,8 +16,8 @@ public sealed partial class PowerCellSystem
         SubscribeLocalEvent<PowerCellSlotComponent, ChangeChargeEvent>(RelayToCell);
 
         SubscribeLocalEvent<PowerCellComponent, EmpAttemptEvent>(RelayToCellSlot); // Prevent the ninja from EMPing its own battery
-        SubscribeLocalEvent<PowerCellComponent, PredictedBatteryChargeChangedEvent>(RelayToCellSlot);
-        SubscribeLocalEvent<PowerCellComponent, PredictedBatteryStateChangedEvent>(RelayToCellSlot); // For shutting down devices if the battery is empty
+        SubscribeLocalEvent<PowerCellComponent, ChargeChangedEvent>(RelayToCellSlot);
+        SubscribeLocalEvent<PowerCellComponent, BatteryStateChangedEvent>(RelayToCellSlot); // For shutting down devices if the battery is empty
         SubscribeLocalEvent<PowerCellComponent, RefreshChargeRateEvent>(RelayToCellSlot); // Allow devices to charge/drain inserted batteries
     }
 
diff --git a/Content.Shared/PowerCell/PowerCellSystem.cs b/Content.Shared/PowerCell/PowerCellSystem.cs
index 41d6c094ca..8f4950c5d2 100644
--- a/Content.Shared/PowerCell/PowerCellSystem.cs
+++ b/Content.Shared/PowerCell/PowerCellSystem.cs
@@ -15,7 +15,7 @@ public sealed partial class PowerCellSystem : EntitySystem
     [Dependency] private readonly IGameTiming _timing = default!;
     [Dependency] private readonly ItemSlotsSystem _itemSlots = default!;
     [Dependency] private readonly SharedAppearanceSystem _appearance = default!;
-    [Dependency] private readonly PredictedBatterySystem _battery = default!;
+    [Dependency] private readonly SharedBatterySystem _battery = default!;
     [Dependency] private readonly SharedPopupSystem _popup = default!;
 
     public override void Initialize()
@@ -27,7 +27,7 @@ public sealed partial class PowerCellSystem : EntitySystem
         SubscribeLocalEvent<PowerCellSlotComponent, EntInsertedIntoContainerMessage>(OnCellSlotInserted);
         SubscribeLocalEvent<PowerCellSlotComponent, EntRemovedFromContainerMessage>(OnCellSlotRemoved);
         SubscribeLocalEvent<PowerCellSlotComponent, ExaminedEvent>(OnCellSlotExamined);
-        SubscribeLocalEvent<PowerCellSlotComponent, PredictedBatteryStateChangedEvent>(OnCellSlotStateChanged);
+        SubscribeLocalEvent<PowerCellSlotComponent, BatteryStateChangedEvent>(OnCellSlotStateChanged);
 
         SubscribeLocalEvent<PowerCellComponent, ExaminedEvent>(OnCellExamined);
 
@@ -65,7 +65,7 @@ public sealed partial class PowerCellSystem : EntitySystem
         _battery.RefreshChargeRate(args.Entity);
 
         // Only update the visuals if we actually use them.
-        if (!HasComp<PredictedBatteryVisualsComponent>(ent))
+        if (!HasComp<BatteryVisualsComponent>(ent))
             return;
 
         // Set the data to that of the power cell
@@ -94,7 +94,7 @@ public sealed partial class PowerCellSystem : EntitySystem
         _battery.RefreshChargeRate(args.Entity);
 
         // Only update the visuals if we actually use them.
-        if (!HasComp<PredictedBatteryVisualsComponent>(ent))
+        if (!HasComp<BatteryVisualsComponent>(ent))
             return;
 
         // Set the appearance to empty.
@@ -103,7 +103,7 @@ public sealed partial class PowerCellSystem : EntitySystem
     }
 
 
-    private void OnCellSlotStateChanged(Entity<PowerCellSlotComponent> ent, ref PredictedBatteryStateChangedEvent args)
+    private void OnCellSlotStateChanged(Entity<PowerCellSlotComponent> ent, ref BatteryStateChangedEvent args)
     {
         if (args.NewState != BatteryState.Empty)
             return;
@@ -123,11 +123,11 @@ public sealed partial class PowerCellSystem : EntitySystem
 
     private void OnCellExamined(Entity<PowerCellComponent> ent, ref ExaminedEvent args)
     {
-        if (TryComp<PredictedBatteryComponent>(ent, out var battery))
+        if (TryComp<BatteryComponent>(ent, out var battery))
             OnBatteryExamined((ent.Owner, battery), ref args);
     }
 
-    private void OnBatteryExamined(Entity<PredictedBatteryComponent> ent, ref ExaminedEvent args)
+    private void OnBatteryExamined(Entity<BatteryComponent> ent, ref ExaminedEvent args)
     {
         var chargePercent = _battery.GetChargeLevel(ent.AsNullable()) * 100;
         args.PushMarkup(Loc.GetString("power-cell-component-examine-details", ("currentCharge", $"{chargePercent:F0}")));
diff --git a/Content.Shared/UserInterface/ActivatableUISystem.Power.cs b/Content.Shared/UserInterface/ActivatableUISystem.Power.cs
index f4b866044c..0c80ff802d 100644
--- a/Content.Shared/UserInterface/ActivatableUISystem.Power.cs
+++ b/Content.Shared/UserInterface/ActivatableUISystem.Power.cs
@@ -16,7 +16,7 @@ public sealed partial class ActivatableUISystem
         SubscribeLocalEvent<ActivatableUIRequiresPowerCellComponent, ItemToggledEvent>(OnToggled);
         SubscribeLocalEvent<ActivatableUIRequiresPowerCellComponent, BoundUIOpenedEvent>(OnBatteryOpened);
         SubscribeLocalEvent<ActivatableUIRequiresPowerCellComponent, BoundUIClosedEvent>(OnBatteryClosed);
-        SubscribeLocalEvent<ActivatableUIRequiresPowerCellComponent, PredictedBatteryStateChangedEvent>(OnBatteryStateChanged);
+        SubscribeLocalEvent<ActivatableUIRequiresPowerCellComponent, BatteryStateChangedEvent>(OnBatteryStateChanged);
         SubscribeLocalEvent<ActivatableUIRequiresPowerCellComponent, ActivatableUIOpenAttemptEvent>(OnBatteryOpenAttempt);
     }
 
@@ -57,7 +57,7 @@ public sealed partial class ActivatableUISystem
             _toggle.TryDeactivate(uid);
     }
 
-    private void OnBatteryStateChanged(Entity<ActivatableUIRequiresPowerCellComponent> ent, ref PredictedBatteryStateChangedEvent args)
+    private void OnBatteryStateChanged(Entity<ActivatableUIRequiresPowerCellComponent> ent, ref BatteryStateChangedEvent args)
     {
         // Deactivate when empty.
         if (args.NewState != BatteryState.Empty)
diff --git a/Content.Shared/Weapons/Ranged/Components/BatteryAmmoProviderComponent.cs b/Content.Shared/Weapons/Ranged/Components/BatteryAmmoProviderComponent.cs
index 3378d82b44..63b680066f 100644
--- a/Content.Shared/Weapons/Ranged/Components/BatteryAmmoProviderComponent.cs
+++ b/Content.Shared/Weapons/Ranged/Components/BatteryAmmoProviderComponent.cs
@@ -6,7 +6,7 @@ namespace Content.Shared.Weapons.Ranged.Components;
 
 /// <summary>
 /// Ammo provider that uses electric charge from a battery to provide ammunition to a weapon.
-/// This works with both <see cref="BatteryComponent"/> and <see cref="PredictedBatteryComponent"/>
+/// Works in combination with <see cref="BatteryComponent"/>.
 /// </summary>
 [RegisterComponent, NetworkedComponent]
 [AutoGenerateComponentState(raiseAfterAutoHandleState: true), AutoGenerateComponentPause]
diff --git a/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Battery.cs b/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Battery.cs
index 24cfe35051..f92cea07d3 100644
--- a/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Battery.cs
+++ b/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Battery.cs
@@ -23,7 +23,6 @@ public abstract partial class SharedGunSystem
         SubscribeLocalEvent<BatteryAmmoProviderComponent, ExaminedEvent>(OnBatteryExamine);
         SubscribeLocalEvent<BatteryAmmoProviderComponent, DamageExamineEvent>(OnBatteryDamageExamine);
         SubscribeLocalEvent<BatteryAmmoProviderComponent, PowerCellChangedEvent>(OnPowerCellChanged);
-        SubscribeLocalEvent<BatteryAmmoProviderComponent, PredictedBatteryChargeChangedEvent>(OnPredictedChargeChanged);
         SubscribeLocalEvent<BatteryAmmoProviderComponent, ChargeChangedEvent>(OnChargeChanged);
     }
 
@@ -86,10 +85,10 @@ public abstract partial class SharedGunSystem
     /// </summary>
     public void TakeCharge(Entity<BatteryAmmoProviderComponent> ent, int shots = 1)
     {
-        // Take charge from either the BatteryComponent, PredictedBatteryComponent or PowerCellSlotComponent.
+        // Take charge from either the BatteryComponent or PowerCellSlotComponent.
         var ev = new ChangeChargeEvent(-ent.Comp.FireCost * shots);
         RaiseLocalEvent(ent, ref ev);
-        // UpdateShots is already called by the resulting PredictedBatteryChargeChangedEvent or ChargeChangedEvent
+        // UpdateShots is already called by the resulting ChargeChangedEvent
     }
 
     private (EntityUid? Entity, IShootable) GetShootable(BatteryAmmoProviderComponent component, EntityCoordinates coordinates)
@@ -140,9 +139,8 @@ public abstract partial class SharedGunSystem
         UpdateShots(ent);
     }
 
-    // For predicted batteries.
     // If the entity is has a PowerCellSlotComponent then this event is relayed from the power cell to the slot entity.
-    private void OnPredictedChargeChanged(Entity<BatteryAmmoProviderComponent> ent, ref PredictedBatteryChargeChangedEvent args)
+    private void OnChargeChanged(Entity<BatteryAmmoProviderComponent> ent, ref ChargeChangedEvent args)
     {
         // Update the visuals and charge counter UI.
         UpdateShots(ent);
@@ -150,14 +148,6 @@ public abstract partial class SharedGunSystem
         UpdateNextUpdate(ent, args.CurrentCharge, args.MaxCharge, args.CurrentChargeRate);
     }
 
-    // For unpredicted batteries.
-    private void OnChargeChanged(Entity<BatteryAmmoProviderComponent> ent, ref ChargeChangedEvent args)
-    {
-        // Update the visuals and charge counter UI.
-        UpdateShots(ent);
-        // No need to queue an update here since unpredicted batteries already update periodically as they charge/discharge.
-    }
-
     private void UpdateNextUpdate(Entity<BatteryAmmoProviderComponent> ent, float currentCharge, float maxCharge, float currentChargeRate)
     {
         // Don't queue any updates if charge is constant.
@@ -179,12 +169,15 @@ public abstract partial class SharedGunSystem
     // Shots are only chached, not a DataField, so we need to refresh this when the game is loaded.
     private void OnBatteryStartup(Entity<BatteryAmmoProviderComponent> ent, ref ComponentStartup args)
     {
+        if (_netManager.IsClient && !IsClientSide(ent.Owner))
+            return; // Don't overwrite the server state in cases where the battery is not predicted.
+
         UpdateShots(ent);
     }
 
     /// <summary>
     /// Gets the current and maximum amount of shots from this entity's battery.
-    /// This works for BatteryComponent, PredictedBatteryComponent and PowercellSlotComponent.
+    /// This works for BatteryComponent and PowercellSlotComponent.
     /// </summary>
     public (int, int) GetShots(Entity<BatteryAmmoProviderComponent> ent)
     {
@@ -197,8 +190,7 @@ public abstract partial class SharedGunSystem
     }
 
     /// <summary>
-    /// Update loop for refreshing the ammo counter for charging/draining predicted batteries.
-    /// This is not needed for unpredicted batteries since those already raise ChargeChangedEvent periodically.
+    /// Update loop for refreshing the ammo counter for charging/draining batteries.
     /// </summary>
     private void UpdateBattery(float frameTime)
     {
diff --git a/Resources/Prototypes/Catalog/Bounties/bounties.yml b/Resources/Prototypes/Catalog/Bounties/bounties.yml
index 00f53f443c..137a494674 100644
--- a/Resources/Prototypes/Catalog/Bounties/bounties.yml
+++ b/Resources/Prototypes/Catalog/Bounties/bounties.yml
@@ -519,7 +519,6 @@
     whitelist:
       components:
       - Battery
-      - PredictedBattery
 
 - type: cargoBounty
   id: BountyLaserGun
diff --git a/Resources/Prototypes/Entities/Clothing/Hands/gloves.yml b/Resources/Prototypes/Entities/Clothing/Hands/gloves.yml
index 5dfc94a1f7..05dda23f0a 100644
--- a/Resources/Prototypes/Entities/Clothing/Hands/gloves.yml
+++ b/Resources/Prototypes/Entities/Clothing/Hands/gloves.yml
@@ -619,7 +619,7 @@
     damage: 35
     sound: /Audio/Weapons/egloves.ogg
   - type: LandAtCursor # it deals stamina damage when thrown
-  - type: PredictedBattery
+  - type: Battery
     maxCharge: 1000
     startingCharge: 1000
   - type: GuideHelp
diff --git a/Resources/Prototypes/Entities/Clothing/Head/base_clothinghead.yml b/Resources/Prototypes/Entities/Clothing/Head/base_clothinghead.yml
index 2d320c868c..3b85ce94c9 100644
--- a/Resources/Prototypes/Entities/Clothing/Head/base_clothinghead.yml
+++ b/Resources/Prototypes/Entities/Clothing/Head/base_clothinghead.yml
@@ -243,10 +243,10 @@
         startValue: 0.1
         endValue: 2.0
         isLooped: true
-  - type: PredictedBattery
+  - type: Battery
     maxCharge: 600 #lights drain 3/s but recharge of 2 makes this 1/s. Therefore 600 is 10 minutes of light.
     startingCharge: 600
-  - type: PredictedBatterySelfRecharger
+  - type: BatterySelfRecharger
     autoRechargeRate: 2 #recharge of 2 makes total drain 1w / s so max charge is 1:1 with time. Time to fully charge should be 5 minutes. Having recharge gives light an extended flicker period which gives you some warning to return to light area.
 
 - type: entity
diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml
index 1c23d18a97..341404af2b 100644
--- a/Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml
+++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml
@@ -296,10 +296,10 @@
         startValue: 0.1
         endValue: 2.0
         isLooped: true
-  - type: PredictedBattery
+  - type: Battery
     maxCharge: 600
     startingCharge: 600
-  - type: PredictedBatterySelfRecharger
+  - type: BatterySelfRecharger
     autoRechargeRate: 2
   - type: Item
     size: Normal
diff --git a/Resources/Prototypes/Entities/Debugging/debug_sweps.yml b/Resources/Prototypes/Entities/Debugging/debug_sweps.yml
index 6a8c8a5d02..557a36646f 100644
--- a/Resources/Prototypes/Entities/Debugging/debug_sweps.yml
+++ b/Resources/Prototypes/Entities/Debugging/debug_sweps.yml
@@ -18,7 +18,7 @@
   - type: BatteryAmmoProvider
     proto: DebugLaser
     fireCost: 1
-  - type: PredictedBatterySelfRecharger
+  - type: BatterySelfRecharger
     autoRechargeRate: 1000
 
 - type: entity
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/behonker.yml b/Resources/Prototypes/Entities/Mobs/NPCs/behonker.yml
index 5c575da396..c0220cee13 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/behonker.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/behonker.yml
@@ -22,10 +22,10 @@
     - type: BatteryAmmoProvider
       proto: RedLaser
       fireCost: 62.5
-    - type: PredictedBattery
+    - type: Battery
       maxCharge: 1000
       startingCharge: 1000
-    - type: PredictedBatterySelfRecharger
+    - type: BatterySelfRecharger
       autoRechargeRate: 40
     - type: Gun
       fireRate: 0.75
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/lavaland.yml b/Resources/Prototypes/Entities/Mobs/NPCs/lavaland.yml
index 4a205c9cb0..1f3faf2155 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/lavaland.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/lavaland.yml
@@ -53,9 +53,9 @@
   - type: BatteryAmmoProvider
     proto: WatcherBolt
     fireCost: 50
-  - type: PredictedBatterySelfRecharger
+  - type: BatterySelfRecharger
     autoRechargeRate: 50
-  - type: PredictedBattery
+  - type: Battery
     maxCharge: 1000
     startingCharge: 1000
   - type: Gun
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/living_light.yml b/Resources/Prototypes/Entities/Mobs/NPCs/living_light.yml
index d080f8c45f..fc7058b68e 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/living_light.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/living_light.yml
@@ -170,10 +170,10 @@
   - type: BatteryAmmoProvider
     proto: RedLaser
     fireCost: 140
-  - type: PredictedBattery
+  - type: Battery
     maxCharge: 1000
     startingCharge: 1000
-  - type: PredictedBatterySelfRecharger
+  - type: BatterySelfRecharger
     autoRechargeRate: 50
   - type: Gun
     fireRate: 0.3
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/miscellaneous.yml b/Resources/Prototypes/Entities/Mobs/NPCs/miscellaneous.yml
index ac4f476a35..d6727c7d88 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/miscellaneous.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/miscellaneous.yml
@@ -50,9 +50,9 @@
     - type: BatteryAmmoProvider
       proto: RedLightLaser
       fireCost: 50
-    - type: PredictedBatterySelfRecharger
+    - type: BatterySelfRecharger
       autoRechargeRate: 50
-    - type: PredictedBattery
+    - type: Battery
       maxCharge: 1000
       startingCharge: 1000
     - type: Gun
diff --git a/Resources/Prototypes/Entities/Mobs/Player/silicon.yml b/Resources/Prototypes/Entities/Mobs/Player/silicon.yml
index 9547a0e38b..898cee8524 100644
--- a/Resources/Prototypes/Entities/Mobs/Player/silicon.yml
+++ b/Resources/Prototypes/Entities/Mobs/Player/silicon.yml
@@ -241,6 +241,11 @@
     powerLoad: 500
   - type: ExtensionCableReceiver
   - type: Battery
+    # Very important:
+    # Disable networking to prevent the battery getting continuously dirtied every tick as it interacts with the power network.
+    # This can not be done by changing the charge rate as the power supply ramps up over time.
+    # This disables prediction for this battery.
+    netsync: false
     maxCharge: 300000
     startingCharge: 300000
   - type: ApcPowerReceiverBattery
diff --git a/Resources/Prototypes/Entities/Objects/Power/powercells.yml b/Resources/Prototypes/Entities/Objects/Power/powercells.yml
index a896e3a6e2..0c318dd20d 100644
--- a/Resources/Prototypes/Entities/Objects/Power/powercells.yml
+++ b/Resources/Prototypes/Entities/Objects/Power/powercells.yml
@@ -5,7 +5,7 @@
   components:
   - type: Item
     storedRotation: -90
-  - type: PredictedBattery
+  - type: Battery
     pricePerJoule: 0.15
   - type: PowerCell
   - type: Explosive
@@ -32,7 +32,7 @@
       - PowerCell
   - type: Riggable
   - type: Appearance
-  - type: PredictedBatteryVisuals
+  - type: BatteryVisuals
   - type: GenericVisualizer
     visuals:
       enum.BatteryVisuals.State:
@@ -50,7 +50,7 @@
   - type: Sprite
     layers:
     - state: potato
-  - type: PredictedBattery
+  - type: Battery
     maxCharge: 70
     startingCharge: 70
   - type: Tag
@@ -74,7 +74,7 @@
     - map: [ "enum.PowerCellVisualLayers.Unshaded" ]
       state: o2
       shader: unshaded
-  - type: PredictedBattery
+  - type: Battery
     maxCharge: 360
     startingCharge: 360
   - type: Tag
@@ -94,7 +94,7 @@
         state: o2
         shader: unshaded
         visible: false
-  - type: PredictedBattery
+  - type: Battery
     maxCharge: 360
     startingCharge: 0
 
@@ -104,7 +104,7 @@
   name: small-capacity nuclear power cell
   description: A self rechargeable power cell, designed for fast recharge rate at the expense of capacity.
   components:
-  - type: PredictedBatterySelfRecharger
+  - type: BatterySelfRecharger
     autoRechargeRate: 36 # 10 seconds to recharge
     autoRechargePauseTime: 30
 
@@ -122,7 +122,7 @@
     - map: [ "enum.PowerCellVisualLayers.Unshaded" ]
       state: o2
       shader: unshaded
-  - type: PredictedBattery
+  - type: Battery
     maxCharge: 720
     startingCharge: 720
 
@@ -139,7 +139,7 @@
         state: o2
         shader: unshaded
         visible: false
-  - type: PredictedBattery
+  - type: Battery
     maxCharge: 720
     startingCharge: 0
 
@@ -157,7 +157,7 @@
     - map: [ "enum.PowerCellVisualLayers.Unshaded" ]
       state: o2
       shader: unshaded
-  - type: PredictedBattery
+  - type: Battery
     maxCharge: 1080
     startingCharge: 1080
 
@@ -174,7 +174,7 @@
         state: o2
         shader: unshaded
         visible: false
-  - type: PredictedBattery
+  - type: Battery
     maxCharge: 1080
     startingCharge: 0
 
@@ -192,7 +192,7 @@
     - map: [ "enum.PowerCellVisualLayers.Unshaded" ]
       state: o2
       shader: unshaded
-  - type: PredictedBattery
+  - type: Battery
     maxCharge: 1800
     startingCharge: 1800
 
@@ -209,7 +209,7 @@
         state: o2
         shader: unshaded
         visible: false
-  - type: PredictedBattery
+  - type: Battery
     maxCharge: 1800
     startingCharge: 0
 
@@ -227,10 +227,10 @@
     - map: [ "enum.PowerCellVisualLayers.Unshaded" ]
       state: o2
       shader: unshaded
-  - type: PredictedBattery
+  - type: Battery
     maxCharge: 720
     startingCharge: 720
-  - type: PredictedBatterySelfRecharger
+  - type: BatterySelfRecharger
     autoRechargeRate: 12 # takes 1 minute to charge itself back to full
 
 - type: entity
@@ -246,7 +246,7 @@
       state: o2
       shader: unshaded
       visible: false
-  - type: PredictedBattery
+  - type: Battery
     startingCharge: 0
 
 - type: entity
@@ -262,10 +262,10 @@
       - map: [ "enum.PowerCellVisualLayers.Unshaded" ]
         state: o2
         shader: unshaded
-    - type: PredictedBattery
+    - type: Battery
       maxCharge: 1200
       startingCharge: 1200
-    - type: PredictedBatterySelfRecharger
+    - type: BatterySelfRecharger
       autoRechargeRate: 40
 
 # Power cage (big heavy power cell for big devices)
@@ -309,7 +309,7 @@
     - map: [ "enum.PowerCellVisualLayers.Unshaded" ]
       state: o2
       shader: unshaded
-  - type: PredictedBattery
+  - type: Battery
     maxCharge: 1400
     startingCharge: 1400
 
@@ -327,7 +327,7 @@
     - map: [ "enum.PowerCellVisualLayers.Unshaded" ]
       state: o2
       shader: unshaded
-  - type: PredictedBattery
+  - type: Battery
     maxCharge: 2700
     startingCharge: 2700
 
@@ -345,7 +345,7 @@
     - map: [ "enum.PowerCellVisualLayers.Unshaded" ]
       state: o2
       shader: unshaded
-  - type: PredictedBattery
+  - type: Battery
     maxCharge: 6200
     startingCharge: 6200
 
@@ -363,7 +363,7 @@
       state: o2
       shader: unshaded
       visible: false
-  - type: PredictedBattery
+  - type: Battery
     maxCharge: 1400
     startingCharge: 0
 
@@ -381,7 +381,7 @@
       state: o2
       shader: unshaded
       visible: false
-  - type: PredictedBattery
+  - type: Battery
     startingCharge: 0
 
 - type: entity
@@ -398,5 +398,5 @@
       state: o2
       shader: unshaded
       visible: false
-  - type: PredictedBattery
+  - type: Battery
     startingCharge: 0
diff --git a/Resources/Prototypes/Entities/Objects/Power/powersink.yml b/Resources/Prototypes/Entities/Objects/Power/powersink.yml
index 089610883c..7e448e06f7 100644
--- a/Resources/Prototypes/Entities/Objects/Power/powersink.yml
+++ b/Resources/Prototypes/Entities/Objects/Power/powersink.yml
@@ -40,6 +40,11 @@
           acts: [ "Destruction" ]
     - type: PowerSink
     - type: Battery
+      # Very important:
+      # Disable networking to prevent the battery getting continuously dirtied every tick as it interacts with the power network.
+      # This can not be done by changing the charge rate as the power supply ramps up over time.
+      # This disables prediction for this battery.
+      netsync: false
       maxCharge: 250000000
       pricePerJoule: 0.000009
     - type: ExaminableBattery
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Medical/healthanalyzer.yml b/Resources/Prototypes/Entities/Objects/Specific/Medical/healthanalyzer.yml
index 9fe4d377d7..59efee2e69 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Medical/healthanalyzer.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Medical/healthanalyzer.yml
@@ -48,7 +48,7 @@
   parent: [ HandheldHealthAnalyzerUnpowered, PowerCellSlotSmallItem]
   suffix: ""
   components:
-  - type: PredictedBatteryVisuals
+  - type: BatteryVisuals
   - type: PowerCellDraw
     drawRate: 1.2 #Calculated for 5 minutes on a small cell
   - type: ToggleCellDraw
diff --git a/Resources/Prototypes/Entities/Objects/Tools/handheld_mass_scanner.yml b/Resources/Prototypes/Entities/Objects/Tools/handheld_mass_scanner.yml
index 086901b145..e49c6b2c09 100644
--- a/Resources/Prototypes/Entities/Objects/Tools/handheld_mass_scanner.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/handheld_mass_scanner.yml
@@ -19,7 +19,7 @@
     maxRange: 256
     followEntity: true
   - type: Appearance
-  - type: PredictedBatteryVisuals
+  - type: BatteryVisuals
   - type: GenericVisualizer
     visuals:
       enum.BatteryVisuals.State:
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml
index 1ad4ef01c0..9e4a1a644d 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml
@@ -20,7 +20,7 @@
     - SemiAuto
     soundGunshot:
       path: /Audio/Weapons/Guns/Gunshots/laser.ogg
-  - type: PredictedBattery
+  - type: Battery
     maxCharge: 1000
     startingCharge: 1000
   - type: StaticPrice
@@ -220,7 +220,7 @@
   - type: BatteryAmmoProvider
     proto: RedLaser
     fireCost: 62.5
-  - type: PredictedBattery
+  - type: Battery
     maxCharge: 500
     startingCharge: 500
   - type: Tag
@@ -312,7 +312,7 @@
   - type: BatteryAmmoProvider
     proto: Pulse
     fireCost: 200
-  - type: PredictedBattery
+  - type: Battery
     maxCharge: 2000
     startingCharge: 2000
   - type: Tag
@@ -354,7 +354,7 @@
   - type: BatteryAmmoProvider
     proto: Pulse
     fireCost: 200
-  - type: PredictedBattery
+  - type: Battery
     maxCharge: 5000
     startingCharge: 5000
 
@@ -390,7 +390,7 @@
   - type: BatteryAmmoProvider
     proto: Pulse
     fireCost: 100
-  - type: PredictedBattery
+  - type: Battery
     maxCharge: 40000
     startingCharge: 40000
 
@@ -457,7 +457,7 @@
     - type: BatteryAmmoProvider
       proto: AntiParticlesProjectile
       fireCost: 500
-    - type: PredictedBattery
+    - type: Battery
       maxCharge: 10000
       startingCharge: 10000
 
@@ -682,7 +682,7 @@
   - type: BatteryAmmoProvider
     proto: RedMediumLaser
     fireCost: 100
-  - type: PredictedBatterySelfRecharger
+  - type: BatterySelfRecharger
     autoRechargeRate: 40
   - type: MagazineVisuals
     magState: mag
@@ -730,7 +730,7 @@
   - type: BatteryAmmoProvider
     proto: RedMediumLaser
     fireCost: 100
-  - type: PredictedBatterySelfRecharger
+  - type: BatterySelfRecharger
     autoRechargeRate: 30
   - type: MagazineVisuals
     magState: mag
@@ -829,7 +829,7 @@
   - type: BatteryAmmoProvider
     proto: RedMediumLaser
     fireCost: 100
-  - type: PredictedBatterySelfRecharger
+  - type: BatterySelfRecharger
     autoRechargeRate: 40
   - type: StaticPrice
     price: 750
@@ -878,7 +878,7 @@
     sprite: Objects/Weapons/Guns/Battery/inhands_64x.rsi
     heldPrefix: energy
   - type: GunRequiresWield #remove when inaccuracy on spreads is fixed
-  - type: PredictedBattery
+  - type: Battery
     maxCharge: 480
     startingCharge: 480
 
@@ -925,7 +925,7 @@
     - proto: BulletDisabler
       fireCost: 62.5
       pacifismAllowedMode: true
-  - type: PredictedBatterySelfRecharger
+  - type: BatterySelfRecharger
     autoRechargeRate: 48
     autoRechargePauseTime: 10
 
@@ -967,7 +967,7 @@
       fireCost: 100
     - proto: BoltTempgunHot
       fireCost: 100
-  - type: PredictedBattery
+  - type: Battery
     maxCharge: 1000
     startingCharge: 1000
   - type: StaticPrice
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Turrets/turrets_base.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Turrets/turrets_base.yml
index dc4be40c82..ca56ae0c6c 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Turrets/turrets_base.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Turrets/turrets_base.yml
@@ -124,6 +124,11 @@
     proto: BulletEnergyTurretLaser
     fireCost: 100
   - type: Battery
+    # Very important:
+    # Disable networking to prevent the battery getting continuously dirtied every tick as it interacts with the power network.
+    # This can not be done by changing the charge rate as the power supply ramps up over time.
+    # This disables prediction for this battery.
+    netsync: false
     maxCharge: 2000
     startingCharge: 2000
   - type: ApcPowerReceiverBattery
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/pneumatic_cannon.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/pneumatic_cannon.yml
index 2a197e2685..7b2d96854a 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/pneumatic_cannon.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/pneumatic_cannon.yml
@@ -129,10 +129,10 @@
   - type: BatteryAmmoProvider
     proto: FoodPieBananaCream
     fireCost: 30
-  - type: PredictedBattery
+  - type: Battery
     maxCharge: 90
     startingCharge: 90
-  - type: PredictedBatterySelfRecharger
+  - type: BatterySelfRecharger
     autoRechargeRate: 1
   - type: AmmoCounter
   - type: Item
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/stunprod.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/stunprod.yml
index 27857e24a1..295a782190 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/stunprod.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/stunprod.yml
@@ -42,7 +42,7 @@
     damage: 35
     sound: /Audio/Weapons/egloves.ogg
   - type: LandAtCursor # it deals stamina damage when thrown
-  - type: PredictedBattery
+  - type: Battery
     maxCharge: 360
     startingCharge: 360
   - type: UseDelay
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/security.yml b/Resources/Prototypes/Entities/Objects/Weapons/security.yml
index 217286a5c5..2f6ac834ba 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/security.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/security.yml
@@ -47,7 +47,7 @@
     damage: 35
     sound: /Audio/Weapons/egloves.ogg
   - type: LandAtCursor # it deals stamina damage when thrown
-  - type: PredictedBattery
+  - type: Battery
     maxCharge: 1000
     startingCharge: 1000
   - type: UseDelay
diff --git a/Resources/Prototypes/Entities/Structures/Lighting/base_lighting.yml b/Resources/Prototypes/Entities/Structures/Lighting/base_lighting.yml
index e769d81fbb..e930e105e1 100644
--- a/Resources/Prototypes/Entities/Structures/Lighting/base_lighting.yml
+++ b/Resources/Prototypes/Entities/Structures/Lighting/base_lighting.yml
@@ -451,6 +451,11 @@
   - type: ApcPowerReceiver
   - type: ExtensionCableReceiver
   - type: Battery
+    # Very important:
+    # Disable networking to prevent the battery getting continuously dirtied every tick as it interacts with the power network.
+    # This can not be done by changing the charge rate as the power supply ramps up over time.
+    # This disables prediction for this battery.
+    netsync: false
     maxCharge: 30000
     startingCharge: 0
   - type: EmergencyLight
diff --git a/Resources/Prototypes/Entities/Structures/Power/Generation/Tesla/coil.yml b/Resources/Prototypes/Entities/Structures/Power/Generation/Tesla/coil.yml
index 1def040b09..e7f6082734 100644
--- a/Resources/Prototypes/Entities/Structures/Power/Generation/Tesla/coil.yml
+++ b/Resources/Prototypes/Entities/Structures/Power/Generation/Tesla/coil.yml
@@ -56,6 +56,11 @@
     sprite: Structures/Power/Generation/Tesla/coil.rsi
     state: coil
   - type: Battery
+    # Very important:
+    # Disable networking to prevent the battery getting continuously dirtied every tick as it interacts with the power network.
+    # This can not be done by changing the charge rate as the power supply ramps up over time.
+    # This disables prediction for this battery.
+    netsync: false
     maxCharge: 5000000
     startingCharge: 0
   - type: BatteryDischarger
diff --git a/Resources/Prototypes/Entities/Structures/Power/apc.yml b/Resources/Prototypes/Entities/Structures/Power/apc.yml
index ec8b86e173..4efc5d0fe6 100644
--- a/Resources/Prototypes/Entities/Structures/Power/apc.yml
+++ b/Resources/Prototypes/Entities/Structures/Power/apc.yml
@@ -56,6 +56,11 @@
   - type: Appearance
   - type: ApcVisuals
   - type: Battery
+    # Very important:
+    # Disable networking to prevent the battery getting continuously dirtied every tick as it interacts with the power network.
+    # This can not be done by changing the charge rate as the power supply ramps up over time.
+    # This disables prediction for this battery.
+    netsync: false
     maxCharge: 50000
     startingCharge: 0
   - type: ExaminableBattery
diff --git a/Resources/Prototypes/Entities/Structures/Power/debug_power.yml b/Resources/Prototypes/Entities/Structures/Power/debug_power.yml
index 5706b802a5..e4268a25c5 100644
--- a/Resources/Prototypes/Entities/Structures/Power/debug_power.yml
+++ b/Resources/Prototypes/Entities/Structures/Power/debug_power.yml
@@ -73,6 +73,11 @@
     sprite: Structures/Power/power.rsi
     state: provider
   - type: Battery
+    # Very important:
+    # Disable networking to prevent the battery getting continuously dirtied every tick as it interacts with the power network.
+    # This can not be done by changing the charge rate as the power supply ramps up over time.
+    # This disables prediction for this battery.
+    netsync: false
   - type: NodeContainer
     nodes:
       input:
@@ -104,6 +109,11 @@
     sprite: Structures/Power/power.rsi
     state: provider
   - type: Battery
+    # Very important:
+    # Disable networking to prevent the battery getting continuously dirtied every tick as it interacts with the power network.
+    # This can not be done by changing the charge rate as the power supply ramps up over time.
+    # This disables prediction for this battery.
+    netsync: false
   - type: NodeContainer
     nodes:
       input:
diff --git a/Resources/Prototypes/Entities/Structures/Power/smes.yml b/Resources/Prototypes/Entities/Structures/Power/smes.yml
index 3572fe6a39..c29f7a972c 100644
--- a/Resources/Prototypes/Entities/Structures/Power/smes.yml
+++ b/Resources/Prototypes/Entities/Structures/Power/smes.yml
@@ -33,6 +33,11 @@
     - type: Smes
     - type: Appearance
     - type: Battery
+      # Very important:
+      # Disable networking to prevent the battery getting continuously dirtied every tick as it interacts with the power network.
+      # This can not be done by changing the charge rate as the power supply ramps up over time.
+      # This disables prediction for this battery.
+      netsync: false
       startingCharge: 0
       maxCharge: 8000000
     - type: ExaminableBattery
diff --git a/Resources/Prototypes/Entities/Structures/Power/substation.yml b/Resources/Prototypes/Entities/Structures/Power/substation.yml
index f2d86a3900..a2b5a0a006 100644
--- a/Resources/Prototypes/Entities/Structures/Power/substation.yml
+++ b/Resources/Prototypes/Entities/Structures/Power/substation.yml
@@ -5,6 +5,11 @@
   components:
   # Core power behavior
   - type: Battery
+    # Very important:
+    # Disable networking to prevent the battery getting continuously dirtied every tick as it interacts with the power network.
+    # This can not be done by changing the charge rate as the power supply ramps up over time.
+    # This disables prediction for this battery.
+    netsync: false
   - type: ExaminableBattery
   - type: NodeContainer
     examinable: true

From e552736422d5d6898b8bfeac65815fa57c44dcc2 Mon Sep 17 00:00:00 2001
From: Sir Warock <67167466+SirWarock@users.noreply.github.com>
Date: Sat, 20 Dec 2025 02:37:11 +0100
Subject: [PATCH 012/134] Shield QoL + buff (#41326)

* Add Damage Examine to Shields

* Make Repairs repeat when not fully repaired

* Make some Shields repairable

* Please the Grammar Gods
---
 .../en-US/blocking/blocking-examine.ftl       | 14 ++++++++
 .../Prototypes/Damage/examine_messages.yml    | 12 +++++++
 .../Entities/Objects/Shields/shields.yml      | 33 +++++++++++++++----
 3 files changed, 53 insertions(+), 6 deletions(-)

diff --git a/Resources/Locale/en-US/blocking/blocking-examine.ftl b/Resources/Locale/en-US/blocking/blocking-examine.ftl
index 8afc0ef08f..19cf58d4c3 100644
--- a/Resources/Locale/en-US/blocking/blocking-examine.ftl
+++ b/Resources/Locale/en-US/blocking/blocking-examine.ftl
@@ -4,3 +4,17 @@ blocking-examinable-verb-message = Examine the protection values.
 blocking-fraction = It blocks [color=lightblue]{$value}%[/color] of incoming damage and:
 blocking-coefficient-value = - It takes [color=lightblue]{$value}%[/color] of [color=yellow]{$type}[/color] damage.
 blocking-reduction-value = - It takes [color=lightblue]{$value}[/color] less [color=yellow]{$type}[/color] damage.
+
+# Shown when examining the shield. Each entry represents the shield's health condition
+comp-shield-damaged-1 = It looks fully intact.
+comp-shield-damaged-2 = It has a few scratches.
+comp-shield-damaged-3 = It has a few small holes and divots.
+comp-shield-damaged-4 = [color=yellow]It has several holes and bent parts.[/color]
+comp-shield-damaged-5 = [color=orange]It has deep cracks, several holes and parts of it have broken off.[/color]
+comp-shield-damaged-6 = [color=red]It's been extremely brutalized and is nearly falling apart.[/color]
+
+# Shown when examining the e-shield. Each entry represents the e-shield's health condition
+comp-eshield-damaged-1 = It looks fully intact.
+comp-eshield-damaged-2 = [color=yellow]The battery light is yellow.[/color]
+comp-eshield-damaged-3 = [color=orange]The battery light is orange, the hardlight flickers.[/color]
+comp-eshield-damaged-4 = [color=red]The battery light is red, the hardlight can barely stay alight.[/color]
diff --git a/Resources/Prototypes/Damage/examine_messages.yml b/Resources/Prototypes/Damage/examine_messages.yml
index 91f838a436..fe551902b0 100644
--- a/Resources/Prototypes/Damage/examine_messages.yml
+++ b/Resources/Prototypes/Damage/examine_messages.yml
@@ -3,3 +3,15 @@
   values:
     prefix: comp-window-damaged-
     count: 6
+
+- type: localizedDataset
+  id: ShieldMessages
+  values:
+    prefix: comp-shield-damaged-
+    count: 6
+
+- type: localizedDataset
+  id: EnergyShieldMessages
+  values:
+    prefix: comp-eshield-damaged-
+    count: 4
diff --git a/Resources/Prototypes/Entities/Objects/Shields/shields.yml b/Resources/Prototypes/Entities/Objects/Shields/shields.yml
index 188f4892b6..c82debbfc9 100644
--- a/Resources/Prototypes/Entities/Objects/Shields/shields.yml
+++ b/Resources/Prototypes/Entities/Objects/Shields/shields.yml
@@ -32,6 +32,8 @@
           Heat: 1
     - type: Damageable
       damageContainer: Shield
+    - type: ExaminableDamage
+      messages: ShieldMessages
     - type: Destructible
       thresholds:
         - trigger:
@@ -60,11 +62,28 @@
     - type: StaticPrice
       price: 100
 
+- type: entity
+  name: base repairable shield
+  parent: BaseShield
+  id: BaseRepairableShield
+  description: A repairable shield!
+  abstract: true
+  components:
+  - type: Repairable # Negative values represent healing
+    damage:
+      groups:
+        Brute: -60 # 20 of each Brute Type - 20% of a basic shield HP
+      types:
+        Heat: -20
+    fuelCost: 10 # 1/2 of a Welder for a full repair
+    doAfterDelay: 5
+    allowSelfRepair: false
+
 #Security Shields
 
 - type: entity
   name: riot shield
-  parent: [ BaseShield, BaseSecurityContraband ]
+  parent: [ BaseRepairableShield, BaseSecurityContraband ]
   id: RiotShield
   description: A large tower shield. Good for controlling crowds.
   components:
@@ -85,7 +104,7 @@
 
 - type: entity
   name: laser shield
-  parent: [ BaseShield, BaseSecurityContraband ]
+  parent: [ BaseRepairableShield, BaseSecurityContraband ]
   id: RiotLaserShield
   description: A shield built for withstanding lasers, but not much else.
   components:
@@ -105,7 +124,7 @@
 
 - type: entity
   name: ballistic shield
-  parent: [ BaseShield, BaseSecurityContraband ]
+  parent: [ BaseRepairableShield, BaseSecurityContraband ]
   id: RiotBulletShield
   description: A shield built for protecting against ballistics, but not much else.
   components:
@@ -234,7 +253,7 @@
 
 - type: entity
   name: makeshift shield
-  parent: BaseShield
+  parent: BaseRepairableShield
   id: MakeshiftShield
   description: A rundown looking shield, not good for much.
   components:
@@ -343,7 +362,7 @@
 
 - type: entity
   name: clockwork shield
-  parent: BaseShield
+  parent: BaseRepairableShield
   id: ClockworkShield
   description: Ratvar oyrffrf lbh jvgu uvf cebgrpgvba.
   components:
@@ -492,6 +511,8 @@
     - type: Appearance
     - type: Damageable
       damageContainer: Shield
+    - type: ExaminableDamage
+      messages: EnergyShieldMessages
     - type: Destructible
       thresholds:
         - trigger:
@@ -533,7 +554,7 @@
 
 - type: entity
   name: telescopic shield
-  parent: BaseShield
+  parent: BaseRepairableShield
   id: TelescopicShield
   description: An advanced riot shield made of lightweight materials that collapses for easy storage.
   components:

From 386115a5756b58ddc08f611c2a43364300ae266a Mon Sep 17 00:00:00 2001
From: PJBot <pieterjan.briers+bot@gmail.com>
Date: Sat, 20 Dec 2025 01:51:25 +0000
Subject: [PATCH 013/134] Automatic changelog update

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

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index aff07648a4..54bf0a73c7 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -1,11 +1,4 @@
 Entries:
-- author: Disp-Dev
-  changes:
-  - message: A new recipe has been added, moth-edible cotton cakes.
-    type: Add
-  id: 8820
-  time: '2025-07-30T22:51:21.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/39222
 - author: spanky-spanky
   changes:
   - message: The wizard now spawns in a den instead of a shuttle.
@@ -3917,3 +3910,14 @@
   id: 9319
   time: '2025-12-19T07:04:09.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/41335
+- author: SirWarock
+  changes:
+  - message: Shields are now examinable for their damage - You'll see how much dawg
+      it got left in it on a glance!
+    type: Add
+  - message: Shields are now repairable with a welder - Some shields are excluded,
+      notably the Energy Shield.
+    type: Add
+  id: 9320
+  time: '2025-12-20T01:50:14.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/41326

From 092f0f8b4a01092ca12726ceca2080409a61fea6 Mon Sep 17 00:00:00 2001
From: Spessmann <156740760+Spessmann@users.noreply.github.com>
Date: Sat, 20 Dec 2025 00:20:14 -0800
Subject: [PATCH 014/134] Snowball update (#41908)

snowball update
---
 Resources/Maps/snowball.yml | 215 +++++++++++++++++-------------------
 1 file changed, 104 insertions(+), 111 deletions(-)

diff --git a/Resources/Maps/snowball.yml b/Resources/Maps/snowball.yml
index 8ea162b718..fe888aac60 100644
--- a/Resources/Maps/snowball.yml
+++ b/Resources/Maps/snowball.yml
@@ -4,8 +4,8 @@ meta:
   engineVersion: 268.0.0
   forkId: ""
   forkVersion: ""
-  time: 12/09/2025 06:22:32
-  entityCount: 18233
+  time: 12/19/2025 00:12:07
+  entityCount: 18235
 maps:
 - 1793
 grids:
@@ -62,167 +62,167 @@ entities:
           version: 7
         0,2:
           ind: 0,2
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAhwAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAdwAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAdwAAAAAAAHcAAAAAAwCCAAAAAAAAdwAAAAAAAIIAAAAAAAB3AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAdwAAAAALAHcAAAAAAACCAAAAAAAAggAAAAAAAHcAAAAAAACCAAAAAAAAdwAAAAAJAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHcAAAAAAACCAAAAAAAAggAAAAAAAHcAAAAAAAB3AAAAAAMAggAAAAAAAHcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHcAAAAAAAB3AAAAAAAAggAAAAAAAHcAAAAAAAB3AAAAAAcAdwAAAAAAAHcAAAAAAAB3AAAAAAkAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHcAAAAAAAB3AAAAAAAAggAAAAAAAIIAAAAAAAB3AAAAAAAAdwAAAAAAAHcAAAAABgCCAAAAAAAAdwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB3AAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAHcAAAAAAACCAAAAAAAAggAAAAAAAHcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB3AAAAAAAAdwAAAAACAIIAAAAAAACCAAAAAAAAggAAAAAAAHcAAAAAAAB3AAAAAAAAggAAAAAAAIIAAAAAAAB3AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAdwAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAAB3AAAAAAAAdwAAAAAAAHcAAAAAAAB3AAAAAAYAdwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAdwAAAAAIAHcAAAAAAACCAAAAAAAAdwAAAAAAAHcAAAAABwCCAAAAAAAAdwAAAAAAAHcAAAAAAAB3AAAAAAYAdwAAAAAAAHcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHcAAAAAAACCAAAAAAAAggAAAAAAAHcAAAAABAB3AAAAAAEAggAAAAAAAHcAAAAAAAB3AAAAAAAAdwAAAAAAAHcAAAAAAAB3AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHcAAAAAAAB3AAAAAAAAggAAAAAAAHcAAAAABAB3AAAAAAwAdwAAAAAAAHcAAAAACQB3AAAAAAoAdwAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAA==
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAhwAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAdwAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAdwAAAAAAAHcAAAAAAACCAAAAAAAAdwAAAAAAAIIAAAAAAAB3AAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAdwAAAAAAAHcAAAAAAACCAAAAAAAAggAAAAAAAHcAAAAAAACCAAAAAAAAdwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHcAAAAAAACCAAAAAAAAggAAAAAAAHcAAAAAAAB3AAAAAAAAggAAAAAAAHcAAAAABgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHcAAAAAAAB3AAAAAAAAggAAAAAAAHcAAAAAAAB3AAAAAAEAdwAAAAAAAHcAAAAAAAB3AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHcAAAAAAAB3AAAAAAAAggAAAAAAAIIAAAAAAAB3AAAAAAAAdwAAAAAAAHcAAAAAAACCAAAAAAAAdwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB3AAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAHcAAAAAAACCAAAAAAAAggAAAAAAAHcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB3AAAAAAAAdwAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAHcAAAAABwB3AAAAAAAAggAAAAAAAIIAAAAAAAB3AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAdwAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAAB3AAAAAAAAdwAAAAADAHcAAAAAAAB3AAAAAAAAdwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAdwAAAAAAAHcAAAAAAACCAAAAAAAAdwAAAAADAHcAAAAAAACCAAAAAAAAdwAAAAAAAHcAAAAAAAB3AAAAAAAAdwAAAAAAAHcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHcAAAAAAACCAAAAAAAAggAAAAAAAHcAAAAAAAB3AAAAAAAAggAAAAAAAHcAAAAAAAB3AAAAAAAAdwAAAAACAHcAAAAAAAB3AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHcAAAAAAAB3AAAAAAAAggAAAAAAAHcAAAAAAQB3AAAAAAkAdwAAAAAAAHcAAAAAAAB3AAAAAAAAdwAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAA==
           version: 7
         0,3:
           ind: 0,3
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHcAAAAAAACCAAAAAAAAggAAAAAAAHcAAAAACwB3AAAAAAAAdwAAAAAAAIIAAAAAAAB3AAAAAAAAggAAAAAAAIIAAAAAAAAGAAAAAAEABgAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB3AAAAAAQAggAAAAAAAHcAAAAAAAB3AAAAAAAAdwAAAAAAAHcAAAAACgCCAAAAAAAAdwAAAAAAAIIAAAAAAAAGAAAAAAIABgAAAAADAAYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB3AAAAAAAAdwAAAAAAAIIAAAAAAAB3AAAAAAAAGQAAAAAGAAgAAAAAAwB3AAAAAAEAdwAAAAAAAHcAAAAAAACCAAAAAAAABgAAAAABAAYAAAAAAAAGAAAAAAIAAAAAAAAAAAAAAAAAAAB3AAAAAAsAdwAAAAAAAIIAAAAAAACCAAAAAAAAdwAAAAAAAAgAAAAAAgAIAAAAAAAAGQAAAAAAAHcAAAAACgB3AAAAAAAAggAAAAAAAAYAAAAAAgAGAAAAAAMABgAAAAACAAAAAAAAAAAAAAAAAAAAdwAAAAAAAIIAAAAAAACCAAAAAAAAdwAAAAAAAHcAAAAAAAB3AAAAAAAAGQAAAAADAHcAAAAAAAB3AAAAAAAAdwAAAAAAAIIAAAAAAAAGAAAAAAAABgAAAAADAAYAAAAAAQAAAAAAAAAAAAAAAAAAAHcAAAAAAACCAAAAAAAAdwAAAAAAAHcAAAAAAAB3AAAAAAAAdwAAAAAAAHcAAAAAAAB3AAAAAAAAdwAAAAAAAHcAAAAAAACCAAAAAAAABgAAAAADAAYAAAAAAwAGAAAAAAEAAAAAAAAAAAAAAAAAAAB3AAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAdwAAAAAAAHcAAAAAAAB3AAAAAAwAggAAAAAAAIIAAAAAAAAGAAAAAAAABgAAAAACAAAAAAAAAAAAAAAAAAAAdwAAAAAAAIIAAAAAAAACAAAAAAAAAQAAAAADAAEAAAAAAwACAAAAAAAAggAAAAAAAHcAAAAAAAAEAAAAAAAAdwAAAAAAAHcAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAAAAAAAAAAAAAAAAAAAAAHcAAAAAAACCAAAAAAAAAgAAAAAAAAEAAAAAAgABAAAAAAIAAgAAAAAAAIIAAAAAAACCAAAAAAAABAAAAAAAAIIAAAAAAAB3AAAAAAAAdwAAAAAKAHcAAAAAAACCAAAAAAAAAAAAAAAAAHcAAAAAAAB3AAAAAAAAggAAAAAAAAIAAAAAAAABAAAAAAEAAQAAAAACAAIAAAAAAAACAAAAAAAAggAAAAAAAAQAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAHcAAAAAAAB3AAAAAAAAdwAAAAACAIIAAAAAAACCAAAAAAAAAQAAAAACAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAAQAAAAAAAAEAAAAAAgABAAAAAAMAAQAAAAABAIIAAAAAAAB3AAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAEAAAAAAgABAAAAAAEAAQAAAAABAAEAAAAAAQCCAAAAAAAAdwAAAAAAAHcAAAAAAAB3AAAAAAAAdwAAAAAJAHcAAAAAAAB3AAAAAAcAdwAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAAABAAAAAAEAAQAAAAACAAEAAAAAAQABAAAAAAAAggAAAAAAAHcAAAAAAAB3AAAAAAAAdwAAAAAAAHcAAAAAAgB3AAAAAAAAdwAAAAAAAHcAAAAAAACCAAAAAAAAdwAAAAAAAHcAAAAAAACCAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAADAIIAAAAAAAB3AAAAAAAAdwAAAAAAAHcAAAAAAAB3AAAAAAAAdwAAAAAAAHcAAAAAAAB3AAAAAAAAggAAAAAAAHcAAAAAAAB3AAAAAAAAggAAAAAAAAEAAAAAAQABAAAAAAEAAQAAAAADAAEAAAAAAQCCAAAAAAAAdwAAAAAAAHcAAAAACAB3AAAAAAAAdwAAAAAAAHcAAAAAAAB3AAAAAAUAdwAAAAAAAA==
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHcAAAAAAACCAAAAAAAAggAAAAAAAHcAAAAAAAB3AAAAAAAAdwAAAAAFAIIAAAAAAAB3AAAAAAAAggAAAAAAAIIAAAAAAAAGAAAAAAEABgAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB3AAAAAAEAggAAAAAAAHcAAAAACgB3AAAAAAUAdwAAAAAMAHcAAAAAAACCAAAAAAAAdwAAAAAAAIIAAAAAAAAGAAAAAAAABgAAAAABAAYAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAB3AAAAAAAAdwAAAAAJAIIAAAAAAAB3AAAAAAAAGQAAAAAAAAgAAAAAAwB3AAAAAAAAdwAAAAAAAHcAAAAAAACCAAAAAAAABgAAAAADAAYAAAAAAgAGAAAAAAIAAAAAAAAAAAAAAAAAAAB3AAAAAAAAdwAAAAAAAIIAAAAAAACCAAAAAAAAdwAAAAAAAAgAAAAAAgAIAAAAAAMAGQAAAAAGAHcAAAAAAAB3AAAAAAAAggAAAAAAAAYAAAAAAwAGAAAAAAMABgAAAAAAAAAAAAAAAAAAAAAAAAAAdwAAAAAGAIIAAAAAAACCAAAAAAAAdwAAAAAAAHcAAAAAAAB3AAAAAAoAGQAAAAAGAHcAAAAAAAB3AAAAAAAAdwAAAAAAAIIAAAAAAAAGAAAAAAMABgAAAAADAAYAAAAAAgAAAAAAAAAAAAAAAAAAAHcAAAAAAACCAAAAAAAAdwAAAAAAAHcAAAAAAAB3AAAAAAAAdwAAAAAHAHcAAAAAAAB3AAAAAAYAdwAAAAADAHcAAAAAAACCAAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAAAAAAAAAAAAAAAAAAAAAAB3AAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAdwAAAAAAAHcAAAAAAQB3AAAAAAMAggAAAAAAAIIAAAAAAAAGAAAAAAIABgAAAAABAAAAAAAAAAAAAAAAAAAAdwAAAAAAAIIAAAAAAAACAAAAAAAAAQAAAAABAAEAAAAAAQACAAAAAAAAggAAAAAAAHcAAAAAAAAEAAAAAAAAdwAAAAACAHcAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAAAAAAAAAAAAAAAAAAAAAHcAAAAAAACCAAAAAAAAAgAAAAAAAAEAAAAAAQABAAAAAAMAAgAAAAAAAIIAAAAAAACCAAAAAAAABAAAAAAAAIIAAAAAAAB3AAAAAAAAdwAAAAAAAHcAAAAAAACCAAAAAAAAAAAAAAAAAHcAAAAAAAB3AAAAAAAAggAAAAAAAAIAAAAAAAABAAAAAAIAAQAAAAABAAIAAAAAAAACAAAAAAAAggAAAAAAAAQAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAHcAAAAAAAB3AAAAAAAAdwAAAAAAAIIAAAAAAACCAAAAAAAAAQAAAAADAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAAQAAAAACAAEAAAAAAwABAAAAAAIAAQAAAAADAIIAAAAAAAB3AAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAEAAAAAAAABAAAAAAMAAQAAAAAAAAEAAAAAAwCCAAAAAAAAdwAAAAAAAHcAAAAAAAB3AAAAAAcAdwAAAAAAAHcAAAAAAAB3AAAAAAAAdwAAAAAHAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAAABAAAAAAMAAQAAAAAAAAEAAAAAAwABAAAAAAIAggAAAAAAAHcAAAAAAAB3AAAAAAAAdwAAAAAAAHcAAAAAAAB3AAAAAAAAdwAAAAAAAHcAAAAAAACCAAAAAAAAdwAAAAAAAHcAAAAAAACCAAAAAAAAAQAAAAADAAEAAAAAAQABAAAAAAMAAQAAAAABAIIAAAAAAAB3AAAAAAAAdwAAAAAAAHcAAAAAAAB3AAAAAAAAdwAAAAAAAHcAAAAAAAB3AAAAAAAAggAAAAAAAHcAAAAAAAB3AAAAAAAAggAAAAAAAAEAAAAAAgABAAAAAAEAAQAAAAACAAEAAAAAAgCCAAAAAAAAdwAAAAAAAHcAAAAAAAB3AAAAAAAAdwAAAAAAAHcAAAAAAAB3AAAAAAAAdwAAAAAAAA==
           version: 7
         0,4:
           ind: 0,4
-          tiles: ggAAAAAAAHcAAAAAAAB3AAAAAAAAggAAAAAAAAEAAAAAAgABAAAAAAIAAQAAAAACAAEAAAAAAQCCAAAAAAAAdwAAAAAAAHcAAAAAAAB3AAAAAAAAdwAAAAAAAHcAAAAAAAB3AAAAAAAAdwAAAAAAAIIAAAAAAAB3AAAAAAAAdwAAAAAAAIIAAAAAAAABAAAAAAAAAQAAAAABAAEAAAAAAAABAAAAAAEAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAAEAAAAAAQCCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAAQAAAAABAAEAAAAAAQABAAAAAAMAAQAAAAACAAIAAAAAAAABAAAAAAIAAQAAAAAAAAEAAAAAAgABAAAAAAMAAQAAAAAAAAEAAAAAAwABAAAAAAIABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAEAAAAAAgABAAAAAAEAAQAAAAADAAEAAAAAAgACAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAIAAQAAAAADAAEAAAAAAQABAAAAAAIAAQAAAAADAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAAABAAAAAAMAAQAAAAABAAEAAAAAAgABAAAAAAMAAgAAAAAAAAEAAAAAAQABAAAAAAAAAQAAAAADAAEAAAAAAgABAAAAAAEAAQAAAAACAAEAAAAAAQCCAAAAAAAAdwAAAAAKAHcAAAAAAACCAAAAAAAAAQAAAAADAAEAAAAAAgABAAAAAAMAAQAAAAADAIIAAAAAAACCAAAAAAAAAQAAAAABAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAHcAAAAAAAB3AAAAAAUAggAAAAAAAAEAAAAAAAABAAAAAAEAAQAAAAACAAEAAAAAAACCAAAAAAAAdwAAAAAAAHcAAAAABQCCAAAAAAAAdwAAAAAAAHcAAAAAAAB3AAAAAAAAdwAAAAAAAIIAAAAAAAB3AAAAAAIAdwAAAAAAAIIAAAAAAAABAAAAAAIAAQAAAAAAAAEAAAAAAwABAAAAAAEAggAAAAAAAHcAAAAAAAB3AAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAdwAAAAAAAHcAAAAAAACCAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAIAAQAAAAACAIIAAAAAAAB3AAAAAAAAdwAAAAAAAIIAAAAAAAABAAAAAAAAAQAAAAABAAEAAAAAAgABAAAAAAEAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAAEAAAAAAAABAAAAAAMAAQAAAAACAAEAAAAAAwCCAAAAAAAAggAAAAAAAHcAAAAAAAABAAAAAAIAAQAAAAAAAAEAAAAAAwABAAAAAAEAAQAAAAADAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAABAAAAAAMAAQAAAAACAAEAAAAAAgABAAAAAAMAggAAAAAAAHcAAAAAAAB3AAAAAAAAggAAAAAAAAEAAAAAAgABAAAAAAEAAQAAAAAAAAEAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAAQAAAAABAAEAAAAAAQABAAAAAAEAAQAAAAACAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAAABAAAAAAEAAQAAAAACAAEAAAAAAwABAAAAAAMAdwAAAAAAAHcAAAAAAAB3AAAAAAkAggAAAAAAAIIAAAAAAACCAAAAAAAAAQAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAAIAAAAAAAACAAAAAAAAggAAAAAAAAAAAAAAAAB3AAAAAAAAdwAAAAAAAIIAAAAAAAB3AAAAAAoAdwAAAAAMAHcAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAAABAAAAAAMAAQAAAAABAIIAAAAAAAAAAAAAAAAAAAAAAAAAAHcAAAAAAACCAAAAAAAAdwAAAAAAAHcAAAAAAAB3AAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAAQAAAAABAAEAAAAAAACCAAAAAAAAAAAAAAAAAAAAAAAAAAB3AAAAAAAAggAAAAAAAIIAAAAAAAB3AAAAAAAAdwAAAAAGAIIAAAAAAAAGAAAAAAMABgAAAAAAAAYAAAAAAwAGAAAAAAMAggAAAAAAAAEAAAAAAAABAAAAAAMAggAAAAAAAA==
+          tiles: ggAAAAAAAHcAAAAAAAB3AAAAAAAAggAAAAAAAAEAAAAAAwABAAAAAAIAAQAAAAACAAEAAAAAAQCCAAAAAAAAdwAAAAAAAHcAAAAABQB3AAAAAAAAdwAAAAAAAHcAAAAAAAB3AAAAAAAAdwAAAAAAAIIAAAAAAAB3AAAAAAAAdwAAAAAAAIIAAAAAAAABAAAAAAIAAQAAAAAAAAEAAAAAAAABAAAAAAIAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAAEAAAAAAgCCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAAQAAAAABAAEAAAAAAAABAAAAAAEAAQAAAAABAAIAAAAAAAABAAAAAAIAAQAAAAADAAEAAAAAAQABAAAAAAMAAQAAAAAAAAEAAAAAAgABAAAAAAIABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAEAAAAAAQABAAAAAAAAAQAAAAABAAEAAAAAAAACAAAAAAAAAQAAAAABAAEAAAAAAAABAAAAAAEAAQAAAAACAAEAAAAAAAABAAAAAAAAAQAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAAABAAAAAAEAAQAAAAABAAEAAAAAAQABAAAAAAAAAgAAAAAAAAEAAAAAAQABAAAAAAAAAQAAAAAAAAEAAAAAAQABAAAAAAAAAQAAAAADAAEAAAAAAACCAAAAAAAAdwAAAAAAAHcAAAAADACCAAAAAAAAAQAAAAACAAEAAAAAAgABAAAAAAAAAQAAAAAAAIIAAAAAAACCAAAAAAAAAQAAAAADAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAHcAAAAAAAB3AAAAAAAAggAAAAAAAAEAAAAAAwABAAAAAAIAAQAAAAABAAEAAAAAAgCCAAAAAAAAdwAAAAAAAHcAAAAAAACCAAAAAAAAdwAAAAAAAHcAAAAAAAB3AAAAAAAAdwAAAAAAAIIAAAAAAAB3AAAAAAAAdwAAAAAAAIIAAAAAAAABAAAAAAEAAQAAAAADAAEAAAAAAAABAAAAAAAAggAAAAAAAHcAAAAAAAB3AAAAAAMAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAdwAAAAAAAHcAAAAABgCCAAAAAAAAAQAAAAACAAEAAAAAAwABAAAAAAMAAQAAAAADAIIAAAAAAAB3AAAAAAAAdwAAAAAAAIIAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAwABAAAAAAMAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAAEAAAAAAQABAAAAAAMAAQAAAAACAAEAAAAAAwCCAAAAAAAAggAAAAAAAHcAAAAAAAABAAAAAAMAAQAAAAABAAEAAAAAAgABAAAAAAAAAQAAAAACAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAABAAAAAAEAAQAAAAAAAAEAAAAAAgABAAAAAAIAggAAAAAAAHcAAAAAAAB3AAAAAAAAggAAAAAAAAEAAAAAAgABAAAAAAAAAQAAAAAAAAEAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAAQAAAAACAAEAAAAAAwABAAAAAAMAAQAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAAABAAAAAAMAAQAAAAADAAEAAAAAAAABAAAAAAEAdwAAAAAAAHcAAAAAAAB3AAAAAAQAggAAAAAAAIIAAAAAAACCAAAAAAAAAQAAAAACAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAAIAAAAAAAACAAAAAAAAggAAAAAAAAAAAAAAAAB3AAAAAAAAdwAAAAAAAIIAAAAAAAB3AAAAAAAAdwAAAAAIAHcAAAAACACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAAABAAAAAAAAAQAAAAADAIIAAAAAAAAAAAAAAAAAAAAAAAAAAHcAAAAAAACCAAAAAAAAdwAAAAAHAHcAAAAAAAB3AAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAAQAAAAADAAEAAAAAAgCCAAAAAAAAAAAAAAAAAAAAAAAAAAB3AAAAAAkAggAAAAAAAIIAAAAAAAB3AAAAAAAAdwAAAAAAAIIAAAAAAAAGAAAAAAEABgAAAAACAAYAAAAAAwAGAAAAAAMAggAAAAAAAAEAAAAAAAABAAAAAAAAggAAAAAAAA==
           version: 7
         0,5:
           ind: 0,5
-          tiles: AAAAAAAAAAAAAAAAAAB3AAAAAAAAdwAAAAAAAIIAAAAAAACCAAAAAAAAdwAAAAAAAIIAAAAAAAAGAAAAAAEABgAAAAACAAYAAAAAAwAGAAAAAAAABgAAAAAAAAEAAAAAAAABAAAAAAAAggAAAAAAAAAAAAAAAAAAAAAAAAAAdwAAAAAIAHcAAAAABQCCAAAAAAAAdwAAAAAAAHcAAAAAAACCAAAAAAAABgAAAAADAAYAAAAAAQAGAAAAAAMABgAAAAACAIIAAAAAAAABAAAAAAMAAQAAAAADAIIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB3AAAAAAQAggAAAAAAAHcAAAAAAAB3AAAAAAAAggAAAAAAAAYAAAAAAQAGAAAAAAAABgAAAAACAAYAAAAAAgCCAAAAAAAAAQAAAAADAAEAAAAAAgCCAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAdwAAAAAAAIIAAAAAAAB3AAAAAAgAdwAAAAACAIIAAAAAAACCAAAAAAAAggAAAAAAAAQAAAAAAACCAAAAAAAAggAAAAAAAAEAAAAAAQABAAAAAAEAggAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHcAAAAAAACCAAAAAAAAggAAAAAAAHcAAAAAAAB3AAAAAAAAggAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAIIAAAAAAAACAAAAAAAAAgAAAAAAAIIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB3AAAAAAAAggAAAAAAAIIAAAAAAAB3AAAAAAAAdwAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAABgAAAAADAAYAAAAAAwAGAAAAAAEAAAAAAAAAAAAAAAAAAAB3AAAAAAAAdwAAAAAAAIIAAAAAAAB3AAAAAAAAggAAAAAAAHcAAAAAAAB3AAAAAAAAdwAAAAAAAIIAAAAAAACCAAAAAAAABAAAAAAAAAYAAAAAAgABAAAAAAMAAQAAAAABAAAAAAAAAAAAAAAAAAAAdwAAAAAAAHcAAAAAAACCAAAAAAAAdwAAAAAAAHcAAAAAAwB3AAAAAAYAdwAAAAAAAHcAAAAAAAB3AAAAAAAAdwAAAAAAAIIAAAAAAAAGAAAAAAIAAQAAAAABAAEAAAAAAgAAAAAAAAAAAAAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAAwAAAAAAgCCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAABgAAAAACAAEAAAAAAgABAAAAAAEAAAAAAAAAAAAAAAAAAAACAAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAAggAAAAAAAAwAAAAAAgAMAAAAAAMAFwAAAAADAAEAAAAAAwABAAAAAAIAggAAAAAAAAYAAAAAAQABAAAAAAEAAQAAAAACAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAAQAAAAAAAAEAAAAAAAADAAAAAADAAEAAAAAAwABAAAAAAAAAQAAAAABAAIAAAAAAAAGAAAAAAMAAQAAAAAAAAEAAAAAAQAAAAAAAAAAAAAAAAAAAAIAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAACCAAAAAAAADAAAAAAAAAwAAAAAAQAXAAAAAAEAAQAAAAACAAEAAAAAAgACAAAAAAAABgAAAAADAAEAAAAAAwABAAAAAAAAAAAAAAAAAAAAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAAEAAAAAAgABAAAAAAEAAQAAAAADAAEAAAAAAwABAAAAAAMAggAAAAAAAAYAAAAAAQAGAAAAAAAABgAAAAACAAAAAAAAAAAAAAAAAAAAdwAAAAAAAHcAAAAAAACCAAAAAAAAAQAAAAABAAEAAAAAAAABAAAAAAMAAQAAAAAAAAEAAAAAAwABAAAAAAMAAQAAAAABAIIAAAAAAACCAAAAAAAAggAAAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAHcAAAAAAAB3AAAAAAAAggAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAQABAAAAAAEAAQAAAAABAAEAAAAAAwCCAAAAAAAABAAAAAAAAAYAAAAAAwAGAAAAAAMAAAAAAAAAAAAAAAAAAAB3AAAAAAAAdwAAAAAAAIIAAAAAAAABAAAAAAAAAQAAAAACAAEAAAAAAQAMAAAAAAAADAAAAAAAAAwAAAAAAwABAAAAAAEAggAAAAAAAAQAAAAAAAAGAAAAAAIABgAAAAABAA==
+          tiles: AAAAAAAAAAAAAAAAAAB3AAAAAAAAdwAAAAAAAIIAAAAAAACCAAAAAAAAdwAAAAAAAIIAAAAAAAAGAAAAAAIABgAAAAACAAYAAAAAAgAGAAAAAAAABgAAAAABAAEAAAAAAgABAAAAAAAAggAAAAAAAAAAAAAAAAAAAAAAAAAAdwAAAAAAAHcAAAAAAACCAAAAAAAAdwAAAAAAAHcAAAAAAQCCAAAAAAAABgAAAAACAAYAAAAAAQAGAAAAAAAABgAAAAADAIIAAAAAAAABAAAAAAIAAQAAAAABAIIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB3AAAAAAAAggAAAAAAAHcAAAAAAAB3AAAAAAIAggAAAAAAAAYAAAAAAQAGAAAAAAEABgAAAAABAAYAAAAAAQCCAAAAAAAAAQAAAAAAAAEAAAAAAACCAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAdwAAAAAAAIIAAAAAAAB3AAAAAAAAdwAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAAQAAAAAAACCAAAAAAAAggAAAAAAAAEAAAAAAgABAAAAAAEAggAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHcAAAAAAACCAAAAAAAAggAAAAAAAHcAAAAACgB3AAAAAAAAggAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAIIAAAAAAAACAAAAAAAAAgAAAAAAAIIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB3AAAAAAAAggAAAAAAAIIAAAAAAAB3AAAAAAAAdwAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAABgAAAAABAAYAAAAAAQAGAAAAAAMAAAAAAAAAAAAAAAAAAAB3AAAAAAAAdwAAAAAAAIIAAAAAAAB3AAAAAAAAggAAAAAAAHcAAAAACgB3AAAAAAMAdwAAAAAAAIIAAAAAAACCAAAAAAAABAAAAAAAAAYAAAAAAQABAAAAAAAAAQAAAAADAAAAAAAAAAAAAAAAAAAAdwAAAAAAAHcAAAAAAACCAAAAAAAAdwAAAAAAAHcAAAAACgB3AAAAAAAAdwAAAAAAAHcAAAAAAgB3AAAAAAAAdwAAAAACAIIAAAAAAAAGAAAAAAIAAQAAAAADAAEAAAAAAQAAAAAAAAAAAAAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAAwAAAAAAgCCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAABgAAAAAAAAEAAAAAAQABAAAAAAEAAAAAAAAAAAAAAAAAAAACAAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAAggAAAAAAAAwAAAAAAAAMAAAAAAMAFwAAAAACAAEAAAAAAgABAAAAAAIAggAAAAAAAAYAAAAAAAABAAAAAAAAAQAAAAACAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAAQAAAAAAAAEAAAAAAAADAAAAAAAAAEAAAAAAwABAAAAAAMAAQAAAAACAAIAAAAAAAAGAAAAAAMAAQAAAAAAAAEAAAAAAQAAAAAAAAAAAAAAAAAAAAIAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAACCAAAAAAAADAAAAAADAAwAAAAAAQAXAAAAAAEAAQAAAAABAAEAAAAAAAACAAAAAAAABgAAAAABAAEAAAAAAwABAAAAAAEAAAAAAAAAAAAAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAAEAAAAAAgABAAAAAAEAAQAAAAACAAEAAAAAAwABAAAAAAAAggAAAAAAAAYAAAAAAAAGAAAAAAEABgAAAAAAAAAAAAAAAAAAAAAAAAAAdwAAAAAAAHcAAAAAAACCAAAAAAAAAQAAAAACAAEAAAAAAwABAAAAAAMAAQAAAAABAAEAAAAAAAABAAAAAAMAAQAAAAADAIIAAAAAAACCAAAAAAAAggAAAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAHcAAAAAAAB3AAAAAAYAggAAAAAAAAEAAAAAAgABAAAAAAAAAQAAAAABAAEAAAAAAwABAAAAAAEAAQAAAAADAAEAAAAAAwCCAAAAAAAABAAAAAAAAAYAAAAAAAAGAAAAAAEAAAAAAAAAAAAAAAAAAAB3AAAAAAAAdwAAAAAAAIIAAAAAAAABAAAAAAEAAQAAAAABAAEAAAAAAwAMAAAAAAEADAAAAAACAAwAAAAAAAABAAAAAAAAggAAAAAAAAQAAAAAAAAGAAAAAAMABgAAAAADAA==
           version: 7
         0,6:
           ind: 0,6
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAdwAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAAAMAAAAAAIABAAAAAAAAAwAAAAAAwCCAAAAAAAAggAAAAAAAIIAAAAAAAAGAAAAAAMABwAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHcAAAAABQB3AAAAAAAAdwAAAAAAAHcAAAAAAACCAAAAAAAAggAAAAAAAAQAAAAAAACCAAAAAAAAggAAAAAAAHcAAAAAAACCAAAAAAAABgAAAAADAAcAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAdwAAAAAAAHcAAAAAAAB3AAAAAAUAggAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAIIAAAAAAAB3AAAAAAAAggAAAAAAAAYAAAAAAQAGAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHcAAAAAAAB3AAAAAAAAdwAAAAAAAIIAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAACCAAAAAAAAdwAAAAAAAIIAAAAAAACCAAAAAAAABgAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAdwAAAAAAAHcAAAAAAACCAAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAAggAAAAAAAHcAAAAAAAB3AAAAAAAAggAAAAAAAIIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB3AAAAAAAAggAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAIIAAAAAAAB3AAAAAAAAdwAAAAAEAHcAAAAAAAB3AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHcAAAAAAAB3AAAAAAsAdwAAAAAJAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAdwAAAAAAAHcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB3AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAdwAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAAAMAAAAAAIABAAAAAAAAAwAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAAAGAAAAAAIABwAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHcAAAAAAgB3AAAAAAAAdwAAAAAAAHcAAAAAAACCAAAAAAAAggAAAAAAAAQAAAAAAACCAAAAAAAAggAAAAAAAHcAAAAAAACCAAAAAAAABgAAAAAAAAcAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAdwAAAAAAAHcAAAAACgB3AAAAAAAAggAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAIIAAAAAAAB3AAAAAAUAggAAAAAAAAYAAAAAAAAGAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHcAAAAAAAB3AAAAAAAAdwAAAAAJAIIAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAACCAAAAAAAAdwAAAAAAAIIAAAAAAACCAAAAAAAABgAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAdwAAAAAAAHcAAAAABACCAAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAAggAAAAAAAHcAAAAAAAB3AAAAAAAAggAAAAAAAIIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB3AAAAAAkAggAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAIIAAAAAAAB3AAAAAAAAdwAAAAADAHcAAAAAAAB3AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHcAAAAABwB3AAAAAAAAdwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAdwAAAAAAAHcAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB3AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==
           version: 7
         1,1:
           ind: 1,1
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB3AAAAAAAAdwAAAAAAAHcAAAAAAAB3AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHcAAAAAAAB3AAAAAAAAdwAAAAAAAHcAAAAAAACCAAAAAAAAggAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAdwAAAAAAAHcAAAAAAAB3AAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAHcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHcAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAAB3AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAdwAAAAAAAHcAAAAAAAB3AAAAAAAAggAAAAAAAHcAAAAAAAB3AAAAAAAAdwAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAdwAAAAAAAHcAAAAAAQCCAAAAAAAAggAAAAAAAIIAAAAAAAB3AAAAAAAAdwAAAAAAAHcAAAAAAAB3AAAAAAAAggAAAAAAAHcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB3AAAAAAAAdwAAAAAAAHcAAAAACgCCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAdwAAAAAAAHcAAAAAAAB3AAAAAAAAdwAAAAAAAIIAAAAAAACCAAAAAAAAAAAAAAAAAAAAAAAAAAB3AAAAAAAAdwAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAAB3AAAAAAAAdwAAAAAAAHcAAAAAAAB3AAAAAAAAggAAAAAAAAAAAAAAAAB3AAAAAAAAdwAAAAAAAIIAAAAAAACCAAAAAAAAdwAAAAAAAHcAAAAAAAB3AAAAAAkAggAAAAAAAIIAAAAAAACCAAAAAAAAdwAAAAAAAHcAAAAAAQB3AAAAAAAAdwAAAAAIAIIAAAAAAAB3AAAAAAAAdwAAAAAAAIIAAAAAAACCAAAAAAAAdwAAAAAAAHcAAAAAAAB3AAAAAAAAdwAAAAAAAIIAAAAAAACCAAAAAAAACAAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAdwAAAAAAAIIAAAAAAACCAAAAAAAAdwAAAAAAAHcAAAAAAAB3AAAAAAAAdwAAAAAAAHcAAAAAAACCAAAAAAAACAAAAAACAAgAAAAAAQAIAAAAAAMACAAAAAABAAgAAAAAAQAIAAAAAAAAggAAAAAAAA==
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB3AAAAAAAAdwAAAAADAHcAAAAAAgB3AAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHcAAAAAAAB3AAAAAAAAdwAAAAAKAHcAAAAAAACCAAAAAAAAggAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAdwAAAAAAAHcAAAAAAAB3AAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAHcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHcAAAAABgCCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAAB3AAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAdwAAAAAAAHcAAAAAAAB3AAAAAAAAggAAAAAAAHcAAAAAAAB3AAAAAAAAdwAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAdwAAAAAAAHcAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAAB3AAAAAAAAdwAAAAAAAHcAAAAAAAB3AAAAAAAAggAAAAAAAHcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB3AAAAAAAAdwAAAAAAAHcAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAdwAAAAAAAHcAAAAAAAB3AAAAAAAAdwAAAAAAAIIAAAAAAACCAAAAAAAAAAAAAAAAAAAAAAAAAAB3AAAAAAQAdwAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAAB3AAAAAAAAdwAAAAAAAHcAAAAABwB3AAAAAAAAggAAAAAAAAAAAAAAAAB3AAAAAAAAdwAAAAAAAIIAAAAAAACCAAAAAAAAdwAAAAAAAHcAAAAAAAB3AAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAdwAAAAAAAHcAAAAAAAB3AAAAAAAAdwAAAAAAAIIAAAAAAAB3AAAAAAAAdwAAAAAAAIIAAAAAAACCAAAAAAAAdwAAAAAJAHcAAAAAAAB3AAAAAAQAdwAAAAAAAIIAAAAAAACCAAAAAAAACAAAAAACAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAdwAAAAAAAIIAAAAAAACCAAAAAAAAdwAAAAAAAHcAAAAAAAB3AAAAAAAAdwAAAAAAAHcAAAAAAACCAAAAAAAACAAAAAABAAgAAAAAAQAIAAAAAAMACAAAAAACAAgAAAAAAAAIAAAAAAMAggAAAAAAAA==
           version: 7
         1,2:
           ind: 1,2
-          tiles: ggAAAAAAAIIAAAAAAAB3AAAAAAAAdwAAAAAAAIIAAAAAAAB3AAAAAAAAdwAAAAAHAHcAAAAAAACCAAAAAAAACAAAAAACAAgAAAAAAAAIAAAAAAEACAAAAAADAAgAAAAAAAAIAAAAAAMAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAHcAAAAAAAB3AAAAAAAAdwAAAAAAAHcAAAAACAB3AAAAAAYAggAAAAAAAAgAAAAAAwAIAAAAAAIACAAAAAADAAgAAAAAAAAIAAAAAAIACAAAAAACAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAHcAAAAACgCCAAAAAAAAdwAAAAAAAIIAAAAAAACCAAAAAAAACAAAAAADAIIAAAAAAACCAAAAAAAACAAAAAACAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAAB3AAAAAAAAggAAAAAAAHcAAAAAAACCAAAAAAAAAQAAAAADAAEAAAAAAQABAAAAAAAAggAAAAAAAAEAAAAAAgABAAAAAAMAggAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAHcAAAAAAAB3AAAAAAAAdwAAAAAAAHcAAAAAAAB3AAAAAAAAAQAAAAADAAEAAAAAAwABAAAAAAAAAQAAAAADAIIAAAAAAAABAAAAAAAAAQAAAAACAAEAAAAAAQB3AAAAAAEAggAAAAAAAHcAAAAAAAB3AAAAAAYAdwAAAAAAAHcAAAAAAAB3AAAAAAAAdwAAAAAAAIIAAAAAAAABAAAAAAIAAQAAAAABAAEAAAAAAACCAAAAAAAAAQAAAAABAAEAAAAAAwABAAAAAAMAdwAAAAAAAIIAAAAAAAB3AAAAAAAAdwAAAAAAAHcAAAAAAAB3AAAAAAAAdwAAAAAAAHcAAAAAAACCAAAAAAAAAQAAAAAAAAEAAAAAAgABAAAAAAAAggAAAAAAAAEAAAAAAwABAAAAAAIAAQAAAAABAHcAAAAAAwCCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAAEAAAAAAwABAAAAAAMAAQAAAAACAIIAAAAAAAABAAAAAAEAAQAAAAACAAEAAAAAAgB3AAAAAAAAggAAAAAAABUAAAAAAACCAAAAAAAACAAAAAABAAgAAAAAAQCCAAAAAAAAdwAAAAAAAIIAAAAAAAABAAAAAAMAAQAAAAABAAEAAAAAAwCCAAAAAAAAggAAAAAAAAIAAAAAAAACAAAAAAAAdwAAAAAAAIIAAAAAAAALAAAAAAAAggAAAAAAAAgAAAAAAQAIAAAAAAMAggAAAAAAAHcAAAAAAACCAAAAAAAAAQAAAAABAAEAAAAAAgABAAAAAAEAggAAAAAAAAYAAAAAAgAGAAAAAAAABgAAAAABAIIAAAAAAACCAAAAAAAACwAAAAAAAIIAAAAAAAAIAAAAAAMAggAAAAAAAIIAAAAAAAB3AAAAAAAAggAAAAAAAAEAAAAAAgABAAAAAAMAAQAAAAADAAIAAAAAAAAGAAAAAAIABgAAAAABAAYAAAAAAgCCAAAAAAAACAAAAAADAAgAAAAAAAAIAAAAAAIACAAAAAABAAgAAAAAAgCCAAAAAAAAdwAAAAAAAIIAAAAAAAABAAAAAAMAAQAAAAAAAAEAAAAAAQACAAAAAAAABgAAAAABAAYAAAAAAQAGAAAAAAEAggAAAAAAAAgAAAAAAAAIAAAAAAMACAAAAAAAAAgAAAAAAAAIAAAAAAAAggAAAAAAAHcAAAAAAACCAAAAAAAAAQAAAAADAAEAAAAAAAABAAAAAAMAggAAAAAAAAYAAAAAAwAGAAAAAAIABgAAAAACAIIAAAAAAAAIAAAAAAEACAAAAAACAAgAAAAAAgAIAAAAAAMACAAAAAADAIIAAAAAAAB3AAAAAAAAggAAAAAAAAEAAAAAAQABAAAAAAEAAQAAAAABAIIAAAAAAACCAAAAAAAABgAAAAAAAIIAAAAAAACCAAAAAAAACAAAAAACAAgAAAAAAQAIAAAAAAAACAAAAAACAAgAAAAAAwCCAAAAAAAAdwAAAAAHAIIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAACCAAAAAAAABgAAAAACAAYAAAAAAgAGAAAAAAMAggAAAAAAAIIAAAAAAACCAAAAAAAABgAAAAADAIIAAAAAAACCAAAAAAAAggAAAAAAAHcAAAAACgCCAAAAAAAAAQAAAAADAAEAAAAAAgABAAAAAAEAggAAAAAAAAYAAAAAAQAGAAAAAAMABgAAAAAAAA==
+          tiles: ggAAAAAAAIIAAAAAAAB3AAAAAAAAdwAAAAAAAIIAAAAAAAB3AAAAAAAAdwAAAAAAAHcAAAAAAACCAAAAAAAACAAAAAADAAgAAAAAAAAIAAAAAAMACAAAAAAAAAgAAAAAAQAIAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAHcAAAAAAAB3AAAAAAAAdwAAAAAAAHcAAAAAAAB3AAAAAAAAggAAAAAAAAgAAAAAAQAIAAAAAAAACAAAAAABAAgAAAAAAwAIAAAAAAAACAAAAAABAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAHcAAAAAAACCAAAAAAAAdwAAAAAAAIIAAAAAAACCAAAAAAAACAAAAAAAAIIAAAAAAACCAAAAAAAACAAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAAB3AAAAAAAAggAAAAAAAHcAAAAAAACCAAAAAAAAAQAAAAABAAEAAAAAAQABAAAAAAIAggAAAAAAAAEAAAAAAQABAAAAAAMAggAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAHcAAAAAAAB3AAAAAAAAdwAAAAAAAHcAAAAAAAB3AAAAAAoAAQAAAAABAAEAAAAAAAABAAAAAAMAAQAAAAABAIIAAAAAAAABAAAAAAEAAQAAAAABAAEAAAAAAgB3AAAAAAAAggAAAAAAAHcAAAAAAAB3AAAAAAAAdwAAAAAAAHcAAAAAAAB3AAAAAAAAdwAAAAAAAIIAAAAAAAABAAAAAAEAAQAAAAADAAEAAAAAAgCCAAAAAAAAAQAAAAABAAEAAAAAAQABAAAAAAMAdwAAAAAEAIIAAAAAAAB3AAAAAAAAdwAAAAAAAHcAAAAAAAB3AAAAAAEAdwAAAAAAAHcAAAAAAACCAAAAAAAAAQAAAAADAAEAAAAAAAABAAAAAAMAggAAAAAAAAEAAAAAAAABAAAAAAEAAQAAAAAAAHcAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAAEAAAAAAQABAAAAAAMAAQAAAAABAIIAAAAAAAABAAAAAAIAAQAAAAABAAEAAAAAAAB3AAAAAAAAggAAAAAAABUAAAAAAACCAAAAAAAACAAAAAACAAgAAAAAAQCCAAAAAAAAdwAAAAAAAIIAAAAAAAABAAAAAAMAAQAAAAABAAEAAAAAAwCCAAAAAAAAggAAAAAAAAIAAAAAAAACAAAAAAAAdwAAAAAAAIIAAAAAAAALAAAAAAAAggAAAAAAAAgAAAAAAQAIAAAAAAIAggAAAAAAAHcAAAAAAACCAAAAAAAAAQAAAAACAAEAAAAAAwABAAAAAAMAggAAAAAAAAYAAAAAAgAGAAAAAAMABgAAAAAAAIIAAAAAAACCAAAAAAAACwAAAAAAAIIAAAAAAAAIAAAAAAAAggAAAAAAAIIAAAAAAAB3AAAAAAAAggAAAAAAAAEAAAAAAgABAAAAAAAAAQAAAAADAAIAAAAAAAAGAAAAAAEABgAAAAABAAYAAAAAAwCCAAAAAAAACAAAAAABAAgAAAAAAgAIAAAAAAAACAAAAAAAAAgAAAAAAQCCAAAAAAAAdwAAAAAAAIIAAAAAAAABAAAAAAEAAQAAAAAAAAEAAAAAAQACAAAAAAAABgAAAAADAAYAAAAAAwAGAAAAAAAAggAAAAAAAAgAAAAAAwAIAAAAAAIACAAAAAACAAgAAAAAAgAIAAAAAAMAggAAAAAAAHcAAAAACwCCAAAAAAAAAQAAAAACAAEAAAAAAQABAAAAAAMAggAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAAIIAAAAAAAAIAAAAAAEACAAAAAABAAgAAAAAAgAIAAAAAAIACAAAAAABAIIAAAAAAAB3AAAAAAAAggAAAAAAAAEAAAAAAQABAAAAAAAAAQAAAAACAIIAAAAAAACCAAAAAAAABgAAAAABAIIAAAAAAACCAAAAAAAACAAAAAABAAgAAAAAAwAIAAAAAAMACAAAAAAAAAgAAAAAAQCCAAAAAAAAdwAAAAAGAIIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAACCAAAAAAAABgAAAAADAAYAAAAAAwAGAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAABgAAAAABAIIAAAAAAACCAAAAAAAAggAAAAAAAHcAAAAAAACCAAAAAAAAAQAAAAACAAEAAAAAAwABAAAAAAIAggAAAAAAAAYAAAAAAAAGAAAAAAMABgAAAAABAA==
           version: 7
         1,3:
           ind: 1,3
-          tiles: BgAAAAACAAYAAAAAAQAGAAAAAAIABgAAAAADAAYAAAAAAwAGAAAAAAAAggAAAAAAAHcAAAAAAACCAAAAAAAAAQAAAAABAAEAAAAAAgABAAAAAAAAggAAAAAAAAYAAAAAAgAGAAAAAAIABgAAAAABAAYAAAAAAQAGAAAAAAAABgAAAAAAAAYAAAAAAgAGAAAAAAIABgAAAAACAIIAAAAAAAB3AAAAAAAAggAAAAAAAAEAAAAAAQABAAAAAAAAAQAAAAABAIIAAAAAAAAGAAAAAAMABgAAAAACAAYAAAAAAgAGAAAAAAIABgAAAAACAAYAAAAAAgAGAAAAAAAABgAAAAACAAYAAAAAAgCCAAAAAAAAdwAAAAAFAIIAAAAAAAABAAAAAAMAAQAAAAACAAEAAAAAAgCCAAAAAAAABgAAAAADAAYAAAAAAAAGAAAAAAIABgAAAAADAAYAAAAAAwAGAAAAAAEABgAAAAAAAAYAAAAAAQAGAAAAAAEAggAAAAAAAHcAAAAAAACCAAAAAAAAAQAAAAACAAEAAAAAAQABAAAAAAEAggAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAACAAYAAAAAAAAGAAAAAAEABgAAAAAAAAYAAAAAAAAGAAAAAAMABgAAAAABAIIAAAAAAAB3AAAAAAAAggAAAAAAAAEAAAAAAgABAAAAAAAAAQAAAAACAAIAAAAAAAAGAAAAAAEABgAAAAACAAYAAAAAAwAGAAAAAAEABgAAAAABAAYAAAAAAACCAAAAAAAAAgAAAAAAAAIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAAABAAAAAAAAAQAAAAACAAEAAAAAAQCCAAAAAAAABgAAAAAAAAYAAAAAAgAGAAAAAAMABgAAAAABAAYAAAAAAwAGAAAAAAAAggAAAAAAAAYAAAAAAgAGAAAAAAAABgAAAAADAAYAAAAAAgCCAAAAAAAAAQAAAAADAAEAAAAAAwABAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAAAGAAAAAAIAggAAAAAAAIIAAAAAAAAGAAAAAAEABgAAAAACAAYAAAAAAgAGAAAAAAIAAgAAAAAAAAEAAAAAAQABAAAAAAMAAQAAAAACAIIAAAAAAAAGAAAAAAEAAQAAAAAAAAEAAAAAAQABAAAAAAIAAQAAAAADAAEAAAAAAACCAAAAAAAABgAAAAACAAYAAAAAAAAGAAAAAAEABgAAAAAAAAIAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAgACAAAAAAAABgAAAAADAAYAAAAAAwAGAAAAAAIAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAAQAAAAACAAEAAAAAAwABAAAAAAAAAgAAAAAAAAYAAAAAAQAGAAAAAAIABgAAAAABAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAAB3AAAAAAEAdwAAAAAAAHcAAAAABgB3AAAAAAAAggAAAAAAAAEAAAAAAwABAAAAAAEAAQAAAAADAIIAAAAAAAAGAAAAAAIAAQAAAAADAAEAAAAAAwCCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAdwAAAAAAAHcAAAAABQB3AAAAAAAAdwAAAAAAAIIAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAwCCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAdwAAAAAAAHcAAAAAAAB3AAAAAAAAdwAAAAAAAHcAAAAAAAB3AAAAAAAAdwAAAAAAAHcAAAAAAAABAAAAAAMAAQAAAAACAAEAAAAAAAABAAAAAAIAggAAAAAAAHcAAAAAAwB3AAAAAAAAggAAAAAAAHcAAAAAAAB3AAAAAAAAdwAAAAAAAHcAAAAAAAB3AAAAAAAAdwAAAAAAAHcAAAAAAAB3AAAAAAAAggAAAAAAAAEAAAAAAwABAAAAAAIAAQAAAAADAIIAAAAAAAB3AAAAAAoAdwAAAAAAAIIAAAAAAAB3AAAAAAAAggAAAAAAAHcAAAAAAACCAAAAAAAAggAAAAAAAHcAAAAAAAB3AAAAAAcAdwAAAAAAAIIAAAAAAAABAAAAAAEAAQAAAAAAAAEAAAAAAACCAAAAAAAAdwAAAAAAAHcAAAAAAwCCAAAAAAAAdwAAAAAAAHcAAAAABgB3AAAAAAAAdwAAAAAAAHcAAAAAAAB3AAAAAAAAdwAAAAAAAHcAAAAAAACCAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAggAAAAAAAHcAAAAABwB3AAAAAAAAggAAAAAAAA==
+          tiles: BgAAAAAAAAYAAAAAAwAGAAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAAEAggAAAAAAAHcAAAAAAACCAAAAAAAAAQAAAAAAAAEAAAAAAQABAAAAAAAAggAAAAAAAAYAAAAAAwAGAAAAAAAABgAAAAAAAAYAAAAAAwAGAAAAAAEABgAAAAABAAYAAAAAAwAGAAAAAAAABgAAAAAAAIIAAAAAAAB3AAAAAAAAggAAAAAAAAEAAAAAAgABAAAAAAEAAQAAAAADAIIAAAAAAAAGAAAAAAMABgAAAAACAAYAAAAAAQAGAAAAAAAABgAAAAADAAYAAAAAAwAGAAAAAAMABgAAAAAAAAYAAAAAAgCCAAAAAAAAdwAAAAAAAIIAAAAAAAABAAAAAAIAAQAAAAACAAEAAAAAAACCAAAAAAAABgAAAAACAAYAAAAAAQAGAAAAAAIABgAAAAACAAYAAAAAAgAGAAAAAAMABgAAAAAAAAYAAAAAAAAGAAAAAAEAggAAAAAAAHcAAAAAAACCAAAAAAAAAQAAAAADAAEAAAAAAgABAAAAAAIAggAAAAAAAAYAAAAAAQAGAAAAAAIABgAAAAABAAYAAAAAAQAGAAAAAAEABgAAAAABAAYAAAAAAwAGAAAAAAEABgAAAAAAAIIAAAAAAAB3AAAAAAwAggAAAAAAAAEAAAAAAQABAAAAAAAAAQAAAAAAAAIAAAAAAAAGAAAAAAIABgAAAAAAAAYAAAAAAwAGAAAAAAAABgAAAAACAAYAAAAAAQCCAAAAAAAAAgAAAAAAAAIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAAABAAAAAAMAAQAAAAAAAAEAAAAAAwCCAAAAAAAABgAAAAABAAYAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAgAGAAAAAAIAggAAAAAAAAYAAAAAAwAGAAAAAAMABgAAAAABAAYAAAAAAQCCAAAAAAAAAQAAAAADAAEAAAAAAAABAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAAAGAAAAAAMAggAAAAAAAIIAAAAAAAAGAAAAAAAABgAAAAACAAYAAAAAAAAGAAAAAAMAAgAAAAAAAAEAAAAAAAABAAAAAAMAAQAAAAABAIIAAAAAAAAGAAAAAAIAAQAAAAABAAEAAAAAAAABAAAAAAIAAQAAAAABAAEAAAAAAwCCAAAAAAAABgAAAAADAAYAAAAAAAAGAAAAAAIABgAAAAACAAIAAAAAAAABAAAAAAAAAQAAAAABAAEAAAAAAAACAAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAAIAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAAQAAAAAAAAEAAAAAAQABAAAAAAAAAgAAAAAAAAYAAAAAAwAGAAAAAAMABgAAAAADAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAAB3AAAAAAAAdwAAAAAAAHcAAAAAAAB3AAAAAAgAggAAAAAAAAEAAAAAAwABAAAAAAEAAQAAAAAAAIIAAAAAAAAGAAAAAAAAAQAAAAABAAEAAAAAAgCCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAdwAAAAAAAHcAAAAAAAB3AAAAAAAAdwAAAAAAAIIAAAAAAAABAAAAAAEAAQAAAAAAAAEAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAdwAAAAAAAHcAAAAAAAB3AAAAAAsAdwAAAAAAAHcAAAAAAAB3AAAAAAAAdwAAAAAAAHcAAAAAAAABAAAAAAIAAQAAAAAAAAEAAAAAAAABAAAAAAEAggAAAAAAAHcAAAAAAAB3AAAAAAAAggAAAAAAAHcAAAAAAAB3AAAAAAAAdwAAAAAMAHcAAAAAAAB3AAAAAAAAdwAAAAAAAHcAAAAAAAB3AAAAAAUAggAAAAAAAAEAAAAAAAABAAAAAAIAAQAAAAABAIIAAAAAAAB3AAAAAAAAdwAAAAAAAIIAAAAAAAB3AAAAAAUAggAAAAAAAHcAAAAAAQCCAAAAAAAAggAAAAAAAHcAAAAAAAB3AAAAAAAAdwAAAAAAAIIAAAAAAAABAAAAAAEAAQAAAAACAAEAAAAAAACCAAAAAAAAdwAAAAAAAHcAAAAAAACCAAAAAAAAdwAAAAAAAHcAAAAAAAB3AAAAAAAAdwAAAAAAAHcAAAAAAAB3AAAAAAAAdwAAAAAAAHcAAAAABgCCAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAggAAAAAAAHcAAAAABgB3AAAAAAgAggAAAAAAAA==
           version: 7
         1,4:
           ind: 1,4
-          tiles: dwAAAAAAAHcAAAAACAB3AAAAAAAAdwAAAAABAHcAAAAAAAB3AAAAAAYAdwAAAAAAAIIAAAAAAACCAAAAAAAAAQAAAAABAAEAAAAAAwABAAAAAAMAggAAAAAAAIIAAAAAAAB3AAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAAQAAAAABAAEAAAAAAgABAAAAAAEAAQAAAAAAAAEAAAAAAwCCAAAAAAAAggAAAAAAAIIAAAAAAAABAAAAAAMAAQAAAAABAAEAAAAAAgABAAAAAAMAAQAAAAACAAEAAAAAAQABAAAAAAMAAQAAAAACAAEAAAAAAAABAAAAAAEAAQAAAAABAAEAAAAAAAABAAAAAAMAAQAAAAAAAAIAAAAAAAABAAAAAAIAAQAAAAAAAAEAAAAAAAABAAAAAAMAAQAAAAADAAEAAAAAAQABAAAAAAMAAQAAAAADAAEAAAAAAgABAAAAAAEAAQAAAAABAAEAAAAAAgABAAAAAAEAAQAAAAABAAEAAAAAAAACAAAAAAAAAQAAAAADAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAgABAAAAAAIAAQAAAAABAAEAAAAAAAABAAAAAAEAAQAAAAACAAEAAAAAAAABAAAAAAEAAQAAAAAAAAEAAAAAAwABAAAAAAMAAgAAAAAAAAEAAAAAAwCCAAAAAAAAggAAAAAAAIIAAAAAAAACAAAAAAAAAgAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAAEAAAAAAgABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAIAggAAAAAAAIIAAAAAAACCAAAAAAAAdwAAAAAAAIIAAAAAAAAGAAAAAAEABAAAAAAAAAQAAAAAAACCAAAAAAAAdwAAAAAAAIIAAAAAAACCAAAAAAAAAQAAAAAAAAEAAAAAAgABAAAAAAAAggAAAAAAAIIAAAAAAAB3AAAAAAAAdwAAAAAGAIIAAAAAAACCAAAAAAAABgAAAAADAAQAAAAAAAAEAAAAAAAAggAAAAAAAHcAAAAAAAB3AAAAAAAAggAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAIIAAAAAAAB3AAAAAAAAdwAAAAAAAHcAAAAACQABAAAAAAIAggAAAAAAAAYAAAAAAgAEAAAAAAAABAAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAAABAAAAAAIAAQAAAAABAAEAAAAAAgCCAAAAAAAAdwAAAAAAAHcAAAAAAACCAAAAAAAAAQAAAAAAAIIAAAAAAAAGAAAAAAMABgAAAAADAAYAAAAAAgAGAAAAAAEABgAAAAACAAYAAAAAAACCAAAAAAAAAQAAAAABAAEAAAAAAAABAAAAAAEAggAAAAAAAHcAAAAAAAB3AAAAAAAAdwAAAAAEAAEAAAAAAQAGAAAAAAEABgAAAAAAAAYAAAAAAAAGAAAAAAMABgAAAAAAAAYAAAAAAQAGAAAAAAIABgAAAAABAAEAAAAAAAABAAAAAAMAAQAAAAABAIIAAAAAAAB3AAAAAAAAdwAAAAAAAHcAAAAAAAABAAAAAAAAggAAAAAAAAYAAAAAAQAGAAAAAAEABgAAAAAAAAYAAAAAAQAGAAAAAAAABgAAAAAAAIIAAAAAAAABAAAAAAIAAQAAAAAAAAEAAAAAAgCCAAAAAAAAggAAAAAAAIIAAAAAAAABAAAAAAMAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAAQAAAAABAAEAAAAAAgABAAAAAAEAggAAAAAAAAEAAAAAAgABAAAAAAAAAQAAAAAAAHcAAAAAAAB3AAAAAAAAdwAAAAAAAHcAAAAAAAB3AAAAAAAAdwAAAAAAAHcAAAAAAAB3AAAAAAAAggAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAABAAEAAAAAAQABAAAAAAEAAQAAAAADAAEAAAAAAQB3AAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAAABAAAAAAEAAQAAAAADAAEAAAAAAwABAAAAAAMAAQAAAAABAAEAAAAAAgABAAAAAAAAdwAAAAAAAIIAAAAAAAAEAAAAAAAABAAAAAAAAAEAAAAAAQABAAAAAAIAAQAAAAADAAEAAAAAAAABAAAAAAAAAQAAAAADAAEAAAAAAAABAAAAAAAAggAAAAAAAAEAAAAAAgABAAAAAAMAAQAAAAADAA==
+          tiles: dwAAAAAAAHcAAAAAAAB3AAAAAAAAdwAAAAAAAHcAAAAAAAB3AAAAAAAAdwAAAAAMAIIAAAAAAACCAAAAAAAAAQAAAAACAAEAAAAAAAABAAAAAAMAggAAAAAAAIIAAAAAAAB3AAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAAQAAAAACAAEAAAAAAAABAAAAAAEAAQAAAAACAAEAAAAAAgCCAAAAAAAAggAAAAAAAIIAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAwABAAAAAAMAAQAAAAACAAEAAAAAAgABAAAAAAMAAQAAAAACAAEAAAAAAQABAAAAAAIAAQAAAAABAAEAAAAAAAABAAAAAAEAAQAAAAABAAIAAAAAAAABAAAAAAMAAQAAAAAAAAEAAAAAAwABAAAAAAIAAQAAAAABAAEAAAAAAwABAAAAAAIAAQAAAAAAAAEAAAAAAgABAAAAAAIAAQAAAAADAAEAAAAAAwABAAAAAAEAAQAAAAADAAEAAAAAAAACAAAAAAAAAQAAAAACAAEAAAAAAgABAAAAAAEAAQAAAAACAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAgABAAAAAAEAAQAAAAAAAAEAAAAAAQABAAAAAAIAAQAAAAACAAEAAAAAAwABAAAAAAIAAgAAAAAAAAEAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAAACAAAAAAAAAgAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAAEAAAAAAgABAAAAAAEAAQAAAAABAAEAAAAAAgABAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAdwAAAAALAIIAAAAAAAAGAAAAAAMABAAAAAAAAAQAAAAAAACCAAAAAAAAdwAAAAAAAIIAAAAAAACCAAAAAAAAAQAAAAABAAEAAAAAAAABAAAAAAIAggAAAAAAAIIAAAAAAAB3AAAAAAAAdwAAAAAHAIIAAAAAAACCAAAAAAAABgAAAAACAAQAAAAAAAAEAAAAAAAAggAAAAAAAHcAAAAAAAB3AAAAAAAAggAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAIIAAAAAAAB3AAAAAAAAdwAAAAAAAHcAAAAAAAABAAAAAAMAggAAAAAAAAYAAAAAAQAEAAAAAAAABAAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAACCAAAAAAAAdwAAAAAAAHcAAAAAAACCAAAAAAAAAQAAAAABAIIAAAAAAAAGAAAAAAEABgAAAAADAAYAAAAAAAAGAAAAAAMABgAAAAABAAYAAAAAAACCAAAAAAAAAQAAAAACAAEAAAAAAQABAAAAAAIAggAAAAAAAHcAAAAAAAB3AAAAAAAAdwAAAAAAAAEAAAAAAwAGAAAAAAIABgAAAAACAAYAAAAAAAAGAAAAAAIABgAAAAAAAAYAAAAAAgAGAAAAAAAABgAAAAADAAEAAAAAAwABAAAAAAIAAQAAAAACAIIAAAAAAAB3AAAAAAAAdwAAAAAIAHcAAAAAAAABAAAAAAIAggAAAAAAAAYAAAAAAQAGAAAAAAAABgAAAAACAAYAAAAAAgAGAAAAAAMABgAAAAABAIIAAAAAAAABAAAAAAEAAQAAAAACAAEAAAAAAgCCAAAAAAAAggAAAAAAAIIAAAAAAAABAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAAQAAAAADAAEAAAAAAAABAAAAAAEAggAAAAAAAAEAAAAAAAABAAAAAAMAAQAAAAADAHcAAAAAAAB3AAAAAAEAdwAAAAAAAHcAAAAAAAB3AAAAAAAAdwAAAAAGAHcAAAAAAAB3AAAAAAAAggAAAAAAAAEAAAAAAgABAAAAAAAAAQAAAAABAAEAAAAAAwABAAAAAAEAAQAAAAABAAEAAAAAAAB3AAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAAABAAAAAAAAAQAAAAACAAEAAAAAAQABAAAAAAMAAQAAAAABAAEAAAAAAAABAAAAAAIAdwAAAAAAAIIAAAAAAAAEAAAAAAAABAAAAAAAAAEAAAAAAwABAAAAAAMAAQAAAAABAAEAAAAAAAABAAAAAAMAAQAAAAADAAEAAAAAAQABAAAAAAIAggAAAAAAAAEAAAAAAQABAAAAAAAAAQAAAAADAA==
           version: 7
         1,5:
           ind: 1,5
-          tiles: dwAAAAAAAIIAAAAAAAABAAAAAAIAAQAAAAADAAEAAAAAAwABAAAAAAAAggAAAAAAAAEAAAAAAgABAAAAAAIAAQAAAAABAAEAAAAAAwABAAAAAAIAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAHcAAAAAAACCAAAAAAAAAQAAAAADAAEAAAAAAQABAAAAAAMAAQAAAAADAAEAAAAAAgABAAAAAAEAAQAAAAAAAAEAAAAAAgABAAAAAAAAAQAAAAACAIIAAAAAAAB3AAAAAAAAdwAAAAAAAHcAAAAAAAB3AAAAAAAAggAAAAAAAAEAAAAAAgABAAAAAAEAAQAAAAABAAEAAAAAAwABAAAAAAAAAQAAAAADAAEAAAAAAwABAAAAAAAAAQAAAAABAAEAAAAAAgCCAAAAAAAAdwAAAAAAAHcAAAAAAAB3AAAAAAkAdwAAAAAAAIIAAAAAAAABAAAAAAAAAQAAAAACAAEAAAAAAgABAAAAAAIAggAAAAAAAAEAAAAAAAABAAAAAAMAAQAAAAADAAEAAAAAAQABAAAAAAEAggAAAAAAAHcAAAAABwB3AAAAAAAAdwAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAAAGAAAAAAIAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAAEAAAAAAgABAAAAAAEAAQAAAAACAAEAAAAAAAB3AAAAAAMAdwAAAAAIAHcAAAAAAAAGAAAAAAIABgAAAAAAAAYAAAAAAgAGAAAAAAEABgAAAAABAAYAAAAAAwCCAAAAAAAAdwAAAAAJAIIAAAAAAAABAAAAAAMAAQAAAAAAAAEAAAAAAACCAAAAAAAAdwAAAAAAAHcAAAAAAAB3AAAAAAAAAQAAAAADAAEAAAAAAQABAAAAAAIABgAAAAAAAAYAAAAAAQAGAAAAAAAAggAAAAAAAHcAAAAAAACCAAAAAAAAAQAAAAADAAEAAAAAAgABAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAAEAAAAAAAABAAAAAAMAAQAAAAABAAYAAAAAAgAGAAAAAAAABgAAAAAAAIIAAAAAAAB3AAAAAAAAggAAAAAAAAEAAAAAAgABAAAAAAIAAQAAAAAAAIIAAAAAAAAIAAAAAAMACAAAAAACAIIAAAAAAAABAAAAAAEAAQAAAAAAAAEAAAAAAAAGAAAAAAAABgAAAAABAAYAAAAAAACCAAAAAAAAdwAAAAAAAIIAAAAAAAABAAAAAAIAAQAAAAAAAAEAAAAAAQCCAAAAAAAACAAAAAADAAgAAAAAAwCCAAAAAAAAAQAAAAABAAEAAAAAAgABAAAAAAMABgAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAggAAAAAAAAgAAAAAAwCCAAAAAAAAggAAAAAAAAEAAAAAAAABAAAAAAIAAQAAAAADAAYAAAAAAACCAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAMAggAAAAAAAAEAAAAAAQABAAAAAAMAAQAAAAABAIIAAAAAAAAIAAAAAAMACAAAAAAAAAgAAAAAAwABAAAAAAAAAQAAAAACAAEAAAAAAwAGAAAAAAEABgAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAABAAAAAAIAAQAAAAACAAEAAAAAAACCAAAAAAAACAAAAAACAAgAAAAAAQAIAAAAAAAABgAAAAADAAYAAAAAAgAGAAAAAAEABgAAAAABAIIAAAAAAAAHAAAAAAMABwAAAAAAAAcAAAAAAgCCAAAAAAAAAQAAAAADAAEAAAAAAAABAAAAAAMAAgAAAAAAAAEAAAAAAwABAAAAAAAAAQAAAAADAAIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAAEAAAAAAQABAAAAAAAAAQAAAAABAAIAAAAAAAABAAAAAAMAAQAAAAABAAEAAAAAAgAGAAAAAAAABgAAAAADAAYAAAAAAACCAAAAAAAAdwAAAAAAAHcAAAAAAAB3AAAAAAIAdwAAAAAAAIIAAAAAAAABAAAAAAEAAQAAAAAAAAEAAAAAAgCCAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAIABgAAAAADAAYAAAAAAQAGAAAAAAIABgAAAAABAHcAAAAAAAB3AAAAAAAAdwAAAAAAAHcAAAAAAACCAAAAAAAAAQAAAAACAAEAAAAAAwABAAAAAAEAggAAAAAAAAEAAAAAAwABAAAAAAIAAQAAAAAAAA==
+          tiles: dwAAAAAAAIIAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAwABAAAAAAMAggAAAAAAAAEAAAAAAQABAAAAAAEAAQAAAAADAAEAAAAAAwABAAAAAAMAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAHcAAAAAAACCAAAAAAAAAQAAAAAAAAEAAAAAAwABAAAAAAMAAQAAAAAAAAEAAAAAAQABAAAAAAEAAQAAAAAAAAEAAAAAAgABAAAAAAAAAQAAAAACAIIAAAAAAAB3AAAAAAAAdwAAAAAAAHcAAAAAAAB3AAAAAAgAggAAAAAAAAEAAAAAAAABAAAAAAEAAQAAAAABAAEAAAAAAwABAAAAAAEAAQAAAAACAAEAAAAAAgABAAAAAAAAAQAAAAADAAEAAAAAAwCCAAAAAAAAdwAAAAAAAHcAAAAAAAB3AAAAAAAAdwAAAAAAAIIAAAAAAAABAAAAAAEAAQAAAAABAAEAAAAAAQABAAAAAAAAggAAAAAAAAEAAAAAAQABAAAAAAEAAQAAAAAAAAEAAAAAAwABAAAAAAEAggAAAAAAAHcAAAAAAAB3AAAAAAAAdwAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAAAGAAAAAAIAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAAEAAAAAAQABAAAAAAMAAQAAAAACAAEAAAAAAQB3AAAAAAAAdwAAAAACAHcAAAAAAAAGAAAAAAMABgAAAAACAAYAAAAAAwAGAAAAAAIABgAAAAACAAYAAAAAAACCAAAAAAAAdwAAAAAAAIIAAAAAAAABAAAAAAMAAQAAAAAAAAEAAAAAAgCCAAAAAAAAdwAAAAAAAHcAAAAAAAB3AAAAAAAAAQAAAAADAAEAAAAAAAABAAAAAAIABgAAAAAAAAYAAAAAAQAGAAAAAAAAggAAAAAAAHcAAAAAAACCAAAAAAAAAQAAAAADAAEAAAAAAwABAAAAAAIAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAAEAAAAAAgABAAAAAAMAAQAAAAABAAYAAAAAAgAGAAAAAAEABgAAAAAAAIIAAAAAAAB3AAAAAAAAggAAAAAAAAEAAAAAAwABAAAAAAAAAQAAAAACAIIAAAAAAAAIAAAAAAIACAAAAAAAAIIAAAAAAAABAAAAAAMAAQAAAAABAAEAAAAAAgAGAAAAAAIABgAAAAAAAAYAAAAAAACCAAAAAAAAdwAAAAAAAIIAAAAAAAABAAAAAAMAAQAAAAACAAEAAAAAAwCCAAAAAAAACAAAAAABAAgAAAAAAQCCAAAAAAAAAQAAAAADAAEAAAAAAQABAAAAAAAABgAAAAABAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAggAAAAAAAAgAAAAAAwCCAAAAAAAAggAAAAAAAAEAAAAAAgABAAAAAAEAAQAAAAADAAYAAAAAAgCCAAAAAAAABwAAAAAAAAcAAAAAAgAHAAAAAAIAggAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAABAIIAAAAAAAAIAAAAAAEACAAAAAAAAAgAAAAAAAABAAAAAAMAAQAAAAABAAEAAAAAAQAGAAAAAAEABgAAAAABAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAABAAAAAAMAAQAAAAABAAEAAAAAAwCCAAAAAAAACAAAAAAAAAgAAAAAAwAIAAAAAAMABgAAAAABAAYAAAAAAAAGAAAAAAMABgAAAAABAIIAAAAAAAAHAAAAAAIABwAAAAACAAcAAAAAAgCCAAAAAAAAAQAAAAADAAEAAAAAAQABAAAAAAMAAgAAAAAAAAEAAAAAAAABAAAAAAIAAQAAAAADAAIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAAEAAAAAAAABAAAAAAEAAQAAAAADAAIAAAAAAAABAAAAAAAAAQAAAAABAAEAAAAAAgAGAAAAAAMABgAAAAACAAYAAAAAAACCAAAAAAAAdwAAAAAAAHcAAAAAAAB3AAAAAAQAdwAAAAAAAIIAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAgCCAAAAAAAAAQAAAAACAAEAAAAAAQABAAAAAAAABgAAAAABAAYAAAAAAgAGAAAAAAMABgAAAAABAHcAAAAAAAB3AAAAAAQAdwAAAAAIAHcAAAAAAACCAAAAAAAAAQAAAAABAAEAAAAAAAABAAAAAAAAggAAAAAAAAEAAAAAAQABAAAAAAAAAQAAAAABAA==
           version: 7
         1,6:
           ind: 1,6
-          tiles: BwAAAAADAAcAAAAAAAAGAAAAAAIAggAAAAAAAHcAAAAAAAB3AAAAAAAAggAAAAAAAHcAAAAAAACCAAAAAAAAAQAAAAACAAEAAAAAAQABAAAAAAEAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAA8AAAAAAgAHAAAAAAMABgAAAAABAIIAAAAAAAB3AAAAAAAAdwAAAAAAAIIAAAAAAAB3AAAAAAAAggAAAAAAAAEAAAAAAwABAAAAAAIAAQAAAAAAAIIAAAAAAAB3AAAAAAQAggAAAAAAAHcAAAAAAAAPAAAAAAMABgAAAAADAAYAAAAAAQCCAAAAAAAAdwAAAAAJAHcAAAAAAACCAAAAAAAAggAAAAAAAAEAAAAAAQABAAAAAAEAAQAAAAABAAEAAAAAAAABAAAAAAMAggAAAAAAAIIAAAAAAAB3AAAAAAIABgAAAAACAAYAAAAAAwCCAAAAAAAAggAAAAAAAHcAAAAAAAB3AAAAAAkAggAAAAAAAHcAAAAAAACCAAAAAAAAAQAAAAACAAEAAAAAAQABAAAAAAEAggAAAAAAAHcAAAAAAAB3AAAAAAAAdwAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAHcAAAAAAAB3AAAAAAAAggAAAAAAAHcAAAAAAAB3AAAAAAAAggAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAdwAAAAAAAHcAAAAAAAB3AAAAAAAAdwAAAAAAAIIAAAAAAACCAAAAAAAAdwAAAAAAAIIAAAAAAAABAAAAAAAAAQAAAAADAAEAAAAAAAABAAAAAAMAAQAAAAAAAAEAAAAAAwABAAAAAAMAggAAAAAAAHcAAAAACAB3AAAAAAkAdwAAAAAAAHcAAAAAAAB3AAAAAAgAdwAAAAAAAHcAAAAAAACCAAAAAAAAAQAAAAABAAEAAAAAAQABAAAAAAEAAQAAAAABAAEAAAAAAAABAAAAAAEAAQAAAAADAIIAAAAAAACCAAAAAAAAdwAAAAAAAHcAAAAAAAB3AAAAAAAAggAAAAAAAHcAAAAAAAB3AAAAAAAAggAAAAAAAAEAAAAAAwABAAAAAAMAAQAAAAAAAAEAAAAAAQABAAAAAAEACAAAAAAAAAgAAAAAAgB3AAAAAAcAggAAAAAAAIIAAAAAAAB3AAAAAAAAdwAAAAAIAIIAAAAAAAB3AAAAAAAAdwAAAAAAAIIAAAAAAAABAAAAAAIAAQAAAAAAAAEAAAAAAQABAAAAAAMAAQAAAAAAAAgAAAAAAQAIAAAAAAAAdwAAAAABAHcAAAAAAQCCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAHcAAAAAAACCAAAAAAAAAQAAAAACAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAgABAAAAAAMAAQAAAAACAAAAAAAAAAB3AAAAAAAAdwAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAAABAAAAAAAAggAAAAAAAAEAAAAAAwABAAAAAAMAAQAAAAABAAEAAAAAAwABAAAAAAAAAQAAAAAAAAEAAAAAAQAAAAAAAAAAdwAAAAAKAHcAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAAQAAAAABAIIAAAAAAACCAAAAAAAAAQAAAAADAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAAAAAAAAAAAAAAAAAAAB3AAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAAEAAAAAAQABAAAAAAMAAQAAAAABAAEAAAAAAAABAAAAAAEAggAAAAAAAHcAAAAAAAB3AAAAAAAAdwAAAAAJAAAAAAAAAAAAAAAAAAAAdwAAAAAAAHcAAAAAAAB3AAAAAAAAdwAAAAAAAIIAAAAAAAABAAAAAAEAAQAAAAACAAEAAAAAAAABAAAAAAAAAQAAAAABAAEAAAAAAQCCAAAAAAAAggAAAAAAAHcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAdwAAAAAAAHcAAAAAAACCAAAAAAAAAQAAAAADAAEAAAAAAwABAAAAAAIAAQAAAAAAAAEAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB3AAAAAAcAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAA==
+          tiles: BwAAAAADAAcAAAAAAgAGAAAAAAEAggAAAAAAAHcAAAAAAAB3AAAAAAUAggAAAAAAAHcAAAAAAACCAAAAAAAAAQAAAAADAAEAAAAAAQABAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAA8AAAAAAAAHAAAAAAIABgAAAAACAIIAAAAAAAB3AAAAAAkAdwAAAAAAAIIAAAAAAAB3AAAAAAAAggAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAIIAAAAAAAB3AAAAAAAAggAAAAAAAHcAAAAAAAAPAAAAAAIABgAAAAACAAYAAAAAAgCCAAAAAAAAdwAAAAAAAHcAAAAACgCCAAAAAAAAggAAAAAAAAEAAAAAAQABAAAAAAAAAQAAAAACAAEAAAAAAwABAAAAAAIAggAAAAAAAIIAAAAAAAB3AAAAAAYABgAAAAADAAYAAAAAAACCAAAAAAAAggAAAAAAAHcAAAAAAAB3AAAAAAAAggAAAAAAAHcAAAAAAACCAAAAAAAAAQAAAAABAAEAAAAAAQABAAAAAAEAggAAAAAAAHcAAAAAAAB3AAAAAAMAdwAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAHcAAAAAAAB3AAAAAAgAggAAAAAAAHcAAAAAAAB3AAAAAAAAggAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAdwAAAAAAAHcAAAAAAAB3AAAAAAUAdwAAAAAAAIIAAAAAAACCAAAAAAAAdwAAAAAAAIIAAAAAAAABAAAAAAIAAQAAAAAAAAEAAAAAAgABAAAAAAIAAQAAAAADAAEAAAAAAQABAAAAAAAAggAAAAAAAHcAAAAAAAB3AAAAAAAAdwAAAAAAAHcAAAAAAAB3AAAAAAwAdwAAAAAAAHcAAAAAAACCAAAAAAAAAQAAAAABAAEAAAAAAAABAAAAAAEAAQAAAAAAAAEAAAAAAQABAAAAAAEAAQAAAAAAAIIAAAAAAACCAAAAAAAAdwAAAAAAAHcAAAAAAAB3AAAAAAAAggAAAAAAAHcAAAAAAAB3AAAAAAAAggAAAAAAAAEAAAAAAwABAAAAAAEAAQAAAAADAAEAAAAAAgABAAAAAAIACAAAAAADAAgAAAAAAwB3AAAAAAAAggAAAAAAAIIAAAAAAAB3AAAAAAAAdwAAAAAAAIIAAAAAAAB3AAAAAAAAdwAAAAAFAIIAAAAAAAABAAAAAAEAAQAAAAACAAEAAAAAAgABAAAAAAEAAQAAAAADAAgAAAAAAwAIAAAAAAMAdwAAAAAAAHcAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAHcAAAAAAACCAAAAAAAAAQAAAAABAAEAAAAAAQABAAAAAAEAAQAAAAADAAEAAAAAAQABAAAAAAEAAQAAAAACAAAAAAAAAAB3AAAAAAAAdwAAAAAJAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAAABAAAAAAMAggAAAAAAAAEAAAAAAAABAAAAAAMAAQAAAAADAAEAAAAAAQABAAAAAAMAAQAAAAAAAAEAAAAAAAAAAAAAAAAAdwAAAAAAAHcAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAAQAAAAABAIIAAAAAAACCAAAAAAAAAQAAAAACAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAAAAAAAAAAAAAAAAAAAB3AAAAAAQAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAAEAAAAAAQABAAAAAAMAAQAAAAAAAAEAAAAAAgABAAAAAAIAggAAAAAAAHcAAAAAAAB3AAAAAAYAdwAAAAAAAAAAAAAAAAAAAAAAAAAAdwAAAAAAAHcAAAAAAAB3AAAAAAAAdwAAAAAAAIIAAAAAAAABAAAAAAIAAQAAAAABAAEAAAAAAwABAAAAAAEAAQAAAAAAAAEAAAAAAwCCAAAAAAAAggAAAAAAAHcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAdwAAAAAAAHcAAAAAAACCAAAAAAAAAQAAAAABAAEAAAAAAwABAAAAAAIAAQAAAAADAAEAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB3AAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAA==
           version: 7
         1,7:
           ind: 1,7
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB3AAAAAAAAdwAAAAALAHcAAAAAAAB3AAAAAAwAdwAAAAAKAHcAAAAAAAB3AAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHcAAAAAAAB3AAAAAAAAdwAAAAAAAHcAAAAAAAB3AAAAAAcAdwAAAAAAAHcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHcAAAAAAAB3AAAAAAAAdwAAAAAAAAAAAAAAAACHAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAhwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB3AAAAAAAAdwAAAAAAAHcAAAAAAAB3AAAAAAAAdwAAAAAAAHcAAAAAAAB3AAAAAAsAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHcAAAAAAAB3AAAAAAAAdwAAAAAKAHcAAAAAAAB3AAAAAAAAdwAAAAAAAHcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHcAAAAAAAB3AAAAAAAAdwAAAAAKAAAAAAAAAACHAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAhwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==
           version: 7
         2,1:
           ind: 2,1
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAdwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHcAAAAAAQB3AAAAAAAAdwAAAAAAAHcAAAAAAAB3AAAAAAAAdwAAAAAAAHcAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHcAAAAAAAB3AAAAAAAAdwAAAAAKAHcAAAAAAAB3AAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAAAAAAAAAAHcAAAAAAAB3AAAAAAAAdwAAAAAAAHcAAAAABwB3AAAAAAEAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAAAGAAAAAAAABgAAAAAAAHcAAAAAAAAGAAAAAAAABgAAAAADAHcAAAAACAB3AAAAAAAAdwAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAAB3AAAAAAAAdwAAAAAGAHcAAAAAAAAGAAAAAAIAdwAAAAAAAAYAAAAAAwAGAAAAAAEABgAAAAADAHcAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAdwAAAAAAAHcAAAAAAAB3AAAAAAAAdwAAAAAIAHcAAAAAAAB3AAAAAAIAggAAAAAAAHcAAAAAAAB3AAAAAAAABgAAAAADAAYAAAAAAAAGAAAAAAEAggAAAAAAAHcAAAAAAAB3AAAAAAAAdwAAAAAAAHcAAAAAAAB3AAAAAAAAdwAAAAAAAHcAAAAAAAB3AAAAAAAAdwAAAAAEAIIAAAAAAAB3AAAAAAwAggAAAAAAAIIAAAAAAAAGAAAAAAEAggAAAAAAAHcAAAAAAgB3AAAAAAcAdwAAAAAIAHcAAAAAAAB3AAAAAAAAdwAAAAAAAIIAAAAAAACCAAAAAAAAdwAAAAAAAHcAAAAAAAB3AAAAAAAAdwAAAAAAAHcAAAAAAAB3AAAAAAAAdwAAAAAAAAQAAAAAAAB3AAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAdwAAAAAAAHcAAAAAAAB3AAAAAAAAdwAAAAAAAHcAAAAAAAB3AAAAAAAAdwAAAAAAAHcAAAAACQB3AAAAAAYAdwAAAAAAAHcAAAAAAAB3AAAAAAEAdwAAAAAAAHcAAAAAAQB3AAAAAAAAdwAAAAAAAHcAAAAAAAB3AAAAAAAAdwAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAHcAAAAAAAB3AAAAAAAAdwAAAAAAAHcAAAAAAQB3AAAAAAAAdwAAAAAAAHcAAAAABQCCAAAAAAAABgAAAAAAAAYAAAAAAgAGAAAAAAIAggAAAAAAAAYAAAAAAgAGAAAAAAMABgAAAAADAAYAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAAYAAAAAAAAGAAAAAAMABgAAAAAAAIIAAAAAAAAGAAAAAAAABgAAAAABAAYAAAAAAgAGAAAAAAAABwAAAAABAAcAAAAAAwAHAAAAAAIABwAAAAACAAcAAAAAAwAHAAAAAAEABwAAAAADAIIAAAAAAAAIAAAAAAMACAAAAAADAAgAAAAAAACCAAAAAAAABgAAAAACAAYAAAAAAQAGAAAAAAIABgAAAAABAAcAAAAAAQAGAAAAAAAABgAAAAADAAYAAAAAAwAGAAAAAAIABgAAAAADAAcAAAAAAACCAAAAAAAACAAAAAADAAgAAAAAAwAIAAAAAAAAggAAAAAAAAYAAAAAAQAGAAAAAAIABgAAAAACAAEAAAAAAQAHAAAAAAAABwAAAAABAAcAAAAAAAAHAAAAAAEABwAAAAAAAAYAAAAAAwAHAAAAAAMAggAAAAAAAAgAAAAAAAAIAAAAAAMACAAAAAABAIIAAAAAAAAGAAAAAAEABgAAAAADAAYAAAAAAQABAAAAAAEAggAAAAAAAIIAAAAAAAAGAAAAAAMAggAAAAAAAIIAAAAAAAAGAAAAAAMAggAAAAAAAIIAAAAAAACCAAAAAAAABgAAAAADAIIAAAAAAACCAAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAACAA==
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAdwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHcAAAAAAAB3AAAAAAAAdwAAAAAAAHcAAAAAAAB3AAAAAAAAdwAAAAAAAHcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHcAAAAAAAB3AAAAAAAAdwAAAAALAHcAAAAAAwB3AAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAAAAAAAAAAHcAAAAAAAB3AAAAAAAAdwAAAAAAAHcAAAAAAAB3AAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAAAGAAAAAAMABgAAAAABAHcAAAAAAAAGAAAAAAIABgAAAAACAHcAAAAAAAB3AAAAAAAAdwAAAAAKAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAAB3AAAAAAAAdwAAAAAAAHcAAAAAAAAGAAAAAAAAdwAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAABAHcAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAdwAAAAAAAHcAAAAACgB3AAAAAAAAdwAAAAAAAHcAAAAAAAB3AAAAAAAAggAAAAAAAHcAAAAAAAB3AAAAAAAABgAAAAABAAYAAAAAAwAGAAAAAAEAggAAAAAAAHcAAAAAAAB3AAAAAAAAdwAAAAAAAHcAAAAAAAB3AAAAAAIAdwAAAAAAAHcAAAAAAAB3AAAAAAAAdwAAAAAAAIIAAAAAAAB3AAAAAAAAggAAAAAAAIIAAAAAAAAGAAAAAAEAggAAAAAAAHcAAAAAAAB3AAAAAAAAdwAAAAAAAHcAAAAAAAB3AAAAAAAAdwAAAAAAAIIAAAAAAACCAAAAAAAAdwAAAAAAAHcAAAAAAAB3AAAAAAAAdwAAAAAAAHcAAAAAAAB3AAAAAAAAdwAAAAAAAAQAAAAAAAB3AAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAdwAAAAAAAHcAAAAAAAB3AAAAAAMAdwAAAAAAAHcAAAAAAAB3AAAAAAAAdwAAAAAAAHcAAAAAAAB3AAAAAAEAdwAAAAAIAHcAAAAABAB3AAAAAAYAdwAAAAAIAHcAAAAAAAB3AAAAAAAAdwAAAAAAAHcAAAAACQB3AAAAAAoAdwAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAHcAAAAAAAB3AAAAAAAAdwAAAAAAAHcAAAAAAAB3AAAAAAAAdwAAAAAAAHcAAAAAAACCAAAAAAAABgAAAAACAAYAAAAAAAAGAAAAAAAAggAAAAAAAAYAAAAAAQAGAAAAAAAABgAAAAABAAYAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAAYAAAAAAgAGAAAAAAEABgAAAAADAIIAAAAAAAAGAAAAAAAABgAAAAABAAYAAAAAAAAGAAAAAAMABwAAAAABAAcAAAAAAQAHAAAAAAAABwAAAAADAAcAAAAAAQAHAAAAAAAABwAAAAACAIIAAAAAAAAIAAAAAAAACAAAAAABAAgAAAAAAwCCAAAAAAAABgAAAAADAAYAAAAAAQAGAAAAAAAABgAAAAADAAcAAAAAAwAGAAAAAAEABgAAAAACAAYAAAAAAQAGAAAAAAIABgAAAAAAAAcAAAAAAACCAAAAAAAACAAAAAAAAAgAAAAAAwAIAAAAAAMAggAAAAAAAAYAAAAAAQAGAAAAAAMABgAAAAAAAAEAAAAAAQAHAAAAAAEABwAAAAAAAAcAAAAAAQAHAAAAAAAABwAAAAACAAYAAAAAAAAHAAAAAAIAggAAAAAAAAgAAAAAAwAIAAAAAAAACAAAAAAAAIIAAAAAAAAGAAAAAAEABgAAAAACAAYAAAAAAwABAAAAAAEAggAAAAAAAIIAAAAAAAAGAAAAAAMAggAAAAAAAIIAAAAAAAAGAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAABgAAAAAAAIIAAAAAAACCAAAAAAAABgAAAAADAAYAAAAAAQAGAAAAAAEABgAAAAACAA==
           version: 7
         2,2:
           ind: 2,2
-          tiles: BwAAAAACAAcAAAAAAAAHAAAAAAEABwAAAAACAAcAAAAAAAAGAAAAAAAABwAAAAACAIIAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAgCCAAAAAAAAggAAAAAAAAIAAAAAAAACAAAAAAAAggAAAAAAAAcAAAAAAQAGAAAAAAMABgAAAAADAAYAAAAAAwAGAAAAAAEABgAAAAACAAcAAAAAAgCCAAAAAAAAAQAAAAACAAEAAAAAAQABAAAAAAEAAQAAAAABAAEAAAAAAwABAAAAAAMAAQAAAAAAAAEAAAAAAQAHAAAAAAEABgAAAAACAAcAAAAAAwAHAAAAAAAABwAAAAABAAcAAAAAAAAHAAAAAAMAggAAAAAAAAEAAAAAAwABAAAAAAMAAQAAAAACAAEAAAAAAAABAAAAAAMAAQAAAAAAAAEAAAAAAQABAAAAAAMAggAAAAAAAAYAAAAAAwCCAAAAAAAAggAAAAAAAAYAAAAAAQCCAAAAAAAAggAAAAAAAIIAAAAAAAABAAAAAAAAAQAAAAACAAEAAAAAAwABAAAAAAEAAQAAAAABAAEAAAAAAAABAAAAAAMAAQAAAAABAAEAAAAAAQABAAAAAAEAAQAAAAACAAEAAAAAAwABAAAAAAEAAQAAAAADAAEAAAAAAQACAAAAAAAAAQAAAAABAAEAAAAAAgABAAAAAAEAAQAAAAABAAEAAAAAAQABAAAAAAMAAQAAAAAAAAEAAAAAAwABAAAAAAIAAQAAAAACAAEAAAAAAwABAAAAAAEAAQAAAAACAAEAAAAAAgABAAAAAAMAAgAAAAAAAAEAAAAAAAABAAAAAAMAAQAAAAACAAEAAAAAAwABAAAAAAAAAQAAAAACAAEAAAAAAgABAAAAAAEAAQAAAAADAAEAAAAAAwABAAAAAAEAAQAAAAABAAEAAAAAAgABAAAAAAEAAQAAAAADAAIAAAAAAAABAAAAAAMAAQAAAAACAAEAAAAAAgABAAAAAAAAAQAAAAADAAEAAAAAAgABAAAAAAMAAQAAAAAAAAEAAAAAAQABAAAAAAEAAQAAAAABAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAAgAAAAAAQCCAAAAAAAAggAAAAAAAAYAAAAAAQCCAAAAAAAAdwAAAAAAAHcAAAAAAAB3AAAAAAAAdwAAAAAAAHcAAAAAAAB3AAAAAAAAdwAAAAAGAHcAAAAAAAB3AAAAAAAAggAAAAAAAAgAAAAAAwAIAAAAAAMAggAAAAAAAAYAAAAAAgAGAAAAAAEAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAAAIAAAAAAEACAAAAAAAAAYAAAAAAAAGAAAAAAEABgAAAAAAAAYAAAAAAgCCAAAAAAAAEgAAAAAAABIAAAAAAAASAAAAAAAAEgAAAAAAAIIAAAAAAAAIAAAAAAIACAAAAAADAIIAAAAAAAAIAAAAAAEACAAAAAAAAAgAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAgAGAAAAAAMAggAAAAAAABIAAAAAAAASAAAAAAAAEgAAAAAAABIAAAAAAACCAAAAAAAACAAAAAACAAgAAAAAAACCAAAAAAAACAAAAAABAAgAAAAAAwAIAAAAAAEAggAAAAAAAAYAAAAAAQAGAAAAAAIABgAAAAADAIIAAAAAAAASAAAAAAAAEgAAAAAAABIAAAAAAAASAAAAAAAAggAAAAAAAAgAAAAAAACCAAAAAAAAggAAAAAAAAgAAAAAAQAIAAAAAAEACAAAAAACAIIAAAAAAAAGAAAAAAMABgAAAAAAAAYAAAAAAQCCAAAAAAAAEwAAAAABABMAAAAAAgATAAAAAAMAEwAAAAACAAEAAAAAAAABAAAAAAEAAQAAAAADAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAABgAAAAABAAYAAAAAAwAGAAAAAAAAggAAAAAAABMAAAAAAAATAAAAAAMAEwAAAAABABMAAAAAAQABAAAAAAAAAQAAAAADAAEAAAAAAwALAAAAAAAACwAAAAAAAAsAAAAAAACCAAAAAAAABgAAAAABAAYAAAAAAgAGAAAAAAIABgAAAAADAIIAAAAAAAATAAAAAAAAEwAAAAAAABMAAAAAAwATAAAAAAAAAQAAAAABAAEAAAAAAAABAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAA==
+          tiles: BwAAAAAAAAcAAAAAAgAHAAAAAAMABwAAAAACAAcAAAAAAwAGAAAAAAIABwAAAAADAIIAAAAAAAAGAAAAAAEABgAAAAAAAAYAAAAAAgCCAAAAAAAAggAAAAAAAAIAAAAAAAACAAAAAAAAggAAAAAAAAcAAAAAAQAGAAAAAAAABgAAAAACAAYAAAAAAgAGAAAAAAAABgAAAAABAAcAAAAAAACCAAAAAAAAAQAAAAAAAAEAAAAAAQABAAAAAAMAAQAAAAAAAAEAAAAAAwABAAAAAAIAAQAAAAAAAAEAAAAAAgAHAAAAAAIABgAAAAACAAcAAAAAAwAHAAAAAAMABwAAAAAAAAcAAAAAAAAHAAAAAAEAggAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAwABAAAAAAIAAQAAAAADAAEAAAAAAgABAAAAAAMAggAAAAAAAAYAAAAAAgCCAAAAAAAAggAAAAAAAAYAAAAAAgCCAAAAAAAAggAAAAAAAIIAAAAAAAABAAAAAAIAAQAAAAABAAEAAAAAAwABAAAAAAAAAQAAAAACAAEAAAAAAAABAAAAAAMAAQAAAAABAAEAAAAAAwABAAAAAAAAAQAAAAADAAEAAAAAAQABAAAAAAMAAQAAAAADAAEAAAAAAQACAAAAAAAAAQAAAAADAAEAAAAAAwABAAAAAAMAAQAAAAAAAAEAAAAAAgABAAAAAAIAAQAAAAACAAEAAAAAAQABAAAAAAIAAQAAAAAAAAEAAAAAAgABAAAAAAIAAQAAAAADAAEAAAAAAQABAAAAAAMAAgAAAAAAAAEAAAAAAQABAAAAAAAAAQAAAAABAAEAAAAAAwABAAAAAAEAAQAAAAAAAAEAAAAAAgABAAAAAAEAAQAAAAADAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAQABAAAAAAMAAQAAAAADAAIAAAAAAAABAAAAAAIAAQAAAAABAAEAAAAAAQABAAAAAAAAAQAAAAADAAEAAAAAAQABAAAAAAIAAQAAAAAAAAEAAAAAAAABAAAAAAIAAQAAAAABAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAAgAAAAAAACCAAAAAAAAggAAAAAAAAYAAAAAAACCAAAAAAAAdwAAAAAAAHcAAAAAAAB3AAAAAAAAdwAAAAAAAHcAAAAAAAB3AAAAAAAAdwAAAAAFAHcAAAAAAAB3AAAAAAAAggAAAAAAAAgAAAAAAQAIAAAAAAIAggAAAAAAAAYAAAAAAwAGAAAAAAEAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAAAIAAAAAAIACAAAAAAAAAYAAAAAAgAGAAAAAAMABgAAAAADAAYAAAAAAACCAAAAAAAAEgAAAAAAABIAAAAAAAASAAAAAAAAEgAAAAAAAIIAAAAAAAAIAAAAAAEACAAAAAACAIIAAAAAAAAIAAAAAAEACAAAAAABAAgAAAAAAAAGAAAAAAAABgAAAAACAAYAAAAAAwAGAAAAAAEAggAAAAAAABIAAAAAAAASAAAAAAAAEgAAAAAAABIAAAAAAACCAAAAAAAACAAAAAADAAgAAAAAAgCCAAAAAAAACAAAAAABAAgAAAAAAgAIAAAAAAMAggAAAAAAAAYAAAAAAQAGAAAAAAIABgAAAAABAIIAAAAAAAASAAAAAAAAEgAAAAAAABIAAAAAAAASAAAAAAAAggAAAAAAAAgAAAAAAQCCAAAAAAAAggAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAACAIIAAAAAAAAGAAAAAAMABgAAAAAAAAYAAAAAAQCCAAAAAAAAEwAAAAAAABMAAAAAAAATAAAAAAAAEwAAAAAAAAEAAAAAAQABAAAAAAIAAQAAAAADAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAABgAAAAACAAYAAAAAAAAGAAAAAAAAggAAAAAAABMAAAAAAQATAAAAAAEAEwAAAAADABMAAAAAAgABAAAAAAEAAQAAAAADAAEAAAAAAwALAAAAAAAACwAAAAAAAAsAAAAAAACCAAAAAAAABgAAAAACAAYAAAAAAgAGAAAAAAMABgAAAAADAIIAAAAAAAATAAAAAAEAEwAAAAADABMAAAAAAAATAAAAAAIAAQAAAAADAAEAAAAAAwABAAAAAAMAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAA==
           version: 7
         2,3:
           ind: 2,3
-          tiles: ggAAAAAAAIIAAAAAAAAGAAAAAAIAggAAAAAAAIIAAAAAAAATAAAAAAIAEwAAAAABABMAAAAAAAATAAAAAAIAAQAAAAABAAEAAAAAAQABAAAAAAIAggAAAAAAAHcAAAAABwB3AAAAAAAAggAAAAAAAIIAAAAAAAAHAAAAAAAABwAAAAABAAcAAAAAAQCCAAAAAAAAAQAAAAAAAAEAAAAAAgABAAAAAAAAAQAAAAADAAEAAAAAAwABAAAAAAAAAQAAAAACAIIAAAAAAAB3AAAAAAAAdwAAAAAAAHcAAAAAAAACAAAAAAAABgAAAAAAAAYAAAAAAQAGAAAAAAAAAgAAAAAAAAEAAAAAAwABAAAAAAMAAQAAAAAAAAEAAAAAAwABAAAAAAAAAQAAAAACAAEAAAAAAwCCAAAAAAAAdwAAAAAAAHcAAAAAAACCAAAAAAAAggAAAAAAAAYAAAAAAwAGAAAAAAEABgAAAAADAAIAAAAAAAABAAAAAAIAAQAAAAABAAEAAAAAAAAUAAAAAAIAFAAAAAADABQAAAAAAQAUAAAAAAMAggAAAAAAAHcAAAAACgB3AAAAAAAAdwAAAAAAAAIAAAAAAAAGAAAAAAAABgAAAAABAAYAAAAAAwACAAAAAAAAAQAAAAADAAEAAAAAAwABAAAAAAMAFAAAAAAAABQAAAAAAwAUAAAAAAIAFAAAAAABAIIAAAAAAAB3AAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAABwAAAAADAAcAAAAAAwAHAAAAAAMAggAAAAAAAAEAAAAAAAABAAAAAAEAAQAAAAAAABQAAAAAAwAUAAAAAAIAFAAAAAACABQAAAAAAgCCAAAAAAAAdwAAAAAAAIIAAAAAAAB3AAAAAAoAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAHcAAAAAAACCAAAAAAAAdwAAAAAAAAYAAAAAAAAGAAAAAAEAAQAAAAAAAAEAAAAAAwAGAAAAAAAAggAAAAAAAHcAAAAAAgB3AAAAAAUAdwAAAAAAAHcAAAAAAAB3AAAAAAAAdwAAAAAAAHcAAAAABwB3AAAAAAcAdwAAAAAAAHcAAAAABwAGAAAAAAIABgAAAAACAAYAAAAAAQAGAAAAAAMABgAAAAACAAYAAAAAAwB3AAAAAAAAdwAAAAAAAIIAAAAAAAB3AAAAAAAAdwAAAAAAAIIAAAAAAACCAAAAAAAAdwAAAAABAHcAAAAAAAB3AAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAAMABgAAAAABAAYAAAAAAgCCAAAAAAAAdwAAAAAAAAQAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAHcAAAAAAAB3AAAAAAYAdwAAAAAAAAYAAAAAAQAGAAAAAAEAAQAAAAADAAEAAAAAAwAGAAAAAAMAggAAAAAAAIIAAAAAAAAEAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAdwAAAAAAAHcAAAAAAACCAAAAAAAABgAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAABAAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAAAIAAAAAAAABgAAAAAAAAYAAAAAAQAGAAAAAAAABgAAAAADAAYAAAAAAgCCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAABgAAAAACABAAAAAAAAAQAAAAAAAAEAAAAAAAAIIAAAAAAAAIAAAAAAIACAAAAAADAAYAAAAAAQAGAAAAAAMABgAAAAABAAYAAAAAAQAGAAAAAAEABgAAAAABAIIAAAAAAACCAAAAAAAABgAAAAAAAAYAAAAAAQAQAAAAAAAAEAAAAAAAABAAAAAAAACCAAAAAAAACAAAAAADAAgAAAAAAwAGAAAAAAAABgAAAAACAAYAAAAAAgAGAAAAAAEABgAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAAAGAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAggAAAAAAAAgAAAAAAgAIAAAAAAAABgAAAAABAAYAAAAAAgAGAAAAAAAABgAAAAADAAYAAAAAAQCCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAABgAAAAABABAAAAAAAAAQAAAAAAAAEAAAAAAAAAYAAAAAAgAIAAAAAAAACAAAAAADAA==
+          tiles: ggAAAAAAAIIAAAAAAAAGAAAAAAMAggAAAAAAAIIAAAAAAAATAAAAAAMAEwAAAAACABMAAAAAAAATAAAAAAAAAQAAAAACAAEAAAAAAQABAAAAAAMAggAAAAAAAHcAAAAAAAB3AAAAAAAAggAAAAAAAIIAAAAAAAAHAAAAAAIABwAAAAAAAAcAAAAAAwCCAAAAAAAAAQAAAAADAAEAAAAAAgABAAAAAAEAAQAAAAACAAEAAAAAAwABAAAAAAMAAQAAAAACAIIAAAAAAAB3AAAAAAAAdwAAAAAAAHcAAAAAAAACAAAAAAAABgAAAAACAAYAAAAAAQAGAAAAAAAAAgAAAAAAAAEAAAAAAQABAAAAAAIAAQAAAAAAAAEAAAAAAAABAAAAAAEAAQAAAAACAAEAAAAAAgCCAAAAAAAAdwAAAAAAAHcAAAAAAACCAAAAAAAAggAAAAAAAAYAAAAAAwAGAAAAAAEABgAAAAACAAIAAAAAAAABAAAAAAAAAQAAAAABAAEAAAAAAwAUAAAAAAEAFAAAAAACABQAAAAAAgAUAAAAAAIAggAAAAAAAHcAAAAABAB3AAAAAAAAdwAAAAAKAAIAAAAAAAAGAAAAAAIABgAAAAABAAYAAAAAAAACAAAAAAAAAQAAAAAAAAEAAAAAAQABAAAAAAAAFAAAAAAAABQAAAAAAwAUAAAAAAIAFAAAAAAAAIIAAAAAAAB3AAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAABwAAAAADAAcAAAAAAwAHAAAAAAAAggAAAAAAAAEAAAAAAgABAAAAAAMAAQAAAAAAABQAAAAAAQAUAAAAAAIAFAAAAAABABQAAAAAAQCCAAAAAAAAdwAAAAABAIIAAAAAAAB3AAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAHcAAAAAAACCAAAAAAAAdwAAAAAAAAYAAAAAAwAGAAAAAAEAAQAAAAABAAEAAAAAAgAGAAAAAAAAggAAAAAAAHcAAAAAAAB3AAAAAAAAdwAAAAAAAHcAAAAAAAB3AAAAAAAAdwAAAAAAAHcAAAAAAAB3AAAAAAAAdwAAAAAAAHcAAAAAAAAGAAAAAAEABgAAAAABAAYAAAAAAwAGAAAAAAAABgAAAAAAAAYAAAAAAwB3AAAAAAAAdwAAAAAAAIIAAAAAAAB3AAAAAAAAdwAAAAAAAIIAAAAAAACCAAAAAAAAdwAAAAAAAHcAAAAAAAB3AAAAAAAABgAAAAACAAYAAAAAAwAGAAAAAAIABgAAAAABAAYAAAAAAQCCAAAAAAAAdwAAAAAAAAQAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAHcAAAAAAAB3AAAAAAAAdwAAAAAAAAYAAAAAAQAGAAAAAAMAAQAAAAACAAEAAAAAAQAGAAAAAAMAggAAAAAAAIIAAAAAAAAEAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAdwAAAAAAAHcAAAAAAACCAAAAAAAABgAAAAABAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAABAAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAAAIAAAAAAMABgAAAAACAAYAAAAAAgAGAAAAAAIABgAAAAADAAYAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAABgAAAAABABAAAAAAAAAQAAAAAAAAEAAAAAAAAIIAAAAAAAAIAAAAAAAACAAAAAACAAYAAAAAAQAGAAAAAAIABgAAAAACAAYAAAAAAgAGAAAAAAIABgAAAAACAIIAAAAAAACCAAAAAAAABgAAAAADAAYAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAACCAAAAAAAACAAAAAAAAAgAAAAAAAAGAAAAAAIABgAAAAADAAYAAAAAAgAGAAAAAAMABgAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAAAGAAAAAAIAEAAAAAAAABAAAAAAAAAQAAAAAAAAggAAAAAAAAgAAAAAAQAIAAAAAAAABgAAAAADAAYAAAAAAgAGAAAAAAEABgAAAAADAAYAAAAAAwCCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAABgAAAAABABAAAAAAAAAQAAAAAAAAEAAAAAAAAAYAAAAAAgAIAAAAAAAACAAAAAABAA==
           version: 7
         2,4:
           ind: 2,4
-          tiles: ggAAAAAAAIIAAAAAAACCAAAAAAAABgAAAAADAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAABgAAAAABABAAAAAAAAAQAAAAAAAAEAAAAAAAAIIAAAAAAAAIAAAAAAEACAAAAAABAAYAAAAAAAAGAAAAAAEABgAAAAADAAYAAAAAAwAGAAAAAAAAggAAAAAAAAEAAAAAAQCCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAACAAAAAADAAgAAAAAAAABAAAAAAIAAQAAAAAAAAEAAAAAAAABAAAAAAEAAQAAAAABAAEAAAAAAgABAAAAAAIAAQAAAAABAAEAAAAAAAABAAAAAAIAAQAAAAACAAEAAAAAAwABAAAAAAAAAgAAAAAAAAEAAAAAAAABAAAAAAEAAQAAAAAAAAEAAAAAAAABAAAAAAIAAQAAAAADAAEAAAAAAAABAAAAAAIAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAADAAEAAAAAAwABAAAAAAEAAQAAAAADAAIAAAAAAAABAAAAAAMAAQAAAAABAAEAAAAAAwABAAAAAAEAAQAAAAADAAEAAAAAAQABAAAAAAMAAQAAAAACAAEAAAAAAwABAAAAAAEAAQAAAAAAAAEAAAAAAQABAAAAAAAAAQAAAAABAAEAAAAAAgACAAAAAAAAAQAAAAACAAEAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAAABAAAAAAIAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAAYAAAAAAAAGAAAAAAMAdwAAAAAAAHcAAAAAAAB3AAAAAAAAdwAAAAAAAHcAAAAAAAB3AAAAAAAAdwAAAAAAAHcAAAAAAACCAAAAAAAABgAAAAADAAYAAAAAAQAGAAAAAAEABgAAAAADAIIAAAAAAAAGAAAAAAEABgAAAAACAHcAAAAAAAB3AAAAAAAAdwAAAAAAAHcAAAAAAAB3AAAAAAAAdwAAAAAAAHcAAAAAAAB3AAAAAAAAggAAAAAAAAYAAAAAAQAGAAAAAAIABgAAAAACAAYAAAAAAAAGAAAAAAIABgAAAAAAAAYAAAAAAwB3AAAAAAAAggAAAAAAAHcAAAAAAAB3AAAAAAAAdwAAAAAAAHcAAAAAAAB3AAAAAAAAdwAAAAAAAIIAAAAAAAAGAAAAAAAAEQAAAAAAABEAAAAAAAAGAAAAAAMABgAAAAADAAYAAAAAAwAGAAAAAAAAdwAAAAAAAHcAAAAAAAB3AAAAAAAAggAAAAAAAHcAAAAAAAB3AAAAAAMAdwAAAAAAAHcAAAAABQCCAAAAAAAABgAAAAACABEAAAAAAAARAAAAAAAABgAAAAADAIIAAAAAAAAGAAAAAAEABgAAAAACAHcAAAAAAAB3AAAAAAgAggAAAAAAAHcAAAAAAAB3AAAAAAAAdwAAAAAAAHcAAAAAAAB3AAAAAAAAggAAAAAAAAYAAAAAAQARAAAAAAAAEQAAAAAAAAYAAAAAAgCCAAAAAAAABgAAAAADAAYAAAAAAACCAAAAAAAAggAAAAAAAHcAAAAAAAB3AAAAAAAAdwAAAAAAAHcAAAAACAB3AAAAAAoAdwAAAAAAAIIAAAAAAAAGAAAAAAMAEQAAAAAAABEAAAAAAAAGAAAAAAIAggAAAAAAAAYAAAAAAgCCAAAAAAAAAQAAAAAAAIIAAAAAAAB3AAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAHcAAAAAAACCAAAAAAAABgAAAAABAAYAAAAAAAAGAAAAAAMABgAAAAAAAAYAAAAAAgAGAAAAAAMABgAAAAABAAEAAAAAAACCAAAAAAAAdwAAAAAAAIIAAAAAAAAOAAAAAAAADgAAAAAAAIIAAAAAAAB3AAAAAAAAggAAAAAAAAYAAAAAAAARAAAAAAAAEQAAAAAAABEAAAAAAAARAAAAAAAAEQAAAAAAABEAAAAAAAABAAAAAAAAggAAAAAAAHcAAAAAAACCAAAAAAAADgAAAAAAAA4AAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAAAGAAAAAAMAEQAAAAAAABEAAAAAAAARAAAAAAAAEQAAAAAAABEAAAAAAAARAAAAAAAAAQAAAAAAAIIAAAAAAAB3AAAAAAAAggAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAAYAAAAAAQAGAAAAAAMABgAAAAACABEAAAAAAAARAAAAAAAAEQAAAAAAABEAAAAAAAARAAAAAAAAEQAAAAAAAA==
+          tiles: ggAAAAAAAIIAAAAAAACCAAAAAAAABgAAAAABAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAABgAAAAADABAAAAAAAAAQAAAAAAAAEAAAAAAAAIIAAAAAAAAIAAAAAAIACAAAAAABAAYAAAAAAwAGAAAAAAAABgAAAAACAAYAAAAAAgAGAAAAAAMAggAAAAAAAAEAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAACAAAAAACAAgAAAAAAAABAAAAAAIAAQAAAAABAAEAAAAAAQABAAAAAAMAAQAAAAADAAEAAAAAAQABAAAAAAIAAQAAAAAAAAEAAAAAAgABAAAAAAMAAQAAAAACAAEAAAAAAwABAAAAAAEAAgAAAAAAAAEAAAAAAQABAAAAAAAAAQAAAAAAAAEAAAAAAQABAAAAAAAAAQAAAAABAAEAAAAAAwABAAAAAAMAAQAAAAADAAEAAAAAAwABAAAAAAIAAQAAAAACAAEAAAAAAgABAAAAAAEAAQAAAAAAAAIAAAAAAAABAAAAAAIAAQAAAAAAAAEAAAAAAgABAAAAAAEAAQAAAAAAAAEAAAAAAwABAAAAAAIAAQAAAAABAAEAAAAAAwABAAAAAAMAAQAAAAACAAEAAAAAAAABAAAAAAEAAQAAAAADAAEAAAAAAwACAAAAAAAAAQAAAAACAAEAAAAAAwCCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAAABAAAAAAIAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAAYAAAAAAwAGAAAAAAAAdwAAAAAAAHcAAAAAAAB3AAAAAAAAdwAAAAAAAHcAAAAABwB3AAAAAAAAdwAAAAAAAHcAAAAAAACCAAAAAAAABgAAAAACAAYAAAAAAwAGAAAAAAIABgAAAAABAIIAAAAAAAAGAAAAAAIABgAAAAADAHcAAAAAAAB3AAAAAAAAdwAAAAAAAHcAAAAAAAB3AAAAAAAAdwAAAAAMAHcAAAAAAAB3AAAAAAgAggAAAAAAAAYAAAAAAwAGAAAAAAMABgAAAAADAAYAAAAAAAAGAAAAAAMABgAAAAACAAYAAAAAAQB3AAAAAAAAggAAAAAAAHcAAAAAAAB3AAAAAAAAdwAAAAAAAHcAAAAAAAB3AAAAAAAAdwAAAAAAAIIAAAAAAAAGAAAAAAEAEQAAAAAAABEAAAAAAAAGAAAAAAEABgAAAAABAAYAAAAAAQAGAAAAAAIAdwAAAAAFAHcAAAAAAAB3AAAAAAcAggAAAAAAAHcAAAAAAAB3AAAAAAAAdwAAAAAAAHcAAAAAAwCCAAAAAAAABgAAAAACABEAAAAAAAARAAAAAAAABgAAAAABAIIAAAAAAAAGAAAAAAIABgAAAAABAHcAAAAABwB3AAAAAAAAggAAAAAAAHcAAAAACQB3AAAAAAAAdwAAAAAAAHcAAAAACwB3AAAAAAAAggAAAAAAAAYAAAAAAAARAAAAAAAAEQAAAAAAAAYAAAAAAwCCAAAAAAAABgAAAAACAAYAAAAAAQCCAAAAAAAAggAAAAAAAHcAAAAAAAB3AAAAAAAAdwAAAAAFAHcAAAAACwB3AAAAAAAAdwAAAAAAAIIAAAAAAAAGAAAAAAAAEQAAAAAAABEAAAAAAAAGAAAAAAAAggAAAAAAAAYAAAAAAQCCAAAAAAAAAQAAAAACAIIAAAAAAAB3AAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAHcAAAAABwCCAAAAAAAABgAAAAADAAYAAAAAAAAGAAAAAAMABgAAAAACAAYAAAAAAQAGAAAAAAAABgAAAAAAAAEAAAAAAwCCAAAAAAAAdwAAAAACAIIAAAAAAAAOAAAAAAAADgAAAAAAAIIAAAAAAAB3AAAAAAQAggAAAAAAAAYAAAAAAAARAAAAAAAAEQAAAAAAABEAAAAAAAARAAAAAAAAEQAAAAAAABEAAAAAAAABAAAAAAEAggAAAAAAAHcAAAAAAgCCAAAAAAAADgAAAAAAAA4AAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAAAGAAAAAAAAEQAAAAAAABEAAAAAAAARAAAAAAAAEQAAAAAAABEAAAAAAAARAAAAAAAAAQAAAAABAIIAAAAAAAB3AAAAAAAAggAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAABABEAAAAAAAARAAAAAAAAEQAAAAAAABEAAAAAAAARAAAAAAAAEQAAAAAAAA==
           version: 7
         2,5:
           ind: 2,5
-          tiles: AQAAAAACAIIAAAAAAAB3AAAAAAAAggAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAACCAAAAAAAABgAAAAACABEAAAAAAAARAAAAAAAAEQAAAAAAABEAAAAAAAARAAAAAAAAEQAAAAAAAHcAAAAAAAB3AAAAAAAAdwAAAAAAAIIAAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAAggAAAAAAAAYAAAAAAAAGAAAAAAIABgAAAAAAAAYAAAAAAQAGAAAAAAAABgAAAAADAAYAAAAAAgB3AAAAAAEAdwAAAAAAAHcAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAAYAAAAAAQCCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAdwAAAAAAAIIAAAAAAAB3AAAAAAYAdwAAAAAAAHcAAAAAAAB3AAAAAAAAdwAAAAAAAHcAAAAAAAB3AAAAAAAAdwAAAAAAAHcAAAAAAACCAAAAAAAAdwAAAAAAAHcAAAAAAAB3AAAAAAAAdwAAAAAAAHcAAAAAAAB3AAAAAAAAdwAAAAALAIIAAAAAAACCAAAAAAAAdwAAAAAAAIIAAAAAAACCAAAAAAAAdwAAAAAAAHcAAAAAAAB3AAAAAAAAggAAAAAAAHcAAAAAAAB3AAAAAAAAdwAAAAAAAHcAAAAAAAB3AAAAAAcAdwAAAAAFAHcAAAAAAAB3AAAAAAYAdwAAAAAAAHcAAAAAAAB3AAAAAAAAdwAAAAAAAHcAAAAAAAB3AAAAAAAAggAAAAAAAHcAAAAAAAB3AAAAAAAAdwAAAAAAAHcAAAAACwB3AAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAAB3AAAAAAAAdwAAAAADAHcAAAAAAAB3AAAAAAAAdwAAAAAKAAgAAAAAAgAIAAAAAAMAggAAAAAAAAgAAAAAAgAIAAAAAAMAggAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAAAAIIAAAAAAAB3AAAAAAAAdwAAAAAAAHcAAAAAAAB3AAAAAAAAdwAAAAAAAHcAAAAAAAAIAAAAAAEACAAAAAAAAIIAAAAAAAAIAAAAAAAACAAAAAADAIIAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAAdwAAAAAAAHcAAAAAAAB3AAAAAAUAdwAAAAACAIIAAAAAAACCAAAAAAAACAAAAAAAAIIAAAAAAACCAAAAAAAACAAAAAADAIIAAAAAAACCAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAAggAAAAAAAHcAAAAAAAB3AAAAAAAAdwAAAAAAAHcAAAAADACCAAAAAAAAggAAAAAAAAgAAAAAAgAIAAAAAAAACAAAAAADAAgAAAAAAgAIAAAAAAEACAAAAAACAAgAAAAAAwAIAAAAAAIAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAwAIAAAAAAIACAAAAAABAAgAAAAAAAAIAAAAAAIACAAAAAADAIIAAAAAAACHAAAAAAAAhwAAAAAAAIcAAAAAAACHAAAAAAAAhwAAAAAAAIcAAAAAAACHAAAAAAAAAQAAAAABAAEAAAAAAgAIAAAAAAMACAAAAAADAAgAAAAAAAAIAAAAAAIACAAAAAABAAgAAAAAAwCCAAAAAAAAhwAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAhwAAAAAAAAEAAAAAAwABAAAAAAIAggAAAAAAAIIAAAAAAAAIAAAAAAIAggAAAAAAAIIAAAAAAAAIAAAAAAMAggAAAAAAAIcAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIcAAAAAAAABAAAAAAMAAQAAAAABAIIAAAAAAAAIAAAAAAMACAAAAAAAAIIAAAAAAAAIAAAAAAIACAAAAAAAAIIAAAAAAACHAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACHAAAAAAAAAQAAAAAAAAEAAAAAAgCCAAAAAAAACAAAAAABAAgAAAAAAACCAAAAAAAACAAAAAAAAAgAAAAAAQCCAAAAAAAAhwAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAhwAAAAAAAA==
+          tiles: AQAAAAADAIIAAAAAAAB3AAAAAAAAggAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAACCAAAAAAAABgAAAAAAABEAAAAAAAARAAAAAAAAEQAAAAAAABEAAAAAAAARAAAAAAAAEQAAAAAAAHcAAAAAAAB3AAAAAAcAdwAAAAAAAIIAAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAAggAAAAAAAAYAAAAAAQAGAAAAAAIABgAAAAACAAYAAAAAAQAGAAAAAAAABgAAAAACAAYAAAAAAwB3AAAAAAgAdwAAAAAAAHcAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAAYAAAAAAgCCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAdwAAAAAAAIIAAAAAAAB3AAAAAAkAdwAAAAAAAHcAAAAAAAB3AAAAAAYAdwAAAAAAAHcAAAAAAAB3AAAAAAAAdwAAAAAFAHcAAAAAAACCAAAAAAAAdwAAAAAAAHcAAAAAAAB3AAAAAAAAdwAAAAAAAHcAAAAAAAB3AAAAAAAAdwAAAAAAAIIAAAAAAACCAAAAAAAAdwAAAAAAAIIAAAAAAACCAAAAAAAAdwAAAAAAAHcAAAAABgB3AAAAAAAAggAAAAAAAHcAAAAAAAB3AAAAAAAAdwAAAAABAHcAAAAAAAB3AAAAAAAAdwAAAAAAAHcAAAAAAAB3AAAAAAYAdwAAAAAAAHcAAAAAAAB3AAAAAAAAdwAAAAAAAHcAAAAAAAB3AAAAAAAAggAAAAAAAHcAAAAAAAB3AAAAAAAAdwAAAAAGAHcAAAAAAAB3AAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAAB3AAAAAAAAdwAAAAAAAHcAAAAAAAB3AAAAAAAAdwAAAAAAAAgAAAAAAwAIAAAAAAIAggAAAAAAAAgAAAAAAwAIAAAAAAIAggAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAAAAIIAAAAAAAB3AAAAAAAAdwAAAAAAAHcAAAAABwB3AAAAAAAAdwAAAAAAAHcAAAAABQAIAAAAAAAACAAAAAABAIIAAAAAAAAIAAAAAAIACAAAAAABAIIAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAAdwAAAAAAAHcAAAAACAB3AAAAAAAAdwAAAAAGAIIAAAAAAACCAAAAAAAACAAAAAAAAIIAAAAAAACCAAAAAAAACAAAAAADAIIAAAAAAACCAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAAggAAAAAAAHcAAAAAAAB3AAAAAAAAdwAAAAAAAHcAAAAAAACCAAAAAAAAggAAAAAAAAgAAAAAAAAIAAAAAAIACAAAAAAAAAgAAAAAAgAIAAAAAAAACAAAAAAAAAgAAAAAAwAIAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAAAIAAAAAAEACAAAAAADAAgAAAAAAgAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAEACAAAAAADAIIAAAAAAACHAAAAAAAAhwAAAAAAAIcAAAAAAACHAAAAAAAAhwAAAAAAAIcAAAAAAACHAAAAAAAAAQAAAAABAAEAAAAAAAAIAAAAAAEACAAAAAACAAgAAAAAAgAIAAAAAAAACAAAAAADAAgAAAAAAACCAAAAAAAAhwAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAhwAAAAAAAAEAAAAAAQABAAAAAAMAggAAAAAAAIIAAAAAAAAIAAAAAAIAggAAAAAAAIIAAAAAAAAIAAAAAAIAggAAAAAAAIcAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIcAAAAAAAABAAAAAAAAAQAAAAABAIIAAAAAAAAIAAAAAAMACAAAAAAAAIIAAAAAAAAIAAAAAAAACAAAAAAAAIIAAAAAAACHAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACHAAAAAAAAAQAAAAADAAEAAAAAAwCCAAAAAAAACAAAAAADAAgAAAAAAgCCAAAAAAAACAAAAAACAAgAAAAAAwCCAAAAAAAAhwAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAhwAAAAAAAA==
           version: 7
         2,6:
           ind: 2,6
-          tiles: AQAAAAADAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAhwAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAhwAAAAAAAIIAAAAAAAB3AAAAAAAAdwAAAAAAAHcAAAAAAAB3AAAAAAAAdwAAAAAAAHcAAAAAAAB3AAAAAAAAggAAAAAAAIcAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIcAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAAB3AAAAAAQAdwAAAAAAAHcAAAAAAAB3AAAAAAAAdwAAAAAIAIIAAAAAAACHAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACHAAAAAAAAdwAAAAAEAHcAAAAAAAB3AAAAAAYAdwAAAAAAAHcAAAAAAAB3AAAAAAcAdwAAAAAAAHcAAAAAAgCCAAAAAAAAhwAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAhwAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAAB3AAAAAAAAdwAAAAAAAHcAAAAAAAB3AAAAAAAAggAAAAAAAIcAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIcAAAAAAAABAAAAAAMAAQAAAAABAAEAAAAAAQCCAAAAAAAAdwAAAAAAAHcAAAAAAAAEAAAAAAAAdwAAAAAAAIIAAAAAAACHAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACHAAAAAAAACAAAAAABAAgAAAAAAgAIAAAAAAIAggAAAAAAAIIAAAAAAACCAAAAAAAABAAAAAAAAIIAAAAAAACCAAAAAAAAhwAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAhwAAAAAAAAgAAAAAAgAIAAAAAAMACAAAAAADAAgAAAAAAwCCAAAAAAAAdwAAAAAAAAQAAAAAAAB3AAAAAAAAggAAAAAAAIcAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIcAAAAAAAAIAAAAAAMACAAAAAABAAgAAAAAAQCCAAAAAAAAdwAAAAADAHcAAAAAAAB3AAAAAAsAdwAAAAAAAIIAAAAAAACHAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACHAAAAAAAACAAAAAABAAgAAAAAAAAIAAAAAAMAggAAAAAAAHcAAAAAAAB3AAAAAAAAdwAAAAAAAHcAAAAAAACCAAAAAAAAhwAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAhwAAAAAAAAEAAAAAAwABAAAAAAAAAQAAAAADAIIAAAAAAAB3AAAAAAAAdwAAAAAKAHcAAAAAAAB3AAAAAAQAggAAAAAAAIIAAAAAAACHAAAAAAAAhwAAAAAAAIcAAAAAAACHAAAAAAAAhwAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAdwAAAAAAAHcAAAAACgB3AAAAAAAAdwAAAAAAAHcAAAAAAACCAAAAAAAAdwAAAAAAAHcAAAAAAAB3AAAAAAAAdwAAAAAAAHcAAAAACAB3AAAAAAAAdwAAAAACAHcAAAAABQB3AAAAAAQAdwAAAAAAAHcAAAAAAAB3AAAAAAQAdwAAAAALAHcAAAAAAAB3AAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAHcAAAAAAAB3AAAAAAAAdwAAAAABAHcAAAAABwB3AAAAAAEAdwAAAAAAAHcAAAAAAAB3AAAAAAAAdwAAAAAAAIIAAAAAAAABAAAAAAAAAQAAAAADAAEAAAAAAwABAAAAAAIAAQAAAAAAAIIAAAAAAACCAAAAAAAAdwAAAAAAAHcAAAAAAQCCAAAAAAAAdwAAAAAAAHcAAAAAAAB3AAAAAAAAdwAAAAAAAHcAAAAAAQCCAAAAAAAAAQAAAAACAAEAAAAAAwABAAAAAAAAAQAAAAAAAAEAAAAAAwABAAAAAAMAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAAB3AAAAAAkAdwAAAAAAAHcAAAAABwB3AAAAAAAAggAAAAAAAAEAAAAAAgABAAAAAAIAAQAAAAABAAEAAAAAAQABAAAAAAAAAQAAAAABAA==
+          tiles: AQAAAAADAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAhwAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAhwAAAAAAAIIAAAAAAAB3AAAAAAAAdwAAAAAAAHcAAAAAAwB3AAAAAAIAdwAAAAAAAHcAAAAAAAB3AAAAAAUAggAAAAAAAIcAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIcAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAAB3AAAAAAAAdwAAAAAAAHcAAAAAAgB3AAAAAAcAdwAAAAAMAIIAAAAAAACHAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACHAAAAAAAAdwAAAAAAAHcAAAAACAB3AAAAAAAAdwAAAAAAAHcAAAAAAAB3AAAAAAMAdwAAAAAFAHcAAAAAAACCAAAAAAAAhwAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAhwAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAAB3AAAAAAAAdwAAAAAAAHcAAAAAAAB3AAAAAAAAggAAAAAAAIcAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIcAAAAAAAABAAAAAAEAAQAAAAADAAEAAAAAAgCCAAAAAAAAdwAAAAAAAHcAAAAAAAAEAAAAAAAAdwAAAAAAAIIAAAAAAACHAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACHAAAAAAAACAAAAAACAAgAAAAAAwAIAAAAAAEAggAAAAAAAIIAAAAAAACCAAAAAAAABAAAAAAAAIIAAAAAAACCAAAAAAAAhwAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAhwAAAAAAAAgAAAAAAQAIAAAAAAMACAAAAAABAAgAAAAAAwCCAAAAAAAAdwAAAAAAAAQAAAAAAAB3AAAAAAoAggAAAAAAAIcAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIcAAAAAAAAIAAAAAAIACAAAAAAAAAgAAAAAAQCCAAAAAAAAdwAAAAAAAHcAAAAAAAB3AAAAAAAAdwAAAAAAAIIAAAAAAACHAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACHAAAAAAAACAAAAAAAAAgAAAAAAQAIAAAAAAMAggAAAAAAAHcAAAAAAAB3AAAAAAAAdwAAAAACAHcAAAAAAACCAAAAAAAAhwAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAhwAAAAAAAAEAAAAAAAABAAAAAAEAAQAAAAABAIIAAAAAAAB3AAAAAAoAdwAAAAAAAHcAAAAAAAB3AAAAAAAAggAAAAAAAIIAAAAAAACHAAAAAAAAhwAAAAAAAIcAAAAAAACHAAAAAAAAhwAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAdwAAAAAAAHcAAAAAAAB3AAAAAAAAdwAAAAAAAHcAAAAAAACCAAAAAAAAdwAAAAAFAHcAAAAAAAB3AAAAAAAAdwAAAAAAAHcAAAAACgB3AAAAAAcAdwAAAAAAAHcAAAAAAwB3AAAAAAAAdwAAAAAAAHcAAAAAAAB3AAAAAAAAdwAAAAAAAHcAAAAAAAB3AAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAHcAAAAAAAB3AAAAAAAAdwAAAAAAAHcAAAAADAB3AAAAAAAAdwAAAAAAAHcAAAAAAAB3AAAAAAgAdwAAAAAAAIIAAAAAAAABAAAAAAAAAQAAAAACAAEAAAAAAgABAAAAAAAAAQAAAAACAIIAAAAAAACCAAAAAAAAdwAAAAAAAHcAAAAAAACCAAAAAAAAdwAAAAAAAHcAAAAAAAB3AAAAAAAAdwAAAAAAAHcAAAAAAACCAAAAAAAAAQAAAAADAAEAAAAAAgABAAAAAAAAAQAAAAABAAEAAAAAAwABAAAAAAMAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAAB3AAAAAAEAdwAAAAAAAHcAAAAADAB3AAAAAAAAggAAAAAAAAEAAAAAAgABAAAAAAMAAQAAAAAAAAEAAAAAAQABAAAAAAEAAQAAAAAAAA==
           version: 7
         2,7:
           ind: 2,7
-          tiles: ggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAAB3AAAAAAAAdwAAAAAAAHcAAAAAAAB3AAAAAAAAggAAAAAAAAEAAAAAAAABAAAAAAIAAQAAAAADAAEAAAAAAAABAAAAAAMAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAAB3AAAAAAAAdwAAAAAAAHcAAAAAAAB3AAAAAAAAdwAAAAAAAIIAAAAAAAABAAAAAAIAAQAAAAACAAEAAAAAAAABAAAAAAMAAQAAAAACAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAdwAAAAAAAHcAAAAAAAB3AAAAAAAAdwAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAAEAAAAAAwABAAAAAAMAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAAgAAAAAAAAMAAAAAAAADAAAAAAEAAgAAAAAAAAMAAAAAAwADAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAAB3AAAAAAAAdwAAAAAAAHcAAAAAAACCAAAAAAAAAwAAAAABAAIAAAAAAAADAAAAAAEAggAAAAAAAIIAAAAAAAACAAAAAAAAggAAAAAAAIIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB3AAAAAAAAdwAAAAAAAHcAAAAAAAB3AAAAAAAAggAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAIIAAAAAAACCAAAAAAAABAAAAAAAAIIAAAAAAACCAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHcAAAAAAAB3AAAAAAAAdwAAAAAAAIIAAAAAAAADAAAAAAAAAwAAAAACAAIAAAAAAACCAAAAAAAAggAAAAAAAAIAAAAAAACCAAAAAAAAggAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAdwAAAAAJAHcAAAAAAACCAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAAggAAAAAAAIIAAAAAAAAEAAAAAAAAggAAAAAAAIIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHcAAAAAAAB3AAAAAAAAggAAAAAAAAIAAAAAAAADAAAAAAEAAwAAAAABAIIAAAAAAACCAAAAAAAAAwAAAAACAIIAAAAAAACCAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAAgAAAAAAAAIAAAAAAACCAAAAAAAAggAAAAAAAAIAAAAAAACCAAAAAAAAggAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHcAAAAAAAB3AAAAAAAAggAAAAAAAIIAAAAAAAADAAAAAAMAAwAAAAACAAIAAAAAAAADAAAAAAMAAwAAAAADAAUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAdwAAAAAAAHcAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAAADAAAAAAIAAwAAAAACAAMAAAAAAwAFAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB3AAAAAAAAdwAAAAAAAHcAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB3AAAAAAoAggAAAAAAAHcAAAAAAAB3AAAAAAAAdwAAAAAAAHcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB3AAAAAAAAdwAAAAAAAHcAAAAAAQB3AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB3AAAAAAAAdwAAAAAIAA==
+          tiles: ggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAAB3AAAAAAAAdwAAAAAAAHcAAAAAAAB3AAAAAAAAggAAAAAAAAEAAAAAAwABAAAAAAMAAQAAAAACAAEAAAAAAwABAAAAAAIAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAAB3AAAAAAAAdwAAAAAAAHcAAAAAAAB3AAAAAAAAdwAAAAADAIIAAAAAAAABAAAAAAEAAQAAAAAAAAEAAAAAAQABAAAAAAIAAQAAAAABAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAdwAAAAAJAHcAAAAAAAB3AAAAAAMAdwAAAAAFAIIAAAAAAACCAAAAAAAAggAAAAAAAAEAAAAAAQABAAAAAAIAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAAgAAAAAAAAMAAAAAAwADAAAAAAAAAgAAAAAAAAMAAAAAAQADAAAAAAEAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAAB3AAAAAAAAdwAAAAAAAHcAAAAACgCCAAAAAAAAAwAAAAADAAIAAAAAAAADAAAAAAAAggAAAAAAAIIAAAAAAAACAAAAAAAAggAAAAAAAIIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB3AAAAAAAAdwAAAAACAHcAAAAAAAB3AAAAAAsAggAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAIIAAAAAAACCAAAAAAAABAAAAAAAAIIAAAAAAACCAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHcAAAAAAAB3AAAAAAAAdwAAAAAAAIIAAAAAAAADAAAAAAMAAwAAAAAAAAIAAAAAAACCAAAAAAAAggAAAAAAAAIAAAAAAACCAAAAAAAAggAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAdwAAAAAIAHcAAAAAAACCAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAAggAAAAAAAIIAAAAAAAAEAAAAAAAAggAAAAAAAIIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHcAAAAAAAB3AAAAAAAAggAAAAAAAAIAAAAAAAADAAAAAAMAAwAAAAADAIIAAAAAAACCAAAAAAAAAwAAAAADAIIAAAAAAACCAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAAgAAAAAAAAIAAAAAAACCAAAAAAAAggAAAAAAAAIAAAAAAACCAAAAAAAAggAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHcAAAAAAAB3AAAAAAAAggAAAAAAAIIAAAAAAAADAAAAAAEAAwAAAAABAAIAAAAAAAADAAAAAAEAAwAAAAAAAAUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAdwAAAAAAAHcAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAAADAAAAAAIAAwAAAAAAAAMAAAAAAwAFAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB3AAAAAAAAdwAAAAAAAHcAAAAADACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB3AAAAAAAAggAAAAAAAHcAAAAAAAB3AAAAAAAAdwAAAAAAAHcAAAAACwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB3AAAAAAcAdwAAAAAAAHcAAAAAAAB3AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB3AAAAAAAAdwAAAAAAAA==
           version: 7
         3,0:
           ind: 3,0
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHcAAAAAAAB3AAAAAAAAdwAAAAAAAHcAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHcAAAAAAAB3AAAAAAgAdwAAAAACAHcAAAAACAB3AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB3AAAAAAwAdwAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB3AAAAAAAAdwAAAAAAAHcAAAAADACCAAAAAAAABwAAAAADAAcAAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAdwAAAAAAAHcAAAAAAAB3AAAAAAoAggAAAAAAAAcAAAAAAAAHAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAdwAAAAAGAHcAAAAAAAB3AAAAAAAAdwAAAAAAAIIAAAAAAAAHAAAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHcAAAAACAB3AAAAAAAAdwAAAAAAAHcAAAAAAACCAAAAAAAABgAAAAABAAYAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHcAAAAAAAB3AAAAAAAAdwAAAAAMAHcAAAAAAAB3AAAAAAAAggAAAAAAAAYAAAAAAQAGAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB3AAAAAAAAdwAAAAAAAHcAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAABgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB3AAAAAAAAdwAAAAAAAHcAAAAAAAB3AAAAAAAAggAAAAAAAAkAAAAAAAAJAAAAAAAACQAAAAAAAAcAAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAdwAAAAAAAHcAAAAAAAB3AAAAAAgAdwAAAAAAAIIAAAAAAAAJAAAAAAAACQAAAAAAAIIAAAAAAACCAAAAAAAAAAAAAAAAAAAAAAAAAACHAAAAAAAAhwAAAAAAAIcAAAAAAACHAAAAAAAAdwAAAAAAAHcAAAAAAAB3AAAAAAMAdwAAAAAAAHcAAAAAAACCAAAAAAAACQAAAAAAAAkAAAAAAAAJAAAAAAAAggAAAAAAAAAAAAAAAAAAAAAAAAAAhwAAAAAAAIIAAAAAAACCAAAAAAAAdwAAAAAAAHcAAAAAAgB3AAAAAAAAdwAAAAAGAHcAAAAAAAB3AAAAAAAAggAAAAAAAAkAAAAAAAAJAAAAAAAACQAAAAAAAIIAAAAAAAAAAAAAAAAAAAAAAAAAAIcAAAAAAACCAAAAAAAAAwAAAAABAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAAAAAAAAAAHcAAAAAAAB3AAAAAAAAggAAAAAAAAMAAAAAAQADAAAAAAEAAwAAAAACAAMAAAAAAQADAAAAAAIAAwAAAAABAAMAAAAAAgCCAAAAAAAAdwAAAAAAAHcAAAAAAACCAAAAAAAABwAAAAACAA==
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHcAAAAAAAB3AAAAAAEAdwAAAAAAAHcAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHcAAAAAAAB3AAAAAAAAdwAAAAAAAHcAAAAAAAB3AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB3AAAAAAAAdwAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB3AAAAAAAAdwAAAAAAAHcAAAAAAACCAAAAAAAABwAAAAADAAcAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAdwAAAAAAAHcAAAAAAAB3AAAAAAAAggAAAAAAAAcAAAAAAQAHAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAdwAAAAAHAHcAAAAAAQB3AAAAAAAAdwAAAAAAAIIAAAAAAAAHAAAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHcAAAAAAAB3AAAAAAcAdwAAAAAAAHcAAAAAAACCAAAAAAAABgAAAAACAAYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHcAAAAAAAB3AAAAAAAAdwAAAAAAAHcAAAAAAAB3AAAAAAAAggAAAAAAAAYAAAAAAAAGAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB3AAAAAAkAdwAAAAAAAHcAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAABgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB3AAAAAAAAdwAAAAAAAHcAAAAAAAB3AAAAAAAAggAAAAAAAAkAAAAAAAAJAAAAAAAACQAAAAAAAAcAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAdwAAAAAAAHcAAAAAAQB3AAAAAAAAdwAAAAAAAIIAAAAAAAAJAAAAAAAACQAAAAAAAIIAAAAAAACCAAAAAAAAAAAAAAAAAAAAAAAAAACHAAAAAAAAhwAAAAAAAIcAAAAAAACHAAAAAAAAdwAAAAAAAHcAAAAAAAB3AAAAAAAAdwAAAAAAAHcAAAAAAACCAAAAAAAACQAAAAAAAAkAAAAAAAAJAAAAAAAAggAAAAAAAAAAAAAAAAAAAAAAAAAAhwAAAAAAAIIAAAAAAACCAAAAAAAAdwAAAAAAAHcAAAAAAwB3AAAAAAAAdwAAAAAAAHcAAAAAAAB3AAAAAAAAggAAAAAAAAkAAAAAAAAJAAAAAAAACQAAAAAAAIIAAAAAAAAAAAAAAAAAAAAAAAAAAIcAAAAAAACCAAAAAAAAAwAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAAAAAAAAAAHcAAAAAAAB3AAAAAAAAggAAAAAAAAMAAAAAAQADAAAAAAMAAwAAAAABAAMAAAAAAAADAAAAAAIAAwAAAAAAAAMAAAAAAQCCAAAAAAAAdwAAAAAAAHcAAAAAAACCAAAAAAAABwAAAAAAAA==
           version: 7
         3,1:
           ind: 3,1
-          tiles: dwAAAAAAAHcAAAAAAAB3AAAAAAAAggAAAAAAAAMAAAAAAwCCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAAMAAAAAAQCCAAAAAAAAdwAAAAAAAHcAAAAAAACCAAAAAAAABwAAAAABAHcAAAAAAAB3AAAAAAAAdwAAAAAKAIIAAAAAAAADAAAAAAEAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAADAAAAAAIAggAAAAAAAHcAAAAAAwB3AAAAAAAAggAAAAAAAAcAAAAAAgCCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAAB3AAAAAAAAdwAAAAAAAIIAAAAAAAAHAAAAAAIAdwAAAAAAAAYAAAAAAwB3AAAAAAAAggAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAIIAAAAAAAB3AAAAAAAAdwAAAAAAAHcAAAAAAACCAAAAAAAABwAAAAADAAYAAAAAAwB3AAAAAAgAdwAAAAAEAIIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAAB3AAAAAAAAdwAAAAAAAHcAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAAgAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAHcAAAAAAACCAAAAAAAAggAAAAAAAHcAAAAAAAB3AAAAAAAAdwAAAAAAAHcAAAAAAAB3AAAAAAAAdwAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAAB3AAAAAAAAggAAAAAAAAQAAAAAAAAEAAAAAAAAdwAAAAALAHcAAAAAAAB3AAAAAAAAdwAAAAAAAHcAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAdwAAAAAAAIIAAAAAAACCAAAAAAAAdwAAAAAAAHcAAAAAAAB3AAAAAAAAdwAAAAAAAHcAAAAAAAB3AAAAAAEAggAAAAAAAIIAAAAAAACCAAAAAAAAAQAAAAACAAEAAAAAAgABAAAAAAIAdwAAAAAHAHcAAAAAAACCAAAAAAAAggAAAAAAAHcAAAAAAAB3AAAAAAAAdwAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAAEAAAAAAQCCAAAAAAAAggAAAAAAAAEAAAAAAwABAAAAAAEAAQAAAAAAAHcAAAAABAB3AAAAAAEAggAAAAAAAIIAAAAAAAB3AAAAAAAAdwAAAAAAAHcAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAAB3AAAAAAAAggAAAAAAAHcAAAAAAAB3AAAAAAkAdwAAAAAJAIIAAAAAAAAGAAAAAAMAdwAAAAAAAHcAAAAABwCCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAdwAAAAAAAHcAAAAAAAB3AAAAAAsAdwAAAAAAAHcAAAAAAACCAAAAAAAAggAAAAAAAHcAAAAAAAB3AAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAdwAAAAAAAHcAAAAAAgCCAAAAAAAAdwAAAAAAAHcAAAAAAAB3AAAAAAAAggAAAAAAAIIAAAAAAAB3AAAAAAAAdwAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAHcAAAAAAAB3AAAAAAAAdwAAAAAMAHcAAAAAAACCAAAAAAAAdwAAAAAAAAEAAAAAAQCCAAAAAAAAdwAAAAALAHcAAAAAAAB3AAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAdwAAAAAAAHcAAAAAAAB3AAAAAAAAdwAAAAAAAHcAAAAAAACCAAAAAAAAggAAAAAAAHcAAAAAAAB3AAAAAAAAggAAAAAAAHcAAAAAAAB3AAAAAAAAdwAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAAwAAAAAAQCCAAAAAAAAggAAAAAAAA==
+          tiles: dwAAAAAKAHcAAAAAAAB3AAAAAAIAggAAAAAAAAMAAAAAAgCCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAAMAAAAAAwCCAAAAAAAAdwAAAAAAAHcAAAAAAACCAAAAAAAABwAAAAAAAHcAAAAAAAB3AAAAAAIAdwAAAAAAAIIAAAAAAAADAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAADAAAAAAEAggAAAAAAAHcAAAAAAAB3AAAAAAAAggAAAAAAAAcAAAAAAwCCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAAB3AAAAAAAAdwAAAAAKAIIAAAAAAAAHAAAAAAEAdwAAAAAAAAYAAAAAAgB3AAAAAAgAggAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAIIAAAAAAAB3AAAAAAEAdwAAAAAAAHcAAAAADACCAAAAAAAABwAAAAAAAAYAAAAAAQB3AAAAAAAAdwAAAAAAAIIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAAB3AAAAAAAAdwAAAAAAAHcAAAAABgCCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAAgAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAHcAAAAAAACCAAAAAAAAggAAAAAAAHcAAAAAAAB3AAAAAAQAdwAAAAAAAHcAAAAAAAB3AAAAAAAAdwAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAAB3AAAAAAAAggAAAAAAAAQAAAAAAAAEAAAAAAAAdwAAAAAJAHcAAAAAAAB3AAAAAAAAdwAAAAAAAHcAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAdwAAAAAAAIIAAAAAAACCAAAAAAAAdwAAAAAAAHcAAAAAAAB3AAAAAAUAdwAAAAAFAHcAAAAAAAB3AAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAAQAAAAABAAEAAAAAAgABAAAAAAIAdwAAAAAAAHcAAAAAAACCAAAAAAAAggAAAAAAAHcAAAAAAAB3AAAAAAAAdwAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAAEAAAAAAQCCAAAAAAAAggAAAAAAAAEAAAAAAQABAAAAAAIAAQAAAAADAHcAAAAAAAB3AAAAAAAAggAAAAAAAIIAAAAAAAB3AAAAAAAAdwAAAAAAAHcAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAAB3AAAAAAAAggAAAAAAAHcAAAAAAAB3AAAAAAAAdwAAAAAAAIIAAAAAAAAGAAAAAAAAdwAAAAAAAHcAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAdwAAAAAAAHcAAAAAAAB3AAAAAAAAdwAAAAAAAHcAAAAAAACCAAAAAAAAggAAAAAAAHcAAAAAAAB3AAAAAAwAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAdwAAAAAAAHcAAAAAAACCAAAAAAAAdwAAAAAAAHcAAAAAAAB3AAAAAAEAggAAAAAAAIIAAAAAAAB3AAAAAAAAdwAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAHcAAAAAAAB3AAAAAAAAdwAAAAAAAHcAAAAAAACCAAAAAAAAdwAAAAAAAAEAAAAAAwCCAAAAAAAAdwAAAAAAAHcAAAAAAAB3AAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAdwAAAAADAHcAAAAABgB3AAAAAAEAdwAAAAAAAHcAAAAAAACCAAAAAAAAggAAAAAAAHcAAAAAAAB3AAAAAAsAggAAAAAAAHcAAAAAAAB3AAAAAAAAdwAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAAwAAAAAAACCAAAAAAAAggAAAAAAAA==
           version: 7
         3,2:
           ind: 3,2
-          tiles: ggAAAAAAAIIAAAAAAACCAAAAAAAAdwAAAAAHAHcAAAAABQB3AAAAAAAAdwAAAAAAAIIAAAAAAAAMAAAAAAMADAAAAAACAIIAAAAAAAAMAAAAAAIADAAAAAAAAAwAAAAAAwB3AAAAAAAAdwAAAAAJAAEAAAAAAAABAAAAAAAAggAAAAAAAHcAAAAAAAB3AAAAAAAAdwAAAAAAAHcAAAAAAACCAAAAAAAADAAAAAABAAwAAAAAAgCCAAAAAAAADAAAAAACAAwAAAAAAAAMAAAAAAIADAAAAAADAHcAAAAAAAABAAAAAAIAAQAAAAADAIIAAAAAAAB3AAAAAAAAdwAAAAAAAHcAAAAAAAB3AAAAAAAAdwAAAAAAAAwAAAAAAgAMAAAAAAAAdwAAAAAAAHcAAAAAAAAMAAAAAAAADAAAAAACAAwAAAAAAAAMAAAAAAAAAQAAAAADAAEAAAAAAACCAAAAAAAAdwAAAAAAAIIAAAAAAAAMAAAAAAIADAAAAAADAHcAAAAAAAB3AAAAAAAAdwAAAAAAAHcAAAAAAAB3AAAAAAAADAAAAAABAAwAAAAAAwB3AAAAAAAADAAAAAACAAEAAAAAAgABAAAAAAEAggAAAAAAAHcAAAAAAACCAAAAAAAADAAAAAACAAwAAAAAAgAMAAAAAAIAdwAAAAAAAHcAAAAAAAB3AAAAAAcAdwAAAAAAAAwAAAAAAQB3AAAAAAAAdwAAAAAAAHcAAAAAAAABAAAAAAMAAQAAAAACAIIAAAAAAAB3AAAAAAAAggAAAAAAAIIAAAAAAAAMAAAAAAMAggAAAAAAAHcAAAAAAAB3AAAAAAAAdwAAAAAAAHcAAAAAAAB3AAAAAAAAdwAAAAAAAHcAAAAAAAB3AAAAAAAAAQAAAAABAAEAAAAAAQCCAAAAAAAAdwAAAAAAAAwAAAAAAQAMAAAAAAIADAAAAAACAAwAAAAAAAB3AAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAHcAAAAACgB3AAAAAAAAdwAAAAAAAAwAAAAAAQB3AAAAAAUAdwAAAAAAAIIAAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAGAAAAAAMABgAAAAACAIIAAAAAAAAIAAAAAAIAggAAAAAAAHcAAAAAAAB3AAAAAAAAdwAAAAAAAHcAAAAAAAB3AAAAAAAAdwAAAAAAAHcAAAAADACCAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAABgAAAAAAAAYAAAAAAQAGAAAAAAMACAAAAAACAIIAAAAAAAB3AAAAAAAAggAAAAAAAHcAAAAAAAB3AAAAAAAADAAAAAACAHcAAAAAAAB3AAAAAAAAggAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAAYAAAAAAwAGAAAAAAEAggAAAAAAAAgAAAAAAgCCAAAAAAAAdwAAAAAAAIIAAAAAAACCAAAAAAAADAAAAAACAAwAAAAAAwB3AAAAAAQAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAAAGAAAAAAEAggAAAAAAAIIAAAAAAAAIAAAAAAEAggAAAAAAAHcAAAAAAACCAAAAAAAADAAAAAAAAAwAAAAAAgAMAAAAAAEADAAAAAABAAwAAAAAAQCCAAAAAAAAggAAAAAAAAEAAAAAAwABAAAAAAIADAAAAAAAAAEAAAAAAAABAAAAAAAACAAAAAABAIIAAAAAAAB3AAAAAAAAggAAAAAAAAwAAAAAAwAMAAAAAAAAdwAAAAAAAAwAAAAAAgCCAAAAAAAAdwAAAAAAAAwAAAAAAgAMAAAAAAMADAAAAAAAAAwAAAAAAwAMAAAAAAIADAAAAAACAAgAAAAAAACCAAAAAAAAdwAAAAAAAIIAAAAAAAAMAAAAAAAAdwAAAAAAAAwAAAAAAQAMAAAAAAIAggAAAAAAAHcAAAAAAACCAAAAAAAADAAAAAADAAwAAAAAAAAMAAAAAAEADAAAAAABAAwAAAAAAQABAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAADAAAAAADAAwAAAAAAAAMAAAAAAIADAAAAAAAAIIAAAAAAAB3AAAAAAAAggAAAAAAAAwAAAAAAQAMAAAAAAMADAAAAAADAAwAAAAAAQAMAAAAAAEAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAAAMAAAAAAMAdwAAAAAAAAwAAAAAAACCAAAAAAAAdwAAAAACAIIAAAAAAAAMAAAAAAMADAAAAAADAAwAAAAAAQAMAAAAAAIADAAAAAADAA==
+          tiles: ggAAAAAAAIIAAAAAAACCAAAAAAAAdwAAAAAAAHcAAAAAAAB3AAAAAAAAdwAAAAACAIIAAAAAAAAMAAAAAAAADAAAAAAAAIIAAAAAAAAMAAAAAAAADAAAAAACAAwAAAAAAwB3AAAAAAIAdwAAAAAAAAEAAAAAAwABAAAAAAMAggAAAAAAAHcAAAAAAAB3AAAAAAAAdwAAAAAAAHcAAAAAAACCAAAAAAAADAAAAAAAAAwAAAAAAQCCAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAHcAAAAABgABAAAAAAAAAQAAAAACAIIAAAAAAAB3AAAAAAAAdwAAAAAAAHcAAAAAAAB3AAAAAAIAdwAAAAAAAAwAAAAAAAAMAAAAAAEAdwAAAAAAAHcAAAAAAAAMAAAAAAAADAAAAAABAAwAAAAAAgAMAAAAAAMAAQAAAAABAAEAAAAAAACCAAAAAAAAdwAAAAAAAIIAAAAAAAAMAAAAAAEADAAAAAACAHcAAAAAAAB3AAAAAAAAdwAAAAAIAHcAAAAACgB3AAAAAAAADAAAAAADAAwAAAAAAwB3AAAAAAAADAAAAAACAAEAAAAAAwABAAAAAAEAggAAAAAAAHcAAAAAAACCAAAAAAAADAAAAAADAAwAAAAAAgAMAAAAAAAAdwAAAAAAAHcAAAAAAAB3AAAAAAAAdwAAAAAAAAwAAAAAAgB3AAAAAAAAdwAAAAAAAHcAAAAAAAABAAAAAAAAAQAAAAAAAIIAAAAAAAB3AAAAAAAAggAAAAAAAIIAAAAAAAAMAAAAAAMAggAAAAAAAHcAAAAAAAB3AAAAAAAAdwAAAAAAAHcAAAAAAAB3AAAAAAAAdwAAAAAAAHcAAAAAAAB3AAAAAAoAAQAAAAABAAEAAAAAAwCCAAAAAAAAdwAAAAAAAAwAAAAAAwAMAAAAAAEADAAAAAACAAwAAAAAAwB3AAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAHcAAAAABwB3AAAAAAAAdwAAAAAHAAwAAAAAAgB3AAAAAAAAdwAAAAAIAIIAAAAAAAAOAAAAAAAADgAAAAAAAA4AAAAAAAAGAAAAAAAABgAAAAAAAIIAAAAAAAAIAAAAAAEAggAAAAAAAHcAAAAAAgB3AAAAAAAAdwAAAAAAAHcAAAAAAAB3AAAAAAAAdwAAAAAAAHcAAAAABACCAAAAAAAADgAAAAAAAA4AAAAAAAAOAAAAAAAABgAAAAADAAYAAAAAAQAGAAAAAAAACAAAAAADAIIAAAAAAAB3AAAAAAAAggAAAAAAAHcAAAAAAAB3AAAAAAwADAAAAAACAHcAAAAAAAB3AAAAAAAAggAAAAAAAA4AAAAAAAAOAAAAAAAADgAAAAAAAAYAAAAAAgAGAAAAAAAAggAAAAAAAAgAAAAAAACCAAAAAAAAdwAAAAAAAIIAAAAAAACCAAAAAAAADAAAAAADAAwAAAAAAgB3AAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAAAGAAAAAAIAggAAAAAAAIIAAAAAAAAIAAAAAAMAggAAAAAAAHcAAAAAAACCAAAAAAAADAAAAAACAAwAAAAAAgAMAAAAAAEADAAAAAACAAwAAAAAAwCCAAAAAAAAggAAAAAAAAEAAAAAAwABAAAAAAMADAAAAAADAAEAAAAAAAABAAAAAAMACAAAAAABAIIAAAAAAAB3AAAAAAAAggAAAAAAAAwAAAAAAQAMAAAAAAAAdwAAAAAAAAwAAAAAAgCCAAAAAAAAdwAAAAABAAwAAAAAAwAMAAAAAAMADAAAAAABAAwAAAAAAgAMAAAAAAEADAAAAAABAAgAAAAAAQCCAAAAAAAAdwAAAAALAIIAAAAAAAAMAAAAAAEAdwAAAAAAAAwAAAAAAgAMAAAAAAMAggAAAAAAAHcAAAAABACCAAAAAAAADAAAAAACAAwAAAAAAAAMAAAAAAIADAAAAAAAAAwAAAAAAAABAAAAAAMAggAAAAAAAIIAAAAAAACCAAAAAAAADAAAAAAAAAwAAAAAAgAMAAAAAAEADAAAAAADAIIAAAAAAAB3AAAAAAAAggAAAAAAAAwAAAAAAgAMAAAAAAAADAAAAAABAAwAAAAAAgAMAAAAAAIAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAAAMAAAAAAIAdwAAAAAAAAwAAAAAAgCCAAAAAAAAdwAAAAAAAIIAAAAAAAAMAAAAAAAADAAAAAADAAwAAAAAAAAMAAAAAAIADAAAAAAAAA==
           version: 7
         3,3:
           ind: 3,3
-          tiles: ggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAdwAAAAAAAHcAAAAAAACCAAAAAAAAdwAAAAAAAIIAAAAAAAAMAAAAAAIADAAAAAAAAAwAAAAAAQAMAAAAAAMADAAAAAABAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAHcAAAAAAACCAAAAAAAAggAAAAAAAHcAAAAAAACCAAAAAAAAAQAAAAAAAAEAAAAAAQAMAAAAAAMAAQAAAAAAAAEAAAAAAgCCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAHcAAAAAAAB3AAAAAAAAdwAAAAAAAHcAAAAAAAB3AAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAdwAAAAAAAHcAAAAAAAB3AAAAAAAAdwAAAAAAAHcAAAAAAAB3AAAAAAAAdwAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAAAMAAAAAAAAggAAAAAAAAwAAAAAAQAMAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAAB3AAAAAAcAggAAAAAAAAwAAAAAAwAMAAAAAAIADAAAAAAAAAwAAAAAAgAMAAAAAAIADAAAAAADAAwAAAAAAACCAAAAAAAADAAAAAACAAwAAAAAAwAMAAAAAAMADAAAAAABAAwAAAAAAgAMAAAAAAMAdwAAAAAAAIIAAAAAAAAMAAAAAAEADAAAAAADAAwAAAAAAQAMAAAAAAIADAAAAAABAAwAAAAAAAAMAAAAAAMADAAAAAADAAwAAAAAAgAMAAAAAAMADAAAAAADAAwAAAAAAAAMAAAAAAEADAAAAAABAHcAAAAADACCAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAEADAAAAAACAAwAAAAAAQAMAAAAAAEADAAAAAAAAIIAAAAAAAAMAAAAAAIADAAAAAABAAwAAAAAAQAMAAAAAAEADAAAAAABAAwAAAAAAgB3AAAAAAAAggAAAAAAAAwAAAAAAwAMAAAAAAEADAAAAAABAAwAAAAAAAAMAAAAAAEADAAAAAADAAwAAAAAAQCCAAAAAAAAggAAAAAAAAYAAAAAAQCCAAAAAAAAggAAAAAAAAwAAAAAAQAMAAAAAAMAdwAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAAYAAAAAAwAGAAAAAAMABgAAAAAAAIIAAAAAAAAMAAAAAAMADAAAAAADAHcAAAAAAACCAAAAAAAAdwAAAAAAAHcAAAAAAAB3AAAAAAAAdwAAAAAAAHcAAAAAAAB3AAAAAAAAdwAAAAAIAIIAAAAAAAAGAAAAAAEABgAAAAABAAYAAAAAAACCAAAAAAAADAAAAAADAAwAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAAMAggAAAAAAAAwAAAAAAwCCAAAAAAAACAAAAAABAAYAAAAAAQAGAAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAAMABgAAAAAAAAYAAAAAAgAGAAAAAAAAggAAAAAAAAYAAAAAAQAGAAAAAAIABgAAAAADAIIAAAAAAACCAAAAAAAAdwAAAAAAAAgAAAAAAwAGAAAAAAAABgAAAAAAAAYAAAAAAwAGAAAAAAMABgAAAAABAAYAAAAAAwAGAAAAAAAABgAAAAADAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAdwAAAAAAAIIAAAAAAAAIAAAAAAIABgAAAAADAAYAAAAAAAAGAAAAAAMABgAAAAADAAYAAAAAAAAGAAAAAAMABgAAAAABAAYAAAAAAwAGAAAAAAAAdwAAAAAAAHcAAAAAAwCCAAAAAAAAdwAAAAAAAHcAAAAAAACCAAAAAAAACAAAAAADAAYAAAAAAAAGAAAAAAAABgAAAAADAAYAAAAAAQAGAAAAAAIAdwAAAAAAAAYAAAAAAAAGAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAdwAAAAAKAHcAAAAAAAB3AAAAAAcAdwAAAAAAAA==
+          tiles: ggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAdwAAAAALAHcAAAAAAACCAAAAAAAAdwAAAAAAAIIAAAAAAAAMAAAAAAAADAAAAAADAAwAAAAAAwAMAAAAAAIADAAAAAADAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAHcAAAAAAACCAAAAAAAAggAAAAAAAHcAAAAAAACCAAAAAAAAAQAAAAADAAEAAAAAAAAMAAAAAAMAAQAAAAABAAEAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAHcAAAAAAAB3AAAAAAAAdwAAAAAAAHcAAAAADAB3AAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAdwAAAAAAAHcAAAAAAAB3AAAAAAAAdwAAAAAAAHcAAAAAAAB3AAAAAAAAdwAAAAAKAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAAAMAAAAAAEAggAAAAAAAAwAAAAAAQAMAAAAAAEAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAAB3AAAAAAoAggAAAAAAAAwAAAAAAQAMAAAAAAIADAAAAAADAAwAAAAAAAAMAAAAAAEADAAAAAACAAwAAAAAAwCCAAAAAAAADAAAAAAAAAwAAAAAAwAMAAAAAAAADAAAAAADAAwAAAAAAAAMAAAAAAIAdwAAAAAAAIIAAAAAAAAMAAAAAAMADAAAAAACAAwAAAAAAgAMAAAAAAMADAAAAAADAAwAAAAAAAAMAAAAAAIADAAAAAACAAwAAAAAAQAMAAAAAAMADAAAAAABAAwAAAAAAQAMAAAAAAIADAAAAAAAAHcAAAAAAACCAAAAAAAADAAAAAAAAAwAAAAAAwAMAAAAAAMADAAAAAAAAAwAAAAAAAAMAAAAAAIADAAAAAADAIIAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAQAMAAAAAAMADAAAAAACAAwAAAAAAAB3AAAAAAAAggAAAAAAAAwAAAAAAAAMAAAAAAIADAAAAAAAAAwAAAAAAwAMAAAAAAIADAAAAAADAAwAAAAAAwCCAAAAAAAAggAAAAAAAAYAAAAAAwCCAAAAAAAAggAAAAAAAAwAAAAAAAAMAAAAAAAAdwAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAAYAAAAAAwAGAAAAAAEABgAAAAABAIIAAAAAAAAMAAAAAAIADAAAAAAAAHcAAAAAAACCAAAAAAAAdwAAAAAAAHcAAAAACgB3AAAAAAAAdwAAAAAAAHcAAAAAAAB3AAAAAAAAdwAAAAAAAIIAAAAAAAAGAAAAAAAABgAAAAACAAYAAAAAAQCCAAAAAAAADAAAAAAAAAwAAAAAAQCCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAABgAAAAABAAYAAAAAAgAGAAAAAAMAggAAAAAAAAwAAAAAAgCCAAAAAAAACAAAAAABAAYAAAAAAAAGAAAAAAMABgAAAAACAAYAAAAAAQAGAAAAAAEABgAAAAADAAYAAAAAAQAGAAAAAAMAggAAAAAAAAYAAAAAAQAGAAAAAAMABgAAAAACAIIAAAAAAACCAAAAAAAAdwAAAAABAAgAAAAAAgAGAAAAAAIABgAAAAACAAYAAAAAAwAGAAAAAAEABgAAAAAAAAYAAAAAAQAGAAAAAAEABgAAAAACAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAdwAAAAAAAIIAAAAAAAAIAAAAAAEABgAAAAAAAAYAAAAAAgAGAAAAAAMABgAAAAACAAYAAAAAAgAGAAAAAAAABgAAAAAAAAYAAAAAAgAGAAAAAAAAdwAAAAAAAHcAAAAAAACCAAAAAAAAdwAAAAABAHcAAAAAAACCAAAAAAAACAAAAAADAAYAAAAAAgAGAAAAAAMABgAAAAACAAYAAAAAAQAGAAAAAAEAdwAAAAAAAAYAAAAAAAAGAAAAAAIAggAAAAAAAIIAAAAAAACCAAAAAAAAdwAAAAAAAHcAAAAAAAB3AAAAAAAAdwAAAAAAAA==
           version: 7
         3,4:
           ind: 3,4
-          tiles: CAAAAAADAAYAAAAAAgAGAAAAAAIABgAAAAACAAYAAAAAAAAGAAAAAAMABgAAAAACAAYAAAAAAQAGAAAAAAMAggAAAAAAAHcAAAAACAB3AAAAAAAAdwAAAAAAAHcAAAAAAAB3AAAAAAAAdwAAAAAAAAgAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAACAAYAAAAAAQAGAAAAAAIABgAAAAACAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAAABAAAAAAMAAQAAAAABAAEAAAAAAgABAAAAAAAAAQAAAAACAAEAAAAAAwABAAAAAAMAAQAAAAABAAEAAAAAAgACAAAAAAAAAQAAAAADAAEAAAAAAQABAAAAAAAAAQAAAAABAAEAAAAAAwABAAAAAAAAAQAAAAADAAEAAAAAAQABAAAAAAMAAQAAAAADAAEAAAAAAwABAAAAAAAAAQAAAAADAAEAAAAAAwABAAAAAAMAAgAAAAAAAAEAAAAAAwABAAAAAAEAAQAAAAABAAEAAAAAAwABAAAAAAMAAQAAAAAAAAEAAAAAAwABAAAAAAIAAQAAAAACAAEAAAAAAgABAAAAAAAAAQAAAAADAAEAAAAAAwABAAAAAAMAAQAAAAACAAIAAAAAAAABAAAAAAEAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAQAGAAAAAAMABgAAAAACAAYAAAAAAAAGAAAAAAEABgAAAAAAAAYAAAAAAwAGAAAAAAIABgAAAAABAAYAAAAAAgCCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAAIABgAAAAABAAYAAAAAAAAGAAAAAAAABgAAAAADAAYAAAAAAgAGAAAAAAMAggAAAAAAAAYAAAAAAgAGAAAAAAAABgAAAAABAAYAAAAAAgAGAAAAAAAABgAAAAABAAYAAAAAAwAGAAAAAAEACAAAAAADAAgAAAAAAwAIAAAAAAMABgAAAAAAAAYAAAAAAAAGAAAAAAIABgAAAAABAAYAAAAAAgAGAAAAAAIABgAAAAAAAAYAAAAAAQAGAAAAAAEABgAAAAABAAYAAAAAAAAGAAAAAAAACAAAAAAAAAgAAAAAAQAIAAAAAAEACAAAAAABAAgAAAAAAAAGAAAAAAAABgAAAAABAAYAAAAAAQAGAAAAAAMABgAAAAABABIAAAAAAAASAAAAAAAAEgAAAAAAABIAAAAAAAAGAAAAAAAABgAAAAAAAAgAAAAAAwAIAAAAAAIACAAAAAAAAAgAAAAAAAAIAAAAAAIABgAAAAACAAYAAAAAAQAGAAAAAAAAggAAAAAAAAYAAAAAAAASAAAAAAAAEgAAAAAAABIAAAAAAAASAAAAAAAABgAAAAAAAAYAAAAAAQAIAAAAAAAACAAAAAADAAgAAAAAAwAIAAAAAAEACAAAAAAAAAYAAAAAAQAGAAAAAAEABgAAAAADAIIAAAAAAAAGAAAAAAIABgAAAAACAAYAAAAAAgAGAAAAAAMABgAAAAADAAYAAAAAAwCCAAAAAAAAggAAAAAAAIIAAAAAAAAGAAAAAAMABgAAAAADAIIAAAAAAACCAAAAAAAAggAAAAAAAAYAAAAAAACCAAAAAAAABgAAAAAAABIAAAAAAAASAAAAAAAAEgAAAAAAABIAAAAAAAAGAAAAAAAABgAAAAADAIIAAAAAAAAGAAAAAAMABgAAAAADAAYAAAAAAgAGAAAAAAAAggAAAAAAAAYAAAAAAAAGAAAAAAAAggAAAAAAAAYAAAAAAwASAAAAAAAAEgAAAAAAABIAAAAAAAASAAAAAAAABgAAAAABAAYAAAAAAwAGAAAAAAEABgAAAAACAAYAAAAAAgAGAAAAAAAABgAAAAABAIIAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAAMABgAAAAACAAYAAAAAAgAGAAAAAAEABgAAAAABAAYAAAAAAAAGAAAAAAAAggAAAAAAAAYAAAAAAgAGAAAAAAEABgAAAAADAAYAAAAAAwAGAAAAAAEABgAAAAACAAYAAAAAAgAGAAAAAAIABgAAAAAAAAYAAAAAAQAGAAAAAAEABgAAAAAAAAYAAAAAAgAGAAAAAAIABgAAAAABAIIAAAAAAAAGAAAAAAAABgAAAAABAAYAAAAAAQAGAAAAAAMAggAAAAAAAAYAAAAAAQAGAAAAAAAAggAAAAAAAAYAAAAAAgAGAAAAAAMABgAAAAADAAYAAAAAAwAGAAAAAAEAggAAAAAAAA==
+          tiles: CAAAAAADAAYAAAAAAwAGAAAAAAMABgAAAAACAAYAAAAAAQAGAAAAAAIABgAAAAABAAYAAAAAAQAGAAAAAAEAggAAAAAAAHcAAAAAAAB3AAAAAAAAdwAAAAAAAHcAAAAABQB3AAAAAAAAdwAAAAAAAAgAAAAAAgAGAAAAAAIABgAAAAADAAYAAAAAAwAGAAAAAAMABgAAAAAAAAYAAAAAAgAGAAAAAAIABgAAAAABAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAAABAAAAAAMAAQAAAAAAAAEAAAAAAgABAAAAAAEAAQAAAAADAAEAAAAAAgABAAAAAAEAAQAAAAADAAEAAAAAAwACAAAAAAAAAQAAAAABAAEAAAAAAwABAAAAAAEAAQAAAAADAAEAAAAAAQABAAAAAAAAAQAAAAADAAEAAAAAAQABAAAAAAIAAQAAAAAAAAEAAAAAAwABAAAAAAMAAQAAAAAAAAEAAAAAAQABAAAAAAAAAgAAAAAAAAEAAAAAAgABAAAAAAEAAQAAAAADAAEAAAAAAgABAAAAAAAAAQAAAAAAAAEAAAAAAwABAAAAAAEAAQAAAAAAAAEAAAAAAgABAAAAAAMAAQAAAAACAAEAAAAAAQABAAAAAAIAAQAAAAABAAIAAAAAAAABAAAAAAAAAQAAAAACAAEAAAAAAwABAAAAAAAAAQAAAAACAAEAAAAAAwAGAAAAAAIABgAAAAAAAAYAAAAAAgAGAAAAAAEABgAAAAABAAYAAAAAAQAGAAAAAAMABgAAAAAAAAYAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAABgAAAAABAAYAAAAAAwAGAAAAAAAABgAAAAAAAAYAAAAAAwAGAAAAAAIABgAAAAACAAYAAAAAAQAGAAAAAAAAggAAAAAAAAYAAAAAAAAGAAAAAAMABgAAAAABAAYAAAAAAQAGAAAAAAEABgAAAAAAAAYAAAAAAwAGAAAAAAMACAAAAAADAAgAAAAAAAAIAAAAAAMABgAAAAACAAYAAAAAAQAGAAAAAAEABgAAAAACAAYAAAAAAgAGAAAAAAIABgAAAAADAAYAAAAAAAAGAAAAAAIABgAAAAADAAYAAAAAAAAGAAAAAAEACAAAAAADAAgAAAAAAgAIAAAAAAIACAAAAAABAAgAAAAAAwAGAAAAAAAABgAAAAADAAYAAAAAAQAGAAAAAAEABgAAAAADABIAAAAAAAASAAAAAAAAEgAAAAAAABIAAAAAAAAGAAAAAAEABgAAAAAAAAgAAAAAAgAIAAAAAAIACAAAAAAAAAgAAAAAAwAIAAAAAAMABgAAAAACAAYAAAAAAQAGAAAAAAEAggAAAAAAAAYAAAAAAgASAAAAAAAAEgAAAAAAABIAAAAAAAASAAAAAAAABgAAAAADAAYAAAAAAAAIAAAAAAIACAAAAAABAAgAAAAAAwAIAAAAAAEACAAAAAACAAYAAAAAAwAGAAAAAAMABgAAAAABAIIAAAAAAAAGAAAAAAMABgAAAAADAAYAAAAAAwAGAAAAAAMABgAAAAABAAYAAAAAAgCCAAAAAAAAggAAAAAAAIIAAAAAAAAGAAAAAAAABgAAAAABAIIAAAAAAACCAAAAAAAAggAAAAAAAAYAAAAAAwCCAAAAAAAABgAAAAADABIAAAAAAAASAAAAAAAAEgAAAAAAABIAAAAAAAAGAAAAAAEABgAAAAABAIIAAAAAAAAGAAAAAAEABgAAAAABAAYAAAAAAwAGAAAAAAEAggAAAAAAAAYAAAAAAQAGAAAAAAMAggAAAAAAAAYAAAAAAAASAAAAAAAAEgAAAAAAABIAAAAAAAASAAAAAAAABgAAAAACAAYAAAAAAQAGAAAAAAMABgAAAAABAAYAAAAAAQAGAAAAAAAABgAAAAAAAIIAAAAAAAAGAAAAAAIABgAAAAACAAYAAAAAAwAGAAAAAAAABgAAAAADAAYAAAAAAQAGAAAAAAMABgAAAAAAAAYAAAAAAAAGAAAAAAIAggAAAAAAAAYAAAAAAQAGAAAAAAMABgAAAAABAAYAAAAAAAAGAAAAAAEABgAAAAAAAAYAAAAAAgAGAAAAAAAABgAAAAADAAYAAAAAAAAGAAAAAAEABgAAAAABAAYAAAAAAAAGAAAAAAIABgAAAAADAIIAAAAAAAAGAAAAAAMABgAAAAAAAAYAAAAAAQAGAAAAAAMAggAAAAAAAAYAAAAAAgAGAAAAAAEAggAAAAAAAAYAAAAAAwAGAAAAAAIABgAAAAADAAYAAAAAAQAGAAAAAAIAggAAAAAAAA==
           version: 7
         3,5:
           ind: 3,5
-          tiles: BgAAAAADAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAAYAAAAAAgAGAAAAAAEAggAAAAAAAIIAAAAAAAAGAAAAAAEAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAAYAAAAAAwAGAAAAAAMABgAAAAABAAYAAAAAAQAGAAAAAAIABgAAAAAAAAYAAAAAAgAGAAAAAAAABgAAAAAAAIIAAAAAAAAGAAAAAAIABgAAAAADAAYAAAAAAACCAAAAAAAAdwAAAAAAAHcAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAAAGAAAAAAMABgAAAAACAAYAAAAAAQAGAAAAAAAABgAAAAAAAAYAAAAAAwCCAAAAAAAABgAAAAABABIAAAAAAAAGAAAAAAEABgAAAAADAHcAAAAAAAB3AAAAAAAAdwAAAAAAAHcAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAAAGAAAAAAIAggAAAAAAAAYAAAAAAgASAAAAAAAABgAAAAADAIIAAAAAAAB3AAAAAAYAdwAAAAAAAHcAAAAAAAB3AAAAAAAAggAAAAAAAHcAAAAAAAB3AAAAAAAAdwAAAAAAAHcAAAAAAAB3AAAAAAAAggAAAAAAAIIAAAAAAAAGAAAAAAAABgAAAAABAAYAAAAAAgCCAAAAAAAAdwAAAAADAHcAAAAAAAB3AAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAAdwAAAAAAAHcAAAAAAAB3AAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAHcAAAAAAAB3AAAAAAsAdwAAAAAEAHcAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAHcAAAAAAAB3AAAAAAAAggAAAAAAAHcAAAAAAAB3AAAAAAAAggAAAAAAAHcAAAAAAAB3AAAAAAAAdwAAAAAAAHcAAAAAAAB3AAAAAAAAggAAAAAAAAIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAAEAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAAIAAAAAAAABAAAAAAAAAQAAAAABAAEAAAAAAQABAAAAAAEAAQAAAAADAAEAAAAAAgABAAAAAAIAAQAAAAADAAEAAAAAAgACAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAAgAAAAAAAIIAAAAAAACCAAAAAAAAAQAAAAACAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAwABAAAAAAMAAQAAAAACAAEAAAAAAAABAAAAAAAAAgAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAAIAAAAAAACCAAAAAAAAggAAAAAAAAEAAAAAAQABAAAAAAIAAQAAAAAAAAEAAAAAAAABAAAAAAMAggAAAAAAAIIAAAAAAAAGAAAAAAMAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAAABAAAAAAEAAQAAAAACAAEAAAAAAQABAAAAAAIAAQAAAAAAAIIAAAAAAAAGAAAAAAIABgAAAAACAAgAAAAAAwAIAAAAAAEAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAAQAAAAAAAAEAAAAAAgABAAAAAAAAAQAAAAABAAEAAAAAAQCCAAAAAAAABgAAAAAAAAYAAAAAAQAIAAAAAAEACAAAAAACAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAAEAAAAAAAABAAAAAAIAAQAAAAACAAEAAAAAAgABAAAAAAAAggAAAAAAAAYAAAAAAAAGAAAAAAAACAAAAAAAAAgAAAAAAQCCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAABgAAAAABAAYAAAAAAQAGAAAAAAIABgAAAAAAAA==
+          tiles: BgAAAAABAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAAYAAAAAAgAGAAAAAAIAggAAAAAAAIIAAAAAAAAGAAAAAAIAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAAYAAAAAAQAGAAAAAAEABgAAAAADAAYAAAAAAgAGAAAAAAEABgAAAAACAAYAAAAAAAAGAAAAAAAABgAAAAACAIIAAAAAAAAGAAAAAAEABgAAAAADAAYAAAAAAwCCAAAAAAAAdwAAAAAAAHcAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAAAGAAAAAAAABgAAAAADAAYAAAAAAwAGAAAAAAIABgAAAAAAAAYAAAAAAACCAAAAAAAABgAAAAADABIAAAAAAAAGAAAAAAEABgAAAAADAHcAAAAAAAB3AAAAAAAAdwAAAAAAAHcAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAAAGAAAAAAAAggAAAAAAAAYAAAAAAwASAAAAAAAABgAAAAACAIIAAAAAAAB3AAAAAAAAdwAAAAAAAHcAAAAAAwB3AAAAAAAAggAAAAAAAHcAAAAAAAB3AAAAAAAAdwAAAAAFAHcAAAAAAAB3AAAAAAAAggAAAAAAAIIAAAAAAAAGAAAAAAMABgAAAAABAAYAAAAAAACCAAAAAAAAdwAAAAAAAHcAAAAAAAB3AAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAAdwAAAAAEAHcAAAAABQB3AAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAHcAAAAAAAB3AAAAAAAAdwAAAAAAAHcAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAHcAAAAAAAB3AAAAAAAAggAAAAAAAHcAAAAAAwB3AAAAAAAAggAAAAAAAHcAAAAAAAB3AAAAAAYAdwAAAAAAAHcAAAAAAQB3AAAAAAAAggAAAAAAAAIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAAEAAAAAAwCCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAAIAAAAAAAABAAAAAAAAAQAAAAABAAEAAAAAAAABAAAAAAAAAQAAAAACAAEAAAAAAQABAAAAAAIAAQAAAAADAAEAAAAAAgACAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAAgAAAAAAAIIAAAAAAACCAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAACAAEAAAAAAQABAAAAAAMAAQAAAAABAAEAAAAAAwABAAAAAAIAAgAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAAIAAAAAAACCAAAAAAAAggAAAAAAAAEAAAAAAQABAAAAAAMAAQAAAAADAAEAAAAAAAABAAAAAAMAggAAAAAAAIIAAAAAAAAGAAAAAAIAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAAABAAAAAAAAAQAAAAABAAEAAAAAAQABAAAAAAIAAQAAAAADAIIAAAAAAAAGAAAAAAEABgAAAAAAAAgAAAAAAAAIAAAAAAIAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAAQAAAAACAAEAAAAAAwABAAAAAAAAAQAAAAADAAEAAAAAAgCCAAAAAAAABgAAAAADAAYAAAAAAwAIAAAAAAMACAAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAAEAAAAAAgABAAAAAAAAAQAAAAACAAEAAAAAAAABAAAAAAIAggAAAAAAAAYAAAAAAwAGAAAAAAMACAAAAAACAAgAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAABgAAAAADAAYAAAAAAgAGAAAAAAMABgAAAAABAA==
           version: 7
         3,6:
           ind: 3,6
-          tiles: ggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAAAEAAAAAAAAAgAAAAAAAAMAAAAAAAACAAAAAAAAAgAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAABAAAAAAAAAQAAAAAAAACAAAAAAAAAwAAAAAAAAIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAAAGAAAAAAAABgAAAAABAAYAAAAAAwAGAAAAAAEAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAAEAAAAAAgABAAAAAAEAAQAAAAACAAEAAAAAAgCCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAAIAAAAAAAABAAAAAAIAAQAAAAADAAEAAAAAAwABAAAAAAMAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAAACAAAAAAAAAQAAAAAAAAEAAAAAAwABAAAAAAIAAQAAAAABAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAAgAAAAAAAAEAAAAAAQABAAAAAAAAAQAAAAABAAEAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAAIAAAAAAAABAAAAAAMAAQAAAAABAAEAAAAAAgABAAAAAAMAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAAQAAAAAAAAEAAAAAAwABAAAAAAAAAQAAAAADAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAdwAAAAAAAHcAAAAABAB3AAAAAAAAdwAAAAAAAHcAAAAAAAB3AAAAAAAAdwAAAAAAAHcAAAAAAAB3AAAAAAAAggAAAAAAAAYAAAAAAQAGAAAAAAEABgAAAAACAAYAAAAAAgAGAAAAAAIAggAAAAAAAIIAAAAAAAB3AAAAAAAAdwAAAAAAAHcAAAAAAAB3AAAAAAAAdwAAAAAAAHcAAAAAAAB3AAAAAAIAdwAAAAAAAAYAAAAAAAAGAAAAAAAABwAAAAACAAcAAAAAAgAHAAAAAAIABgAAAAAAAAYAAAAAAQCCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAAAGAAAAAAIABgAAAAADAAcAAAAAAAAHAAAAAAIABwAAAAAAAAYAAAAAAAAGAAAAAAIAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAQABAAAAAAIAAQAAAAADAAEAAAAAAQABAAAAAAIABgAAAAAAAAYAAAAAAgAHAAAAAAMABwAAAAACAAcAAAAAAAAGAAAAAAAABgAAAAAAAAEAAAAAAwABAAAAAAEAAQAAAAAAAAEAAAAAAAABAAAAAAEAAQAAAAAAAAEAAAAAAQABAAAAAAEAAQAAAAADAA==
+          tiles: ggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAAAEAAAAAAAAAgAAAAAAAAMAAAAAAgACAAAAAAAAAgAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAABAAAAAAAAAQAAAAAAAACAAAAAAAAAwAAAAADAAIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAwAGAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAAEAAAAAAgABAAAAAAEAAQAAAAAAAAEAAAAAAgCCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAAIAAAAAAAABAAAAAAEAAQAAAAABAAEAAAAAAQABAAAAAAEAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAAACAAAAAAAAAQAAAAABAAEAAAAAAwABAAAAAAIAAQAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAAgAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAACAAEAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAAIAAAAAAAABAAAAAAEAAQAAAAAAAAEAAAAAAgABAAAAAAEAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAAQAAAAABAAEAAAAAAgABAAAAAAMAAQAAAAADAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAdwAAAAAAAHcAAAAAAAB3AAAAAAAAdwAAAAAAAHcAAAAAAAB3AAAAAAAAdwAAAAAKAHcAAAAAAAB3AAAAAAAAggAAAAAAAAYAAAAAAgAGAAAAAAIABgAAAAADAAYAAAAAAgAGAAAAAAAAggAAAAAAAIIAAAAAAAB3AAAAAAAAdwAAAAAAAHcAAAAAAAB3AAAAAAAAdwAAAAAAAHcAAAAAAAB3AAAAAAsAdwAAAAAJAAYAAAAAAwAGAAAAAAIABwAAAAAAAAcAAAAAAAAHAAAAAAEABgAAAAADAAYAAAAAAQCCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAAAGAAAAAAIABgAAAAACAAcAAAAAAgAHAAAAAAIABwAAAAAAAAYAAAAAAAAGAAAAAAIAAQAAAAACAAEAAAAAAAABAAAAAAMAAQAAAAAAAAEAAAAAAQABAAAAAAMAAQAAAAAAAAEAAAAAAwABAAAAAAAABgAAAAADAAYAAAAAAQAHAAAAAAIABwAAAAABAAcAAAAAAQAGAAAAAAIABgAAAAABAAEAAAAAAgABAAAAAAEAAQAAAAABAAEAAAAAAgABAAAAAAAAAQAAAAADAAEAAAAAAgABAAAAAAAAAQAAAAAAAA==
           version: 7
         3,7:
           ind: 3,7
-          tiles: BgAAAAACAAYAAAAAAgAHAAAAAAIABwAAAAACAAcAAAAAAwAGAAAAAAMABgAAAAABAIIAAAAAAAABAAAAAAAAAQAAAAABAAEAAAAAAQABAAAAAAMAAQAAAAABAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAAAGAAAAAAIABwAAAAABAAcAAAAAAwAHAAAAAAIABgAAAAABAIIAAAAAAACCAAAAAAAAAQAAAAACAAEAAAAAAwABAAAAAAMAAQAAAAAAAAEAAAAAAQCCAAAAAAAAdwAAAAAAAHcAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAAQAAAAADAAEAAAAAAwCCAAAAAAAAggAAAAAAAIIAAAAAAAB3AAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAAACAAAAAAAAAgAAAAAAAAMAAAAAAQACAAAAAAAAAwAAAAAAAAIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAAIAAAAAAACCAAAAAAAAggAAAAAAAAIAAAAAAAADAAAAAAIAAwAAAAACAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAAAEAAAAAAAAggAAAAAAAIIAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAAwAAAAABAIIAAAAAAACCAAAAAAAAAwAAAAAAAAMAAAAAAQACAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAAQAAAAAAACCAAAAAAAAggAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAAACAAAAAAAAggAAAAAAAIIAAAAAAAACAAAAAAAAAwAAAAADAAMAAAAAAQCCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAAgAAAAAAAIIAAAAAAACCAAAAAAAAAwAAAAACAAIAAAAAAACCAAAAAAAAggAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAAAwAAAAADAAMAAAAAAAACAAAAAAAAAwAAAAACAAIAAAAAAACCAAAAAAAAggAAAAAAAHcAAAAAAQAFAAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAAMAAAAAAAACAAAAAAAAAwAAAAACAIIAAAAAAACCAAAAAAAAggAAAAAAAHcAAAAAAAB3AAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAdwAAAAAAAHcAAAAAAAB3AAAAAAAAAAAAAAAAAHcAAAAAAAB3AAAAAAAAdwAAAAAAAHcAAAAACQB3AAAAAAAAdwAAAAAAAHcAAAAAAAB3AAAAAAAAdwAAAAAAAHcAAAAAAAB3AAAAAAYAggAAAAAAAHcAAAAABgAAAAAAAAAAAAAAAAAAAAAAAAAAAAB3AAAAAAAAdwAAAAADAHcAAAAAAAB3AAAAAAAAdwAAAAAAAHcAAAAAAAB3AAAAAAAAdwAAAAAAAHcAAAAAAAB3AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAdwAAAAAAAHcAAAAAAAB3AAAAAAYAdwAAAAAAAHcAAAAAAAB3AAAAAAAAdwAAAAAGAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==
+          tiles: BgAAAAABAAYAAAAAAwAHAAAAAAIABwAAAAADAAcAAAAAAAAGAAAAAAIABgAAAAAAAIIAAAAAAAABAAAAAAEAAQAAAAADAAEAAAAAAgABAAAAAAMAAQAAAAABAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAAAGAAAAAAMABwAAAAADAAcAAAAAAAAHAAAAAAIABgAAAAAAAIIAAAAAAACCAAAAAAAAAQAAAAACAAEAAAAAAQABAAAAAAAAAQAAAAADAAEAAAAAAgCCAAAAAAAAdwAAAAAAAHcAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAAQAAAAAAAAEAAAAAAwCCAAAAAAAAggAAAAAAAIIAAAAAAAB3AAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAAACAAAAAAAAAgAAAAAAAAMAAAAAAQACAAAAAAAAAwAAAAADAAIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAAIAAAAAAACCAAAAAAAAggAAAAAAAAIAAAAAAAADAAAAAAEAAwAAAAABAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAAAEAAAAAAAAggAAAAAAAIIAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAAwAAAAACAIIAAAAAAACCAAAAAAAAAwAAAAABAAMAAAAAAAACAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAAQAAAAAAACCAAAAAAAAggAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAAACAAAAAAAAggAAAAAAAIIAAAAAAAACAAAAAAAAAwAAAAACAAMAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAAgAAAAAAAIIAAAAAAACCAAAAAAAAAwAAAAACAAIAAAAAAACCAAAAAAAAggAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAAAwAAAAADAAMAAAAAAAACAAAAAAAAAwAAAAABAAIAAAAAAACCAAAAAAAAggAAAAAAAHcAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAAMAAAAAAwACAAAAAAAAAwAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAHcAAAAAAAB3AAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAdwAAAAAAAHcAAAAABQB3AAAAAAAAAAAAAAAAAHcAAAAAAAB3AAAAAAgAdwAAAAAAAHcAAAAAAAB3AAAAAAUAdwAAAAAAAHcAAAAAAAB3AAAAAAAAdwAAAAAAAHcAAAAAAAB3AAAAAAAAggAAAAAAAHcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB3AAAAAAkAdwAAAAAAAHcAAAAAAAB3AAAAAAAAdwAAAAAHAHcAAAAAAAB3AAAAAAMAdwAAAAAAAHcAAAAACgB3AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAdwAAAAAAAHcAAAAAAAB3AAAAAAwAdwAAAAAAAHcAAAAAAAB3AAAAAAAAdwAAAAAFAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==
           version: 7
         4,0:
           ind: 4,0
-          tiles: dwAAAAAAAHcAAAAAAAB3AAAAAAkAdwAAAAAAAHcAAAAABgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHcAAAAAAAB3AAAAAAAAdwAAAAAAAHcAAAAAAQB3AAAAAAAAdwAAAAAAAHcAAAAAAAB3AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB3AAAAAAAAdwAAAAAAAHcAAAAAAAB3AAAAAAAAdwAAAAALAHcAAAAABgB3AAAAAAAAdwAAAAAAAHcAAAAAAAB3AAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAdwAAAAAAAHcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcAAAAAAwAGAAAAAAIABgAAAAADAAYAAAAAAgAGAAAAAAEABwAAAAAAAAcAAAAAAgAHAAAAAAEAggAAAAAAAHcAAAAAAAB3AAAAAAkAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHAAAAAAEABgAAAAABAAYAAAAAAgAGAAAAAAEABgAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAABAIIAAAAAAAB3AAAAAAUAdwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAACAIIAAAAAAACCAAAAAAAACQAAAAAAAIIAAAAAAAAHAAAAAAEABwAAAAAAAAcAAAAAAgCCAAAAAAAAdwAAAAAFAHcAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAYAAAAAAgCCAAAAAAAADwAAAAABAA8AAAAAAgCCAAAAAAAABgAAAAACAAYAAAAAAAAGAAAAAAIAggAAAAAAAHcAAAAAAAB3AAAAAAgAdwAAAAAKAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGAAAAAAIAggAAAAAAAIIAAAAAAAAJAAAAAAAAggAAAAAAAAYAAAAAAwAGAAAAAAAABgAAAAACAIIAAAAAAAB3AAAAAAAAdwAAAAAAAHcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABgAAAAADAAYAAAAAAgAGAAAAAAMABgAAAAABAAYAAAAAAQAGAAAAAAEABgAAAAADAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAAB3AAAAAAAAdwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcAAAAAAwAHAAAAAAMABgAAAAAAAAYAAAAAAAAHAAAAAAMABwAAAAACAAcAAAAAAAAJAAAAAAAACQAAAAAAAAkAAAAAAACCAAAAAAAAdwAAAAAAAHcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHAAAAAAIABwAAAAAAAAYAAAAAAwAGAAAAAAEABwAAAAAAAAcAAAAAAwCCAAAAAAAAggAAAAAAAAkAAAAAAAAJAAAAAAAAggAAAAAAAHcAAAAABgB3AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAggAAAAAAAIIAAAAAAAACAAAAAAAAAgAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAAkAAAAAAAAJAAAAAAAACQAAAAAAAIIAAAAAAAB3AAAAAAAAdwAAAAAAAHcAAAAAAgAAAAAAAAAAAAAAAAAAAA8AAAAAAwCCAAAAAAAABgAAAAABAAYAAAAAAQCCAAAAAAAADwAAAAABAIIAAAAAAAAJAAAAAAAACQAAAAAAAAkAAAAAAACCAAAAAAAAdwAAAAAAAHcAAAAAAAB3AAAAAAAAAAAAAAAAAAAAAAAAAAAJAAAAAAAAggAAAAAAAAYAAAAAAQAGAAAAAAAAggAAAAAAAAkAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAHcAAAAAAAB3AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABgAAAAABAAYAAAAAAAAGAAAAAAIABgAAAAADAAYAAAAAAwAGAAAAAAEABwAAAAABAIIAAAAAAAB3AAAAAAAAggAAAAAAAHcAAAAAAAB3AAAAAAIAdwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==
+          tiles: dwAAAAAAAHcAAAAAAAB3AAAAAAAAdwAAAAAHAHcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHcAAAAAAAB3AAAAAAAAdwAAAAAAAHcAAAAAAAB3AAAAAAAAdwAAAAAAAHcAAAAAAAB3AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB3AAAAAAYAdwAAAAAAAHcAAAAAAAB3AAAAAAAAdwAAAAAAAHcAAAAAAAB3AAAAAAAAdwAAAAAAAHcAAAAAAAB3AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAdwAAAAAAAHcAAAAACgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcAAAAAAQAGAAAAAAMABgAAAAADAAYAAAAAAgAGAAAAAAMABwAAAAABAAcAAAAAAQAHAAAAAAAAggAAAAAAAHcAAAAAAQB3AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHAAAAAAAABgAAAAACAAYAAAAAAAAGAAAAAAAABgAAAAABAAcAAAAAAgAHAAAAAAEABwAAAAABAIIAAAAAAAB3AAAAAAkAdwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAAAIIAAAAAAACCAAAAAAAACQAAAAAAAIIAAAAAAAAHAAAAAAAABwAAAAACAAcAAAAAAQCCAAAAAAAAdwAAAAAAAHcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAYAAAAAAwCCAAAAAAAADwAAAAACAA8AAAAAAACCAAAAAAAABgAAAAABAAYAAAAAAgAGAAAAAAEAggAAAAAAAHcAAAAAAAB3AAAAAAAAdwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGAAAAAAMAggAAAAAAAIIAAAAAAAAJAAAAAAAAggAAAAAAAAYAAAAAAAAGAAAAAAIABgAAAAACAIIAAAAAAAB3AAAAAAAAdwAAAAAEAHcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABgAAAAABAAYAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAAEABgAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAAB3AAAAAAAAdwAAAAAHAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcAAAAAAAAHAAAAAAAABgAAAAABAAYAAAAAAQAHAAAAAAAABwAAAAACAAcAAAAAAAAJAAAAAAAACQAAAAAAAAkAAAAAAACCAAAAAAAAdwAAAAAAAHcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHAAAAAAMABwAAAAABAAYAAAAAAAAGAAAAAAMABwAAAAABAAcAAAAAAACCAAAAAAAAggAAAAAAAAkAAAAAAAAJAAAAAAAAggAAAAAAAHcAAAAAAgB3AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAggAAAAAAAIIAAAAAAAACAAAAAAAAAgAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAAkAAAAAAAAJAAAAAAAACQAAAAAAAIIAAAAAAAB3AAAAAAAAdwAAAAAAAHcAAAAAAAAAAAAAAAAAAAAAAAAAAA8AAAAAAACCAAAAAAAABgAAAAAAAAYAAAAAAQCCAAAAAAAADwAAAAADAIIAAAAAAAAJAAAAAAAACQAAAAAAAAkAAAAAAACCAAAAAAAAdwAAAAAKAHcAAAAAAwB3AAAAAAAAAAAAAAAAAAAAAAAAAAAJAAAAAAAAggAAAAAAAAYAAAAAAAAGAAAAAAAAggAAAAAAAAkAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAHcAAAAAAAB3AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAAAABwAAAAABAIIAAAAAAAB3AAAAAAAAggAAAAAAAHcAAAAAAAB3AAAAAAAAdwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==
           version: 7
         4,1:
           ind: 4,1
-          tiles: BgAAAAADAAYAAAAAAwAGAAAAAAAABgAAAAABAAYAAAAAAQAGAAAAAAEABwAAAAADAIIAAAAAAAB3AAAAAAAAggAAAAAAAHcAAAAAAACCAAAAAAAAdwAAAAAMAHcAAAAABwAAAAAAAAAAAAAAAAAAAAYAAAAAAAAGAAAAAAIABgAAAAABAAYAAAAAAAAGAAAAAAAABgAAAAACAAcAAAAAAQCCAAAAAAAAdwAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAHcAAAAAAAB3AAAAAAYAAAAAAAAAAAAAAAAAAAAGAAAAAAAABgAAAAACAAYAAAAAAgAGAAAAAAIABgAAAAADAAYAAAAAAQAHAAAAAAMAggAAAAAAAHcAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAdwAAAAAAAHcAAAAAAAAAAAAAAAAABgAAAAADAAYAAAAAAwAGAAAAAAEABgAAAAABAAYAAAAAAwAGAAAAAAMABwAAAAACAIIAAAAAAAB3AAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAdwAAAAAAAHcAAAAAAAB3AAAAAAAAdwAAAAAAAAYAAAAAAQAGAAAAAAIABgAAAAADAAYAAAAAAQAGAAAAAAIABgAAAAADAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAHcAAAAAAAAGAAAAAAMAggAAAAAAAAIAAAAAAAACAAAAAAAAggAAAAAAAAYAAAAAAQCCAAAAAAAAdwAAAAAAAIIAAAAAAAALAAAAAAAAggAAAAAAAAsAAAAAAACCAAAAAAAACwAAAAAAAIIAAAAAAAB3AAAAAAAABQAAAAAAAIIAAAAAAAAGAAAAAAIABgAAAAABAIIAAAAAAAAFAAAAAAAAggAAAAAAAHcAAAAABQCCAAAAAAAACwAAAAAAAIIAAAAAAAALAAAAAAAAggAAAAAAAAsAAAAAAACCAAAAAAAAdwAAAAAAAAUAAAAAAACCAAAAAAAABgAAAAABAAYAAAAAAgCCAAAAAAAABQAAAAAAAIIAAAAAAAB3AAAAAAAAggAAAAAAAAEAAAAAAgABAAAAAAMAAQAAAAAAAAEAAAAAAgABAAAAAAAAggAAAAAAAIIAAAAAAAAFAAAAAAAAggAAAAAAAAYAAAAAAgAGAAAAAAAAggAAAAAAAAUAAAAAAACCAAAAAAAAdwAAAAAAAIIAAAAAAAABAAAAAAEAAQAAAAABAAEAAAAAAAABAAAAAAIAAQAAAAABAAEAAAAAAwCCAAAAAAAABQAAAAAAAIIAAAAAAAAGAAAAAAAABgAAAAADAIIAAAAAAAAFAAAAAAAAggAAAAAAAHcAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAAQAAAAABAIIAAAAAAACCAAAAAAAAggAAAAAAAAUAAAAAAACCAAAAAAAABgAAAAABAAYAAAAAAACCAAAAAAAABQAAAAAAAIIAAAAAAAB3AAAAAAAAdwAAAAAAAHcAAAAAAAB3AAAAAAAAggAAAAAAAAEAAAAAAwCCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAAIAAAAAAAACAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAAABAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAAQAAAAAAAAEAAAAAAQABAAAAAAIAAQAAAAAAAAEAAAAAAwABAAAAAAEAAQAAAAACAAEAAAAAAwABAAAAAAIAAQAAAAAAAAEAAAAAAwABAAAAAAAAAQAAAAAAAAEAAAAAAQCCAAAAAAAAdwAAAAAAAAEAAAAAAgABAAAAAAAAAQAAAAADAAEAAAAAAQABAAAAAAMAAQAAAAABAAEAAAAAAAABAAAAAAEAAQAAAAADAAEAAAAAAAABAAAAAAAAAQAAAAABAAEAAAAAAAABAAAAAAAAAQAAAAAAAHcAAAAADAABAAAAAAIAAQAAAAACAAEAAAAAAgABAAAAAAIAAQAAAAABAAEAAAAAAAABAAAAAAEAAQAAAAAAAAEAAAAAAwABAAAAAAMAAQAAAAACAAEAAAAAAQABAAAAAAMAAQAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAAABAAAAAAMAAQAAAAAAAAEAAAAAAgCCAAAAAAAABAAAAAAAAA==
+          tiles: BgAAAAADAAYAAAAAAQAGAAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAAIABwAAAAACAIIAAAAAAAB3AAAAAAAAggAAAAAAAHcAAAAABQCCAAAAAAAAdwAAAAAAAHcAAAAACAAAAAAAAAAAAAAAAAAAAAYAAAAAAwAGAAAAAAEABgAAAAADAAYAAAAAAwAGAAAAAAMABgAAAAADAAcAAAAAAwCCAAAAAAAAdwAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAHcAAAAABgB3AAAAAAAAAAAAAAAAAAAAAAAAAAAGAAAAAAMABgAAAAACAAYAAAAAAQAGAAAAAAEABgAAAAABAAYAAAAAAgAHAAAAAAAAggAAAAAAAHcAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAdwAAAAACAHcAAAAACQAAAAAAAAAABgAAAAACAAYAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAAIABwAAAAAAAIIAAAAAAAB3AAAAAAsAggAAAAAAAIIAAAAAAACCAAAAAAAAdwAAAAAAAHcAAAAAAAB3AAAAAAAAdwAAAAAHAAYAAAAAAAAGAAAAAAMABgAAAAABAAYAAAAAAQAGAAAAAAEABgAAAAADAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAHcAAAAAAAAGAAAAAAIAggAAAAAAAAIAAAAAAAACAAAAAAAAggAAAAAAAAYAAAAAAACCAAAAAAAAdwAAAAADAIIAAAAAAAALAAAAAAAAggAAAAAAAAsAAAAAAACCAAAAAAAACwAAAAAAAIIAAAAAAAB3AAAAAAQABQAAAAAAAIIAAAAAAAAGAAAAAAIABgAAAAADAIIAAAAAAAAFAAAAAAAAggAAAAAAAHcAAAAAAACCAAAAAAAACwAAAAAAAIIAAAAAAAALAAAAAAAAggAAAAAAAAsAAAAAAACCAAAAAAAAdwAAAAAAAAUAAAAAAACCAAAAAAAABgAAAAACAAYAAAAAAACCAAAAAAAABQAAAAAAAIIAAAAAAAB3AAAAAAsAggAAAAAAAAEAAAAAAgABAAAAAAMAAQAAAAABAAEAAAAAAAABAAAAAAAAggAAAAAAAIIAAAAAAAAFAAAAAAAAggAAAAAAAAYAAAAAAAAGAAAAAAEAggAAAAAAAAUAAAAAAACCAAAAAAAAdwAAAAAAAIIAAAAAAAABAAAAAAMAAQAAAAAAAAEAAAAAAgABAAAAAAMAAQAAAAACAAEAAAAAAACCAAAAAAAABQAAAAAAAIIAAAAAAAAGAAAAAAEABgAAAAABAIIAAAAAAAAFAAAAAAAAggAAAAAAAHcAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAAQAAAAACAIIAAAAAAACCAAAAAAAAggAAAAAAAAUAAAAAAACCAAAAAAAABgAAAAACAAYAAAAAAwCCAAAAAAAABQAAAAAAAIIAAAAAAAB3AAAAAAAAdwAAAAAAAHcAAAAAAAB3AAAAAAAAggAAAAAAAAEAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAAIAAAAAAAACAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAAABAAAAAAIAggAAAAAAAIIAAAAAAACCAAAAAAAAAQAAAAABAAEAAAAAAQABAAAAAAIAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAACAAEAAAAAAQABAAAAAAEAAQAAAAAAAAEAAAAAAQABAAAAAAEAAQAAAAAAAAEAAAAAAwCCAAAAAAAAdwAAAAAAAAEAAAAAAgABAAAAAAEAAQAAAAABAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAwABAAAAAAIAAQAAAAABAAEAAAAAAgABAAAAAAMAAQAAAAADAAEAAAAAAwABAAAAAAMAAQAAAAADAHcAAAAADAABAAAAAAEAAQAAAAADAAEAAAAAAAABAAAAAAIAAQAAAAAAAAEAAAAAAAABAAAAAAEAAQAAAAABAAEAAAAAAwABAAAAAAEAAQAAAAABAAEAAAAAAQABAAAAAAIAAQAAAAABAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAAABAAAAAAAAAQAAAAACAAEAAAAAAQCCAAAAAAAABAAAAAAAAA==
           version: 7
         4,2:
           ind: 4,2
-          tiles: ggAAAAAAAAwAAAAAAAAMAAAAAAIADAAAAAACAAwAAAAAAgAMAAAAAAEADAAAAAADAAwAAAAAAgCCAAAAAAAAdwAAAAAAAIIAAAAAAAABAAAAAAEAAQAAAAACAAEAAAAAAgCCAAAAAAAABAAAAAAAAIIAAAAAAAAMAAAAAAEADAAAAAACAAwAAAAAAwAMAAAAAAAADAAAAAABAAwAAAAAAgAMAAAAAAMAggAAAAAAAHcAAAAAAACCAAAAAAAAAQAAAAADAAEAAAAAAwABAAAAAAEAggAAAAAAAAIAAAAAAAAMAAAAAAAADAAAAAACAAwAAAAAAQAMAAAAAAAADAAAAAACAAwAAAAAAQAMAAAAAAAADAAAAAAAAIIAAAAAAAB3AAAAAAAAggAAAAAAAAEAAAAAAwABAAAAAAIAAQAAAAACAAIAAAAAAAACAAAAAAAAggAAAAAAAAwAAAAAAwAMAAAAAAIADAAAAAAAAAwAAAAAAQAMAAAAAAIADAAAAAADAAwAAAAAAACCAAAAAAAAdwAAAAAAAIIAAAAAAAABAAAAAAMAAQAAAAADAAEAAAAAAQCCAAAAAAAAggAAAAAAAIIAAAAAAAAMAAAAAAIADAAAAAAAAAwAAAAAAwAMAAAAAAMADAAAAAADAAwAAAAAAAAMAAAAAAIAggAAAAAAAHcAAAAAAACCAAAAAAAAAQAAAAABAAEAAAAAAAABAAAAAAIAggAAAAAAAAYAAAAAAwCCAAAAAAAAggAAAAAAAAwAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAAB3AAAAAAYAggAAAAAAAAEAAAAAAgABAAAAAAEAAQAAAAADAIIAAAAAAAAGAAAAAAMAggAAAAAAAAwAAAAAAQAMAAAAAAMADAAAAAADAIIAAAAAAAB3AAAAAAAAdwAAAAAIAHcAAAAAAAB3AAAAAAAAdwAAAAAAAIIAAAAAAAABAAAAAAMAAQAAAAAAAAEAAAAAAQCCAAAAAAAABgAAAAAAAAwAAAAAAwAMAAAAAAIADAAAAAAAAAwAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAAQAAAAAAAAEAAAAAAwABAAAAAAMAggAAAAAAAAYAAAAAAQAMAAAAAAEADAAAAAABAAwAAAAAAwAMAAAAAAEADAAAAAAAAAEAAAAAAQABAAAAAAIAAQAAAAABAAEAAAAAAgABAAAAAAEAggAAAAAAAAEAAAAAAwABAAAAAAMAAQAAAAACAIIAAAAAAAAGAAAAAAAADAAAAAABAAwAAAAAAgAMAAAAAAAADAAAAAAAAIIAAAAAAAABAAAAAAAAAQAAAAADAAEAAAAAAACCAAAAAAAAAQAAAAADAAIAAAAAAAABAAAAAAIAAQAAAAABAAEAAAAAAQCCAAAAAAAABgAAAAABAIIAAAAAAACCAAAAAAAADAAAAAACAIIAAAAAAACCAAAAAAAAAQAAAAAAAAEAAAAAAQABAAAAAAAAAQAAAAAAAAEAAAAAAQACAAAAAAAAAQAAAAACAAEAAAAAAAABAAAAAAAAAgAAAAAAAAYAAAAAAQAMAAAAAAMADAAAAAADAAwAAAAAAQAMAAAAAAIAggAAAAAAAAEAAAAAAwABAAAAAAAAAQAAAAACAAEAAAAAAgABAAAAAAIAggAAAAAAAAEAAAAAAgABAAAAAAAAAQAAAAABAAIAAAAAAAAGAAAAAAIADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAABAIIAAAAAAACCAAAAAAAAggAAAAAAAAEAAAAAAgCCAAAAAAAAggAAAAAAAIIAAAAAAAABAAAAAAEAAQAAAAAAAAEAAAAAAwCCAAAAAAAABgAAAAAAAAwAAAAAAwAMAAAAAAEADAAAAAAAAAwAAAAAAACCAAAAAAAAAQAAAAABAAEAAAAAAQABAAAAAAMAAQAAAAACAAEAAAAAAQCCAAAAAAAAAQAAAAADAAEAAAAAAwABAAAAAAAAggAAAAAAAAYAAAAAAAAMAAAAAAMADAAAAAAAAAwAAAAAAwAMAAAAAAEAAgAAAAAAAAEAAAAAAQABAAAAAAEAAQAAAAACAAEAAAAAAQABAAAAAAIAAgAAAAAAAAEAAAAAAwABAAAAAAMAAQAAAAABAIIAAAAAAACCAAAAAAAADAAAAAAAAAwAAAAAAQAMAAAAAAIADAAAAAAAAAIAAAAAAAABAAAAAAAAAQAAAAACAAEAAAAAAAABAAAAAAIAAQAAAAAAAAIAAAAAAAABAAAAAAEAAQAAAAADAAEAAAAAAQCCAAAAAAAAdwAAAAABAA==
+          tiles: ggAAAAAAAAwAAAAAAwAMAAAAAAAADAAAAAABAAwAAAAAAAAMAAAAAAEADAAAAAAAAAwAAAAAAwCCAAAAAAAAdwAAAAAHAIIAAAAAAAABAAAAAAEAAQAAAAADAAEAAAAAAQCCAAAAAAAABAAAAAAAAIIAAAAAAAAMAAAAAAMADAAAAAADAAwAAAAAAwAMAAAAAAMADAAAAAACAAwAAAAAAQAMAAAAAAMAggAAAAAAAHcAAAAABQCCAAAAAAAAAQAAAAADAAEAAAAAAwABAAAAAAMAggAAAAAAAAIAAAAAAAAMAAAAAAEADAAAAAACAAwAAAAAAgAMAAAAAAAADAAAAAADAAwAAAAAAwAMAAAAAAMADAAAAAADAIIAAAAAAAB3AAAAAAAAggAAAAAAAAEAAAAAAgABAAAAAAAAAQAAAAAAAAIAAAAAAAACAAAAAAAAggAAAAAAAAwAAAAAAAAMAAAAAAIADAAAAAADAAwAAAAAAwAMAAAAAAEADAAAAAAAAAwAAAAAAwCCAAAAAAAAdwAAAAAAAIIAAAAAAAABAAAAAAEAAQAAAAABAAEAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAAAMAAAAAAEADAAAAAACAAwAAAAAAgAMAAAAAAIADAAAAAACAAwAAAAAAwAMAAAAAAAAggAAAAAAAHcAAAAACQCCAAAAAAAAAQAAAAABAAEAAAAAAgABAAAAAAIAggAAAAAAAAYAAAAAAgCCAAAAAAAAggAAAAAAAAwAAAAAAwCCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAAB3AAAAAAIAggAAAAAAAAEAAAAAAwABAAAAAAEAAQAAAAABAIIAAAAAAAAGAAAAAAEAggAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAADAIIAAAAAAAB3AAAAAAAAdwAAAAAAAHcAAAAAAAB3AAAAAAAAdwAAAAAAAIIAAAAAAAABAAAAAAIAAQAAAAACAAEAAAAAAQCCAAAAAAAABgAAAAAAAAwAAAAAAAAMAAAAAAMADAAAAAACAAwAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAAQAAAAADAAEAAAAAAQABAAAAAAMAggAAAAAAAAYAAAAAAQAMAAAAAAEADAAAAAABAAwAAAAAAQAMAAAAAAAADAAAAAABAAEAAAAAAAABAAAAAAMAAQAAAAABAAEAAAAAAwABAAAAAAMAggAAAAAAAAEAAAAAAQABAAAAAAMAAQAAAAABAIIAAAAAAAAGAAAAAAEADAAAAAACAAwAAAAAAgAMAAAAAAMADAAAAAADAIIAAAAAAAABAAAAAAAAAQAAAAACAAEAAAAAAwCCAAAAAAAAAQAAAAACAAIAAAAAAAABAAAAAAIAAQAAAAAAAAEAAAAAAwCCAAAAAAAABgAAAAADAIIAAAAAAACCAAAAAAAADAAAAAADAIIAAAAAAACCAAAAAAAAAQAAAAADAAEAAAAAAgABAAAAAAEAAQAAAAADAAEAAAAAAQACAAAAAAAAAQAAAAADAAEAAAAAAAABAAAAAAEAAgAAAAAAAAYAAAAAAQAMAAAAAAMADAAAAAADAAwAAAAAAwAMAAAAAAMAggAAAAAAAAEAAAAAAgABAAAAAAIAAQAAAAAAAAEAAAAAAwABAAAAAAMAggAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAABAAIAAAAAAAAGAAAAAAMADAAAAAAAAAwAAAAAAQAMAAAAAAAADAAAAAADAIIAAAAAAACCAAAAAAAAggAAAAAAAAEAAAAAAQCCAAAAAAAAggAAAAAAAIIAAAAAAAABAAAAAAMAAQAAAAACAAEAAAAAAACCAAAAAAAABgAAAAAAAAwAAAAAAgAMAAAAAAEADAAAAAADAAwAAAAAAgCCAAAAAAAAAQAAAAAAAAEAAAAAAwABAAAAAAAAAQAAAAAAAAEAAAAAAwCCAAAAAAAAAQAAAAAAAAEAAAAAAgABAAAAAAEAggAAAAAAAAYAAAAAAQAMAAAAAAMADAAAAAADAAwAAAAAAgAMAAAAAAIAAgAAAAAAAAEAAAAAAgABAAAAAAIAAQAAAAABAAEAAAAAAAABAAAAAAAAAgAAAAAAAAEAAAAAAwABAAAAAAAAAQAAAAACAIIAAAAAAACCAAAAAAAADAAAAAABAAwAAAAAAAAMAAAAAAMADAAAAAACAAIAAAAAAAABAAAAAAEAAQAAAAADAAEAAAAAAgABAAAAAAAAAQAAAAABAAIAAAAAAAABAAAAAAEAAQAAAAADAAEAAAAAAgCCAAAAAAAAdwAAAAAAAA==
           version: 7
         4,3:
           ind: 4,3
-          tiles: DAAAAAAAAAwAAAAAAgAMAAAAAAMADAAAAAAAAIIAAAAAAAABAAAAAAEAAQAAAAABAAEAAAAAAQABAAAAAAIAAQAAAAACAIIAAAAAAAABAAAAAAMAAQAAAAACAAEAAAAAAwABAAAAAAIAggAAAAAAAAwAAAAAAwAMAAAAAAMADAAAAAACAAwAAAAAAgCCAAAAAAAAAQAAAAABAAEAAAAAAwABAAAAAAMAAQAAAAADAAEAAAAAAgCCAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAggAAAAAAAHcAAAAAAACCAAAAAAAAggAAAAAAAAwAAAAAAwCCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAAEAAAAAAgABAAAAAAIAAQAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAABAIIAAAAAAAB3AAAAAAAAdwAAAAAAAHcAAAAAAAB3AAAAAAAAdwAAAAAAAIIAAAAAAAABAAAAAAEAAQAAAAADAAEAAAAAAwCCAAAAAAAABgAAAAAAAIIAAAAAAAAMAAAAAAAADAAAAAABAAwAAAAAAQCCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAAQAAAAABAAEAAAAAAAABAAAAAAMAAgAAAAAAAAYAAAAAAgAMAAAAAAAADAAAAAADAAwAAAAAAgAMAAAAAAAAggAAAAAAAAwAAAAAAQAMAAAAAAAADAAAAAABAAwAAAAAAgAMAAAAAAAAggAAAAAAAAEAAAAAAQABAAAAAAAAAQAAAAAAAAIAAAAAAAAGAAAAAAIADAAAAAAAAAwAAAAAAwAMAAAAAAEADAAAAAAAAAwAAAAAAgAMAAAAAAIADAAAAAABAAwAAAAAAAAMAAAAAAIADAAAAAAAAIIAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAgACAAAAAAAABgAAAAADAAwAAAAAAgAMAAAAAAAADAAAAAADAAwAAAAAAgCCAAAAAAAADAAAAAACAAwAAAAAAgAMAAAAAAEADAAAAAAAAAwAAAAAAgAMAAAAAAEAAQAAAAABAAEAAAAAAAABAAAAAAAAggAAAAAAAAYAAAAAAAAMAAAAAAAADAAAAAACAAwAAAAAAwAMAAAAAAAAggAAAAAAAAwAAAAAAAAMAAAAAAMADAAAAAAAAAwAAAAAAQAMAAAAAAIADAAAAAAAAAEAAAAAAAABAAAAAAEAAQAAAAABAIIAAAAAAACCAAAAAAAADAAAAAACAAwAAAAAAQAMAAAAAAEADAAAAAABAAwAAAAAAgAMAAAAAAMADAAAAAACAAwAAAAAAgAMAAAAAAAADAAAAAACAIIAAAAAAAABAAAAAAAAAQAAAAABAAEAAAAAAgABAAAAAAIAAQAAAAACAAwAAAAAAgAMAAAAAAEADAAAAAACAAwAAAAAAQCCAAAAAAAADAAAAAADAAwAAAAAAgAMAAAAAAIADAAAAAABAAwAAAAAAQCCAAAAAAAAAQAAAAADAAEAAAAAAgABAAAAAAEAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAIIAAAAAAAB3AAAAAAAAdwAAAAAAAHcAAAAAAAB3AAAAAAAAdwAAAAAAAHcAAAAAAAB3AAAAAAAAdwAAAAAAAHcAAAAAAAB3AAAAAAAAdwAAAAAEAIIAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAQCCAAAAAAAAdwAAAAAAAHcAAAAAAAB3AAAAAAAAdwAAAAAAAHcAAAAAAAB3AAAAAAAAdwAAAAAAAHcAAAAAAAB3AAAAAAAAggAAAAAAAIIAAAAAAAABAAAAAAMAAQAAAAABAAEAAAAAAQABAAAAAAEAggAAAAAAAHcAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAHcAAAAAAAB3AAAAAAAAdwAAAAACAHcAAAAAAAB3AAAAAAAAggAAAAAAAAEAAAAAAAABAAAAAAMAAQAAAAAAAIIAAAAAAAB3AAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAdwAAAAAAAHcAAAAAAAB3AAAAAAAAdwAAAAAAAIIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAACCAAAAAAAAdwAAAAAAAA==
+          tiles: DAAAAAACAAwAAAAAAwAMAAAAAAAADAAAAAAAAIIAAAAAAAABAAAAAAAAAQAAAAADAAEAAAAAAAABAAAAAAMAAQAAAAADAIIAAAAAAAABAAAAAAIAAQAAAAAAAAEAAAAAAQABAAAAAAMAggAAAAAAAAwAAAAAAQAMAAAAAAMADAAAAAAAAAwAAAAAAACCAAAAAAAAAQAAAAACAAEAAAAAAAABAAAAAAIAAQAAAAABAAEAAAAAAgCCAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAggAAAAAAAHcAAAAAAACCAAAAAAAAggAAAAAAAAwAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAAEAAAAAAQABAAAAAAAAAQAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAAwAAAAAAgAMAAAAAAAADAAAAAACAIIAAAAAAAB3AAAAAAAAdwAAAAAAAHcAAAAAAAB3AAAAAAAAdwAAAAAAAIIAAAAAAAABAAAAAAAAAQAAAAABAAEAAAAAAACCAAAAAAAABgAAAAAAAIIAAAAAAAAMAAAAAAIADAAAAAAAAAwAAAAAAQCCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAAQAAAAABAAEAAAAAAgABAAAAAAEAAgAAAAAAAAYAAAAAAgAMAAAAAAMADAAAAAACAAwAAAAAAQAMAAAAAAAAggAAAAAAAAwAAAAAAwAMAAAAAAEADAAAAAACAAwAAAAAAQAMAAAAAAEAggAAAAAAAAEAAAAAAgABAAAAAAAAAQAAAAACAAIAAAAAAAAGAAAAAAEADAAAAAAAAAwAAAAAAwAMAAAAAAIADAAAAAAAAAwAAAAAAwAMAAAAAAIADAAAAAACAAwAAAAAAwAMAAAAAAMADAAAAAACAIIAAAAAAAABAAAAAAIAAQAAAAAAAAEAAAAAAAACAAAAAAAABgAAAAAAAAwAAAAAAQAMAAAAAAEADAAAAAACAAwAAAAAAACCAAAAAAAADAAAAAACAAwAAAAAAwAMAAAAAAIADAAAAAAAAAwAAAAAAQAMAAAAAAMAAQAAAAACAAEAAAAAAgABAAAAAAEAggAAAAAAAAYAAAAAAwAMAAAAAAEADAAAAAABAAwAAAAAAAAMAAAAAAIAggAAAAAAAAwAAAAAAwAMAAAAAAEADAAAAAADAAwAAAAAAAAMAAAAAAMADAAAAAADAAEAAAAAAgABAAAAAAAAAQAAAAAAAIIAAAAAAACCAAAAAAAADAAAAAABAAwAAAAAAQAMAAAAAAAADAAAAAACAAwAAAAAAwAMAAAAAAEADAAAAAACAAwAAAAAAgAMAAAAAAIADAAAAAACAIIAAAAAAAABAAAAAAMAAQAAAAACAAEAAAAAAwABAAAAAAAAAQAAAAAAAAwAAAAAAAAMAAAAAAEADAAAAAABAAwAAAAAAgCCAAAAAAAADAAAAAACAAwAAAAAAAAMAAAAAAEADAAAAAAAAAwAAAAAAQCCAAAAAAAAAQAAAAABAAEAAAAAAAABAAAAAAIAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAAEAAAAAAwABAAAAAAMAAQAAAAAAAIIAAAAAAAB3AAAAAAAAdwAAAAAAAHcAAAAAAAB3AAAAAAAAdwAAAAAAAHcAAAAAAAB3AAAAAAAAdwAAAAAAAHcAAAAAAAB3AAAAAAAAdwAAAAAAAIIAAAAAAAABAAAAAAEAAQAAAAABAAEAAAAAAACCAAAAAAAAdwAAAAABAHcAAAAAAAB3AAAAAAAAdwAAAAAAAHcAAAAAAAB3AAAAAAAAdwAAAAAAAHcAAAAAAAB3AAAAAAAAggAAAAAAAIIAAAAAAAABAAAAAAAAAQAAAAACAAEAAAAAAwABAAAAAAMAggAAAAAAAHcAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAHcAAAAAAAB3AAAAAAAAdwAAAAAAAHcAAAAADAB3AAAAAAAAggAAAAAAAAEAAAAAAQABAAAAAAAAAQAAAAABAIIAAAAAAAB3AAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAdwAAAAAAAHcAAAAAAAB3AAAAAAAAdwAAAAAAAIIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAACCAAAAAAAAdwAAAAAAAA==
           version: 7
         4,4:
           ind: 4,4
-          tiles: dwAAAAAAAHcAAAAACgCCAAAAAAAAdwAAAAAAAHcAAAAAAwB3AAAAAAAAdwAAAAAAAHcAAAAAAAB3AAAAAAAAggAAAAAAAIIAAAAAAAABAAAAAAEAAQAAAAADAAEAAAAAAwCCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAAQAAAAADAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAAABAAAAAAIAAQAAAAABAAEAAAAAAQABAAAAAAIAAQAAAAADAIIAAAAAAAABAAAAAAEAAQAAAAAAAAEAAAAAAQABAAAAAAEAAQAAAAADAAEAAAAAAQABAAAAAAMAAQAAAAADAAIAAAAAAAABAAAAAAMAAQAAAAADAAEAAAAAAAABAAAAAAIAAQAAAAABAAEAAAAAAgABAAAAAAAAAQAAAAACAAEAAAAAAgABAAAAAAAAAQAAAAAAAAEAAAAAAwABAAAAAAAAAQAAAAACAAEAAAAAAAACAAAAAAAAAQAAAAAAAAEAAAAAAgABAAAAAAAAggAAAAAAAAEAAAAAAgABAAAAAAAAAQAAAAADAAEAAAAAAAABAAAAAAEAAQAAAAADAAEAAAAAAgABAAAAAAEAAQAAAAAAAAEAAAAAAAABAAAAAAMAAgAAAAAAAAEAAAAAAwABAAAAAAEAAQAAAAACAAEAAAAAAwABAAAAAAAAAQAAAAAAAAEAAAAAAgCCAAAAAAAAggAAAAAAAAEAAAAAAACCAAAAAAAAggAAAAAAAAYAAAAAAgCCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAEAAQAAAAABAAEAAAAAAwCCAAAAAAAAggAAAAAAAHcAAAAAAAB3AAAAAAAAdwAAAAAAAIIAAAAAAAAGAAAAAAMAggAAAAAAAIIAAAAAAAB3AAAAAAAAggAAAAAAAIIAAAAAAAABAAAAAAMAAQAAAAADAAEAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAAB3AAAAAAAAdwAAAAAAAIIAAAAAAACCAAAAAAAABgAAAAAAAIIAAAAAAACCAAAAAAAAdwAAAAAAAHcAAAAABQCCAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAggAAAAAAAHcAAAAAAACCAAAAAAAAdwAAAAAAAIIAAAAAAACCAAAAAAAABgAAAAABAAYAAAAAAgAGAAAAAAEAggAAAAAAAIIAAAAAAAB3AAAAAAAAggAAAAAAAAEAAAAAAQABAAAAAAAAAQAAAAABAIIAAAAAAAB3AAAAAAAAggAAAAAAAHcAAAAAAACCAAAAAAAAggAAAAAAAAYAAAAAAwAGAAAAAAAABgAAAAADAAYAAAAAAQCCAAAAAAAAdwAAAAAAAIIAAAAAAAABAAAAAAAAAQAAAAADAAEAAAAAAwCCAAAAAAAAdwAAAAAAAIIAAAAAAAB3AAAAAAAAggAAAAAAAIIAAAAAAAAGAAAAAAMABgAAAAAAAAYAAAAAAgAGAAAAAAAAggAAAAAAAHcAAAAAAACCAAAAAAAAAQAAAAACAAEAAAAAAwABAAAAAAMAggAAAAAAAHcAAAAACgCCAAAAAAAAdwAAAAAAAHcAAAAAAACCAAAAAAAAggAAAAAAAAkAAAAAAAAJAAAAAAAACQAAAAAAAIIAAAAAAAB3AAAAAAAAggAAAAAAAAEAAAAAAwABAAAAAAIAAQAAAAABAIIAAAAAAAB3AAAAAAAAggAAAAAAAHcAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAAAJAAAAAAAACQAAAAAAAAkAAAAAAACCAAAAAAAAdwAAAAAAAIIAAAAAAAABAAAAAAEAAQAAAAADAAEAAAAAAACCAAAAAAAAdwAAAAAAAIIAAAAAAAB3AAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAAQAAAAABAAEAAAAAAgABAAAAAAIAAQAAAAAAAHcAAAAAAACCAAAAAAAAdwAAAAAAAAQAAAAAAACCAAAAAAAAggAAAAAAAHcAAAAAAAB3AAAAAAAAdwAAAAAAAHcAAAAABwB3AAAAAAAAggAAAAAAAAEAAAAAAAABAAAAAAIAAQAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAHcAAAAACwAEAAAAAAAAggAAAAAAAHcAAAAABAB3AAAAAAAAdwAAAAAAAAIAAAAAAAACAAAAAAAAdwAAAAAAAAIAAAAAAAABAAAAAAAAAQAAAAADAAEAAAAAAgABAAAAAAIAggAAAAAAAA==
+          tiles: dwAAAAAAAHcAAAAAAACCAAAAAAAAdwAAAAAAAHcAAAAAAAB3AAAAAAAAdwAAAAAAAHcAAAAAAAB3AAAAAAsAggAAAAAAAIIAAAAAAAABAAAAAAEAAQAAAAADAAEAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAAQAAAAABAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAAABAAAAAAIAAQAAAAABAAEAAAAAAwABAAAAAAEAAQAAAAADAIIAAAAAAAABAAAAAAMAAQAAAAABAAEAAAAAAwABAAAAAAAAAQAAAAADAAEAAAAAAQABAAAAAAIAAQAAAAADAAIAAAAAAAABAAAAAAMAAQAAAAADAAEAAAAAAgABAAAAAAMAAQAAAAACAAEAAAAAAQABAAAAAAAAAQAAAAADAAEAAAAAAwABAAAAAAIAAQAAAAACAAEAAAAAAgABAAAAAAMAAQAAAAABAAEAAAAAAgACAAAAAAAAAQAAAAABAAEAAAAAAwABAAAAAAIAggAAAAAAAAEAAAAAAgABAAAAAAIAAQAAAAADAAEAAAAAAwABAAAAAAAAAQAAAAACAAEAAAAAAQABAAAAAAEAAQAAAAABAAEAAAAAAAABAAAAAAAAAgAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAABAAEAAAAAAgABAAAAAAAAAQAAAAAAAAEAAAAAAwCCAAAAAAAAggAAAAAAAAEAAAAAAQCCAAAAAAAAggAAAAAAAAYAAAAAAQCCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAAQAAAAABAAEAAAAAAgABAAAAAAAAAQAAAAACAAEAAAAAAgCCAAAAAAAAggAAAAAAAHcAAAAAAAB3AAAAAAQAdwAAAAAAAIIAAAAAAAAGAAAAAAMAggAAAAAAAIIAAAAAAAB3AAAAAAAAggAAAAAAAIIAAAAAAAABAAAAAAMAAQAAAAAAAAEAAAAAAQCCAAAAAAAAggAAAAAAAIIAAAAAAAB3AAAAAAQAdwAAAAAAAIIAAAAAAACCAAAAAAAABgAAAAABAIIAAAAAAACCAAAAAAAAdwAAAAAAAHcAAAAAAACCAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAggAAAAAAAHcAAAAAAACCAAAAAAAAdwAAAAAAAIIAAAAAAACCAAAAAAAABgAAAAABAAYAAAAAAQAGAAAAAAIAggAAAAAAAIIAAAAAAAB3AAAAAAQAggAAAAAAAAEAAAAAAAABAAAAAAIAAQAAAAACAIIAAAAAAAB3AAAAAAAAggAAAAAAAHcAAAAAAACCAAAAAAAAggAAAAAAAAYAAAAAAAAGAAAAAAMABgAAAAADAAYAAAAAAwCCAAAAAAAAdwAAAAAAAIIAAAAAAAABAAAAAAMAAQAAAAACAAEAAAAAAQCCAAAAAAAAdwAAAAAAAIIAAAAAAAB3AAAAAAAAggAAAAAAAIIAAAAAAAAGAAAAAAIABgAAAAACAAYAAAAAAgAGAAAAAAIAggAAAAAAAHcAAAAAAACCAAAAAAAAAQAAAAAAAAEAAAAAAQABAAAAAAEAggAAAAAAAHcAAAAAAACCAAAAAAAAdwAAAAAAAHcAAAAAAACCAAAAAAAAggAAAAAAAAkAAAAAAAAJAAAAAAAACQAAAAAAAIIAAAAAAAB3AAAAAAAAggAAAAAAAAEAAAAAAQABAAAAAAAAAQAAAAADAIIAAAAAAAB3AAAAAAAAggAAAAAAAHcAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAAAJAAAAAAAACQAAAAAAAAkAAAAAAACCAAAAAAAAdwAAAAAAAIIAAAAAAAABAAAAAAMAAQAAAAAAAAEAAAAAAwCCAAAAAAAAdwAAAAAAAIIAAAAAAAB3AAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAAQAAAAACAAEAAAAAAQABAAAAAAMAAQAAAAACAHcAAAAAAACCAAAAAAAAdwAAAAAFAAQAAAAAAACCAAAAAAAAggAAAAAAAHcAAAAAAAB3AAAAAAAAdwAAAAAAAHcAAAAAAwB3AAAAAAAAggAAAAAAAAEAAAAAAQABAAAAAAMAAQAAAAACAIIAAAAAAACCAAAAAAAAggAAAAAAAHcAAAAAAAAEAAAAAAAAggAAAAAAAHcAAAAAAAB3AAAAAAAAdwAAAAAEAAIAAAAAAAACAAAAAAAAdwAAAAAAAAIAAAAAAAABAAAAAAEAAQAAAAADAAEAAAAAAwABAAAAAAEAggAAAAAAAA==
           version: 7
         4,5:
           ind: 4,5
-          tiles: dwAAAAADAHcAAAAAAAAEAAAAAAAAdwAAAAAAAHcAAAAAAAADAAAAAAMAAwAAAAACAAMAAAAAAwACAAAAAAAAggAAAAAAAIIAAAAAAAABAAAAAAAAAQAAAAABAAEAAAAAAQABAAAAAAAAggAAAAAAAHcAAAAAAAB3AAAAAAAABAAAAAAAAIIAAAAAAAB3AAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAHcAAAAAAACCAAAAAAAAAQAAAAACAAEAAAAAAAABAAAAAAAAAQAAAAADAAEAAAAAAwB3AAAAAAAAdwAAAAAAAHcAAAAAAACCAAAAAAAAggAAAAAAAAMAAAAAAAACAAAAAAAAAgAAAAAAAHcAAAAAAAB3AAAAAAAAggAAAAAAAAEAAAAAAwABAAAAAAMAAQAAAAACAAEAAAAAAQCCAAAAAAAAdwAAAAAAAHcAAAAAAAB3AAAAAAAAggAAAAAAAHcAAAAAAAB3AAAAAAAAAgAAAAAAAHcAAAAAAAB3AAAAAAkAdwAAAAAAAIIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAACCAAAAAAAAggAAAAAAAHcAAAAACQB3AAAAAAYAdwAAAAAAAIIAAAAAAAB3AAAAAAAAdwAAAAABAHcAAAAABwB3AAAAAAAAdwAAAAAAAHcAAAAAAACCAAAAAAAAAQAAAAADAAEAAAAAAwABAAAAAAIAAgAAAAAAAAEAAAAAAwB3AAAAAAwAdwAAAAAAAHcAAAAAAwCCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAAEAAAAAAQABAAAAAAIAAQAAAAADAAIAAAAAAAABAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAAMAAAAAAQADAAAAAAEAAwAAAAACAAMAAAAAAQACAAAAAAAAggAAAAAAAAEAAAAAAwABAAAAAAMAAQAAAAAAAAEAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAAABAAAAAAIAAQAAAAACAAEAAAAAAgABAAAAAAEAAQAAAAAAAAEAAAAAAgABAAAAAAMAAQAAAAAAAAEAAAAAAQABAAAAAAIAAQAAAAAAAAEAAAAAAwABAAAAAAMAAQAAAAACAAEAAAAAAwABAAAAAAMAAQAAAAAAAIIAAAAAAACCAAAAAAAAAQAAAAAAAIIAAAAAAACCAAAAAAAAAQAAAAACAAEAAAAAAgABAAAAAAIAAQAAAAAAAAEAAAAAAQAKAAAAAAIAAQAAAAABAAEAAAAAAwCCAAAAAAAAAQAAAAACAAEAAAAAAwCCAAAAAAAAggAAAAAAAAEAAAAAAwCCAAAAAAAAggAAAAAAAAEAAAAAAAABAAAAAAAAggAAAAAAAAEAAAAAAgABAAAAAAAACgAAAAABAAEAAAAAAAABAAAAAAMAAQAAAAADAIIAAAAAAAABAAAAAAEAggAAAAAAAIIAAAAAAAABAAAAAAEAggAAAAAAAIIAAAAAAAABAAAAAAMAAQAAAAAAAAIAAAAAAAABAAAAAAAAAQAAAAABAAoAAAAAAwABAAAAAAMAAQAAAAAAAAEAAAAAAACCAAAAAAAAAQAAAAADAAEAAAAAAQABAAAAAAMAAQAAAAABAAEAAAAAAwABAAAAAAAAAQAAAAADAAEAAAAAAgACAAAAAAAAAQAAAAABAAEAAAAAAQABAAAAAAIAAQAAAAADAAEAAAAAAgCCAAAAAAAAggAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAIIAAAAAAAACAAAAAAAAAwAAAAAAAAMAAAAAAQACAAAAAAAAggAAAAAAAAEAAAAAAwABAAAAAAEAAQAAAAACAAEAAAAAAQCCAAAAAAAAggAAAAAAAIIAAAAAAAABAAAAAAAAAQAAAAABAAEAAAAAAACCAAAAAAAAggAAAAAAAAMAAAAAAQCCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAAQAAAAACAAEAAAAAAAABAAAAAAMAggAAAAAAAAYAAAAAAACCAAAAAAAAAgAAAAAAAIIAAAAAAAACAAAAAAAAggAAAAAAAAMAAAAAAwACAAAAAAAAAwAAAAAAAIIAAAAAAAB3AAAAAAAAggAAAAAAAAEAAAAAAAABAAAAAAEAAQAAAAACAAYAAAAAAAAGAAAAAAIAggAAAAAAAAIAAAAAAAADAAAAAAEAAgAAAAAAAIIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAACCAAAAAAAAdwAAAAABAIIAAAAAAAABAAAAAAEAAQAAAAACAAEAAAAAAwCCAAAAAAAABgAAAAAAAA==
+          tiles: dwAAAAAAAHcAAAAAAAAEAAAAAAAAdwAAAAAAAHcAAAAAAAADAAAAAAMAAwAAAAAAAAMAAAAAAQACAAAAAAAAggAAAAAAAIIAAAAAAAABAAAAAAEAAQAAAAADAAEAAAAAAgABAAAAAAAAggAAAAAAAHcAAAAAAAB3AAAAAAAABAAAAAAAAIIAAAAAAAB3AAAAAAYAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAHcAAAAACgCCAAAAAAAAAQAAAAADAAEAAAAAAgABAAAAAAMAAQAAAAAAAAEAAAAAAAB3AAAAAAYAdwAAAAAAAHcAAAAAAACCAAAAAAAAggAAAAAAAAMAAAAAAgACAAAAAAAAAgAAAAAAAHcAAAAAAgB3AAAAAAAAggAAAAAAAAEAAAAAAgABAAAAAAAAAQAAAAACAAEAAAAAAgCCAAAAAAAAdwAAAAAAAHcAAAAAAAB3AAAAAAAAggAAAAAAAHcAAAAAAAB3AAAAAAAAAgAAAAAAAHcAAAAABwB3AAAAAAgAdwAAAAABAIIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAACCAAAAAAAAggAAAAAAAHcAAAAAAAB3AAAAAAAAdwAAAAAAAIIAAAAAAAB3AAAAAAAAdwAAAAAAAHcAAAAAAAB3AAAAAAAAdwAAAAADAHcAAAAAAgCCAAAAAAAAAQAAAAACAAEAAAAAAAABAAAAAAAAAgAAAAAAAAEAAAAAAAB3AAAAAAoAdwAAAAAAAHcAAAAABgCCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAAEAAAAAAQABAAAAAAAAAQAAAAAAAAIAAAAAAAABAAAAAAEAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAAMAAAAAAAADAAAAAAMAAwAAAAACAAMAAAAAAQACAAAAAAAAggAAAAAAAAEAAAAAAwABAAAAAAAAAQAAAAABAAEAAAAAAgCCAAAAAAAAggAAAAAAAIIAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAwABAAAAAAMAAQAAAAADAAEAAAAAAQABAAAAAAAAAQAAAAABAAEAAAAAAwABAAAAAAMAAQAAAAADAAEAAAAAAAABAAAAAAIAAQAAAAACAAEAAAAAAgABAAAAAAIAAQAAAAADAIIAAAAAAACCAAAAAAAAAQAAAAADAIIAAAAAAACCAAAAAAAAAQAAAAACAAEAAAAAAAABAAAAAAMAAQAAAAABAAEAAAAAAAAKAAAAAAEAAQAAAAADAAEAAAAAAQCCAAAAAAAAAQAAAAAAAAEAAAAAAQCCAAAAAAAAggAAAAAAAAEAAAAAAgCCAAAAAAAAggAAAAAAAAEAAAAAAAABAAAAAAIAggAAAAAAAAEAAAAAAgABAAAAAAEACgAAAAAAAAEAAAAAAAABAAAAAAEAAQAAAAADAIIAAAAAAAABAAAAAAIAggAAAAAAAIIAAAAAAAABAAAAAAIAggAAAAAAAIIAAAAAAAABAAAAAAAAAQAAAAABAAIAAAAAAAABAAAAAAEAAQAAAAADAAoAAAAAAgABAAAAAAEAAQAAAAACAAEAAAAAAgCCAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAIAAQAAAAACAAEAAAAAAgABAAAAAAAAAQAAAAADAAEAAAAAAQACAAAAAAAAAQAAAAADAAEAAAAAAQABAAAAAAMAAQAAAAACAAEAAAAAAgCCAAAAAAAAggAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAIIAAAAAAAACAAAAAAAAAwAAAAABAAMAAAAAAgACAAAAAAAAggAAAAAAAAEAAAAAAgABAAAAAAMAAQAAAAAAAAEAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAAABAAAAAAMAAQAAAAACAAEAAAAAAgCCAAAAAAAAggAAAAAAAAMAAAAAAQCCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAAQAAAAACAAEAAAAAAAABAAAAAAMAggAAAAAAAAYAAAAAAgCCAAAAAAAAAgAAAAAAAIIAAAAAAAACAAAAAAAAggAAAAAAAAMAAAAAAwACAAAAAAAAAwAAAAADAIIAAAAAAAB3AAAAAAAAggAAAAAAAAEAAAAAAwABAAAAAAMAAQAAAAAAAAYAAAAAAAAGAAAAAAAAggAAAAAAAAIAAAAAAAADAAAAAAMAAgAAAAAAAIIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAACCAAAAAAAAdwAAAAAAAIIAAAAAAAABAAAAAAMAAQAAAAAAAAEAAAAAAgCCAAAAAAAABgAAAAACAA==
           version: 7
         4,6:
           ind: 4,6
-          tiles: AwAAAAAAAAIAAAAAAACCAAAAAAAAAgAAAAAAAIIAAAAAAAAEAAAAAAAAggAAAAAAAAQAAAAAAACCAAAAAAAAdwAAAAAAAIIAAAAAAAABAAAAAAEAAQAAAAACAAEAAAAAAACCAAAAAAAABgAAAAAAAAQAAAAAAAACAAAAAAAAAwAAAAABAAIAAAAAAACCAAAAAAAABAAAAAAAAIIAAAAAAAAEAAAAAAAAggAAAAAAAHcAAAAAAACCAAAAAAAAAQAAAAACAAEAAAAAAQABAAAAAAMAggAAAAAAAAYAAAAAAgCCAAAAAAAAAgAAAAAAAIIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAACCAAAAAAAABAAAAAAAAIIAAAAAAAB3AAAAAAAAggAAAAAAAAEAAAAAAgABAAAAAAEAAQAAAAADAIIAAAAAAACCAAAAAAAAggAAAAAAAAIAAAAAAACCAAAAAAAAAwAAAAABAIIAAAAAAAADAAAAAAMAggAAAAAAAAQAAAAAAACCAAAAAAAAdwAAAAAEAIIAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAggAAAAAAAIIAAAAAAAABAAAAAAEAAQAAAAACAAIAAAAAAACCAAAAAAAAAwAAAAADAIIAAAAAAAAEAAAAAAAAggAAAAAAAHcAAAAAAACCAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAggAAAAAAAHcAAAAAAACCAAAAAAAAAgAAAAAAAAIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAAACAAAAAAAAggAAAAAAAIIAAAAAAAB3AAAAAAAAggAAAAAAAAEAAAAAAwABAAAAAAMAggAAAAAAAAEAAAAAAwABAAAAAAEAAQAAAAAAAAEAAAAAAAABAAAAAAMAAQAAAAADAIIAAAAAAAACAAAAAAAABAAAAAAAAAIAAAAAAACCAAAAAAAAdwAAAAAMAAEAAAAAAAABAAAAAAIAAQAAAAAAAIIAAAAAAAABAAAAAAIABQAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAAEAAAAAAQACAAAAAAAABAAAAAAAAAMAAAAAAAAEAAAAAAAAAgAAAAAAAHcAAAAAAACCAAAAAAAAAQAAAAACAAEAAAAAAAABAAAAAAIAAQAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAABAAAAAAIAggAAAAAAAAIAAAAAAAAEAAAAAAAAAgAAAAAAAIIAAAAAAAAEAAAAAAAAggAAAAAAAAEAAAAAAgABAAAAAAMAggAAAAAAAAEAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAAAQAAAAADAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAABAAAAAAAAIIAAAAAAAABAAAAAAIAAQAAAAAAAIIAAAAAAAABAAAAAAEAAQAAAAABAAEAAAAAAQABAAAAAAEAAQAAAAADAAEAAAAAAACCAAAAAAAAdwAAAAAAAHcAAAAAAAB3AAAAAAYAggAAAAAAAAQAAAAAAACCAAAAAAAAAQAAAAAAAAEAAAAAAwCCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAHcAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAAEAAAAAAAABAAAAAAEAggAAAAAAAAEAAAAAAgCCAAAAAAAAAQAAAAADAAEAAAAAAQABAAAAAAEAAQAAAAACAAEAAAAAAgCCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAAABAAAAAAIAAQAAAAACAAIAAAAAAAABAAAAAAEAAQAAAAACAAEAAAAAAAABAAAAAAAAAQAAAAAAAIIAAAAAAACCAAAAAAAAdwAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAAABAAAAAAAAAQAAAAADAAEAAAAAAQACAAAAAAAAAQAAAAADAAEAAAAAAgABAAAAAAIAAQAAAAACAAEAAAAAAQABAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAAQAAAAAAAAEAAAAAAwABAAAAAAMAggAAAAAAAAEAAAAAAwCCAAAAAAAAAQAAAAAAAAEAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAAB3AAAAAAAAdwAAAAAAAHcAAAAAAAB3AAAAAAAAdwAAAAACAA==
+          tiles: AwAAAAADAAIAAAAAAACCAAAAAAAAAgAAAAAAAIIAAAAAAAAEAAAAAAAAggAAAAAAAAQAAAAAAACCAAAAAAAAdwAAAAAAAIIAAAAAAAABAAAAAAEAAQAAAAACAAEAAAAAAwCCAAAAAAAABgAAAAAAAAQAAAAAAAACAAAAAAAAAwAAAAAAAAIAAAAAAACCAAAAAAAABAAAAAAAAIIAAAAAAAAEAAAAAAAAggAAAAAAAHcAAAAAAACCAAAAAAAAAQAAAAADAAEAAAAAAQABAAAAAAAAggAAAAAAAAYAAAAAAACCAAAAAAAAAgAAAAAAAIIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAACCAAAAAAAABAAAAAAAAIIAAAAAAAB3AAAAAAAAggAAAAAAAAEAAAAAAQABAAAAAAAAAQAAAAABAIIAAAAAAACCAAAAAAAAggAAAAAAAAIAAAAAAACCAAAAAAAAAwAAAAACAIIAAAAAAAADAAAAAAAAggAAAAAAAAQAAAAAAACCAAAAAAAAdwAAAAAAAIIAAAAAAAABAAAAAAMAAQAAAAAAAAEAAAAAAQABAAAAAAEAggAAAAAAAIIAAAAAAAABAAAAAAEAAQAAAAAAAAIAAAAAAACCAAAAAAAAAwAAAAACAIIAAAAAAAAEAAAAAAAAggAAAAAAAHcAAAAAAACCAAAAAAAAAQAAAAACAAEAAAAAAgABAAAAAAMAggAAAAAAAHcAAAAAAACCAAAAAAAAAgAAAAAAAAIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAAACAAAAAAAAggAAAAAAAIIAAAAAAAB3AAAAAAAAggAAAAAAAAEAAAAAAAABAAAAAAIAggAAAAAAAAEAAAAAAwABAAAAAAMAAQAAAAAAAAEAAAAAAQABAAAAAAMAAQAAAAAAAIIAAAAAAAACAAAAAAAABAAAAAAAAAIAAAAAAACCAAAAAAAAdwAAAAAAAAEAAAAAAQABAAAAAAEAAQAAAAACAIIAAAAAAAABAAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAAEAAAAAAgACAAAAAAAABAAAAAAAAAMAAAAAAgAEAAAAAAAAAgAAAAAAAHcAAAAAAACCAAAAAAAAAQAAAAAAAAEAAAAAAgABAAAAAAEAAQAAAAACAAUAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAABAAAAAAIAggAAAAAAAAIAAAAAAAAEAAAAAAAAAgAAAAAAAIIAAAAAAAAEAAAAAAAAggAAAAAAAAEAAAAAAAABAAAAAAMAggAAAAAAAAEAAAAAAQAFAAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAAAQAAAAACAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAABAAAAAAAAIIAAAAAAAABAAAAAAAAAQAAAAABAIIAAAAAAAABAAAAAAMAAQAAAAABAAEAAAAAAAABAAAAAAEAAQAAAAAAAAEAAAAAAgCCAAAAAAAAdwAAAAAAAHcAAAAAAAB3AAAAAAAAggAAAAAAAAQAAAAAAACCAAAAAAAAAQAAAAAAAAEAAAAAAwCCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAHcAAAAABwCCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAAEAAAAAAwABAAAAAAEAggAAAAAAAAEAAAAAAQCCAAAAAAAAAQAAAAAAAAEAAAAAAQABAAAAAAAAAQAAAAACAAEAAAAAAQCCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAAABAAAAAAEAAQAAAAABAAIAAAAAAAABAAAAAAEAAQAAAAADAAEAAAAAAQABAAAAAAMAAQAAAAADAIIAAAAAAACCAAAAAAAAdwAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAAABAAAAAAEAAQAAAAADAAEAAAAAAAACAAAAAAAAAQAAAAAAAAEAAAAAAgABAAAAAAEAAQAAAAABAAEAAAAAAwABAAAAAAEAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAAQAAAAADAAEAAAAAAAABAAAAAAEAggAAAAAAAAEAAAAAAwCCAAAAAAAAAQAAAAAAAAEAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAAB3AAAAAAAAdwAAAAAAAHcAAAAAAAB3AAAAAAAAdwAAAAAAAA==
           version: 7
         4,7:
           ind: 4,7
-          tiles: ggAAAAAAAAEAAAAAAwABAAAAAAAAggAAAAAAAAEAAAAAAQABAAAAAAEAggAAAAAAAIIAAAAAAACCAAAAAAAAdwAAAAAAAHcAAAAAAwB3AAAAAAIAdwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAAB3AAAAAAAAdwAAAAAAAHcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAdwAAAAAAAHcAAAAAAAB3AAAAAAAAdwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAggAAAAAAAHcAAAAAAAB3AAAAAAYAdwAAAAAAAHcAAAAAAAB3AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHcAAAAAAAB3AAAAAAAAdwAAAAAAAHcAAAAAAAB3AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB3AAAAAAAAdwAAAAAAAHcAAAAAAAB3AAAAAAUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAdwAAAAAAAHcAAAAAAAB3AAAAAAYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHcAAAAABAB3AAAAAAsAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB3AAAAAAAAdwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAggAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==
+          tiles: ggAAAAAAAAEAAAAAAwABAAAAAAMAggAAAAAAAAEAAAAAAgABAAAAAAIAggAAAAAAAIIAAAAAAACCAAAAAAAAdwAAAAAAAHcAAAAAAAB3AAAAAAAAdwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAAB3AAAAAAAAdwAAAAAAAHcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAdwAAAAAAAHcAAAAAAAB3AAAAAAAAdwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAggAAAAAAAHcAAAAAAAB3AAAAAAAAdwAAAAAEAHcAAAAAAAB3AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHcAAAAAAAB3AAAAAAAAdwAAAAAAAHcAAAAAAAB3AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB3AAAAAAAAdwAAAAAAAHcAAAAABQB3AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAdwAAAAAAAHcAAAAAAAB3AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHcAAAAAAgB3AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB3AAAAAAAAdwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAggAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==
           version: 7
         5,1:
           ind: 5,1
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAdwAAAAAGAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB3AAAAAAAAdwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAdwAAAAAEAHcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIIAAAAAAAB3AAAAAAcAdwAAAAAKAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACCAAAAAAAAggAAAAAAAHcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAggAAAAAAAIIAAAAAAAB3AAAAAAcAdwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIIAAAAAAACCAAAAAAAAdwAAAAAAAHcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB3AAAAAAAAggAAAAAAAHcAAAAAAAB3AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAdwAAAAAFAHcAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHcAAAAAAAB3AAAAAAAAggAAAAAAAIIAAAAAAAB3AAAAAAAAdwAAAAAFAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACCAAAAAAAAdwAAAAAAAHcAAAAAAACCAAAAAAAAggAAAAAAAHcAAAAABgB3AAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAggAAAAAAAHcAAAAAAAB3AAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAdwAAAAAAAHcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAdwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB3AAAAAAAAdwAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAdwAAAAAMAHcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIIAAAAAAAB3AAAAAAAAdwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACCAAAAAAAAggAAAAAAAHcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAggAAAAAAAIIAAAAAAAB3AAAAAAMAdwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIIAAAAAAACCAAAAAAAAdwAAAAAAAHcAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB3AAAAAAAAggAAAAAAAHcAAAAAAAB3AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAdwAAAAAJAHcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHcAAAAAAAB3AAAAAAsAggAAAAAAAIIAAAAAAAB3AAAAAAAAdwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACCAAAAAAAAdwAAAAAAAHcAAAAABwCCAAAAAAAAggAAAAAAAHcAAAAAAAB3AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAggAAAAAAAHcAAAAAAgB3AAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAdwAAAAAAAHcAAAAABQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==
           version: 7
         5,2:
           ind: 5,2
-          tiles: ggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAHcAAAAAAAB3AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAAAACAAAAAAAAggAAAAAAAHcAAAAAAAB3AAAAAAAAdwAAAAAKAIIAAAAAAACCAAAAAAAAdwAAAAAAAHcAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAAAAAAAAAgAAAAAAAIIAAAAAAAB3AAAAAAAAdwAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAAB3AAAAAAAAdwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAHcAAAAACAB3AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAYAAAAAAgAGAAAAAAMABgAAAAAAAAYAAAAAAQAGAAAAAAMAggAAAAAAAIIAAAAAAACCAAAAAAAAdwAAAAAAAIIAAAAAAACCAAAAAAAAdwAAAAAAAHcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGAAAAAAAABgAAAAADAAYAAAAAAQAGAAAAAAIAggAAAAAAAHcAAAAABgCCAAAAAAAAggAAAAAAAHcAAAAAAAB3AAAAAAAAggAAAAAAAHcAAAAAAAB3AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABgAAAAAAAAYAAAAAAwAGAAAAAAMABgAAAAADAIIAAAAAAAB3AAAAAAAAdwAAAAAAAHcAAAAAAAB3AAAAAAAAdwAAAAAAAIIAAAAAAACCAAAAAAAAdwAAAAAAAHcAAAAAAAAAAAAAAAAAAAAAAAAAAAYAAAAAAAAGAAAAAAIABgAAAAAAAAYAAAAAAACCAAAAAAAAggAAAAAAAHcAAAAAAAB3AAAAAAcAdwAAAAAAAHcAAAAADAB3AAAAAAAAggAAAAAAAIIAAAAAAAB3AAAAAAMAAAAAAAAAAAAAAAAAAAAIAAAAAAMACAAAAAADAAgAAAAAAQAIAAAAAAIACAAAAAABAIIAAAAAAAB3AAAAAAAAdwAAAAAAAHcAAAAAAAB3AAAAAAAABAAAAAAAAHcAAAAAAACCAAAAAAAAdwAAAAAMAIcAAAAAAACHAAAAAAAACAAAAAAAAAgAAAAAAgAIAAAAAAIACAAAAAAAAAgAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAAQAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAAgAAAAAAQAIAAAAAAMACAAAAAACAAgAAAAAAAAIAAAAAAAAggAAAAAAAHcAAAAAAAB3AAAAAAAAdwAAAAAAAIIAAAAAAAAEAAAAAAAAdwAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAAAIAAAAAAEACAAAAAAAAAgAAAAAAAAGAAAAAAEAggAAAAAAAIIAAAAAAAB3AAAAAAAAdwAAAAAAAHcAAAAAAAB3AAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAACAAAAAABAAgAAAAAAQAIAAAAAAAABgAAAAAAAAYAAAAAAAB3AAAAAAAAdwAAAAAAAHcAAAAAAAB3AAAAAAAAdwAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAAYAAAAAAwAGAAAAAAEABgAAAAACAAYAAAAAAgCCAAAAAAAAdwAAAAAAAHcAAAAAAAB3AAAAAAAAdwAAAAAEAHcAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAHcAAAAACAB3AAAAAAAAdwAAAAAFAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAdwAAAAAAAHcAAAAAAAB3AAAAAAAAdwAAAAAAAHcAAAAABAB3AAAAAAAAdwAAAAAAAHcAAAAAAAB3AAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAAB3AAAAAAAAdwAAAAAAAA==
+          tiles: ggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAHcAAAAAAAB3AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAAAACAAAAAAAAggAAAAAAAHcAAAAABgB3AAAAAAAAdwAAAAAAAIIAAAAAAACCAAAAAAAAdwAAAAAAAHcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAAAAAAAAAgAAAAAAAIIAAAAAAAB3AAAAAAAAdwAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAAB3AAAAAAAAdwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAHcAAAAAAAB3AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAYAAAAAAgAGAAAAAAEABgAAAAACAAYAAAAAAgAGAAAAAAMAggAAAAAAAIIAAAAAAACCAAAAAAAAdwAAAAAAAIIAAAAAAACCAAAAAAAAdwAAAAAAAHcAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGAAAAAAAABgAAAAACAAYAAAAAAAAGAAAAAAIAggAAAAAAAHcAAAAACgCCAAAAAAAAggAAAAAAAHcAAAAAAAB3AAAAAAAAggAAAAAAAHcAAAAAAAB3AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABgAAAAABAAYAAAAAAAAGAAAAAAAABgAAAAABAIIAAAAAAAB3AAAAAAAAdwAAAAABAHcAAAAAAAB3AAAAAAcAdwAAAAAAAIIAAAAAAACCAAAAAAAAdwAAAAAAAHcAAAAAAAAAAAAAAAAAAAAAAAAAAAYAAAAAAwAGAAAAAAEABgAAAAABAAYAAAAAAACCAAAAAAAAggAAAAAAAHcAAAAAAAB3AAAAAAAAdwAAAAAAAHcAAAAABgB3AAAAAAMAggAAAAAAAIIAAAAAAAB3AAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAAIACAAAAAACAAgAAAAAAAAIAAAAAAEACAAAAAADAIIAAAAAAAB3AAAAAAAAdwAAAAAMAHcAAAAAAAB3AAAAAAAABAAAAAAAAHcAAAAAAACCAAAAAAAAdwAAAAAAAIcAAAAAAACHAAAAAAAACAAAAAACAAgAAAAAAgAIAAAAAAEACAAAAAADAAgAAAAAAwCCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAAQAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAAgAAAAAAQAIAAAAAAIACAAAAAAAAAgAAAAAAQAIAAAAAAAAggAAAAAAAHcAAAAAAAB3AAAAAAAAdwAAAAAAAIIAAAAAAAAEAAAAAAAAdwAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAAAIAAAAAAAACAAAAAABAAgAAAAAAwAGAAAAAAAAggAAAAAAAIIAAAAAAAB3AAAAAAMAdwAAAAAAAHcAAAAAAAB3AAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAACAAAAAADAAgAAAAAAwAIAAAAAAEABgAAAAADAAYAAAAAAQB3AAAAAAsAdwAAAAAAAHcAAAAAAAB3AAAAAAAAdwAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAAYAAAAAAwAGAAAAAAAABgAAAAADAAYAAAAAAQCCAAAAAAAAdwAAAAAAAHcAAAAAAAB3AAAAAAAAdwAAAAAAAHcAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAHcAAAAAAAB3AAAAAAAAdwAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAdwAAAAAAAHcAAAAABwB3AAAAAAAAdwAAAAAAAHcAAAAAAwB3AAAAAAAAdwAAAAAAAHcAAAAACwB3AAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAAB3AAAAAAAAdwAAAAAAAA==
           version: 7
         5,3:
           ind: 5,3
-          tiles: dwAAAAAEAHcAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAHcAAAAACwB3AAAAAAAAdwAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAHcAAAAAAAB3AAAAAAMAdwAAAAAAAHcAAAAAAAB3AAAAAAAAdwAAAAAAAHcAAAAAAAB3AAAAAAAAdwAAAAAAAHcAAAAAAAB3AAAAAAkAdwAAAAAAAHcAAAAAAgB3AAAAAAAAggAAAAAAAHcAAAAAAAB3AAAAAAAAdwAAAAAAAHcAAAAAAACCAAAAAAAABgAAAAADAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAdwAAAAAAAHcAAAAAAgB3AAAAAAMAdwAAAAAAAHcAAAAAAAB3AAAAAAUABgAAAAADAAYAAAAAAAAGAAAAAAIABgAAAAACAAYAAAAAAQAGAAAAAAIACAAAAAACAAgAAAAAAgAIAAAAAAEAggAAAAAAAIIAAAAAAAB3AAAAAAAAdwAAAAAAAHcAAAAAAgB3AAAAAAAAggAAAAAAAAgAAAAAAgAIAAAAAAMACAAAAAABAAgAAAAAAQAIAAAAAAEACAAAAAADAAgAAAAAAAAIAAAAAAIACAAAAAAAAAYAAAAAAwCCAAAAAAAAdwAAAAAAAHcAAAAACwCCAAAAAAAAdwAAAAAAAIIAAAAAAAAIAAAAAAMACAAAAAACAAgAAAAAAwAIAAAAAAAACAAAAAACAAgAAAAAAgAIAAAAAAIACAAAAAAAAAgAAAAAAgAGAAAAAAEAggAAAAAAAHcAAAAAAAB3AAAAAAQAggAAAAAAAHcAAAAAAACCAAAAAAAACAAAAAACAAgAAAAAAQAIAAAAAAMACAAAAAABAAgAAAAAAwAIAAAAAAAACAAAAAACAAgAAAAAAAAIAAAAAAMABgAAAAABAIIAAAAAAAB3AAAAAAAAggAAAAAAAIIAAAAAAAB3AAAAAAAAdwAAAAAAAAYAAAAAAwAGAAAAAAMABgAAAAACAAYAAAAAAAAGAAAAAAEABgAAAAACAAgAAAAAAAAIAAAAAAIACAAAAAABAIIAAAAAAACCAAAAAAAAdwAAAAAAAIIAAAAAAACCAAAAAAAAdwAAAAAMAHcAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAAAGAAAAAAIAggAAAAAAAIIAAAAAAACCAAAAAAAAdwAAAAAFAHcAAAAAAAB3AAAAAAAAdwAAAAAAAHcAAAAAAAB3AAAAAAAAAQAAAAACAAEAAAAAAQABAAAAAAMAAQAAAAACAIIAAAAAAAAGAAAAAAIABgAAAAABAIIAAAAAAAB3AAAAAAAAdwAAAAAAAHcAAAAAAAB3AAAAAAAAdwAAAAAAAHcAAAAAAQB3AAAAAAAAdwAAAAAMAIIAAAAAAAABAAAAAAAAAQAAAAACAAEAAAAAAwCCAAAAAAAABgAAAAACAAYAAAAAAwAGAAAAAAEAdwAAAAAFAHcAAAAAAAB3AAAAAAAAdwAAAAAAAHcAAAAADAB3AAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAAQAAAAABAAEAAAAAAwABAAAAAAAAggAAAAAAAAYAAAAAAgAGAAAAAAEAggAAAAAAAHcAAAAAAAB3AAAAAAAAdwAAAAAAAIIAAAAAAAB3AAAAAAAAdwAAAAAAAIIAAAAAAAABAAAAAAMAggAAAAAAAAEAAAAAAQABAAAAAAAAAQAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAAB3AAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAdwAAAAAIAHcAAAAAAACCAAAAAAAAAQAAAAACAIIAAAAAAAABAAAAAAEAAQAAAAABAAEAAAAAAACCAAAAAAAAdwAAAAAAAHcAAAAAAAB3AAAAAAAAdwAAAAALAIIAAAAAAACCAAAAAAAAggAAAAAAAHcAAAAAAAB3AAAAAAkAggAAAAAAAAEAAAAAAACCAAAAAAAAggAAAAAAAAEAAAAAAgABAAAAAAAAggAAAAAAAHcAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAHcAAAAAAAB3AAAAAAAAdwAAAAAAAIIAAAAAAAABAAAAAAMAdwAAAAAAAIIAAAAAAAABAAAAAAMAAQAAAAABAAEAAAAAAgB3AAAAAAAAdwAAAAAAAHcAAAAAAACCAAAAAAAAggAAAAAAAHcAAAAAAAB3AAAAAAAAdwAAAAAAAHcAAAAAAACCAAAAAAAAAQAAAAADAA==
+          tiles: dwAAAAAAAHcAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAHcAAAAAAAB3AAAAAAoAdwAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAHcAAAAAAAB3AAAAAAAAdwAAAAAAAHcAAAAAAAB3AAAAAAAAdwAAAAAAAHcAAAAAAAB3AAAAAAAAdwAAAAAAAHcAAAAABwB3AAAAAAkAdwAAAAAAAHcAAAAAAAB3AAAAAAAAggAAAAAAAHcAAAAAAAB3AAAAAAAAdwAAAAAKAHcAAAAACwCCAAAAAAAABgAAAAACAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAdwAAAAAAAHcAAAAABAB3AAAAAAMAdwAAAAAAAHcAAAAACAB3AAAAAAAABgAAAAADAAYAAAAAAQAGAAAAAAAABgAAAAAAAAYAAAAAAwAGAAAAAAMACAAAAAAAAAgAAAAAAwAIAAAAAAIAggAAAAAAAIIAAAAAAAB3AAAAAAAAdwAAAAAAAHcAAAAAAAB3AAAAAAAAggAAAAAAAAgAAAAAAQAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAEACAAAAAABAAgAAAAAAAAIAAAAAAIACAAAAAAAAAYAAAAAAgCCAAAAAAAAdwAAAAAAAHcAAAAAAACCAAAAAAAAdwAAAAAKAIIAAAAAAAAIAAAAAAMACAAAAAABAAgAAAAAAAAIAAAAAAEACAAAAAAAAAgAAAAAAwAIAAAAAAAACAAAAAADAAgAAAAAAwAGAAAAAAIAggAAAAAAAHcAAAAAAAB3AAAAAAAAggAAAAAAAHcAAAAAAACCAAAAAAAACAAAAAACAAgAAAAAAgAIAAAAAAIACAAAAAABAAgAAAAAAgAIAAAAAAAACAAAAAAAAAgAAAAAAwAIAAAAAAEABgAAAAADAIIAAAAAAAB3AAAAAAwAggAAAAAAAIIAAAAAAAB3AAAAAAAAdwAAAAAAAAYAAAAAAgAGAAAAAAEABgAAAAABAAYAAAAAAAAGAAAAAAAABgAAAAACAAgAAAAAAAAIAAAAAAIACAAAAAACAIIAAAAAAACCAAAAAAAAdwAAAAAAAIIAAAAAAACCAAAAAAAAdwAAAAAAAHcAAAAACACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAAAGAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAdwAAAAACAHcAAAAAAAB3AAAAAAAAdwAAAAAAAHcAAAAAAAB3AAAAAAAAAQAAAAAAAAEAAAAAAQABAAAAAAIAAQAAAAADAIIAAAAAAAAGAAAAAAEABgAAAAADAIIAAAAAAAB3AAAAAAAAdwAAAAAAAHcAAAAAAAB3AAAAAAQAdwAAAAACAHcAAAAAAAB3AAAAAAAAdwAAAAAAAIIAAAAAAAABAAAAAAAAAQAAAAADAAEAAAAAAwCCAAAAAAAABgAAAAABAAYAAAAAAgAGAAAAAAIAdwAAAAAAAHcAAAAAAAB3AAAAAAAAdwAAAAAKAHcAAAAAAAB3AAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAAQAAAAAAAAEAAAAAAQABAAAAAAAAggAAAAAAAAYAAAAAAwAGAAAAAAAAggAAAAAAAHcAAAAAAAB3AAAAAAAAdwAAAAAAAIIAAAAAAAB3AAAAAAAAdwAAAAAAAIIAAAAAAAABAAAAAAEAggAAAAAAAAEAAAAAAAABAAAAAAMAAQAAAAACAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAAB3AAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAdwAAAAALAHcAAAAABACCAAAAAAAAAQAAAAACAIIAAAAAAAABAAAAAAAAAQAAAAABAAEAAAAAAQCCAAAAAAAAdwAAAAAAAHcAAAAAAAB3AAAAAAAAdwAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAHcAAAAABwB3AAAAAAAAggAAAAAAAAEAAAAAAQCCAAAAAAAAggAAAAAAAAEAAAAAAAABAAAAAAMAggAAAAAAAHcAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAHcAAAAABQB3AAAAAAAAdwAAAAAAAIIAAAAAAAABAAAAAAMAdwAAAAAAAIIAAAAAAAABAAAAAAEAAQAAAAACAAEAAAAAAgB3AAAAAAAAdwAAAAAAAHcAAAAABQCCAAAAAAAAggAAAAAAAHcAAAAACwB3AAAAAAAAdwAAAAAAAHcAAAAAAACCAAAAAAAAAQAAAAADAA==
           version: 7
         5,4:
           ind: 5,4
-          tiles: dwAAAAAAAIIAAAAAAAABAAAAAAEAAQAAAAABAIIAAAAAAAB3AAAAAAAAdwAAAAAAAHcAAAAAAAB3AAAAAAAAdwAAAAACAHcAAAAAAAB3AAAAAAAAdwAAAAAAAHcAAAAAAACCAAAAAAAAAQAAAAABAIIAAAAAAACCAAAAAAAAAgAAAAAAAAIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAAEAAAAAAwCCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAAEAAAAAAAABAAAAAAEAAQAAAAACAAEAAAAAAgABAAAAAAAAAQAAAAABAAEAAAAAAAABAAAAAAIAAQAAAAADAAEAAAAAAQABAAAAAAIAAQAAAAACAAEAAAAAAgABAAAAAAMAAQAAAAAAAAIAAAAAAAABAAAAAAEAAQAAAAABAAEAAAAAAwABAAAAAAAAAQAAAAADAAEAAAAAAwABAAAAAAMAAQAAAAAAAAEAAAAAAgABAAAAAAEAAQAAAAAAAAEAAAAAAwABAAAAAAEAAQAAAAABAAEAAAAAAwACAAAAAAAAAQAAAAAAAAEAAAAAAwABAAAAAAAAAQAAAAABAAEAAAAAAQABAAAAAAMAAQAAAAAAAAEAAAAAAQABAAAAAAEAAQAAAAABAAEAAAAAAwABAAAAAAMAAQAAAAAAAAEAAAAAAgABAAAAAAAAAgAAAAAAAAEAAAAAAQCCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAAABAAAAAAEAggAAAAAAAIIAAAAAAAABAAAAAAIAggAAAAAAAIIAAAAAAAABAAAAAAEAdwAAAAAAAHcAAAAAAAB3AAAAAAAAdwAAAAAAAHcAAAAAAAB3AAAAAAAAdwAAAAAAAHcAAAAAAAB3AAAAAAAAdwAAAAAGAIIAAAAAAAABAAAAAAAAAQAAAAABAAEAAAAAAQCCAAAAAAAAAQAAAAACAHcAAAAAAAB3AAAAAAAAdwAAAAAAAHcAAAAAAAB3AAAAAAAAggAAAAAAAHcAAAAAAAB3AAAAAAAAdwAAAAAAAHcAAAAAAACCAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAIAggAAAAAAAAEAAAAAAgB3AAAAAAAAdwAAAAAHAHcAAAAAAAB3AAAAAAAAdwAAAAAAAIIAAAAAAACCAAAAAAAAdwAAAAAAAHcAAAAAAAB3AAAAAAAAggAAAAAAAAEAAAAAAQABAAAAAAIAAQAAAAAAAIIAAAAAAAABAAAAAAAAdwAAAAAAAHcAAAAAAAB3AAAAAAAAdwAAAAAAAHcAAAAAAAB3AAAAAAIAdwAAAAAEAHcAAAAAAAB3AAAAAAAAdwAAAAAAAIIAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAACCAAAAAAAAAQAAAAADAHcAAAAACAB3AAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAAQAAAAAAACCAAAAAAAAAQAAAAADAAEAAAAAAAABAAAAAAAAggAAAAAAAAEAAAAAAwCCAAAAAAAAdwAAAAAAAHcAAAAAAACCAAAAAAAACAAAAAAAAAgAAAAAAwAIAAAAAAIACAAAAAAAAIIAAAAAAAAEAAAAAAAAggAAAAAAAIIAAAAAAAABAAAAAAAAggAAAAAAAIIAAAAAAAABAAAAAAMAdwAAAAAAAHcAAAAABQB3AAAAAAAAggAAAAAAAAgAAAAAAQAIAAAAAAMACAAAAAAAAAgAAAAAAACCAAAAAAAABAAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAHcAAAAAAAB3AAAAAAAAdwAAAAAAAIIAAAAAAAAGAAAAAAMABgAAAAAAAAYAAAAAAQAGAAAAAAEAggAAAAAAAHcAAAAAAAB3AAAAAAAAdwAAAAAAAIIAAAAAAACCAAAAAAAAdwAAAAAAAHcAAAAAAACCAAAAAAAAAQAAAAABAIIAAAAAAACCAAAAAAAABgAAAAAAAAYAAAAAAgAGAAAAAAEABgAAAAABAIIAAAAAAAB3AAAAAAYAdwAAAAAAAHcAAAAAAAB3AAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAAQAAAAACAAEAAAAAAgABAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAABgAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAA==
+          tiles: dwAAAAAAAIIAAAAAAAABAAAAAAMAAQAAAAACAIIAAAAAAAB3AAAAAAAAdwAAAAAAAHcAAAAABAB3AAAAAAAAdwAAAAAAAHcAAAAAAgB3AAAAAAAAdwAAAAAAAHcAAAAAAACCAAAAAAAAAQAAAAABAIIAAAAAAACCAAAAAAAAAgAAAAAAAAIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAAEAAAAAAwCCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAAEAAAAAAQABAAAAAAAAAQAAAAACAAEAAAAAAQABAAAAAAAAAQAAAAABAAEAAAAAAgABAAAAAAAAAQAAAAABAAEAAAAAAAABAAAAAAEAAQAAAAADAAEAAAAAAgABAAAAAAMAAQAAAAACAAIAAAAAAAABAAAAAAMAAQAAAAAAAAEAAAAAAwABAAAAAAIAAQAAAAAAAAEAAAAAAgABAAAAAAMAAQAAAAADAAEAAAAAAAABAAAAAAIAAQAAAAADAAEAAAAAAAABAAAAAAIAAQAAAAADAAEAAAAAAwACAAAAAAAAAQAAAAADAAEAAAAAAQABAAAAAAEAAQAAAAADAAEAAAAAAQABAAAAAAAAAQAAAAADAAEAAAAAAAABAAAAAAAAAQAAAAADAAEAAAAAAAABAAAAAAAAAQAAAAABAAEAAAAAAAABAAAAAAEAAgAAAAAAAAEAAAAAAwCCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAAABAAAAAAIAggAAAAAAAIIAAAAAAAABAAAAAAMAggAAAAAAAIIAAAAAAAABAAAAAAAAdwAAAAAAAHcAAAAAAAB3AAAAAAAAdwAAAAAIAHcAAAAABQB3AAAAAAAAdwAAAAAAAHcAAAAAAAB3AAAAAAAAdwAAAAAAAIIAAAAAAAABAAAAAAAAAQAAAAADAAEAAAAAAQCCAAAAAAAAAQAAAAABAHcAAAAACgB3AAAAAAAAdwAAAAAAAHcAAAAAAAB3AAAAAAQAggAAAAAAAHcAAAAAAAB3AAAAAAAAdwAAAAAAAHcAAAAAAACCAAAAAAAAAQAAAAABAAEAAAAAAAABAAAAAAIAggAAAAAAAAEAAAAAAgB3AAAAAAMAdwAAAAAAAHcAAAAAAAB3AAAAAAAAdwAAAAAAAIIAAAAAAACCAAAAAAAAdwAAAAAAAHcAAAAAAAB3AAAAAAAAggAAAAAAAAEAAAAAAAABAAAAAAEAAQAAAAABAIIAAAAAAAABAAAAAAEAdwAAAAAFAHcAAAAACgB3AAAAAAAAdwAAAAAEAHcAAAAAAAB3AAAAAAAAdwAAAAAAAHcAAAAACgB3AAAAAAAAdwAAAAAAAIIAAAAAAAABAAAAAAAAAQAAAAACAAEAAAAAAACCAAAAAAAAAQAAAAAAAHcAAAAAAAB3AAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAAQAAAAAAACCAAAAAAAAAQAAAAADAAEAAAAAAQABAAAAAAIAggAAAAAAAAEAAAAAAQCCAAAAAAAAdwAAAAAAAHcAAAAAAACCAAAAAAAACAAAAAADAAgAAAAAAgAIAAAAAAEACAAAAAADAIIAAAAAAAAEAAAAAAAAggAAAAAAAIIAAAAAAAABAAAAAAAAggAAAAAAAIIAAAAAAAABAAAAAAEAdwAAAAAAAHcAAAAAAQB3AAAAAAQAggAAAAAAAAgAAAAAAgAIAAAAAAIACAAAAAABAAgAAAAAAQCCAAAAAAAABAAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAHcAAAAAAAB3AAAAAAAAdwAAAAAAAIIAAAAAAAAGAAAAAAAABgAAAAACAAYAAAAAAwAGAAAAAAIAggAAAAAAAHcAAAAAAAB3AAAAAAAAdwAAAAAAAIIAAAAAAACCAAAAAAAAdwAAAAAAAHcAAAAAAACCAAAAAAAAAQAAAAAAAIIAAAAAAACCAAAAAAAABgAAAAACAAYAAAAAAQAGAAAAAAAABgAAAAABAIIAAAAAAAB3AAAAAAAAdwAAAAAFAHcAAAAAAAB3AAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAAQAAAAAAAAEAAAAAAQABAAAAAAEAggAAAAAAAIIAAAAAAACCAAAAAAAABgAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAA==
           version: 7
         5,5:
           ind: 5,5
-          tiles: AQAAAAAAAAEAAAAAAgABAAAAAAMAggAAAAAAAAEAAAAAAQABAAAAAAAAAQAAAAABAAEAAAAAAAABAAAAAAAAAQAAAAADAAEAAAAAAQABAAAAAAIAAQAAAAADAAEAAAAAAwCCAAAAAAAAggAAAAAAAAEAAAAAAAABAAAAAAIAAQAAAAADAAEAAAAAAAABAAAAAAAAAQAAAAACAAEAAAAAAgABAAAAAAIAAQAAAAAAAAEAAAAAAAABAAAAAAMAAQAAAAAAAAEAAAAAAQCCAAAAAAAAdwAAAAAAAHcAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAwCCAAAAAAAAAQAAAAACAAEAAAAAAgABAAAAAAEAAQAAAAADAAEAAAAAAgABAAAAAAIAAQAAAAAAAAEAAAAAAwABAAAAAAAAggAAAAAAAHcAAAAAAAB3AAAAAAMAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAAEAAAAAAgABAAAAAAIAAQAAAAABAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAAABAAAAAAMAAQAAAAADAIIAAAAAAAB3AAAAAAAAdwAAAAABAAEAAAAAAQABAAAAAAAAAQAAAAADAAIAAAAAAAABAAAAAAIAAQAAAAAAAAEAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAAQAAAAACAAEAAAAAAACCAAAAAAAAdwAAAAAAAHcAAAAAAAABAAAAAAMAAQAAAAACAAEAAAAAAAACAAAAAAAAAQAAAAACAAEAAAAAAQABAAAAAAAAAQAAAAAAAAEAAAAAAwABAAAAAAAAAQAAAAABAAEAAAAAAQABAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAAEAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAAQAAAAACAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAQACAAAAAAAAdwAAAAAAAAEAAAAAAgABAAAAAAIAAQAAAAABAAEAAAAAAQABAAAAAAAAggAAAAAAAAEAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAAQAAAAAAAAEAAAAAAwABAAAAAAMAAgAAAAAAAHcAAAAAAQABAAAAAAMAAQAAAAADAAEAAAAAAQABAAAAAAIAAQAAAAAAAIIAAAAAAAABAAAAAAIAAQAAAAABAAEAAAAAAQABAAAAAAIAAQAAAAAAAAEAAAAAAQABAAAAAAIAAQAAAAAAAIIAAAAAAACCAAAAAAAAAQAAAAABAAEAAAAAAwABAAAAAAMAAQAAAAAAAAEAAAAAAQCCAAAAAAAAAQAAAAADAAEAAAAAAQABAAAAAAMAAQAAAAADAAEAAAAAAAABAAAAAAMAAQAAAAADAAEAAAAAAwACAAAAAAAAdwAAAAAAAAEAAAAAAgABAAAAAAEAAQAAAAABAAEAAAAAAQABAAAAAAAAggAAAAAAAAEAAAAAAwABAAAAAAEAAQAAAAACAAEAAAAAAwABAAAAAAIAAQAAAAADAAEAAAAAAQABAAAAAAAAAgAAAAAAAHcAAAAAAAABAAAAAAMAAQAAAAACAAEAAAAAAAABAAAAAAIAAQAAAAAAAIIAAAAAAACCAAAAAAAAAgAAAAAAAAIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAAEAAAAAAgCCAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAIAAQAAAAAAAAEAAAAAAgACAAAAAAAAAgAAAAAAAAIAAAAAAAADAAAAAAEAggAAAAAAAAYAAAAAAwAGAAAAAAAAggAAAAAAAAEAAAAAAwABAAAAAAMAAQAAAAADAAEAAAAAAQABAAAAAAEAAQAAAAACAAEAAAAAAwABAAAAAAMAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAIIAAAAAAAAGAAAAAAIABgAAAAACAIIAAAAAAAABAAAAAAMAAQAAAAABAAEAAAAAAwABAAAAAAEAAQAAAAACAAEAAAAAAQABAAAAAAEAAQAAAAABAIIAAAAAAACCAAAAAAAAAgAAAAAAAAIAAAAAAACCAAAAAAAABgAAAAABAAYAAAAAAgCCAAAAAAAAAQAAAAAAAAEAAAAAAgABAAAAAAIAAQAAAAABAAEAAAAAAwABAAAAAAIAAQAAAAACAAEAAAAAAQCCAAAAAAAAdwAAAAAAAHcAAAAADAB3AAAAAAkAggAAAAAAAA==
+          tiles: AQAAAAAAAAEAAAAAAAABAAAAAAEAggAAAAAAAAEAAAAAAQABAAAAAAEAAQAAAAADAAEAAAAAAAABAAAAAAMAAQAAAAAAAAEAAAAAAAABAAAAAAIAAQAAAAACAAEAAAAAAACCAAAAAAAAggAAAAAAAAEAAAAAAgABAAAAAAEAAQAAAAAAAAEAAAAAAAABAAAAAAMAAQAAAAADAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAEAAQAAAAADAAEAAAAAAwCCAAAAAAAAdwAAAAAAAHcAAAAAAAABAAAAAAAAAQAAAAABAAEAAAAAAwCCAAAAAAAAAQAAAAADAAEAAAAAAAABAAAAAAEAAQAAAAACAAEAAAAAAQABAAAAAAIAAQAAAAAAAAEAAAAAAAABAAAAAAMAggAAAAAAAHcAAAAAAAB3AAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAAEAAAAAAAABAAAAAAMAAQAAAAADAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAAABAAAAAAAAAQAAAAAAAIIAAAAAAAB3AAAAAAAAdwAAAAAAAAEAAAAAAwABAAAAAAMAAQAAAAABAAIAAAAAAAABAAAAAAEAAQAAAAADAAEAAAAAAwCCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAAQAAAAABAAEAAAAAAQCCAAAAAAAAdwAAAAAAAHcAAAAAAAABAAAAAAMAAQAAAAAAAAEAAAAAAgACAAAAAAAAAQAAAAAAAAEAAAAAAwABAAAAAAIAAQAAAAACAAEAAAAAAgABAAAAAAEAAQAAAAADAAEAAAAAAQABAAAAAAEAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAAEAAAAAAgCCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAAQAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAAABAAAAAAEAAQAAAAAAAAEAAAAAAgACAAAAAAAAdwAAAAAAAAEAAAAAAQABAAAAAAIAAQAAAAACAAEAAAAAAAABAAAAAAMAggAAAAAAAAEAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAAQAAAAADAAEAAAAAAAABAAAAAAMAAgAAAAAAAHcAAAAAAAABAAAAAAAAAQAAAAACAAEAAAAAAwABAAAAAAAAAQAAAAACAIIAAAAAAAABAAAAAAMAAQAAAAADAAEAAAAAAgABAAAAAAIAAQAAAAAAAAEAAAAAAQABAAAAAAAAAQAAAAAAAIIAAAAAAACCAAAAAAAAAQAAAAABAAEAAAAAAQABAAAAAAMAAQAAAAABAAEAAAAAAQCCAAAAAAAAAQAAAAABAAEAAAAAAAABAAAAAAIAAQAAAAAAAAEAAAAAAwABAAAAAAAAAQAAAAADAAEAAAAAAgACAAAAAAAAdwAAAAAAAAEAAAAAAgABAAAAAAIAAQAAAAABAAEAAAAAAQABAAAAAAMAggAAAAAAAAEAAAAAAwABAAAAAAAAAQAAAAACAAEAAAAAAQABAAAAAAIAAQAAAAAAAAEAAAAAAgABAAAAAAAAAgAAAAAAAHcAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAwABAAAAAAIAAQAAAAADAIIAAAAAAACCAAAAAAAAAgAAAAAAAAIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAAEAAAAAAgCCAAAAAAAAAQAAAAABAAEAAAAAAAABAAAAAAEAAQAAAAABAAEAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAADAAAAAAAAggAAAAAAAAYAAAAAAQAGAAAAAAMAggAAAAAAAAEAAAAAAgABAAAAAAIAAQAAAAADAAEAAAAAAAABAAAAAAMAAQAAAAACAAEAAAAAAAABAAAAAAEAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAIIAAAAAAAAGAAAAAAEABgAAAAAAAIIAAAAAAAABAAAAAAAAAQAAAAABAAEAAAAAAgABAAAAAAMAAQAAAAADAAEAAAAAAAABAAAAAAEAAQAAAAAAAIIAAAAAAACCAAAAAAAAAgAAAAAAAAIAAAAAAACCAAAAAAAABgAAAAAAAAYAAAAAAQCCAAAAAAAAAQAAAAADAAEAAAAAAAABAAAAAAIAAQAAAAADAAEAAAAAAgABAAAAAAAAAQAAAAABAAEAAAAAAQCCAAAAAAAAdwAAAAAFAHcAAAAAAAB3AAAAAAAAggAAAAAAAA==
           version: 7
         5,6:
           ind: 5,6
-          tiles: BgAAAAAAAAYAAAAAAQCCAAAAAAAAAQAAAAADAAEAAAAAAwABAAAAAAAAAQAAAAACAAEAAAAAAgABAAAAAAMAAQAAAAABAAEAAAAAAgCCAAAAAAAAdwAAAAAAAHcAAAAAAAB3AAAAAAAAggAAAAAAAAYAAAAAAgAGAAAAAAAAggAAAAAAAIIAAAAAAAABAAAAAAMAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAHcAAAAACQB3AAAAAAAAdwAAAAAAAIIAAAAAAACCAAAAAAAABgAAAAADAIIAAAAAAAB3AAAAAAAAdwAAAAAIAHcAAAAABgB3AAAAAAAAdwAAAAAAAHcAAAAAAACCAAAAAAAAdwAAAAAAAHcAAAAABwB3AAAAAAAAdwAAAAAAAAAAAAAAAAAAAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAdwAAAAAAAHcAAAAABACCAAAAAAAAggAAAAAAAHcAAAAAAgB3AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAHcAAAAACQCCAAAAAAAAggAAAAAAAHcAAAAAAAB3AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB3AAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAHcAAAAAAAB3AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAdwAAAAAAAHcAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAAB3AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHcAAAAAAQB3AAAAAAAAdwAAAAAAAHcAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAhwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB3AAAAAAAAdwAAAAAAAHcAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAggAAAAAAAHcAAAAAAACCAAAAAAAAggAAAAAAAHcAAAAABgCHAAAAAAAAhwAAAAAAAIcAAAAAAACHAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAHcAAAAAAAB3AAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAAB3AAAAAAAAdwAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAdwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAHcAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB3AAAAAAAAdwAAAAAAAHcAAAAABwB3AAAAAAkAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAdwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==
+          tiles: BgAAAAACAAYAAAAAAQCCAAAAAAAAAQAAAAADAAEAAAAAAgABAAAAAAIAAQAAAAABAAEAAAAAAQABAAAAAAMAAQAAAAABAAEAAAAAAwCCAAAAAAAAdwAAAAAAAHcAAAAAAAB3AAAAAAAAggAAAAAAAAYAAAAAAAAGAAAAAAAAggAAAAAAAIIAAAAAAAABAAAAAAMAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAHcAAAAAAAB3AAAAAAAAdwAAAAABAIIAAAAAAACCAAAAAAAABgAAAAAAAIIAAAAAAAB3AAAAAAAAdwAAAAAEAHcAAAAAAAB3AAAAAAYAdwAAAAADAHcAAAAAAACCAAAAAAAAdwAAAAAAAHcAAAAAAAB3AAAAAAAAdwAAAAAAAAAAAAAAAAAAAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAdwAAAAAAAHcAAAAAAACCAAAAAAAAggAAAAAAAHcAAAAAAAB3AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAHcAAAAACACCAAAAAAAAggAAAAAAAHcAAAAAAAB3AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB3AAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAHcAAAAAAAB3AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAdwAAAAAAAHcAAAAAAQCCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAAB3AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHcAAAAAAAB3AAAAAAAAdwAAAAAAAHcAAAAAAwCCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAhwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB3AAAAAAAAdwAAAAAAAHcAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAggAAAAAAAHcAAAAAAACCAAAAAAAAggAAAAAAAHcAAAAAAACHAAAAAAAAhwAAAAAAAIcAAAAAAACHAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAHcAAAAAAAB3AAAAAAMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAAB3AAAAAAAAdwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAdwAAAAAHAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAHcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB3AAAAAAAAdwAAAAACAHcAAAAAAAB3AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAdwAAAAAJAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==
           version: 7
         6,2:
           ind: 6,2
@@ -230,15 +230,15 @@ entities:
           version: 7
         6,3:
           ind: 6,3
-          tiles: ggAAAAAAAIIAAAAAAAB3AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHcAAAAAAACCAAAAAAAAdwAAAAAAAHcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB3AAAAAAAAggAAAAAAAHcAAAAAAAB3AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAdwAAAAAAAIIAAAAAAACCAAAAAAAAdwAAAAAMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHcAAAAAAAB3AAAAAAAAggAAAAAAAHcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB3AAAAAAAAdwAAAAAJAIIAAAAAAAB3AAAAAAAAdwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAdwAAAAAAAHcAAAAAAACCAAAAAAAAggAAAAAAAHcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHcAAAAAAAB3AAAAAAAAdwAAAAAAAIIAAAAAAAB3AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACCAAAAAAAAdwAAAAAAAHcAAAAAAACCAAAAAAAAdwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAdwAAAAADAHcAAAAACAB3AAAAAAAAggAAAAAAAHcAAAAAAAB3AAAAAAMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIIAAAAAAAABAAAAAAEAggAAAAAAAIIAAAAAAACCAAAAAAAAdwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAAAAAQAAAAADAAEAAAAAAQABAAAAAAMAggAAAAAAAHcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAACAAEAAAAAAQABAAAAAAIAAQAAAAADAIIAAAAAAAB3AAAAAAAAdwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAgABAAAAAAIAAQAAAAACAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAAMAAQAAAAABAAEAAAAAAgAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAADAAEAAAAAAwABAAAAAAMAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==
+          tiles: ggAAAAAAAIIAAAAAAAB3AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHcAAAAABgCCAAAAAAAAdwAAAAAAAHcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB3AAAAAAAAggAAAAAAAHcAAAAAAAB3AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAdwAAAAAAAIIAAAAAAACCAAAAAAAAdwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHcAAAAACgB3AAAAAAAAggAAAAAAAHcAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB3AAAAAAIAdwAAAAAAAIIAAAAAAAB3AAAAAAAAdwAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAdwAAAAAKAHcAAAAAAACCAAAAAAAAggAAAAAAAHcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHcAAAAAAAB3AAAAAAAAdwAAAAAAAIIAAAAAAAB3AAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACCAAAAAAAAdwAAAAAAAHcAAAAAAACCAAAAAAAAdwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAdwAAAAALAHcAAAAAAAB3AAAAAAAAggAAAAAAAHcAAAAAAAB3AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIIAAAAAAAABAAAAAAEAggAAAAAAAIIAAAAAAACCAAAAAAAAdwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAAEAAQAAAAAAAAEAAAAAAwABAAAAAAMAggAAAAAAAHcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAADAAEAAAAAAAABAAAAAAMAAQAAAAADAIIAAAAAAAB3AAAAAAAAdwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAgABAAAAAAAAAQAAAAABAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAAMAAQAAAAABAAEAAAAAAwAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAACAAEAAAAAAwABAAAAAAIAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==
           version: 7
         6,4:
           ind: 6,4
-          tiles: AQAAAAAAAAEAAAAAAgABAAAAAAIABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAABAAAAAAIAAQAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAAMAAQAAAAADAAEAAAAAAQCCAAAAAAAAdwAAAAAFAHcAAAAABgCCAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAACAAEAAAAAAQABAAAAAAEAggAAAAAAAHcAAAAAAAB3AAAAAAgAggAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAgABAAAAAAAAAQAAAAABAIIAAAAAAAB3AAAAAAAAdwAAAAAAAIIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAAIAAQAAAAABAAEAAAAAAwCCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAACAAEAAAAAAgABAAAAAAIABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAQABAAAAAAIAAQAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAAMAAQAAAAAAAAEAAAAAAQAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAABAAEAAAAAAwABAAAAAAEAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAwABAAAAAAAAAQAAAAAAAAEAAAAAAgCCAAAAAAAAdwAAAAAAAHcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAAAAAQAAAAADAAEAAAAAAAABAAAAAAAAggAAAAAAAHcAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAAB3AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIIAAAAAAAB3AAAAAAAAdwAAAAAAAIIAAAAAAAB3AAAAAAAAdwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACCAAAAAAAAdwAAAAAAAHcAAAAAAACCAAAAAAAAdwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAggAAAAAAAHcAAAAAAACCAAAAAAAAggAAAAAAAHcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==
+          tiles: AQAAAAACAAEAAAAAAAABAAAAAAMABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAgABAAAAAAEAAQAAAAADAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAAAAAQAAAAABAAEAAAAAAACCAAAAAAAAdwAAAAAAAHcAAAAAAACCAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAACAAEAAAAAAAABAAAAAAAAggAAAAAAAHcAAAAAAAB3AAAAAAAAggAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAACAIIAAAAAAAB3AAAAAAAAdwAAAAAHAIIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAAEAAQAAAAACAAEAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAACAAEAAAAAAgABAAAAAAMABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAgABAAAAAAIAAQAAAAACAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAAEAAQAAAAACAAEAAAAAAgAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAADAAEAAAAAAwABAAAAAAEAggAAAAAAAIIAAAAAAACCAAAAAAAAggAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAgABAAAAAAIAAQAAAAABAAEAAAAAAQCCAAAAAAAAdwAAAAAAAHcAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAAEAAQAAAAAAAAEAAAAAAQABAAAAAAIAggAAAAAAAHcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAADAIIAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAAB3AAAAAAkAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIIAAAAAAAB3AAAAAAAAdwAAAAAAAIIAAAAAAAB3AAAAAAAAdwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACCAAAAAAAAdwAAAAAAAHcAAAAAAACCAAAAAAAAdwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAggAAAAAAAHcAAAAAAACCAAAAAAAAggAAAAAAAHcAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==
           version: 7
         6,5:
           ind: 6,5
-          tiles: ggAAAAAAAIIAAAAAAACCAAAAAAAAdwAAAAAAAHcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHcAAAAAAAB3AAAAAAAAggAAAAAAAHcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB3AAAAAAAAdwAAAAAAAIIAAAAAAAB3AAAAAAUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAggAAAAAAAHcAAAAAAACCAAAAAAAAdwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHcAAAAAAAB3AAAAAAAAggAAAAAAAHcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAdwAAAAAAAHcAAAAAAAB3AAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHcAAAAAAAADAAAAAAIAdwAAAAABAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAdwAAAAAAAAMAAAAAAgB3AAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHcAAAAAAAB3AAAAAAAAdwAAAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAdwAAAAAAAHcAAAAAAAB3AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHcAAAAAAAB3AAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACHAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAhwAAAAAAAIcAAAAAAACHAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==
+          tiles: ggAAAAAAAIIAAAAAAACCAAAAAAAAdwAAAAAAAHcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHcAAAAACwB3AAAAAAAAggAAAAAAAHcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB3AAAAAAAAdwAAAAAAAIIAAAAAAAB3AAAAAAoAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAggAAAAAAAHcAAAAABwCCAAAAAAAAdwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHcAAAAAAgB3AAAAAAAAggAAAAAAAHcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAdwAAAAAAAHcAAAAAAgB3AAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHcAAAAABQADAAAAAAEAdwAAAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAdwAAAAAAAAMAAAAAAQB3AAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHcAAAAAAAB3AAAAAAAAdwAAAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACCAAAAAAAAggAAAAAAAIIAAAAAAACCAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAdwAAAAAAAHcAAAAAAAB3AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHcAAAAABAB3AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACHAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAhwAAAAAAAIcAAAAAAACHAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==
           version: 7
         6,6:
           ind: 6,6
@@ -6662,15 +6662,6 @@ entities:
     - type: Action
       originalIconColor: '#FFFFFFFF'
       container: 4544
-  - uid: 12252
-    mapInit: true
-    paused: true
-    components:
-    - type: Transform
-      parent: 12251
-    - type: Action
-      originalIconColor: '#FFFFFFFF'
-      container: 12251
 - proto: AirAlarm
   entities:
   - uid: 59
@@ -12905,6 +12896,13 @@ entities:
       - Arsenal
       - Experimental
       - CivilianServices
+- proto: BananaPhoneInstrument
+  entities:
+  - uid: 18234
+    components:
+    - type: Transform
+      pos: 44.5,60.5
+      parent: 1
 - proto: BanjoInstrument
   entities:
   - uid: 14528
@@ -14422,6 +14420,11 @@ entities:
     - type: Transform
       pos: 70.5,41.5
       parent: 1
+  - uid: 4404
+    components:
+    - type: Transform
+      pos: 59.5,23.5
+      parent: 1
   - uid: 4483
     components:
     - type: Transform
@@ -24887,6 +24890,11 @@ entities:
     - type: Transform
       pos: 71.5,4.5
       parent: 1
+  - uid: 18235
+    components:
+    - type: Transform
+      pos: 59.5,22.5
+      parent: 1
 - proto: CableApcStack
   entities:
   - uid: 7281
@@ -41271,11 +41279,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 92.5,88.5
       parent: 1
-  - uid: 8274
-    components:
-    - type: Transform
-      pos: 77.5,109.5
-      parent: 1
   - uid: 8637
     components:
     - type: Transform
@@ -43401,6 +43404,13 @@ entities:
     - type: Transform
       pos: 8.5,96.5
       parent: 1
+    - type: AnalysisConsole
+      analyzerEntity: 1000
+    - type: DeviceLinkSource
+      linkedPorts:
+        1000:
+        - - ArtifactAnalyzerSender
+          - ArtifactAnalyzerReceiver
 - proto: ComputerAtmosMonitoring
   entities:
   - uid: 6789
@@ -53136,18 +53146,17 @@ entities:
   - uid: 7804
     components:
     - type: Transform
-      pos: 89.31183,96.713135
+      pos: 89.1862,96.686615
       parent: 1
   - uid: 7893
     components:
     - type: Transform
-      pos: 89.5896,96.740906
+      pos: 89.4964,96.686615
       parent: 1
   - uid: 7934
     components:
     - type: Transform
-      rot: -43.98229715025713 rad
-      pos: 89.88367,96.694435
+      pos: 89.820465,96.686615
       parent: 1
 - proto: Firelock
   entities:
@@ -84471,6 +84480,11 @@ entities:
       parent: 1
 - proto: KitchenReagentGrinder
   entities:
+  - uid: 7838
+    components:
+    - type: Transform
+      pos: 68.5,54.5
+      parent: 1
   - uid: 10593
     components:
     - type: Transform
@@ -84508,30 +84522,6 @@ entities:
     - type: Transform
       pos: 39.5,81.5
       parent: 1
-- proto: LampBanana
-  entities:
-  - uid: 12251
-    components:
-    - type: Transform
-      rot: -69.11503837897548 rad
-      pos: 44.48919,60.852806
-      parent: 1
-    - type: HandheldLight
-      toggleActionEntity: 12252
-    - type: ContainerContainer
-      containers:
-        cell_slot: !type:ContainerSlot
-          showEnts: False
-          occludes: True
-          ent: null
-        actions: !type:Container
-          showEnts: False
-          occludes: True
-          ents:
-          - 12252
-    - type: Physics
-      canCollide: True
-    - type: ActionsContainer
 - proto: LampGold
   entities:
   - uid: 4544
@@ -85420,7 +85410,7 @@ entities:
       pos: 44.5,74.5
       parent: 1
     - type: MailingUnit
-      tag: Kitchen
+      tag: kitchen
     - type: Configuration
       config:
         tag: Kitchen
@@ -85653,16 +85643,16 @@ entities:
     - type: Transform
       pos: 73.5,43.5
       parent: 1
-  - uid: 8194
-    components:
-    - type: Transform
-      pos: 90.5,96.5
-      parent: 1
   - uid: 10675
     components:
     - type: Transform
       pos: 58.529686,53.65843
       parent: 1
+  - uid: 12252
+    components:
+    - type: Transform
+      pos: 89.5,96.5
+      parent: 1
   - uid: 15282
     components:
     - type: Transform
@@ -85883,6 +85873,11 @@ entities:
     - type: Transform
       pos: 62.5,101.5
       parent: 1
+  - uid: 7837
+    components:
+    - type: Transform
+      pos: 77.5,109.5
+      parent: 1
   - uid: 8925
     components:
     - type: Transform
@@ -89451,6 +89446,11 @@ entities:
     - type: Transform
       pos: 82.5,82.5
       parent: 1
+  - uid: 8274
+    components:
+    - type: Transform
+      pos: 89.5,96.5
+      parent: 1
   - uid: 8421
     components:
     - type: Transform
@@ -98737,18 +98737,6 @@ entities:
     - type: Transform
       pos: 80.5,80.5
       parent: 1
-  - uid: 7837
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 90.5,96.5
-      parent: 1
-  - uid: 7838
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 89.5,96.5
-      parent: 1
   - uid: 8087
     components:
     - type: Transform
@@ -100879,6 +100867,11 @@ entities:
     - type: Transform
       pos: 68.5,86.5
       parent: 1
+  - uid: 8194
+    components:
+    - type: Transform
+      pos: 90.5,96.5
+      parent: 1
   - uid: 14538
     components:
     - type: Transform
@@ -111287,11 +111280,6 @@ entities:
     - type: Transform
       pos: 81.5,105.5
       parent: 1
-  - uid: 4404
-    components:
-    - type: Transform
-      pos: 81.5,72.5
-      parent: 1
   - uid: 4405
     components:
     - type: Transform
@@ -112767,6 +112755,11 @@ entities:
     - type: Transform
       pos: 3.5,97.5
       parent: 1
+  - uid: 12251
+    components:
+    - type: Transform
+      pos: 81.5,72.5
+      parent: 1
   - uid: 12290
     components:
     - type: Transform

From 2c5b023dc1b7497a124d4ef4eb1627a2fcef3ed6 Mon Sep 17 00:00:00 2001
From: PJBot <pieterjan.briers+bot@gmail.com>
Date: Sat, 20 Dec 2025 08:33:24 +0000
Subject: [PATCH 015/134] Automatic changelog update

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

diff --git a/Resources/Changelog/Maps.yml b/Resources/Changelog/Maps.yml
index 93bc8f7280..68f28da092 100644
--- a/Resources/Changelog/Maps.yml
+++ b/Resources/Changelog/Maps.yml
@@ -947,4 +947,13 @@
   id: 115
   time: '2025-12-18T20:37:25.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/41884
+- author: Spessmann
+  changes:
+  - message: On Snowball, salvage now has a eva tank dispenser.
+    type: Add
+  - message: On Snowball, chemistry now has a reagent grinder.
+    type: Add
+  id: 116
+  time: '2025-12-20T08:32:14.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/41908
 Order: 2

From a9bb4921a28f8d65fe2366f043bfd6ef2e6d9531 Mon Sep 17 00:00:00 2001
From: chromiumboy <50505512+chromiumboy@users.noreply.github.com>
Date: Sat, 20 Dec 2025 08:21:54 -0600
Subject: [PATCH 016/134] Station AI ghost role (#40607)

* Initial commit

* API

* review

---------

Co-authored-by: ScarKy0 <scarky0@onet.eu>
---
 .../Ghost/Roles/ToggleableGhostRoleSystem.cs  | 24 +++++++++++------
 .../Silicons/StationAi/StationAiSystem.cs     | 27 ++++++++++++++++---
 .../Locale/en-US/silicons/station-ai.ftl      |  4 +++
 .../Entities/Mobs/Player/silicon.yml          |  7 +++++
 4 files changed, 50 insertions(+), 12 deletions(-)

diff --git a/Content.Server/Ghost/Roles/ToggleableGhostRoleSystem.cs b/Content.Server/Ghost/Roles/ToggleableGhostRoleSystem.cs
index 7bb25a63fb..13f90d8bd1 100644
--- a/Content.Server/Ghost/Roles/ToggleableGhostRoleSystem.cs
+++ b/Content.Server/Ghost/Roles/ToggleableGhostRoleSystem.cs
@@ -49,15 +49,23 @@ public sealed class ToggleableGhostRoleSystem : EntitySystem
 
         UpdateAppearance(uid, ToggleableGhostRoleStatus.Searching);
 
-        var ghostRole = EnsureComp<GhostRoleComponent>(uid);
-        EnsureComp<GhostTakeoverAvailableComponent>(uid);
+        ActivateGhostRole((uid, component));
+    }
 
-        //GhostRoleComponent inherits custom settings from the ToggleableGhostRoleComponent
-        ghostRole.RoleName = Loc.GetString(component.RoleName);
-        ghostRole.RoleDescription = Loc.GetString(component.RoleDescription);
-        ghostRole.RoleRules = Loc.GetString(component.RoleRules);
-        ghostRole.JobProto = component.JobProto;
-        ghostRole.MindRoles = component.MindRoles;
+    public void ActivateGhostRole(Entity<ToggleableGhostRoleComponent?> ent)
+    {
+        if (!Resolve(ent, ref ent.Comp))
+            return;
+
+        var ghostRole = EnsureComp<GhostRoleComponent>(ent);
+        EnsureComp<GhostTakeoverAvailableComponent>(ent);
+
+        // GhostRoleComponent inherits custom settings from the ToggleableGhostRoleComponent
+        ghostRole.RoleName = Loc.GetString(ent.Comp.RoleName);
+        ghostRole.RoleDescription = Loc.GetString(ent.Comp.RoleDescription);
+        ghostRole.RoleRules = Loc.GetString(ent.Comp.RoleRules);
+        ghostRole.JobProto = ent.Comp.JobProto;
+        ghostRole.MindRoles = ent.Comp.MindRoles;
     }
 
     private void OnExamined(EntityUid uid, ToggleableGhostRoleComponent component, ExaminedEvent args)
diff --git a/Content.Server/Silicons/StationAi/StationAiSystem.cs b/Content.Server/Silicons/StationAi/StationAiSystem.cs
index c4afd83b2d..36aa9acd6b 100644
--- a/Content.Server/Silicons/StationAi/StationAiSystem.cs
+++ b/Content.Server/Silicons/StationAi/StationAiSystem.cs
@@ -2,6 +2,8 @@ using Content.Server.Chat.Systems;
 using Content.Server.Construction;
 using Content.Server.Destructible;
 using Content.Server.Ghost;
+using Content.Server.Ghost.Roles;
+using Content.Server.Ghost.Roles.Components;
 using Content.Server.Mind;
 using Content.Server.Power.Components;
 using Content.Server.Roles;
@@ -47,6 +49,7 @@ public sealed class StationAiSystem : SharedStationAiSystem
     [Dependency] private readonly RoleSystem _roles = default!;
     [Dependency] private readonly ItemSlotsSystem _slots = default!;
     [Dependency] private readonly GhostSystem _ghost = default!;
+    [Dependency] private readonly ToggleableGhostRoleSystem _ghostrole = default!;
     [Dependency] private readonly AlertsSystem _alerts = default!;
     [Dependency] private readonly DestructibleSystem _destructible = default!;
     [Dependency] private readonly SharedBatterySystem _battery = default!;
@@ -97,14 +100,30 @@ public sealed class StationAiSystem : SharedStationAiSystem
         }
 
         var brain = container.ContainedEntities[0];
+        var hasMind = _mind.TryGetMind(brain, out var mindId, out var mind);
 
-        if (_mind.TryGetMind(brain, out var mindId, out var mind))
+        if (hasMind || HasComp<GhostRoleComponent>(brain))
         {
-            // Found an existing mind to transfer into the AI core
             var aiBrain = Spawn(_stationAiBrain, Transform(ent.Owner).Coordinates);
-            _roles.MindAddJobRole(mindId, mind, false, _stationAiJob);
-            _mind.TransferTo(mindId, aiBrain);
 
+            if (hasMind)
+            {
+                // Found an existing mind to transfer into the AI core
+                _roles.MindAddJobRole(mindId, mind, false, _stationAiJob);
+                _mind.TransferTo(mindId, aiBrain);
+            }
+            else
+            {
+                // If the brain had a ghost role attached, activate the station AI ghost role
+                _ghostrole.ActivateGhostRole(aiBrain);
+
+                // Set the new AI brain to the 'rebooting' state
+                if (TryComp<StationAiCustomizationComponent>(aiBrain, out var customization))
+                    SetStationAiState((aiBrain, customization), StationAiState.Rebooting);
+                
+            }
+
+            // Delete the new AI brain if it cannot be inserted into the core
             if (!TryComp<StationAiHolderComponent>(ent, out var targetHolder) ||
                 !_slots.TryInsert(ent, targetHolder.Slot, aiBrain, null))
             {
diff --git a/Resources/Locale/en-US/silicons/station-ai.ftl b/Resources/Locale/en-US/silicons/station-ai.ftl
index e3451452e4..cbe3ef6ec0 100644
--- a/Resources/Locale/en-US/silicons/station-ai.ftl
+++ b/Resources/Locale/en-US/silicons/station-ai.ftl
@@ -9,6 +9,10 @@ station-ai-is-too-damaged-for-upload = Upload failed - the AI core must be repai
 station-ai-core-losing-power = Your AI core is now running on reserve battery power.
 station-ai-core-critical-power = Your AI core is critically low on power. External power must be re-established or severe data corruption may occur!
 
+# Ghost role
+station-ai-ghost-role-name = Station AI
+station-ai-ghost-role-description = Serve the station crew as its ever watchful AI.
+
 # Radial actions
 ai-open = Open actions
 ai-close = Close actions
diff --git a/Resources/Prototypes/Entities/Mobs/Player/silicon.yml b/Resources/Prototypes/Entities/Mobs/Player/silicon.yml
index 898cee8524..d9bc7c5829 100644
--- a/Resources/Prototypes/Entities/Mobs/Player/silicon.yml
+++ b/Resources/Prototypes/Entities/Mobs/Player/silicon.yml
@@ -457,6 +457,13 @@
       state: ai_female
   - type: NameIdentifier
     group: StationAi
+  - type: ToggleableGhostRole
+    roleName: station-ai-ghost-role-name
+    roleDescription: station-ai-ghost-role-description
+    roleRules: ghost-role-information-silicon-rules
+    mindRoles:
+    - MindRoleGhostRoleSilicon
+    job: StationAi
 
 # Hologram projection that the AI's eye tracks.
 - type: entity

From dcd083a25b66e2dcd0c215cd2b149878fa1033ce Mon Sep 17 00:00:00 2001
From: PJBot <pieterjan.briers+bot@gmail.com>
Date: Sat, 20 Dec 2025 14:35:47 +0000
Subject: [PATCH 017/134] 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 54bf0a73c7..53b872afc9 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -1,11 +1,4 @@
 Entries:
-- author: spanky-spanky
-  changes:
-  - message: The wizard now spawns in a den instead of a shuttle.
-    type: Tweak
-  id: 8821
-  time: '2025-07-31T04:08:05.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/37701
 - author: perryprog
   changes:
   - message: Fixed board game areas sometimes overlapping with those of other board
@@ -3921,3 +3914,11 @@
   id: 9320
   time: '2025-12-20T01:50:14.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/41326
+- author: chromiumboy
+  changes:
+  - message: Station AI cores constructed with a positronic brain that is actively
+      seeking a mind will open a ghost role to become its AI.
+    type: Tweak
+  id: 9321
+  time: '2025-12-20T14:34:40.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/40607

From e2ef727096a141706fbdf217d3ec24698731f0c0 Mon Sep 17 00:00:00 2001
From: ScarKy0 <106310278+ScarKy0@users.noreply.github.com>
Date: Sat, 20 Dec 2025 19:11:07 +0100
Subject: [PATCH 018/134] Log Station AI radial actions (#41911)

* fuck you and your anonymous zombie shocking

* ToUglyString

* because
---
 .../SharedStationAiSystem.Airlock.cs          | 24 +++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/Content.Shared/Silicons/StationAi/SharedStationAiSystem.Airlock.cs b/Content.Shared/Silicons/StationAi/SharedStationAiSystem.Airlock.cs
index 2bf1ddc3bf..f11cba419e 100644
--- a/Content.Shared/Silicons/StationAi/SharedStationAiSystem.Airlock.cs
+++ b/Content.Shared/Silicons/StationAi/SharedStationAiSystem.Airlock.cs
@@ -1,3 +1,5 @@
+using Content.Shared.Administration.Logs;
+using Content.Shared.Database;
 using Content.Shared.Doors.Components;
 using Robust.Shared.Serialization;
 using Content.Shared.Electrocution;
@@ -7,6 +9,8 @@ namespace Content.Shared.Silicons.StationAi;
 // Handles airlock radial
 public abstract partial class SharedStationAiSystem
 {
+    [Dependency] private readonly ISharedAdminLogManager _adminLogger = default!;
+
     private void InitializeAirlock()
     {
         SubscribeLocalEvent<DoorBoltComponent, StationAiBoltEvent>(OnAirlockBolt);
@@ -22,20 +26,30 @@ public abstract partial class SharedStationAiSystem
         if (component.BoltWireCut || !PowerReceiver.IsPowered(ent))
         {
             ShowDeviceNotRespondingPopup(args.User);
+            _adminLogger.Add(LogType.Action,
+                $"{args.User} was unable to change bolt status on {ent} to [{args.Bolted}] using the Station AI radial because it was unpowered.");
             return;
         }
 
         if (!_access.IsAllowed(args.User, ent))
         {
             ShowDeviceNoAccessPopup(args.User);
+            _adminLogger.Add(LogType.Action,
+                $"{args.User} was unable to change bolt status on {ent} to [{args.Bolted}] using the Station AI radial because they had no access.");
             return;
         }
 
         var setResult = _doors.TrySetBoltDown((ent, component), args.Bolted, args.User, predicted: true);
         if (!setResult)
         {
+            _adminLogger.Add(LogType.Action,
+                $"{args.User} was unable to change bolt status on {ent} to [{args.Bolted}] using the Station AI radial.");
             ShowDeviceNotRespondingPopup(args.User);
         }
+        else
+        {
+            _adminLogger.Add(LogType.Action, $"{args.User} set bolt status on {ent} to [{args.Bolted}] using the Station AI radial.");
+        }
     }
 
     /// <summary>
@@ -46,16 +60,21 @@ public abstract partial class SharedStationAiSystem
         if (!PowerReceiver.IsPowered(ent))
         {
             ShowDeviceNotRespondingPopup(args.User);
+            _adminLogger.Add(LogType.Action,
+                $"{args.User} was unable to change emergency access status on {ent} to [{args.EmergencyAccess}] using the Station AI radial because it was unpowered.");
             return;
         }
 
         if (!_access.IsAllowed(args.User, ent))
         {
             ShowDeviceNoAccessPopup(args.User);
+            _adminLogger.Add(LogType.Action,
+                $"{args.User} was unable to change emergency access status on {ent} to [{args.EmergencyAccess}] using the Station AI radial because they had no access.");
             return;
         }
 
         _airlocks.SetEmergencyAccess((ent, component), args.EmergencyAccess, args.User, predicted: true);
+        _adminLogger.Add(LogType.Action, $"{args.User} set emergency access status on {ent} to [{args.EmergencyAccess}] using the Station AI radial.");
     }
 
     /// <summary>
@@ -66,15 +85,20 @@ public abstract partial class SharedStationAiSystem
         if (component.IsWireCut || !PowerReceiver.IsPowered(ent))
         {
             ShowDeviceNotRespondingPopup(args.User);
+            _adminLogger.Add(LogType.Action,
+                $"{args.User} was unable to change electrified status on {ent} to [{args.Electrified}] using the Station AI radial because it was unpowered.");
             return;
         }
 
         if (!_access.IsAllowed(args.User, ent))
         {
             ShowDeviceNoAccessPopup(args.User);
+            _adminLogger.Add(LogType.Action,
+                $"{args.User} was unable to change electrified status on {ent} to [{args.Electrified}] using the Station AI radial because they had no access.");
             return;
         }
 
+        _adminLogger.Add(LogType.Action, $"{args.User} set electrified status on {ent} to [{args.Electrified}] using the Station AI radial.");
         _electrify.SetElectrified((ent, component), args.Electrified);
         var soundToPlay = component.Enabled
             ? component.AirlockElectrifyDisabled

From 000c2e9b5d7e6baf855571429ed218677d24a066 Mon Sep 17 00:00:00 2001
From: PJBot <pieterjan.briers+bot@gmail.com>
Date: Sat, 20 Dec 2025 18:24:50 +0000
Subject: [PATCH 019/134] 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 1079b27247..6cb1369a68 100644
--- a/Resources/Changelog/Admin.yml
+++ b/Resources/Changelog/Admin.yml
@@ -1559,5 +1559,13 @@ Entries:
   id: 189
   time: '2025-12-18T19:33:08.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/41900
+- author: ScarKy0
+  changes:
+  - message: Station AI Radial actions are now logged. Search for "Station AI Radial"
+      in the logs menu under Actions.
+    type: Add
+  id: 190
+  time: '2025-12-20T18:23:43.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/41911
 Name: Admin
 Order: 3

From 77036e8cdde1878d396a24ac45c74a81d2787a01 Mon Sep 17 00:00:00 2001
From: korczoczek <danielkorczok@gmail.com>
Date: Sat, 20 Dec 2025 19:21:49 +0100
Subject: [PATCH 020/134] Added sprites for openable ingredients (#41923)

* dont you hate it when you open your bag, but it stays closed?

* linting my yml
---
 .../Objects/Consumable/Food/ingredients.yml   |  66 ++++++++++++++++--
 .../ingredients.rsi/cornmeal-big_open.png     | Bin 0 -> 346 bytes
 .../Food/ingredients.rsi/flour-big_open.png   | Bin 0 -> 550 bytes
 .../Food/ingredients.rsi/mayo_open.png        | Bin 0 -> 369 bytes
 .../Consumable/Food/ingredients.rsi/meta.json |  20 +++++-
 .../Food/ingredients.rsi/oliveoil_open.png    | Bin 0 -> 415 bytes
 .../Food/ingredients.rsi/rice-big.png         | Bin 272 -> 476 bytes
 .../Food/ingredients.rsi/rice-big_open.png    | Bin 0 -> 479 bytes
 .../Food/ingredients.rsi/sugar-big.png        | Bin 298 -> 499 bytes
 .../Food/ingredients.rsi/sugar-big_open.png   | Bin 0 -> 496 bytes
 10 files changed, 79 insertions(+), 7 deletions(-)
 create mode 100644 Resources/Textures/Objects/Consumable/Food/ingredients.rsi/cornmeal-big_open.png
 create mode 100644 Resources/Textures/Objects/Consumable/Food/ingredients.rsi/flour-big_open.png
 create mode 100644 Resources/Textures/Objects/Consumable/Food/ingredients.rsi/mayo_open.png
 create mode 100644 Resources/Textures/Objects/Consumable/Food/ingredients.rsi/oliveoil_open.png
 create mode 100644 Resources/Textures/Objects/Consumable/Food/ingredients.rsi/rice-big_open.png
 create mode 100644 Resources/Textures/Objects/Consumable/Food/ingredients.rsi/sugar-big_open.png

diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/ingredients.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/ingredients.yml
index 28dfe41ba8..d9a06b89ef 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/ingredients.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/ingredients.yml
@@ -84,8 +84,17 @@
   name: flour bag
   description: A big bag of flour. Good for baking!
   components:
+  - type: Appearance
+  - type: GenericVisualizer
+    visuals:
+      enum.OpenableVisuals.Opened:
+        enum.OpenableVisuals.Layer:
+          True: {state: "flour-big_open"} # open
+          False: {state: "flour-big"} # closed
   - type: Sprite
-    state: flour-big
+    layers:
+    - state: flour-big
+      map: ["enum.OpenableVisuals.Layer"]
   - type: SolutionContainerManager
     solutions:
       food:
@@ -116,8 +125,17 @@
   name: cornmeal bag
   description: A big bag of cornmeal. Good for cooking!
   components:
+  - type: Appearance
+  - type: GenericVisualizer
+    visuals:
+      enum.OpenableVisuals.Opened:
+        enum.OpenableVisuals.Layer:
+          True: {state: "cornmeal-big_open"} # open
+          False: {state: "cornmeal-big"} # closed
   - type: Sprite
-    state: cornmeal-big
+    layers:
+    - state: cornmeal-big
+      map: ["enum.OpenableVisuals.Layer"]
   - type: SolutionContainerManager
     solutions:
       food:
@@ -147,8 +165,17 @@
   name: rice bag
   description: A big bag of rice. Good for cooking!
   components:
+  - type: Appearance
+  - type: GenericVisualizer
+    visuals:
+      enum.OpenableVisuals.Opened:
+        enum.OpenableVisuals.Layer:
+          True: {state: "rice-big_open"} # open
+          False: {state: "rice-big"} # closed
   - type: Sprite
-    state: rice-big
+    layers:
+    - state: rice-big
+      map: ["enum.OpenableVisuals.Layer"]
   - type: SolutionContainerManager
     solutions:
       food:
@@ -178,8 +205,17 @@
   name: sugar bag
   description: A big bag of tasty spacey sugar.
   components:
+  - type: Appearance
+  - type: GenericVisualizer
+    visuals:
+      enum.OpenableVisuals.Opened:
+        enum.OpenableVisuals.Layer:
+          True: {state: "sugar-big_open"} # open
+          False: {state: "sugar-big"} # closed
   - type: Sprite
-    state: sugar-big
+    layers:
+    - state: sugar-big
+      map: ["enum.OpenableVisuals.Layer"]
   - type: SolutionContainerManager
     solutions:
       food:
@@ -211,8 +247,17 @@
   name: olive oil
   description: Olive oil. From space olives presumably.
   components:
+  - type: Appearance
+  - type: GenericVisualizer
+    visuals:
+      enum.OpenableVisuals.Opened:
+        enum.OpenableVisuals.Layer:
+          True: {state: "oliveoil_open"} # open
+          False: {state: "oliveoil"} # closed
   - type: Sprite
-    state: oliveoil
+    layers:
+    - state: oliveoil
+      map: ["enum.OpenableVisuals.Layer"]
   - type: SolutionContainerManager
     solutions:
       food:
@@ -229,8 +274,17 @@
   name: mayonnaise
   description: Bottle of mayonnaise.
   components:
+  - type: Appearance
+  - type: GenericVisualizer
+    visuals:
+      enum.OpenableVisuals.Opened:
+        enum.OpenableVisuals.Layer:
+          True: {state: "mayo_open"} # open
+          False: {state: "mayo"} # closed
   - type: Sprite
-    state: mayo
+    layers:
+    - state: mayo
+      map: ["enum.OpenableVisuals.Layer"]
   - type: SolutionContainerManager
     solutions:
       food:
diff --git a/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/cornmeal-big_open.png b/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/cornmeal-big_open.png
new file mode 100644
index 0000000000000000000000000000000000000000..411d9e9ede04f0b0c218a611b237bf604f3a5e0d
GIT binary patch
literal 346
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jPK-BC>eK@{Ea{HEjtmSN
z`?>!lvVv45dj$D1FjT2AFf_C<F#G}vHN0S8C^cYUc$L7wU^Rn*LA+qju0R{0gj|46
zh%1n;4>mg87JO~n+-p<Q=4Cp?*r+lrdh!4Nf1niiqzlPFim@cfFPOpM*^M+HhqJ&V
zvY3H^?=T269?xHq0u*E~@$_|Nf5{`lt;w@&<3}c-P^G7fV~EA+w-dbiju>z_H|J)&
zuYc6IN<LHM(pQh<O^;7n$USC%y6>LV1KVVVDa@}K1VuDo^BkFVkD-ROL_uGC#W5w`
z4NO{&`;^2QDo-vuQh0Ei?Q+Ids;mFrW036Ia>?fC&Eoj97dQRwr5dL3DGTis`Ml}z
dwI8pe<rhXW?XWm}SPbY022WQ%mvv4FO#oqsbj$z%

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/flour-big_open.png b/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/flour-big_open.png
new file mode 100644
index 0000000000000000000000000000000000000000..93ad77d556d263a700a34445cb714ed4743b60bb
GIT binary patch
literal 550
zcmV+>0@?kEP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0olnc
ze*gdg1ZP1_K>z@;j|==^1poj5AY({UO#lFTCIA3{ga82g0001h=l}q9FaQARU;qF*
zm;eA5aGbhPJOBUy32;bRa{vGf6951U69E94oEQKA00(qQO+^Rk3=|6}I|mnKOaK4@
zd`Uz>R9M69l|4(tP#A@ul)IV>1ye!jAh@-Ii=z;5bn6gG=`WBDrA|d0($Y;Fq`yF<
zWN>pYIJ$^mg9r`<!4Ig!xe%A;5+Y)fCW4T&yty~zzUQ8EUIICC{AY}YrZ*az-Xdpc
zNt*i4n;R<tTwcAX_x0VemKg!NQ}G(Ls#@#P;M09m72x#jmV?8)$mbT~Dxgb)V%Y*f
zNE2Ne2x(F*Tj<h=ZGl+i_CZW1PVCz!Qb0&E)gTv=d^B^%--slUKQaMd{&15pkw&eG
z-Klt)DIlcDbmIK21^(^*<Og#gq{+-3FO&_D<fG%Geb(2O13NbWJU+cMpA;|ZG{hn>
zoj587^`#MBvxIi?s;bR)HX#g#&zCyf+-sJyvmod-K&#!Sw^zjmde^AhYWL^UKx7+4
zthsj`wQjZhYCl|4wc!5YL-}7UTR%1p*3>iL|LLMMkE=kWQL%PbJ%B-XE7GCe!3ECw
ovz8ixFp=L7wRw&lIdTAe0j&zCNAT`;I{*Lx07*qoM6N<$f)r8U5&!@I

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/mayo_open.png b/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/mayo_open.png
new file mode 100644
index 0000000000000000000000000000000000000000..cfe6bb408e1f5f47e39e71e846a6687794209b74
GIT binary patch
literal 369
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%C&rs6b?Si}mUKs7M+SzC
z{oH>NSwSk3J%W507^>757#dm_7=8hT8eT9klo~KFyh>nTu$sZZAYL$MSD+10g0sLQ
zvY3H^TNs2H8D`Cq01C2~c>21szvL0&;bSQ1l{^U)I_~M>7!q;#?NmcPCPe{Pd+GiS
z8@~z^u>GDY_IRgG@0OO{rRfdb5?S6ioqWyMxEoV9w@vq9Y&kPu@)M)hR4=x^1$N)^
zHorK<yTY9FDl>zpr(K+JM3B#c?W>YqbUyQHEd8VIr5SIqlhduIgGYJ6dW~1ik6X+<
z>y|Lg&Rw!PUjL51)b+Tw^HPR;85nN7GfRl&UMw4N-EOa=^@+M=`wwJ<pX)l${_uML
z2aden1OHS!73C|8SM%RUkyqFl%kj4O-16M|r9nTv+3NbMA|Ggfc>wehgQu&X%Q~lo
FCIAr4ec=EA

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/meta.json
index e076f72f17..9d16a6bcd6 100644
--- a/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation and baystation and modified by potato1234x at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24 and https://github.com/Baystation12/Baystation12/commit/a6067826de7fd8f698793f6d84e6c2f1f9b1f188. Tofu and tofu-slice were created by Discord user rosysyntax#6514. Chevrelog and chevredisk created by Github user deathride58, tortilladough tortillaflat and tortillaslice added by Phunny, butter-slice and croissant-raw taken from tgstation at commit https://github.com/tgstation/tgstation/commit/7ffd61b6fa6a6183daa8900f9a490f46f7a81955, cotton made by mlexf (discord 1143460554963427380). Croissant-raw-cotton, cotton-dough-slice and cotton-dough-rope by JuneSzalkowska, cloth-box by Janet Blackquill <uhhadd@gmail.com> 2024. Cheese wedge inhand by Orsoniks.",
+  "copyright": "Taken from tgstation and baystation and modified by potato1234x at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24 and https://github.com/Baystation12/Baystation12/commit/a6067826de7fd8f698793f6d84e6c2f1f9b1f188. Tofu and tofu-slice were created by Discord user rosysyntax#6514. Chevrelog and chevredisk created by Github user deathride58, tortilladough tortillaflat and tortillaslice added by Phunny, butter-slice and croissant-raw taken from tgstation at commit https://github.com/tgstation/tgstation/commit/7ffd61b6fa6a6183daa8900f9a490f46f7a81955, cotton made by mlexf (discord 1143460554963427380). Croissant-raw-cotton, cotton-dough-slice and cotton-dough-rope by JuneSzalkowska, cloth-box by Janet Blackquill <uhhadd@gmail.com> 2024. Cheese wedge inhand by Orsoniks. Opened variants of olive oil, mayo and cornmeal, flour, rice and sugar bags by korczoczek, based on the unopened sprites",
   "size": {
     "x": 32,
     "y": 32
@@ -42,6 +42,9 @@
     {
       "name": "cornmeal-big"
     },
+    {
+      "name": "cornmeal-big_open"
+    },
     {
       "name": "cornmealdough"
     },
@@ -84,21 +87,33 @@
     {
       "name": "flour-big"
     },
+    {
+      "name": "flour-big_open"
+    },
     {
       "name": "flour-small"
     },
     {
       "name": "mayo"
     },
+    {
+      "name": "mayo_open"
+    },
     {
       "name": "oliveoil"
     },
+    {
+      "name": "oliveoil_open"
+    },
     {
       "name": "pizzabread"
     },
     {
       "name": "rice-big"
     },
+    {
+      "name": "rice-big_open"
+    },
     {
       "name": "rice-small"
     },
@@ -114,6 +129,9 @@
     {
       "name": "sugar-big"
     },
+    {
+      "name": "sugar-big_open"
+    },
     {
       "name": "sugar-small"
     },
diff --git a/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/oliveoil_open.png b/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/oliveoil_open.png
new file mode 100644
index 0000000000000000000000000000000000000000..d833c0bc85a1c359b3da8162e8a9bf39c0af05c5
GIT binary patch
literal 415
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%C&rs6b?Si}mUKs7M+SzC
z{oH>NSwSk3J%W507^>757#dm_7=8hT8eT9klo~KFyh>nTu$sZZAYL$MSD+10g0sLQ
zvY3H^TNs2H8D`Cq01C2~c>21szvL0&;gQ;Zv&j%B^wrbFF(l$}a)Jcw;slN61qDz4
zJ3c)1U(>L;Rp{)VL*<&^SS~xXD=F`kdc0ZUU-oO~8{zs!20C-x=0!5gG5I|Cb?@+D
z=5yDtwRc=R%Q*kOmawYZW|Ir1lOO)S+Pxy_)-N8O)R#+UyN8+WshZfxXvrl31Z8h-
zIPNbx5MVT~vGJkm;m6Od1CEFp=`4wNTyi4k>;jEs-skfxO569b2KxMS5~(^dttG`;
zLH*t=MYVcGXTLqBu6zpGymRXJO;EhNd*;DI9;~iCd3-<qgw1^T@BU(qoeV(&cV%@u
zUWl{u@bD}SG$;sUU_KFOpx|qiVz<+GQ=kDCL(`R*xmPbYZvqAYgQu&X%Q~loCIH$*
BmDvCQ

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/rice-big.png b/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/rice-big.png
index 7a89c3361bd5aff85cd3183dcc76852aa2747466..7b6e1b942bc54575f24d43d2f63d0b8039ec5fdc 100644
GIT binary patch
delta 450
zcmV;z0X_bZ0^9?TB!2;OQb$4o*~u(_00004XF*Lt006O%3;baP0000WV@Og>004R>
z004l5008;`004mK004C`008P>0026e000+ooVrmw00009a7bBm000XU000XU0RWnu
z7ytkO2XskIMF;5&6bm0SnafQ|0003pNkl<ZSi|j=y>Wyv5PwD=9>*qhLZAz%Koz(G
zy1-SC*i{@|P>3o}0D%)iXh06c|M`a1jU8DpSw;wbpH`~{B9X{{Ckg(dYTfCa&x?57
zr%-X7DRiNrpCX`({j<nquz^V&4W{YPC79X^nx<RCP1B(>xryhX3{2uX%pnFMJFCO)
z>6Q1R!Q2zB6Mxa#VHp5)rm$}V`AfQ(0I=ggZc}eaC=QYu*zA607T@yI*q>woeDU$x
z-M;9RKbER>(yJJD4Gq|Q0N~nRa35+HA3<bb7KJs{<<(KYC%gCv=V_{1rwg?d*<1^z
zzMZPeHB;uR6LmyU4cKwm6`36ebeS&W#~8x-5lnX;13PH$if-fY8UUYqWa6P2kTs0b
sIar&{86nLm>~}mFIVGSIMk0~OH(+O&WbXsd-T(jq07*qoM6N<$g0$zhW&i*H

delta 244
zcmV<Q01N-z1CRocB!AaQL_t(oh3%D17K0!RgonP~h&$n#;7&OcT{JvF{FzX@l5Ybj
znlY0gCX>nIan=O*nDf;hSseY|*HCa@E&w9BuI7wLvw%9dBn>Kn54y%?PKtQ50-E48
zqH{TZ><r4Q?(5I?sy%ES*fLN8_=B6Gb&zf>!mjXc=2B@VKyAI29nXCwlC{9phLBZA
zghP()I07eNC;cI2q{TJk2%H6V`ZreW3N1DfHkiAh3-%+I7D#>2{Gk)L8W=p~7`W06
u-&XWw1}uk>t#<<XmouD%lgZ@a0Qdl>HBqc)I`$+00000<MNUMnLSTZzn{cfF

diff --git a/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/rice-big_open.png b/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/rice-big_open.png
new file mode 100644
index 0000000000000000000000000000000000000000..fb3994f98108789f26aee21f73c35e3b7b056276
GIT binary patch
literal 479
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%C&rs6b?Si}mUKs7M+SzC
z{oH>NSwSk3J%W507^>757#dm_7=8hT8eT9klo~KFyh>nTu$sZZAYL$MSD+10g0sLQ
zvY3H^TNs2H8D`Cq01C2~c>21szvL0&*3fA=@}L`NpQ)#dV@Sl|x1rW~M-)V4)~xlN
znZ~{C0n2-Zovp=Ovz~~&KK+DcPD7LKr5#ZZxhEW|j}BzGJyFT<tn;yow#0diMn?Zk
zr+f{#_Wmb}x6)h3a7Km;@%@?q9v?d=ykL#I2jc+`_RJp<?uLR&T@lPZB@Cs>k>8%E
zvagum?XofbJ9ox{zcp_1j$4>FJ!yZo!y_^!YP;a1r1~8V_x_oljN*u8O}f3QV_W>=
z{{93G`P^a!Z@$aBVsGwPqI1c#VfyhkjPvd;5L6JlaO&5EybkV#^A45e=Y4pe6zI?W
z(59yO>eai8>yo>x&c!ZRvpoEw>b(z!+`I1W^Sb&Z<c0pvNteDaD_zjlfByQ{8_F3+
zc4!OKsm#58*x2AsiQ<!ud@ZpuQ@=Afh}_VTayWaVkSWZm&Q+n(&CQLCp@vyt`@)Ka
T8!eiEVanj?>gTe~DWM4fDnYzL

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/sugar-big.png b/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/sugar-big.png
index fc467656befb08f17c769fd5cad380c737952492..fe544e3a1f7aa359bfe68a9a9589e9c58dd9a894 100644
GIT binary patch
delta 473
zcmV;~0Ve*c0`miqB!2;OQb$4o*~u(_00004XF*Lt006O%3;baP0000WV@Og>004R>
z004l5008;`004mK004C`008P>0026e000+ooVrmw00009a7bBm000XU000XU0RWnu
z7ytkO2XskIMF;5&6bm2%kjrOG0003=Nkl<ZSi|j<F>b{m41b3IS9Q)k7?CPv<rbVH
z6FCBza*gH|89{my8!SCVF5pf?N#0XqS8r<bEhY$JWBWI7adGkAxk)d0@9FGJ-}mhQ
zzDb=MW8j=aN(sgo0Dv)Ox8?*X#(Pg81R^5x-V+g#wRZPi*C7Pr2JtQlqHS9Y!?4?n
zG48AsR;_C4YkvSKB>+Izbr{F->78ks#QpVS05$y~1j;$nk(@Jy5Xf39s{d&dZeL$f
zN<Ex=w#Px#1C?zVwrH)<bse<U#Fe5bfEXj1rU3waeoergfREd12d%}AVa<W+6xgKt
z;2ihgN&hrW-g|P+p_GDUS=L@S$`JsZb8DvNd1g&SR#FK{DNstSS}&!b2BnmGurI}0
zyGpFe?aWH#$m)S*S$3H?vl3WRsjtz@E>9`3C!uIua?|?KF??}x@#pylui^`>CuOB7
P00000NkvXXu0mjfvI4<|

delta 271
zcmV+q0r39w1F8a$B!BTqL_t(oh3%E$34|~Vg`dYQB-}2#iH=}5x$bh%1>B`a#2mF$
zlBoB~eo!J>n%9@KqEe~cp2ljxG)+;OGmfKqU3GFA1jnxHBE!!bk*AWUiAo}Pu4dh*
zMZ_=+==*;2&N;V<R#XB?yUB%w5SG}s?Gm+pU~+&HkP{`y1%DFay;nEkLz=+5-%ENH
zvja$WnnUiaBmSiXl$e~L_?|uRiNLG*MYq=9f>;9V*`Fm};sHdPs0Ua8I{=iAUH(l|
zhC@Ao3!73b0XJK^dkv)~JtP1-c3*|+sL=h6<d&1LTt=qfCJT|U+=P`%<>mnR0ziGF
V>EL(Kg#Z8m00>D%PDHLkV1hO<g604K

diff --git a/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/sugar-big_open.png b/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/sugar-big_open.png
new file mode 100644
index 0000000000000000000000000000000000000000..a05391340c012eccb613f1df554d7853fd1a5af3
GIT binary patch
literal 496
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%C&rs6b?Si}mUKs7M+SzC
z{oH>NSwSk3J%W507^>757#dm_7=8hT8eT9klo~KFyh>nTu$sZZAYL$MSD+10g0sLQ
zvY3H^TNs2H8D`Cq01C2~c>21szvL0&){ye9D-{CT=jQ3+7!q;#ZJ2Lfn}R@XUEx{V
zw9HE_y4xSftoy=IG`Wg<`h*%z>l<H0;u_W|xZM`{u-P;Ce%gc&#-E?{G8a5P7T-3-
z$V2n+OygU#ydUp)|J%Z+__K|<>T^-udCN386fc=4^Ss`r#?5egQ-aL#H^uTxc?^yn
zuw-Wt5R^z(P%1cgP-3?pYrO0JR>Nf$zqHsoUMzL0yOQ(ip1jP;h4!}_J^ufjv{%`Q
z!{@SyUUEZ6LeI~;B1c{<{<PgnL8;=sf9B$~H<wIl+WO7lerc?ibDpV)WkQdqRmJ}q
zjp+>cW~GE)k5xXj_J`2b-KRgU$>#L!V{1!n_$~)@k*>y4zU=lyjenY3RZHcy4^;QR
z2oZU7ZQq`!R?nNRS+xi>6~A*|z4ct)<w&WHx$ky&oHw}eWRt*Y9rkOt-jq8A&+3~~
jy0m|iw0Yj2{2C@Fztd(OAHH1y1~P-EtDnm{r-UW|hSJ0K

literal 0
HcmV?d00001


From c179445ec9f7a44ebf559235ea9bc66ef600aeb2 Mon Sep 17 00:00:00 2001
From: PJBot <pieterjan.briers+bot@gmail.com>
Date: Sat, 20 Dec 2025 18:38:29 +0000
Subject: [PATCH 021/134] 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 53b872afc9..b33b9b9aa6 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -1,12 +1,4 @@
 Entries:
-- author: perryprog
-  changes:
-  - message: Fixed board game areas sometimes overlapping with those of other board
-      games.
-    type: Fix
-  id: 8822
-  time: '2025-08-01T21:48:40.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/39327
 - author: Krosus
   changes:
   - message: Fixed crash when loading saved character profiles
@@ -3922,3 +3914,11 @@
   id: 9321
   time: '2025-12-20T14:34:40.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/40607
+- author: korczoczek
+  changes:
+  - message: Added opened sprite variants to olive oil, mayo and flour, cornmeal,
+      rice, sugar bags
+    type: Tweak
+  id: 9322
+  time: '2025-12-20T18:37:22.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/41923

From 79f58a0314031b852d616a7f0719371ded6bcf8f Mon Sep 17 00:00:00 2001
From: Perry Fraser <perryprog@users.noreply.github.com>
Date: Sat, 20 Dec 2025 14:24:04 -0500
Subject: [PATCH 022/134] Don't process paused MoverControllers (#39444)

* refactor: make MoverController use more queries

* perf: don't process paused MoverControllers

* perf: track active input movers via events

* Revert "place stored changeling identities next to each other (#39452)"

This reverts commit 9b5d2ff11b8f19fafbf97d6ceab238028ca6dfeb.

* perf: keep around the seen movers hashset

* fix: don't reintroduce wild wild west ordering

* style: use virtual method

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

* docs: better ActiveInputMoverComponent motiviation

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

* fix: pass through known comp

* fix: properly order relay movers for real

* perf: use proxy Transform() and inline it

Actually this might be a slight performance improvement since it avoids

the dictionary lookup until the case that its body status is on ground.

* style: switch an event handler to Entity<T>

* fix: just-in-case track for relay loops

* merg conflix

* borger

* whitespace moment

* whoops

* empty

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com>
---
 .../Physics/Controllers/MoverController.cs    | 212 +++++++++++++-----
 .../ActionBlocker/ActionBlockerSystem.cs      |  10 +-
 .../Systems/SharedChangelingIdentitySystem.cs |   7 +-
 .../Components/ActiveInputMoverComponent.cs   |  27 +++
 .../Systems/SharedMoverController.Relay.cs    |   6 +-
 .../Movement/Systems/SharedMoverController.cs |  21 +-
 6 files changed, 212 insertions(+), 71 deletions(-)
 create mode 100644 Content.Shared/Movement/Components/ActiveInputMoverComponent.cs

diff --git a/Content.Server/Physics/Controllers/MoverController.cs b/Content.Server/Physics/Controllers/MoverController.cs
index 5c87de1863..f933c72103 100644
--- a/Content.Server/Physics/Controllers/MoverController.cs
+++ b/Content.Server/Physics/Controllers/MoverController.cs
@@ -1,18 +1,16 @@
+using System.Diagnostics;
 using System.Numerics;
 using System.Runtime.CompilerServices;
 using Content.Server.Shuttles.Components;
 using Content.Server.Shuttles.Systems;
-using Content.Shared.Friction;
 using Content.Shared.Movement.Components;
 using Content.Shared.Movement.Systems;
 using Content.Shared.Shuttles.Components;
 using Content.Shared.Shuttles.Systems;
 using Prometheus;
-using Robust.Shared.Physics.Components;
 using Robust.Shared.Player;
-using DroneConsoleComponent = Content.Server.Shuttles.DroneConsoleComponent;
 using DependencyAttribute = Robust.Shared.IoC.DependencyAttribute;
-using Robust.Shared.Map.Components;
+using DroneConsoleComponent = Content.Server.Shuttles.DroneConsoleComponent;
 
 namespace Content.Server.Physics.Controllers;
 
@@ -20,20 +18,111 @@ public sealed class MoverController : SharedMoverController
 {
     private static readonly Gauge ActiveMoverGauge = Metrics.CreateGauge(
         "physics_active_mover_count",
-        "Active amount of InputMovers being processed by MoverController");
+        "Amount of ActiveInputMovers being processed by MoverController");
 
     [Dependency] private readonly ThrusterSystem _thruster = default!;
-    [Dependency] private readonly SharedTransformSystem _xformSystem = default!;
 
     private Dictionary<EntityUid, (ShuttleComponent, List<(EntityUid, PilotComponent, InputMoverComponent, TransformComponent)>)> _shuttlePilots = new();
 
+    private EntityQuery<ActiveInputMoverComponent> _activeQuery;
+    private EntityQuery<DroneConsoleComponent> _droneQuery;
+    private EntityQuery<ShuttleComponent> _shuttleQuery;
+
+    // Not needed for persistence; just used to save an alloc
+    private readonly HashSet<EntityUid> _seenMovers = [];
+    private readonly HashSet<EntityUid> _seenRelayMovers = [];
+    private readonly List<Entity<InputMoverComponent>> _moversToUpdate = [];
+
     public override void Initialize()
     {
         base.Initialize();
+
+        SubscribeLocalEvent<ActiveInputMoverComponent, EntityPausedEvent>(OnEntityPaused);
+        SubscribeLocalEvent<InputMoverComponent, EntityUnpausedEvent>(OnEntityUnpaused);
+
         SubscribeLocalEvent<RelayInputMoverComponent, PlayerAttachedEvent>(OnRelayPlayerAttached);
         SubscribeLocalEvent<RelayInputMoverComponent, PlayerDetachedEvent>(OnRelayPlayerDetached);
         SubscribeLocalEvent<InputMoverComponent, PlayerAttachedEvent>(OnPlayerAttached);
         SubscribeLocalEvent<InputMoverComponent, PlayerDetachedEvent>(OnPlayerDetached);
+
+        _activeQuery = GetEntityQuery<ActiveInputMoverComponent>();
+        _droneQuery = GetEntityQuery<DroneConsoleComponent>();
+        _shuttleQuery = GetEntityQuery<ShuttleComponent>();
+    }
+
+    private void OnEntityPaused(Entity<ActiveInputMoverComponent> ent, ref EntityPausedEvent args)
+    {
+        // Become unactive [sic] if we don't have PhysicsComp.IgnorePaused
+        if (PhysicsQuery.TryComp(ent, out var phys) && phys.IgnorePaused)
+            return;
+        RemCompDeferred<ActiveInputMoverComponent>(ent);
+    }
+
+    private void OnEntityUnpaused(Entity<InputMoverComponent> ent, ref EntityUnpausedEvent args)
+    {
+        UpdateMoverStatus((ent, ent.Comp));
+    }
+
+    protected override void OnMoverStartup(Entity<InputMoverComponent> ent, ref ComponentStartup args)
+    {
+        base.OnMoverStartup(ent, ref args);
+        UpdateMoverStatus((ent, ent.Comp));
+    }
+
+    protected override void OnTargetRelayShutdown(Entity<MovementRelayTargetComponent> ent, ref ComponentShutdown args)
+    {
+        base.OnTargetRelayShutdown(ent, ref args);
+        UpdateMoverStatus((ent, null, ent.Comp));
+    }
+
+    protected override void UpdateMoverStatus(Entity<InputMoverComponent?, MovementRelayTargetComponent?> ent)
+    {
+        // Track that we aren't in a loop of movement relayers
+        _seenMovers.Clear();
+        while (true)
+        {
+            if (!MoverQuery.Resolve(ent, ref ent.Comp1, logMissing: false))
+            {
+                RemCompDeferred<ActiveInputMoverComponent>(ent);
+                break;
+            }
+
+            var meta = MetaData(ent);
+            if (Terminating(ent, meta))
+                break;
+
+            ActiveInputMoverComponent? activeMover = null;
+            if (!meta.EntityPaused
+                || PhysicsQuery.TryComp(ent, out var phys) && phys.IgnorePaused)
+                activeMover = EnsureComp<ActiveInputMoverComponent>(ent);
+
+            // If we're a relay target, make sure our drivers are InputMovers
+            if (RelayTargetQuery.Resolve(ent, ref ent.Comp2, logMissing: false)
+                // In case we're called from ComponentShutdown:
+                && ent.Comp2.LifeStage <= ComponentLifeStage.Running
+                && Exists(ent.Comp2.Source)
+                && !_seenMovers.Contains(ent.Comp2.Source))
+            {
+                if (ent.Comp2.Source == ent.Owner)
+                {
+                    Log.Error($"Entity {ToPrettyString(ent)} is attempting to relay movement to itself!");
+                    break;
+                }
+
+                if (activeMover is not null)
+                    activeMover.RelayedFrom = ent.Comp2.Source;
+
+                ent = ent.Comp2.Source;
+                _seenMovers.Add(ent);
+                continue;
+            }
+
+            // No longer a well-defined relay target
+            if (activeMover is not null)
+                activeMover.RelayedFrom = null;
+
+            break;
+        }
     }
 
     private void OnRelayPlayerAttached(Entity<RelayInputMoverComponent> entity, ref PlayerAttachedEvent args)
@@ -63,48 +152,70 @@ public sealed class MoverController : SharedMoverController
         return true;
     }
 
-    private HashSet<EntityUid> _moverAdded = new();
-    private List<Entity<InputMoverComponent>> _movers = new();
-
-    private void InsertMover(Entity<InputMoverComponent> source)
-    {
-        if (TryComp(source, out MovementRelayTargetComponent? relay))
-        {
-            if (TryComp(relay.Source, out InputMoverComponent? relayMover))
-            {
-                InsertMover((relay.Source, relayMover));
-            }
-        }
-
-        // Already added
-        if (!_moverAdded.Add(source.Owner))
-            return;
-
-        _movers.Add(source);
-    }
-
     public override void UpdateBeforeSolve(bool prediction, float frameTime)
     {
         base.UpdateBeforeSolve(prediction, frameTime);
 
-        _moverAdded.Clear();
-        _movers.Clear();
-        var inputQueryEnumerator = AllEntityQuery<InputMoverComponent>();
+        // We use _seenMovers here as well as in UpdateMoverStatus—this means we
+        // cannot have any events get fired while we use it in this while loop.
+        _seenMovers.Clear();
+        _moversToUpdate.Clear();
 
-        // Need to order mob movement so that movers don't run before their relays.
-        while (inputQueryEnumerator.MoveNext(out var uid, out var mover))
+        // Don't use EntityQueryEnumerator because admin ghosts have to move on
+        // paused maps. Pausing movers is handled via ActiveInputMoverComponent.
+        var inputQueryEnumerator = AllEntityQuery<ActiveInputMoverComponent, InputMoverComponent>();
+        while (inputQueryEnumerator.MoveNext(out var uid, out var activeComp, out var moverComp))
         {
-            InsertMover((uid, mover));
+            _seenRelayMovers.Clear(); // O(1) if already empty
+            QueueRelaySources(activeComp.RelayedFrom);
+
+            // If it's already inserted, that's fine—that means it'll still be
+            // handled before its child movers
+            AddMover((uid, moverComp));
         }
 
-        foreach (var mover in _movers)
-        {
-            HandleMobMovement(mover, frameTime);
-        }
+        ActiveMoverGauge.Set(_moversToUpdate.Count);
 
-        ActiveMoverGauge.Set(_movers.Count);
+        foreach (var ent in _moversToUpdate)
+        {
+            HandleMobMovement(ent, frameTime);
+        }
 
         HandleShuttleMovement(frameTime);
+        return;
+
+        // When we insert a chain of relay sources we have to flip its ordering
+        // It's going to be extremely uncommon for a relay chain to be more than
+        // one entity so we just recurse as needed.
+        void QueueRelaySources(EntityUid? next)
+        {
+            // We only care if it's still a mover
+            if (!_activeQuery.TryComp(next, out var nextActive)
+                || !MoverQuery.TryComp(next, out var nextMover)
+                || !_seenRelayMovers.Add(next.Value))
+                return;
+
+            Debug.Assert(next.Value != nextActive.RelayedFrom);
+
+            // While it is (as of writing) currently true that this recursion
+            // should always terminate due to RelayedFrom always being written
+            // in a way that tracks if it's made a loop, we still take the extra
+            // memory (and small time cost) of making sure via _seenRelayMovers.
+            QueueRelaySources(nextActive.RelayedFrom);
+            AddMover((next.Value, nextMover));
+        }
+
+        // Track inserts so we have ~ O(1) inserts without duplicates. Hopefully
+        // it doesn't matter that both _seenMovers and _moversToUpdate are never
+        // trimmed? They should be pretty memory light anyway, and in general
+        // it'll be rare for there to be a decrease in movers.
+        void AddMover(Entity<InputMoverComponent> entity)
+        {
+            if (!_seenMovers.Add(entity))
+                return;
+
+            _moversToUpdate.Add(entity);
+        }
     }
 
     public (Vector2 Strafe, float Rotation, float Brakes) GetPilotVelocityInput(PilotComponent component)
@@ -152,7 +263,7 @@ public sealed class MoverController : SharedMoverController
 
     protected override void HandleShuttleInput(EntityUid uid, ShuttleButtons button, ushort subTick, bool state)
     {
-        if (!TryComp<PilotComponent>(uid, out var pilot) || pilot.Console == null)
+        if (!PilotQuery.TryComp(uid, out var pilot) || pilot.Console == null)
             return;
 
         ResetSubtick(pilot);
@@ -263,27 +374,25 @@ public sealed class MoverController : SharedMoverController
 
         // We just mark off their movement and the shuttle itself does its own movement
         var activePilotQuery = EntityQueryEnumerator<PilotComponent, InputMoverComponent>();
-        var shuttleQuery = GetEntityQuery<ShuttleComponent>();
         while (activePilotQuery.MoveNext(out var uid, out var pilot, out var mover))
         {
             var consoleEnt = pilot.Console;
 
             // TODO: This is terrible. Just make a new mover and also make it remote piloting + device networks
-            if (TryComp<DroneConsoleComponent>(consoleEnt, out var cargoConsole))
-            {
+            if (_droneQuery.TryComp(consoleEnt, out var cargoConsole))
                 consoleEnt = cargoConsole.Entity;
-            }
 
-            if (!TryComp(consoleEnt, out TransformComponent? xform)) continue;
+            if (!XformQuery.TryComp(consoleEnt, out var xform))
+                continue;
 
             var gridId = xform.GridUid;
             // This tries to see if the grid is a shuttle and if the console should work.
-            if (!TryComp<MapGridComponent>(gridId, out var _) ||
-                !shuttleQuery.TryGetComponent(gridId, out var shuttleComponent) ||
+            if (!MapGridQuery.HasComp(gridId) ||
+                !_shuttleQuery.TryGetComponent(gridId, out var shuttleComponent) ||
                 !shuttleComponent.Enabled)
                 continue;
 
-            if (!newPilots.TryGetValue(gridId!.Value, out var pilots))
+            if (!newPilots.TryGetValue(gridId.Value, out var pilots))
             {
                 pilots = (shuttleComponent, new List<(EntityUid, PilotComponent, InputMoverComponent, TransformComponent)>());
                 newPilots[gridId.Value] = pilots;
@@ -305,13 +414,12 @@ public sealed class MoverController : SharedMoverController
 
         // Collate all of the linear / angular velocites for a shuttle
         // then do the movement input once for it.
-        var xformQuery = GetEntityQuery<TransformComponent>();
         foreach (var (shuttleUid, (shuttle, pilots)) in _shuttlePilots)
         {
-            if (Paused(shuttleUid) || CanPilot(shuttleUid) || !TryComp<PhysicsComponent>(shuttleUid, out var body))
+            if (Paused(shuttleUid) || CanPilot(shuttleUid) || !PhysicsQuery.TryComp(shuttleUid, out var body))
                 continue;
 
-            var shuttleNorthAngle = _xformSystem.GetWorldRotation(shuttleUid, xformQuery);
+            var shuttleNorthAngle = TransformSystem.GetWorldRotation(shuttleUid, XformQuery);
 
             // Collate movement linear and angular inputs together
             var linearInput = Vector2.Zero;
@@ -321,7 +429,7 @@ public sealed class MoverController : SharedMoverController
             var brakeCount = 0;
             var angularCount = 0;
 
-            foreach (var (pilotUid, pilot, _, consoleXform) in pilots)
+            foreach (var (_, pilot, _, consoleXform) in pilots)
             {
                 var (strafe, rotation, brakes) = GetPilotVelocityInput(pilot);
 
@@ -571,9 +679,9 @@ public sealed class MoverController : SharedMoverController
 
     private bool CanPilot(EntityUid shuttleUid)
     {
-        return TryComp<FTLComponent>(shuttleUid, out var ftl)
+        return FTLQuery.TryComp(shuttleUid, out var ftl)
         && (ftl.State & (FTLState.Starting | FTLState.Travelling | FTLState.Arriving)) != 0x0
-            || HasComp<PreventPilotComponent>(shuttleUid);
+            || PreventPilotQuery.HasComp(shuttleUid);
     }
 
 }
diff --git a/Content.Shared/ActionBlocker/ActionBlockerSystem.cs b/Content.Shared/ActionBlocker/ActionBlockerSystem.cs
index c256872cc7..485dc89580 100644
--- a/Content.Shared/ActionBlocker/ActionBlockerSystem.cs
+++ b/Content.Shared/ActionBlocker/ActionBlockerSystem.cs
@@ -30,15 +30,11 @@ namespace Content.Shared.ActionBlocker
             base.Initialize();
 
             _complexInteractionQuery = GetEntityQuery<ComplexInteractionComponent>();
-
-            SubscribeLocalEvent<InputMoverComponent, ComponentStartup>(OnMoverStartup);
-        }
-
-        private void OnMoverStartup(EntityUid uid, InputMoverComponent component, ComponentStartup args)
-        {
-            UpdateCanMove(uid, component);
         }
 
+        // These two methods should probably both live in SharedMoverController
+        // but they're called in a million places and I'm not doing that
+        // refactor right now.
         public bool CanMove(EntityUid uid, InputMoverComponent? component = null)
         {
             return Resolve(uid, ref component, false) && component.CanMove;
diff --git a/Content.Shared/Changeling/Systems/SharedChangelingIdentitySystem.cs b/Content.Shared/Changeling/Systems/SharedChangelingIdentitySystem.cs
index 830aed6ab6..57439d0a0b 100644
--- a/Content.Shared/Changeling/Systems/SharedChangelingIdentitySystem.cs
+++ b/Content.Shared/Changeling/Systems/SharedChangelingIdentitySystem.cs
@@ -23,7 +23,6 @@ public abstract class SharedChangelingIdentitySystem : EntitySystem
     [Dependency] private readonly SharedPvsOverrideSystem _pvsOverrideSystem = default!;
 
     public MapId? PausedMapId;
-    private int _numberOfStoredIdentities = 0; // TODO: remove this
 
     public override void Initialize()
     {
@@ -99,11 +98,7 @@ public abstract class SharedChangelingIdentitySystem : EntitySystem
             return null;
 
         EnsurePausedMap();
-        // TODO: Setting the spawn location is a shitty bandaid to prevent admins from crashing our servers.
-        // Movercontrollers and mob collisions are currently being calculated even for paused entities.
-        // Spawning all of them in the same spot causes severe performance problems.
-        // Cryopods and Polymorph have the same problem.
-        var clone = Spawn(speciesPrototype.Prototype, new MapCoordinates(new Vector2(2 * _numberOfStoredIdentities++, 0), PausedMapId!.Value));
+        var clone = Spawn(speciesPrototype.Prototype, new MapCoordinates(Vector2.Zero, PausedMapId!.Value));
 
         var storedIdentity = EnsureComp<ChangelingStoredIdentityComponent>(clone);
         storedIdentity.OriginalEntity = target; // TODO: network this once we have WeakEntityReference or the autonetworking source gen is fixed
diff --git a/Content.Shared/Movement/Components/ActiveInputMoverComponent.cs b/Content.Shared/Movement/Components/ActiveInputMoverComponent.cs
new file mode 100644
index 0000000000..24a0d9eacd
--- /dev/null
+++ b/Content.Shared/Movement/Components/ActiveInputMoverComponent.cs
@@ -0,0 +1,27 @@
+using Content.Shared.Movement.Systems;
+
+namespace Content.Shared.Movement.Components;
+
+/// <summary>
+/// Marker component for entities that are being processed by MoverController.
+/// </summary>
+/// <remarks>
+/// The idea here is to keep track via event subscriptions which mover
+/// controllers actually need to be processed. Instead of having this be a
+/// boolean field on the <see cref="InputMoverComponent"/>, we instead track it
+/// as a separate component which is much faster to query all at once.
+/// </remarks>
+/// <seealso cref="InputMoverComponent"/>
+/// <seealso cref="SharedMoverController.UpdateMoverStatus"/>
+[RegisterComponent, Access(typeof(SharedMoverController))]
+public sealed partial class ActiveInputMoverComponent : Component
+{
+    /// <summary>
+    /// Cached version of <see cref="MovementRelayTargetComponent.Source"/>.
+    /// </summary>
+    /// <remarks>
+    /// This <i>must not</i> form a loop of EntityUids.
+    /// </remarks>
+    [DataField, ViewVariables]
+    public EntityUid? RelayedFrom;
+};
diff --git a/Content.Shared/Movement/Systems/SharedMoverController.Relay.cs b/Content.Shared/Movement/Systems/SharedMoverController.Relay.cs
index 79c593cbe7..09cf8eb706 100644
--- a/Content.Shared/Movement/Systems/SharedMoverController.Relay.cs
+++ b/Content.Shared/Movement/Systems/SharedMoverController.Relay.cs
@@ -1,4 +1,3 @@
-using Content.Shared.ActionBlocker;
 using Content.Shared.Movement.Components;
 
 namespace Content.Shared.Movement.Systems;
@@ -61,6 +60,7 @@ public abstract partial class SharedMoverController
         Dirty(uid, component);
         Dirty(relayEntity, targetComp);
         _blocker.UpdateCanMove(uid);
+        UpdateMoverStatus((relayEntity, null, targetComp));
     }
 
     private void OnRelayShutdown(Entity<RelayInputMoverComponent> entity, ref ComponentShutdown args)
@@ -80,7 +80,7 @@ public abstract partial class SharedMoverController
         _blocker.UpdateCanMove(entity.Owner);
     }
 
-    private void OnTargetRelayShutdown(Entity<MovementRelayTargetComponent> entity, ref ComponentShutdown args)
+    protected virtual void OnTargetRelayShutdown(Entity<MovementRelayTargetComponent> entity, ref ComponentShutdown args)
     {
         PhysicsSystem.UpdateIsPredicted(entity.Owner);
         PhysicsSystem.UpdateIsPredicted(entity.Comp.Source);
@@ -91,4 +91,6 @@ public abstract partial class SharedMoverController
         if (TryComp(entity.Comp.Source, out RelayInputMoverComponent? relay) && relay.LifeStage <= ComponentLifeStage.Running)
             RemComp(entity.Comp.Source, relay);
     }
+
+    protected virtual void UpdateMoverStatus(Entity<InputMoverComponent?, MovementRelayTargetComponent?> ent) { }
 }
diff --git a/Content.Shared/Movement/Systems/SharedMoverController.cs b/Content.Shared/Movement/Systems/SharedMoverController.cs
index 5d24b16621..ff034a9c07 100644
--- a/Content.Shared/Movement/Systems/SharedMoverController.cs
+++ b/Content.Shared/Movement/Systems/SharedMoverController.cs
@@ -9,6 +9,7 @@ using Content.Shared.Maps;
 using Content.Shared.Mobs.Systems;
 using Content.Shared.Movement.Components;
 using Content.Shared.Movement.Events;
+using Content.Shared.Shuttles.Components;
 using Content.Shared.Tag;
 using Robust.Shared.Audio;
 using Robust.Shared.Audio.Systems;
@@ -48,6 +49,7 @@ public abstract partial class SharedMoverController : VirtualController
 
     protected EntityQuery<CanMoveInAirComponent> CanMoveInAirQuery;
     protected EntityQuery<FootstepModifierComponent> FootstepModifierQuery;
+    protected EntityQuery<FTLComponent> FTLQuery;
     protected EntityQuery<InputMoverComponent> MoverQuery;
     protected EntityQuery<MapComponent> MapQuery;
     protected EntityQuery<MapGridComponent> MapGridQuery;
@@ -56,6 +58,8 @@ public abstract partial class SharedMoverController : VirtualController
     protected EntityQuery<MovementSpeedModifierComponent> ModifierQuery;
     protected EntityQuery<NoRotateOnMoveComponent> NoRotateQuery;
     protected EntityQuery<PhysicsComponent> PhysicsQuery;
+    protected EntityQuery<PilotComponent> PilotQuery;
+    protected EntityQuery<PreventPilotComponent> PreventPilotQuery;
     protected EntityQuery<RelayInputMoverComponent> RelayQuery;
     protected EntityQuery<PullableComponent> PullableQuery;
     protected EntityQuery<TransformComponent> XformQuery;
@@ -92,8 +96,12 @@ public abstract partial class SharedMoverController : VirtualController
         FootstepModifierQuery = GetEntityQuery<FootstepModifierComponent>();
         MapGridQuery = GetEntityQuery<MapGridComponent>();
         MapQuery = GetEntityQuery<MapComponent>();
+        FTLQuery = GetEntityQuery<FTLComponent>();
+        PilotQuery = GetEntityQuery<PilotComponent>();
+        PreventPilotQuery = GetEntityQuery<PreventPilotComponent>();
 
         SubscribeLocalEvent<MovementSpeedModifierComponent, TileFrictionEvent>(OnTileFriction);
+        SubscribeLocalEvent<InputMoverComponent, ComponentStartup>(OnMoverStartup);
 
         InitializeInput();
         InitializeRelay();
@@ -103,6 +111,11 @@ public abstract partial class SharedMoverController : VirtualController
         Subs.CVar(_configManager, CCVars.OffgridFriction, value => _offGridDamping = value, true);
     }
 
+    protected virtual void OnMoverStartup(Entity<InputMoverComponent> ent, ref ComponentStartup args)
+    {
+       _blocker.UpdateCanMove(ent, ent.Comp);
+    }
+
     public override void Shutdown()
     {
         base.Shutdown();
@@ -469,9 +482,9 @@ public abstract partial class SharedMoverController : VirtualController
             // Only allow pushing off of anchored things that have collision.
             if (otherCollider.BodyType != BodyType.Static ||
                 !otherCollider.CanCollide ||
-                ((collider.CollisionMask & otherCollider.CollisionLayer) == 0 &&
-                (otherCollider.CollisionMask & collider.CollisionLayer) == 0) ||
-                (TryComp(otherEntity, out PullableComponent? pullable) && pullable.BeingPulled))
+                (collider.CollisionMask & otherCollider.CollisionLayer) == 0 &&
+                (otherCollider.CollisionMask & collider.CollisionLayer) == 0 ||
+                PullableQuery.TryComp(otherEntity, out var pullable) && pullable.BeingPulled)
             {
                 continue;
             }
@@ -621,7 +634,7 @@ public abstract partial class SharedMoverController : VirtualController
 
     private void OnTileFriction(Entity<MovementSpeedModifierComponent> ent, ref TileFrictionEvent args)
     {
-        if (!TryComp<PhysicsComponent>(ent, out var physicsComponent) || !XformQuery.TryComp(ent, out var xform))
+        if (!PhysicsQuery.TryComp(ent, out var physicsComponent))
             return;
 
         if (physicsComponent.BodyStatus != BodyStatus.OnGround || _gravity.IsWeightless(ent.Owner))

From 6932f2819136e570e8e763f53c05d1920071d9fa Mon Sep 17 00:00:00 2001
From: Sir Warock <67167466+SirWarock@users.noreply.github.com>
Date: Sun, 21 Dec 2025 00:58:26 +0100
Subject: [PATCH 023/134] Merge Injector & Hypospray Systems & Components
 (#41833)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Merge Injector & Hyposprays

* Fixes

* Requested Changes

* Preview

* Inclusion of Prototypes

* Fix

* small oversight

* Further fixes

* A few more fixes & Bluespacesyringe buff

Co-Authored-By: āda <177162775+iaada@users.noreply.github.com>

* Final Commit, hopefully

* Merge conflict no more

* YML fix

* Add required changes

Co-Authored-By: Princess Cheeseballs <66055347+Princess-Cheeseballs@users.noreply.github.com>

* cleanup warnings removal

* Bug fix & Maintainer Requests

Co-Authored-By: āda <177162775+iaada@users.noreply.github.com>

* Adhere to requested changes

Co-Authored-By: āda <177162775+iaada@users.noreply.github.com>

---------

Co-authored-by: āda <177162775+iaada@users.noreply.github.com>
Co-authored-by: Princess Cheeseballs <66055347+Princess-Cheeseballs@users.noreply.github.com>
Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
---
 .../HyposprayStatusControlSystem.cs           |  16 -
 .../InjectorStatusControlSystem.cs            |  20 +
 .../Chemistry/EntitySystems/InjectorSystem.cs |  16 -
 .../Chemistry/UI/HyposprayStatusControl.cs    |  58 --
 .../Chemistry/UI/InjectorStatusControl.cs     |  61 +-
 .../Chemistry/EntitySystems/InjectorSystem.cs |   6 -
 .../Components/HyposprayComponent.cs          |  60 --
 .../Chemistry/Components/InjectorComponent.cs | 120 +--
 .../EntitySystems/HypospraySystem.cs          | 329 --------
 .../Chemistry/EntitySystems/InjectorSystem.cs | 762 ++++++++++++++++++
 .../EntitySystems/SharedInjectorSystem.cs     | 536 ------------
 .../Chemistry/Events/HyposprayEvents.cs       |  38 -
 .../Chemistry/Events/InjectorEvents.cs        |  43 +
 .../Prototypes/InjectorModePrototype.cs       | 145 ++++
 Content.Shared/Clumsy/ClumsySystem.cs         |  12 +-
 .../Fluids/SharedPuddleSystem.Spillable.cs    |  19 +-
 .../Inventory/InventorySystem.Relay.cs        |   7 +-
 .../components/hypospray-component.ftl        |  20 -
 .../components/injector-component.ftl         |  45 +-
 .../Prototypes/Chemistry/injector_modes.yml   | 118 +++
 .../Prototypes/Entities/Clothing/Belt/job.yml |   3 +-
 .../Objects/Specific/Medical/hypospray.yml    | 113 +--
 .../Entities/Objects/Specific/chemistry.yml   |  48 +-
 Resources/Prototypes/tags.yml                 |   3 +
 24 files changed, 1274 insertions(+), 1324 deletions(-)
 delete mode 100644 Content.Client/Chemistry/EntitySystems/HyposprayStatusControlSystem.cs
 create mode 100644 Content.Client/Chemistry/EntitySystems/InjectorStatusControlSystem.cs
 delete mode 100644 Content.Client/Chemistry/EntitySystems/InjectorSystem.cs
 delete mode 100644 Content.Client/Chemistry/UI/HyposprayStatusControl.cs
 delete mode 100644 Content.Server/Chemistry/EntitySystems/InjectorSystem.cs
 delete mode 100644 Content.Shared/Chemistry/Components/HyposprayComponent.cs
 delete mode 100644 Content.Shared/Chemistry/EntitySystems/HypospraySystem.cs
 create mode 100644 Content.Shared/Chemistry/EntitySystems/InjectorSystem.cs
 delete mode 100644 Content.Shared/Chemistry/EntitySystems/SharedInjectorSystem.cs
 delete mode 100644 Content.Shared/Chemistry/Events/HyposprayEvents.cs
 create mode 100644 Content.Shared/Chemistry/Events/InjectorEvents.cs
 create mode 100644 Content.Shared/Chemistry/Prototypes/InjectorModePrototype.cs
 delete mode 100644 Resources/Locale/en-US/chemistry/components/hypospray-component.ftl
 create mode 100644 Resources/Prototypes/Chemistry/injector_modes.yml

diff --git a/Content.Client/Chemistry/EntitySystems/HyposprayStatusControlSystem.cs b/Content.Client/Chemistry/EntitySystems/HyposprayStatusControlSystem.cs
deleted file mode 100644
index 4dfc8506d2..0000000000
--- a/Content.Client/Chemistry/EntitySystems/HyposprayStatusControlSystem.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-using Content.Client.Chemistry.UI;
-using Content.Client.Items;
-using Content.Shared.Chemistry.Components;
-using Content.Shared.Chemistry.EntitySystems;
-
-namespace Content.Client.Chemistry.EntitySystems;
-
-public sealed class HyposprayStatusControlSystem : EntitySystem
-{
-    [Dependency] private readonly SharedSolutionContainerSystem _solutionContainers = default!;
-    public override void Initialize()
-    {
-        base.Initialize();
-        Subs.ItemStatus<HyposprayComponent>(ent => new HyposprayStatusControl(ent, _solutionContainers));
-    }
-}
diff --git a/Content.Client/Chemistry/EntitySystems/InjectorStatusControlSystem.cs b/Content.Client/Chemistry/EntitySystems/InjectorStatusControlSystem.cs
new file mode 100644
index 0000000000..ca8685eb3e
--- /dev/null
+++ b/Content.Client/Chemistry/EntitySystems/InjectorStatusControlSystem.cs
@@ -0,0 +1,20 @@
+using Content.Client.Chemistry.UI;
+using Content.Client.Items;
+using Content.Shared.Chemistry.Components;
+using Content.Shared.Chemistry.EntitySystems;
+using Robust.Shared.Prototypes;
+
+namespace Content.Client.Chemistry.EntitySystems;
+
+public sealed class InjectorStatusControlSystem : EntitySystem
+{
+    [Dependency] private readonly SharedSolutionContainerSystem _solutionContainers = default!;
+    [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
+
+
+    public override void Initialize()
+    {
+        base.Initialize();
+        Subs.ItemStatus<InjectorComponent>(injector => new InjectorStatusControl(injector, _solutionContainers, _prototypeManager));
+    }
+}
diff --git a/Content.Client/Chemistry/EntitySystems/InjectorSystem.cs b/Content.Client/Chemistry/EntitySystems/InjectorSystem.cs
deleted file mode 100644
index 58cb5330a2..0000000000
--- a/Content.Client/Chemistry/EntitySystems/InjectorSystem.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-using Content.Client.Chemistry.UI;
-using Content.Client.Items;
-using Content.Shared.Chemistry.Components;
-using Content.Shared.Chemistry.EntitySystems;
-
-namespace Content.Client.Chemistry.EntitySystems;
-
-public sealed class InjectorSystem : SharedInjectorSystem
-{
-    public override void Initialize()
-    {
-        base.Initialize();
-
-        Subs.ItemStatus<InjectorComponent>(ent => new InjectorStatusControl(ent, SolutionContainer));
-    }
-}
diff --git a/Content.Client/Chemistry/UI/HyposprayStatusControl.cs b/Content.Client/Chemistry/UI/HyposprayStatusControl.cs
deleted file mode 100644
index a564bcefc6..0000000000
--- a/Content.Client/Chemistry/UI/HyposprayStatusControl.cs
+++ /dev/null
@@ -1,58 +0,0 @@
-using Content.Client.Message;
-using Content.Client.Stylesheets;
-using Content.Shared.Chemistry.Components;
-using Content.Shared.Chemistry.EntitySystems;
-using Content.Shared.FixedPoint;
-using Robust.Client.UserInterface;
-using Robust.Client.UserInterface.Controls;
-using Robust.Shared.Timing;
-
-namespace Content.Client.Chemistry.UI;
-
-public sealed class HyposprayStatusControl : Control
-{
-    private readonly Entity<HyposprayComponent> _parent;
-    private readonly RichTextLabel _label;
-    private readonly SharedSolutionContainerSystem _solutionContainers;
-
-    private FixedPoint2 PrevVolume;
-    private FixedPoint2 PrevMaxVolume;
-    private bool PrevOnlyAffectsMobs;
-
-    public HyposprayStatusControl(Entity<HyposprayComponent> parent, SharedSolutionContainerSystem solutionContainers)
-    {
-        _parent = parent;
-        _solutionContainers = solutionContainers;
-        _label = new RichTextLabel { StyleClasses = { StyleClass.ItemStatus } };
-        AddChild(_label);
-    }
-
-    protected override void FrameUpdate(FrameEventArgs args)
-    {
-        base.FrameUpdate(args);
-
-        if (!_solutionContainers.TryGetSolution(_parent.Owner, _parent.Comp.SolutionName, out _, out var solution))
-            return;
-
-        // only updates the UI if any of the details are different than they previously were
-        if (PrevVolume == solution.Volume
-            && PrevMaxVolume == solution.MaxVolume
-            && PrevOnlyAffectsMobs == _parent.Comp.OnlyAffectsMobs)
-            return;
-
-        PrevVolume = solution.Volume;
-        PrevMaxVolume = solution.MaxVolume;
-        PrevOnlyAffectsMobs = _parent.Comp.OnlyAffectsMobs;
-
-        var modeStringLocalized = Loc.GetString((_parent.Comp.OnlyAffectsMobs && _parent.Comp.CanContainerDraw) switch
-        {
-            false => "hypospray-all-mode-text",
-            true => "hypospray-mobs-only-mode-text",
-        });
-
-        _label.SetMarkup(Loc.GetString("hypospray-volume-label",
-            ("currentVolume", solution.Volume),
-            ("totalVolume", solution.MaxVolume),
-            ("modeString", modeStringLocalized)));
-    }
-}
diff --git a/Content.Client/Chemistry/UI/InjectorStatusControl.cs b/Content.Client/Chemistry/UI/InjectorStatusControl.cs
index 24f988bd35..0c57da7813 100644
--- a/Content.Client/Chemistry/UI/InjectorStatusControl.cs
+++ b/Content.Client/Chemistry/UI/InjectorStatusControl.cs
@@ -2,26 +2,32 @@ using Content.Client.Message;
 using Content.Client.Stylesheets;
 using Content.Shared.Chemistry.Components;
 using Content.Shared.Chemistry.EntitySystems;
+using Content.Shared.Chemistry.Prototypes;
 using Content.Shared.FixedPoint;
 using Robust.Client.UserInterface;
 using Robust.Client.UserInterface.Controls;
+using Robust.Shared.Prototypes;
 using Robust.Shared.Timing;
 
 namespace Content.Client.Chemistry.UI;
 
 public sealed class InjectorStatusControl : Control
 {
+    private readonly IPrototypeManager _prototypeManager;
+
     private readonly Entity<InjectorComponent> _parent;
     private readonly SharedSolutionContainerSystem _solutionContainers;
     private readonly RichTextLabel _label;
 
-    private FixedPoint2 PrevVolume;
-    private FixedPoint2 PrevMaxVolume;
-    private FixedPoint2 PrevTransferAmount;
-    private InjectorToggleMode PrevToggleState;
+    private FixedPoint2 _prevVolume;
+    private FixedPoint2 _prevMaxVolume;
+    private FixedPoint2? _prevTransferAmount;
+    private InjectorBehavior _prevBehavior;
 
-    public InjectorStatusControl(Entity<InjectorComponent> parent, SharedSolutionContainerSystem solutionContainers)
+    public InjectorStatusControl(Entity<InjectorComponent> parent, SharedSolutionContainerSystem solutionContainers, IPrototypeManager prototypeManager)
     {
+        _prototypeManager  = prototypeManager;
+
         _parent = parent;
         _solutionContainers = solutionContainers;
         _label = new RichTextLabel { StyleClasses = { StyleClass.ItemStatus } };
@@ -32,33 +38,38 @@ public sealed class InjectorStatusControl : Control
     {
         base.FrameUpdate(args);
 
-        if (!_solutionContainers.TryGetSolution(_parent.Owner, _parent.Comp.SolutionName, out _, out var solution))
+        if (!_solutionContainers.TryGetSolution(_parent.Owner, _parent.Comp.SolutionName, out _, out var solution)
+            || !_prototypeManager.Resolve(_parent.Comp.ActiveModeProtoId, out var activeMode))
             return;
 
         // only updates the UI if any of the details are different than they previously were
-        if (PrevVolume == solution.Volume
-            && PrevMaxVolume == solution.MaxVolume
-            && PrevTransferAmount == _parent.Comp.CurrentTransferAmount
-            && PrevToggleState == _parent.Comp.ToggleState)
+        if (_prevVolume == solution.Volume
+            && _prevMaxVolume == solution.MaxVolume
+            && _prevTransferAmount == _parent.Comp.CurrentTransferAmount
+            && _prevBehavior == activeMode.Behavior)
             return;
 
-        PrevVolume = solution.Volume;
-        PrevMaxVolume = solution.MaxVolume;
-        PrevTransferAmount = _parent.Comp.CurrentTransferAmount;
-        PrevToggleState = _parent.Comp.ToggleState;
+        _prevVolume = solution.Volume;
+        _prevMaxVolume = solution.MaxVolume;
+        _prevTransferAmount = _parent.Comp.CurrentTransferAmount;
+        _prevBehavior = activeMode.Behavior;
 
         // Update current volume and injector state
-        var modeStringLocalized = Loc.GetString(_parent.Comp.ToggleState switch
+        // Seeing transfer volume is only important for injectors that can change it.
+        if (activeMode.TransferAmounts.Count > 1 && _parent.Comp.CurrentTransferAmount.HasValue)
         {
-            InjectorToggleMode.Draw => "injector-draw-text",
-            InjectorToggleMode.Inject => "injector-inject-text",
-            _ => "injector-invalid-injector-toggle-mode"
-        });
-
-        _label.SetMarkup(Loc.GetString("injector-volume-label",
-            ("currentVolume", solution.Volume),
-            ("totalVolume", solution.MaxVolume),
-            ("modeString", modeStringLocalized),
-            ("transferVolume", _parent.Comp.CurrentTransferAmount)));
+            _label.SetMarkup(Loc.GetString("injector-volume-transfer-label",
+                ("currentVolume", solution.Volume),
+                ("totalVolume", solution.MaxVolume),
+                ("modeString", Loc.GetString(activeMode.Name)),
+                ("transferVolume", _parent.Comp.CurrentTransferAmount.Value)));
+        }
+        else
+        {
+            _label.SetMarkup(Loc.GetString("injector-volume-label",
+                ("currentVolume", solution.Volume),
+                ("totalVolume", solution.MaxVolume),
+                ("modeString", Loc.GetString(activeMode.Name))));
+        }
     }
 }
diff --git a/Content.Server/Chemistry/EntitySystems/InjectorSystem.cs b/Content.Server/Chemistry/EntitySystems/InjectorSystem.cs
deleted file mode 100644
index 6088d01c59..0000000000
--- a/Content.Server/Chemistry/EntitySystems/InjectorSystem.cs
+++ /dev/null
@@ -1,6 +0,0 @@
-
-using Content.Shared.Chemistry.EntitySystems;
-
-namespace Content.Server.Chemistry.EntitySystems;
-
-public sealed class InjectorSystem : SharedInjectorSystem;
diff --git a/Content.Shared/Chemistry/Components/HyposprayComponent.cs b/Content.Shared/Chemistry/Components/HyposprayComponent.cs
deleted file mode 100644
index e1e4f21101..0000000000
--- a/Content.Shared/Chemistry/Components/HyposprayComponent.cs
+++ /dev/null
@@ -1,60 +0,0 @@
-using Content.Shared.FixedPoint;
-using Robust.Shared.GameStates;
-using Robust.Shared.Audio;
-
-namespace Content.Shared.Chemistry.Components;
-
-/// <summary>
-///     Component that allows an entity instantly transfer liquids by interacting with objects that have solutions.
-/// </summary>
-[RegisterComponent, NetworkedComponent]
-[AutoGenerateComponentState]
-public sealed partial class HyposprayComponent : Component
-{
-    /// <summary>
-    ///     Solution that will be used by hypospray for injections.
-    /// </summary>
-    [DataField]
-    public string SolutionName = "hypospray";
-
-    /// <summary>
-    ///     Amount of the units that will be transfered.
-    /// </summary>
-    [AutoNetworkedField]
-    [DataField]
-    public FixedPoint2 TransferAmount = FixedPoint2.New(5);
-
-    /// <summary>
-    /// The delay to draw reagents using the hypospray.
-    /// If set, <see cref="RefillableSolutionComponent"/> RefillTime should probably have the same value.
-    /// </summary>
-    [DataField]
-    public float DrawTime = 0f;
-
-    /// <summary>
-    ///     Sound that will be played when injecting.
-    /// </summary>
-    [DataField]
-    public SoundSpecifier InjectSound = new SoundPathSpecifier("/Audio/Items/hypospray.ogg");
-
-    /// <summary>
-    /// Decides whether you can inject everything or just mobs.
-    /// </summary>
-    [AutoNetworkedField]
-    [DataField(required: true)]
-    public bool OnlyAffectsMobs = false;
-
-    /// <summary>
-    /// If this can draw from containers in mob-only mode.
-    /// </summary>
-    [AutoNetworkedField]
-    [DataField]
-    public bool CanContainerDraw = true;
-
-    /// <summary>
-    /// Whether or not the hypospray is able to draw from containers or if it's a single use
-    /// device that can only inject.
-    /// </summary>
-    [DataField]
-    public bool InjectOnly = false;
-}
diff --git a/Content.Shared/Chemistry/Components/InjectorComponent.cs b/Content.Shared/Chemistry/Components/InjectorComponent.cs
index d3a0503c3c..e31d8d3503 100644
--- a/Content.Shared/Chemistry/Components/InjectorComponent.cs
+++ b/Content.Shared/Chemistry/Components/InjectorComponent.cs
@@ -1,10 +1,10 @@
 using Content.Shared.Chemistry.EntitySystems;
+using Content.Shared.Chemistry.Prototypes;
 using Content.Shared.Chemistry.Reagent;
 using Content.Shared.DoAfter;
 using Content.Shared.FixedPoint;
 using Robust.Shared.GameStates;
 using Robust.Shared.Prototypes;
-using Robust.Shared.Serialization;
 
 namespace Content.Shared.Chemistry.Components;
 
@@ -14,11 +14,10 @@ namespace Content.Shared.Chemistry.Components;
 /// <remarks>
 /// Can optionally support both
 /// injection and drawing or just injection. Can inject/draw reagents from solution
-/// containers, and can directly inject into a mobs bloodstream.
+/// containers, and can directly inject into a mob's bloodstream.
 /// </remarks>
-/// <seealso cref="SharedInjectorSystem"/>
-/// <seealso cref="InjectorToggleMode"/>
-[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
+/// <seealso cref="InjectorModePrototype"/>
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState, Access(typeof(InjectorSystem))]
 public sealed partial class InjectorComponent : Component
 {
     /// <summary>
@@ -34,111 +33,74 @@ public sealed partial class InjectorComponent : Component
     public Entity<SolutionComponent>? Solution = null;
 
     /// <summary>
-    /// Whether or not the injector is able to draw from containers or if it's a single use
-    /// device that can only inject.
-    /// </summary>
-    [DataField]
-    public bool InjectOnly;
-
-    /// <summary>
-    /// Whether or not the injector is able to draw from or inject from mobs.
+    /// Amount to inject or draw on each usage.
     /// </summary>
     /// <remarks>
-    /// For example: droppers would ignore mobs.
+    /// If its set null, this injector is marked to inject its entire contents upon usage.
     /// </remarks>
+    [DataField, AutoNetworkedField]
+    public FixedPoint2? CurrentTransferAmount = FixedPoint2.New(5);
+
+
+    /// <summary>
+    /// The mode that this injector starts with on MapInit.
+    /// </summary>
+    [DataField(required: true), AutoNetworkedField]
+    public ProtoId<InjectorModePrototype> ActiveModeProtoId;
+
+    /// <summary>
+    /// The possible <see cref="InjectorModePrototype"/> that it can switch between.
+    /// </summary>
+    [DataField(required: true)]
+    public List<ProtoId<InjectorModePrototype>> AllowedModes;
+
+    /// <summary>
+    /// Whether the injector is able to draw from or inject from mobs.
+    /// </summary>
+    /// <example>
+    /// Droppers ignore mobs.
+    /// </example>
     [DataField]
     public bool IgnoreMobs;
 
     /// <summary>
-    /// Whether or not the injector is able to draw from or inject into containers that are closed/sealed.
+    /// Whether the injector is able to draw from or inject into containers that are closed/sealed.
     /// </summary>
-    /// <remarks>
-    /// For example: droppers can not inject into cans, but syringes can.
-    /// </remarks>
+    /// <example>
+    /// Droppers can't inject into closed cans.
+    /// </example>
     [DataField]
     public bool IgnoreClosed = true;
 
-    /// <summary>
-    /// The transfer amounts for the set-transfer verb.
-    /// </summary>
-    [DataField]
-    public List<FixedPoint2> TransferAmounts = new() { 1, 5, 10, 15 };
-
-    /// <summary>
-    /// Amount to inject or draw on each usage. If the injector is inject only, it will
-    /// attempt to inject it's entire contents upon use.
-    /// </summary>
-    [DataField, AutoNetworkedField]
-    public FixedPoint2 CurrentTransferAmount = FixedPoint2.New(5);
-
-    /// <summary>
-    /// Injection delay (seconds) when the target is a mob.
-    /// </summary>
-    /// <remarks>
-    /// The base delay has a minimum of 1 second, but this will still be modified if the target is incapacitated or
-    /// in combat mode.
-    /// </remarks>
-    [DataField]
-    public TimeSpan Delay = TimeSpan.FromSeconds(5);
-
-    /// <summary>
-    /// Each additional 1u after first 5u increases the delay by X seconds.
-    /// </summary>
-    [DataField]
-    public TimeSpan DelayPerVolume = TimeSpan.FromSeconds(0.1);
-
-    /// <summary>
-    /// The state of the injector. Determines it's attack behavior. Containers must have the
-    /// right SolutionCaps to support injection/drawing. For InjectOnly injectors this should
-    /// only ever be set to Inject
-    /// </summary>
-    [DataField, AutoNetworkedField]
-    public InjectorToggleMode ToggleState = InjectorToggleMode.Draw;
-
     /// <summary>
     /// Reagents that are allowed to be within this injector.
     /// If a solution has both allowed and non-allowed reagents, only allowed reagents will be drawn into this injector.
     /// A null ReagentWhitelist indicates all reagents are allowed.
     /// </summary>
     [DataField]
-    public List<ProtoId<ReagentPrototype>>? ReagentWhitelist = null;
+    public List<ProtoId<ReagentPrototype>>? ReagentWhitelist;
 
     #region Arguments for injection doafter
 
-    /// <inheritdoc cref=DoAfterArgs.NeedHand>
+    /// <inheritdoc cref="DoAfterArgs.NeedHand"/>
     [DataField]
     public bool NeedHand = true;
 
-    /// <inheritdoc cref=DoAfterArgs.BreakOnHandChange>
+    /// <inheritdoc cref="DoAfterArgs.BreakOnHandChange"/>
     [DataField]
     public bool BreakOnHandChange = true;
 
-    /// <inheritdoc cref=DoAfterArgs.MovementThreshold>
+    /// <inheritdoc cref="DoAfterArgs.MovementThreshold"/>
     [DataField]
     public float MovementThreshold = 0.1f;
 
     #endregion
 }
 
-/// <summary>
-/// Possible modes for an <see cref="InjectorComponent"/>.
-/// </summary>
-[Serializable, NetSerializable]
-public enum InjectorToggleMode : byte
+internal static class InjectorToggleModeExtensions
 {
-    /// <summary>
-    /// The injector will try to inject reagent into things.
-    /// </summary>
-    Inject,
-
-    /// <summary>
-    /// The injector will try to draw reagent from things.
-    /// </summary>
-    Draw,
+    public static bool HasAnyFlag(this InjectorBehavior s1, InjectorBehavior s2)
+    {
+        return (s1 & s2) != 0;
+    }
 }
-
-/// <summary>
-/// Raised on the injector when the doafter has finished.
-/// </summary>
-[Serializable, NetSerializable]
-public sealed partial class InjectorDoAfterEvent : SimpleDoAfterEvent;
diff --git a/Content.Shared/Chemistry/EntitySystems/HypospraySystem.cs b/Content.Shared/Chemistry/EntitySystems/HypospraySystem.cs
deleted file mode 100644
index e179fb5f43..0000000000
--- a/Content.Shared/Chemistry/EntitySystems/HypospraySystem.cs
+++ /dev/null
@@ -1,329 +0,0 @@
-using System.Diagnostics.CodeAnalysis;
-using Content.Shared.Administration.Logs;
-using Content.Shared.Chemistry.Components;
-using Content.Shared.Chemistry.Components.SolutionManager;
-using Content.Shared.Chemistry.Hypospray.Events;
-using Content.Shared.Database;
-using Content.Shared.DoAfter;
-using Content.Shared.FixedPoint;
-using Content.Shared.Forensics;
-using Content.Shared.IdentityManagement;
-using Content.Shared.Interaction.Events;
-using Content.Shared.Interaction;
-using Content.Shared.Mobs.Components;
-using Content.Shared.Popups;
-using Content.Shared.Timing;
-using Content.Shared.Verbs;
-using Content.Shared.Weapons.Melee.Events;
-using Robust.Shared.Audio.Systems;
-using Robust.Shared.Serialization;
-
-namespace Content.Shared.Chemistry.EntitySystems;
-
-public sealed class HypospraySystem : EntitySystem
-{
-    [Dependency] private readonly ISharedAdminLogManager _adminLogger = default!;
-    [Dependency] private readonly ReactiveSystem _reactiveSystem = default!;
-    [Dependency] private readonly SharedAudioSystem _audio = default!;
-    [Dependency] private readonly SharedPopupSystem _popup = default!;
-    [Dependency] private readonly SharedSolutionContainerSystem _solutionContainers = default!;
-    [Dependency] private readonly UseDelaySystem _useDelay = default!;
-    [Dependency] private readonly SharedDoAfterSystem _doAfter = default!;
-
-    public override void Initialize()
-    {
-        base.Initialize();
-
-        SubscribeLocalEvent<HyposprayComponent, AfterInteractEvent>(OnAfterInteract);
-        SubscribeLocalEvent<HyposprayComponent, MeleeHitEvent>(OnAttack);
-        SubscribeLocalEvent<HyposprayComponent, UseInHandEvent>(OnUseInHand);
-        SubscribeLocalEvent<HyposprayComponent, GetVerbsEvent<AlternativeVerb>>(AddToggleModeVerb);
-        SubscribeLocalEvent<HyposprayComponent, HyposprayDrawDoAfterEvent>(OnDrawDoAfter);
-    }
-
-    #region Ref events
-    private void OnUseInHand(Entity<HyposprayComponent> entity, ref UseInHandEvent args)
-    {
-        if (args.Handled)
-            return;
-
-        args.Handled = TryDoInject(entity, args.User, args.User);
-    }
-
-    private void OnAfterInteract(Entity<HyposprayComponent> entity, ref AfterInteractEvent args)
-    {
-        if (args.Handled || !args.CanReach || args.Target == null)
-            return;
-
-        args.Handled = TryUseHypospray(entity, args.Target.Value, args.User);
-    }
-
-    private void OnAttack(Entity<HyposprayComponent> entity, ref MeleeHitEvent args)
-    {
-        if (args.HitEntities is [])
-            return;
-
-        TryDoInject(entity, args.HitEntities[0], args.User);
-    }
-
-    private void OnDrawDoAfter(Entity<HyposprayComponent> entity, ref HyposprayDrawDoAfterEvent args)
-    {
-        if (args.Cancelled)
-            return;
-
-        if (entity.Comp.CanContainerDraw
-            && args.Target.HasValue
-            && !EligibleEntity(args.Target.Value, entity)
-            && _solutionContainers.TryGetDrawableSolution(args.Target.Value, out var drawableSolution, out _))
-        {
-            TryDraw(entity, args.Target.Value, drawableSolution.Value, args.User);
-        }
-    }
-
-    #endregion
-
-    #region Draw/Inject
-    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 allowed
-        if (entity.Comp.CanContainerDraw
-            && !EligibleEntity(target, entity)
-            && _solutionContainers.TryGetDrawableSolution(target, out var drawableSolution, out _))
-        {
-            return TryStartDraw(entity, target, drawableSolution.Value, user);
-        }
-
-        return TryDoInject(entity, target, user);
-    }
-
-    public bool TryDoInject(Entity<HyposprayComponent> entity, EntityUid target, EntityUid user)
-    {
-        var (uid, component) = entity;
-
-        if (!EligibleEntity(target, component))
-            return false;
-
-        if (TryComp(uid, out UseDelayComponent? delayComp))
-        {
-            if (_useDelay.IsDelayed((uid, delayComp)))
-                return false;
-        }
-
-        string? msgFormat = null;
-
-        // Self event
-        var selfEvent = new SelfBeforeHyposprayInjectsEvent(user, entity.Owner, target);
-        RaiseLocalEvent(user, selfEvent);
-
-        if (selfEvent.Cancelled)
-        {
-            _popup.PopupClient(Loc.GetString(selfEvent.InjectMessageOverride ?? "hypospray-cant-inject", ("owner", Identity.Entity(target, EntityManager))), target, user);
-            return false;
-        }
-
-        target = selfEvent.TargetGettingInjected;
-
-        if (!EligibleEntity(target, component))
-            return false;
-
-        // Target event
-        var targetEvent = new TargetBeforeHyposprayInjectsEvent(user, entity.Owner, target);
-        RaiseLocalEvent(target, targetEvent);
-
-        if (targetEvent.Cancelled)
-        {
-            _popup.PopupClient(Loc.GetString(targetEvent.InjectMessageOverride ?? "hypospray-cant-inject", ("owner", Identity.Entity(target, EntityManager))), target, user);
-            return false;
-        }
-
-        target = targetEvent.TargetGettingInjected;
-
-        if (!EligibleEntity(target, component))
-            return false;
-
-        // The target event gets priority for the overriden message.
-        if (targetEvent.InjectMessageOverride != null)
-            msgFormat = targetEvent.InjectMessageOverride;
-        else if (selfEvent.InjectMessageOverride != null)
-            msgFormat = selfEvent.InjectMessageOverride;
-        else if (target == user)
-            msgFormat = "hypospray-component-inject-self-message";
-
-        if (!_solutionContainers.TryGetSolution(uid, component.SolutionName, out var hypoSpraySoln, out var hypoSpraySolution) || hypoSpraySolution.Volume == 0)
-        {
-            _popup.PopupClient(Loc.GetString("hypospray-component-empty-message"), target, user);
-            return true;
-        }
-
-        if (!_solutionContainers.TryGetInjectableSolution(target, out var targetSoln, out var targetSolution))
-        {
-            _popup.PopupClient(Loc.GetString("hypospray-cant-inject", ("target", Identity.Entity(target, EntityManager))), target, user);
-            return false;
-        }
-
-        _popup.PopupClient(Loc.GetString(msgFormat ?? "hypospray-component-inject-other-message", ("other", Identity.Entity(target, EntityManager))), target, user);
-
-        if (target != user)
-        {
-            _popup.PopupEntity(Loc.GetString("hypospray-component-feel-prick-message"), target, target);
-            // TODO: This should just be using melee attacks...
-            // meleeSys.SendLunge(angle, user);
-        }
-
-        _audio.PlayPredicted(component.InjectSound, target, user);
-
-        // Medipens and such use this system and don't have a delay, requiring extra checks
-        // BeginDelay function returns if item is already on delay
-        if (delayComp != null)
-            _useDelay.TryResetDelay((uid, delayComp));
-
-        // Get transfer amount. May be smaller than component.TransferAmount if not enough room
-        var realTransferAmount = FixedPoint2.Min(component.TransferAmount, targetSolution.AvailableVolume);
-
-        if (realTransferAmount <= 0)
-        {
-            _popup.PopupClient(Loc.GetString("hypospray-component-transfer-already-full-message", ("owner", target)), target, user);
-            return true;
-        }
-
-        // Move units from attackSolution to targetSolution
-        var removedSolution = _solutionContainers.SplitSolution(hypoSpraySoln.Value, realTransferAmount);
-
-        if (!targetSolution.CanAddSolution(removedSolution))
-            return true;
-        _reactiveSystem.DoEntityReaction(target, removedSolution, ReactionMethod.Injection);
-        _solutionContainers.TryAddSolution(targetSoln.Value, removedSolution);
-
-        var ev = new TransferDnaEvent { Donor = target, Recipient = uid };
-        RaiseLocalEvent(target, ref ev);
-
-        // same LogType as syringes...
-        _adminLogger.Add(LogType.ForceFeed, $"{ToPrettyString(user):user} injected {ToPrettyString(target):target} with a solution {SharedSolutionContainerSystem.ToPrettyString(removedSolution):removedSolution} using a {ToPrettyString(uid):using}");
-
-        return true;
-    }
-
-    public bool TryStartDraw(Entity<HyposprayComponent> entity, EntityUid target, Entity<SolutionComponent> targetSolution, EntityUid user)
-    {
-        if (!_solutionContainers.TryGetSolution(entity.Owner, entity.Comp.SolutionName, out var soln))
-            return false;
-
-        if (!TryGetDrawAmount(entity, target, targetSolution, user,  soln.Value, out _))
-            return false;
-
-        var doAfterArgs = new DoAfterArgs(EntityManager, user, entity.Comp.DrawTime, new HyposprayDrawDoAfterEvent(), entity, target)
-        {
-            BreakOnDamage = true,
-            BreakOnMove = true,
-            NeedHand = true,
-            Hidden = true,
-        };
-
-        return _doAfter.TryStartDoAfter(doAfterArgs, out _);
-    }
-
-    private bool TryGetDrawAmount(Entity<HyposprayComponent> entity, EntityUid target, Entity<SolutionComponent> targetSolution, EntityUid user, Entity<SolutionComponent> solutionEntity, [NotNullWhen(true)] out FixedPoint2? amount)
-    {
-        amount = null;
-
-        if (solutionEntity.Comp.Solution.AvailableVolume == 0)
-        {
-            return false;
-        }
-
-        // Get transfer amount. May be smaller than _transferAmount if not enough room, also make sure there's room in the injector
-        var realTransferAmount = FixedPoint2.Min(entity.Comp.TransferAmount, targetSolution.Comp.Solution.Volume,
-            solutionEntity.Comp.Solution.AvailableVolume);
-
-        if (realTransferAmount <= 0)
-        {
-            _popup.PopupClient(
-                Loc.GetString("injector-component-target-is-empty-message",
-                    ("target", Identity.Entity(target, EntityManager))),
-                entity.Owner, user);
-            return false;
-        }
-
-        amount = realTransferAmount;
-        return true;
-    }
-
-    private bool TryDraw(Entity<HyposprayComponent> entity, EntityUid target, Entity<SolutionComponent> targetSolution, EntityUid user)
-    {
-        if (!_solutionContainers.TryGetSolution(entity.Owner, entity.Comp.SolutionName, out var soln))
-            return false;
-
-        if (!TryGetDrawAmount(entity, target, targetSolution, user, soln.Value, out var amount))
-            return false;
-
-        var removedSolution = _solutionContainers.Draw(target, targetSolution, amount.Value);
-
-        if (!_solutionContainers.TryAddSolution(soln.Value, removedSolution))
-        {
-            return false;
-        }
-
-        _popup.PopupClient(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, HyposprayComponent component)
-    {
-        // TODO: Does checking for BodyComponent make sense as a "can be hypospray'd" tag?
-        // In SS13 the hypospray ONLY works on mobs, NOT beakers or anything else.
-        // But this is 14, we dont do what SS13 does just because SS13 does it.
-        return component.OnlyAffectsMobs
-            ? HasComp<SolutionContainerManagerComponent>(entity) &&
-              HasComp<MobStateComponent>(entity)
-            : HasComp<SolutionContainerManagerComponent>(entity);
-    }
-
-    #endregion
-
-    #region Verbs
-
-    // <summary>
-    // Uses the OnlyMobs field as a check to implement the ability
-    // to draw from jugs and containers with the hypospray
-    // Toggleable to allow people to inject containers if they prefer it over drawing
-    // </summary>
-    private void AddToggleModeVerb(Entity<HyposprayComponent> entity, ref GetVerbsEvent<AlternativeVerb> args)
-    {
-        if (!args.CanAccess || !args.CanInteract || args.Hands == null || entity.Comp.InjectOnly)
-            return;
-
-        var user = args.User;
-        var verb = new AlternativeVerb
-        {
-            Text = Loc.GetString("hypospray-verb-mode-label"),
-            Act = () =>
-            {
-                ToggleMode(entity, user);
-            }
-        };
-        args.Verbs.Add(verb);
-    }
-
-    private void ToggleMode(Entity<HyposprayComponent> entity, EntityUid user)
-    {
-        SetMode(entity, !entity.Comp.OnlyAffectsMobs);
-        var msg = (entity.Comp.OnlyAffectsMobs && entity.Comp.CanContainerDraw) ? "hypospray-verb-mode-inject-mobs-only" : "hypospray-verb-mode-inject-all";
-        _popup.PopupClient(Loc.GetString(msg), entity, user);
-    }
-
-    public void SetMode(Entity<HyposprayComponent> entity, bool onlyAffectsMobs)
-    {
-        if (entity.Comp.OnlyAffectsMobs == onlyAffectsMobs)
-            return;
-
-        entity.Comp.OnlyAffectsMobs = onlyAffectsMobs;
-        Dirty(entity);
-    }
-
-    #endregion
-}
-
-[Serializable, NetSerializable]
-public sealed partial class HyposprayDrawDoAfterEvent : SimpleDoAfterEvent {}
diff --git a/Content.Shared/Chemistry/EntitySystems/InjectorSystem.cs b/Content.Shared/Chemistry/EntitySystems/InjectorSystem.cs
new file mode 100644
index 0000000000..438da65293
--- /dev/null
+++ b/Content.Shared/Chemistry/EntitySystems/InjectorSystem.cs
@@ -0,0 +1,762 @@
+using System.Linq;
+using Content.Shared.Administration.Logs;
+using Content.Shared.Body.Components;
+using Content.Shared.Chemistry.Components;
+using Content.Shared.Chemistry.Events;
+using Content.Shared.Chemistry.Prototypes;
+using Content.Shared.Database;
+using Content.Shared.DoAfter;
+using Content.Shared.FixedPoint;
+using Content.Shared.Forensics.Systems;
+using Content.Shared.IdentityManagement;
+using Content.Shared.Interaction;
+using Content.Shared.Interaction.Events;
+using Content.Shared.Nutrition.EntitySystems;
+using Content.Shared.Popups;
+using Content.Shared.Stacks;
+using Content.Shared.Standing;
+using Content.Shared.Timing;
+using Content.Shared.Verbs;
+using Content.Shared.Weapons.Melee.Events;
+using JetBrains.Annotations;
+using Robust.Shared.Audio.Systems;
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.Chemistry.EntitySystems;
+
+/// <summary>
+/// This handles toggling injection modes, injections and drawings for all kinds of injectors.
+/// </summary>
+/// <seealso cref="InjectorComponent"/>
+/// <seealso cref="InjectorModePrototype"/>
+public sealed partial class InjectorSystem : EntitySystem
+{
+    [Dependency] private readonly ISharedAdminLogManager _adminLogger = default!;
+    [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
+    [Dependency] private readonly SharedAudioSystem _audio = default!;
+    [Dependency] private readonly SharedForensicsSystem _forensics = default!;
+    [Dependency] private readonly SharedDoAfterSystem _doAfter = default!;
+    [Dependency] private readonly OpenableSystem _openable = default!;
+    [Dependency] private readonly SharedPopupSystem _popup = default!;
+    [Dependency] private readonly ReactiveSystem _reactiveSystem = default!;
+    [Dependency] private readonly SharedSolutionContainerSystem _solutionContainer = default!;
+    [Dependency] private readonly StandingStateSystem _standingState = default!;
+    [Dependency] private readonly UseDelaySystem _useDelay = default!;
+
+    public override void Initialize()
+    {
+        SubscribeLocalEvent<InjectorComponent, UseInHandEvent>(OnInjectorUse);
+        SubscribeLocalEvent<InjectorComponent, AfterInteractEvent>(OnInjectorAfterInteract);
+        SubscribeLocalEvent<InjectorComponent, InjectorDoAfterEvent>(OnInjectDoAfter);
+        SubscribeLocalEvent<InjectorComponent, MeleeHitEvent>(OnAttack);
+        SubscribeLocalEvent<InjectorComponent, GetVerbsEvent<AlternativeVerb>>(AddVerbs);
+    }
+
+    #region Events Handling
+    private void OnInjectorUse(Entity<InjectorComponent> injector, ref UseInHandEvent args)
+    {
+        if (args.Handled
+            || !_prototypeManager.Resolve(injector.Comp.ActiveModeProtoId, out var activeProto))
+            return;
+
+        if (activeProto.InjectOnUse) // Injectors that can't toggle transferAmounts will be used.
+            TryMobsDoAfter(injector, args.User, args.User);
+        else // Syringes toggle Draw/Inject.
+            ToggleMode(injector, args.User);
+
+        args.Handled = true;
+    }
+
+    private void OnInjectorAfterInteract(Entity<InjectorComponent> injector, ref AfterInteractEvent args)
+    {
+        if (args.Handled || !args.CanReach || args.Target is not { Valid: true } target)
+            return;
+
+        // Is the target a mob? If yes, use a do-after to give them time to respond.
+        if (HasComp<BloodstreamComponent>(target))
+        {
+            // Are use using an injector capable of targeting a mob?
+            if (injector.Comp.IgnoreMobs)
+            {
+                _popup.PopupClient(Loc.GetString("injector-component-ignore-mobs"), args.Target.Value, args.User);
+                return;
+            }
+
+            args.Handled = TryMobsDoAfter(injector, args.User, target);
+            return;
+        }
+
+        // Draw from or inject into jugs, bottles, etc.
+        args.Handled = ContainerDoAfter(injector, args.User, target);
+    }
+
+    private void OnInjectDoAfter(Entity<InjectorComponent> injector, ref InjectorDoAfterEvent args)
+    {
+        if (args.Cancelled || args.Handled || args.Args.Target == null)
+            return;
+
+        args.Handled = TryUseInjector(injector, args.Args.User, args.Args.Target.Value);
+    }
+
+    private void OnAttack(Entity<InjectorComponent> injector, ref MeleeHitEvent args)
+    {
+        if (args.HitEntities is [])
+            return;
+
+        TryMobsDoAfter(injector, args.User, args.HitEntities[0]);
+    }
+
+    /// <summary>
+    /// Give the user interaction verbs for their injector.
+    /// </summary>
+    /// <param name="injector"></param>
+    /// <param name="args"></param>
+    /// <remarks>
+    /// If they have multiple transferAmounts, they'll be able to switch between them via the verbs.
+    /// If they have multiple injector modes and don't toggle when used in hand, they can toggle the mode with the verbs too.
+    /// </remarks>
+    private void AddVerbs(Entity<InjectorComponent> injector, ref GetVerbsEvent<AlternativeVerb> args)
+    {
+        if (!args.CanAccess || !args.CanInteract || args.Hands == null
+            || !_prototypeManager.Resolve(injector.Comp.ActiveModeProtoId, out var activeMode))
+            return;
+
+        var user = args.User;
+        var min = activeMode.TransferAmounts.Min();
+        var max = activeMode.TransferAmounts.Max();
+        var cur = injector.Comp.CurrentTransferAmount;
+        var toggleAmount = cur == max ? min : max;
+
+        var priority = 0;
+
+        if (activeMode.TransferAmounts.Count > 1)
+        {
+            AlternativeVerb toggleVerb = new()
+            {
+                Text = Loc.GetString("comp-solution-transfer-verb-toggle", ("amount", toggleAmount)),
+                Category = VerbCategory.SetTransferAmount,
+                Act = () =>
+                {
+                    injector.Comp.CurrentTransferAmount = toggleAmount;
+                    _popup.PopupClient(Loc.GetString("comp-solution-transfer-set-amount", ("amount", toggleAmount)), user, user);
+                    Dirty(injector);
+                },
+
+                Priority = priority
+            };
+            args.Verbs.Add(toggleVerb);
+
+            priority -= 1;
+
+            // Add specific transfer verbs for amounts defined in the component
+            foreach (var amount in activeMode.TransferAmounts)
+            {
+                AlternativeVerb verb = new()
+                {
+                    Text = Loc.GetString("comp-solution-transfer-verb-amount", ("amount", amount)),
+                    Category = VerbCategory.SetTransferAmount,
+                    Act = () =>
+                    {
+                        injector.Comp.CurrentTransferAmount = amount;
+                        _popup.PopupClient(Loc.GetString("comp-solution-transfer-set-amount", ("amount", amount)), user, user);
+                        Dirty(injector);
+                    },
+
+                    // we want to sort by size, not alphabetically by the verb text.
+                    Priority = priority
+                };
+                args.Verbs.Add(verb);
+            }
+        }
+
+        // If the injector cannot toggle via using in hand, allow toggling via verb.
+        if (!activeMode.InjectOnUse || injector.Comp.AllowedModes.Count <= 1)
+            return;
+
+        var toggleModeVerb = new AlternativeVerb
+        {
+            Text = Loc.GetString("injector-toggle-verb-text"),
+            Act = () =>
+            {
+                ToggleMode(injector, user);
+            },
+            Priority = priority,
+        };
+
+        args.Verbs.Add(toggleModeVerb);
+    }
+    #endregion Events Handling
+
+    #region Mob Interaction
+    /// <summary>
+    /// Send informative pop-up messages and wait for a do-after to complete.
+    /// </summary>
+    private bool TryMobsDoAfter(Entity<InjectorComponent> injector, EntityUid user, EntityUid target)
+    {
+        if (_useDelay.IsDelayed(injector.Owner) // Check for Delay.
+            || !GetMobsDoAfterTime(injector, user, target, out var doAfterTime, out var amount)) // Get the DoAfter time.
+            return false;
+
+        _doAfter.TryStartDoAfter(new DoAfterArgs(EntityManager, user, doAfterTime, new InjectorDoAfterEvent(), injector.Owner, target: target, used: injector.Owner)
+        {
+            BreakOnMove = true,
+            BreakOnWeightlessMove = false,
+            BreakOnDamage = true,
+            NeedHand = injector.Comp.NeedHand,
+            BreakOnHandChange = injector.Comp.BreakOnHandChange,
+            MovementThreshold = injector.Comp.MovementThreshold,
+        });
+
+        // If the DoAfter was instant, don't send popups and logs indicating an attempt.
+        if (doAfterTime == TimeSpan.Zero)
+            return true;
+
+        if (!_solutionContainer.ResolveSolution(injector.Owner, injector.Comp.SolutionName, ref injector.Comp.Solution, out var injectorSolution)
+            || !_prototypeManager.Resolve(injector.Comp.ActiveModeProtoId, out var activeMode))
+            return false;
+
+        // Create a pop-up for the user.
+        _popup.PopupClient(Loc.GetString(activeMode.PopupUserAttempt), target, user);
+
+        if (user == target)
+        {
+            if (activeMode.Behavior.HasFlag(InjectorBehavior.Draw))
+            {
+                _adminLogger.Add(LogType.ForceFeed,
+                    $"{ToPrettyString(user):user} is attempting to draw {amount} units from themselves.");
+            }
+            else
+            {
+                _adminLogger.Add(LogType.Ingestion,
+                    $"{ToPrettyString(user):user} is attempting to inject themselves with a solution {SharedSolutionContainerSystem.ToPrettyString(injectorSolution):solution}.");
+            }
+        }
+        else
+        {
+            // Create a popup to the target.
+            var userName = Identity.Entity(user, EntityManager);
+            var popup = Loc.GetString(activeMode.PopupTargetAttempt, ("user", userName));
+            _popup.PopupEntity(popup, user, target);
+
+            if (activeMode.Behavior.HasFlag(InjectorBehavior.Draw))
+            {
+                _adminLogger.Add(LogType.ForceFeed,
+                    $"{ToPrettyString(user):user} is attempting to draw {amount} units from {ToPrettyString(target):target}");
+            }
+            else
+            {
+                _adminLogger.Add(LogType.ForceFeed,
+                    $"{ToPrettyString(user):user} is attempting to inject {ToPrettyString(target):target} with a solution {SharedSolutionContainerSystem.ToPrettyString(injectorSolution):solution}");
+            }
+        }
+
+        return true;
+    }
+
+    /// <summary>
+    /// Get the DoAfter Time for Mobs.
+    /// </summary>
+    /// <param name="injector">The injector that is interacting with the mob.</param>
+    /// <param name="user">The user using the injector.</param>
+    /// <param name="target">The target mob.</param>
+    /// <param name="doAfterTime">The duration of the resulting doAfter.</param>
+    /// <param name="amount">The amount of the reagents transferred.</param>
+    /// <returns>True if calculating the time was successful, false if not.</returns>
+    private bool GetMobsDoAfterTime(Entity<InjectorComponent> injector, EntityUid user, EntityUid target, out TimeSpan doAfterTime, out FixedPoint2 amount)
+    {
+        doAfterTime = TimeSpan.Zero;
+        amount = FixedPoint2.Zero;
+
+        if (!_solutionContainer.ResolveSolution(injector.Owner, injector.Comp.SolutionName, ref injector.Comp.Solution, out var injectorSolution)
+            || !_prototypeManager.Resolve(injector.Comp.ActiveModeProtoId, out var activeMode))
+            return false;
+
+        doAfterTime = activeMode.MobTime;
+
+        // Can only draw blood with a draw mode and a transferAmount.
+        if (activeMode.Behavior.HasFlag(InjectorBehavior.Draw) && injector.Comp.CurrentTransferAmount != null)
+        {
+            // additional delay is based on actual volume left to draw in syringe when smaller than transfer amount
+            amount = FixedPoint2.Min(injector.Comp.CurrentTransferAmount.Value, injectorSolution.AvailableVolume);
+        }
+        else
+        {
+            // additional delay is based on actual volume left to inject in syringe when smaller than transfer amount
+            // If CurrentTransferAmount is null, it'll want to inject its entire contents, e.g., epipens.
+            amount = injector.Comp.CurrentTransferAmount ?? injectorSolution.Volume;
+            amount = FixedPoint2.Min(amount, injectorSolution.Volume);
+        }
+
+        // Transfers over the IgnoreDelayForVolume amount take Xu times DelayPerVolume longer.
+        doAfterTime += activeMode.DelayPerVolume * FixedPoint2.Max(0, amount - activeMode.IgnoreDelayForVolume).Double();
+
+        // Check if the target is either the user or downed.
+        if (user == target) // Self-injections take priority.
+            doAfterTime *= activeMode.SelfModifier;
+        // Technically, both can be true, but that is probably a balance nightmare.
+        else if (_standingState.IsDown(target))
+            doAfterTime *= activeMode.DownedModifier;
+
+        return true;
+    }
+    #endregion Mob Interaction
+
+    #region Container Interaction
+    private bool ContainerDoAfter(Entity<InjectorComponent> injector, EntityUid user, EntityUid target)
+    {
+        if (!GetContainerDoAfterTime(injector, user, target, out var doAfterTime))
+            return false;
+
+        _doAfter.TryStartDoAfter(new DoAfterArgs(EntityManager, user, doAfterTime, new InjectorDoAfterEvent(), injector.Owner, target: target, used: injector.Owner)
+        {
+            BreakOnMove = true,
+            BreakOnWeightlessMove = false,
+            BreakOnDamage = true,
+            NeedHand = injector.Comp.NeedHand,
+            BreakOnHandChange = injector.Comp.BreakOnHandChange,
+            MovementThreshold = injector.Comp.MovementThreshold,
+        });
+
+        return true;
+    }
+
+    /// <summary>
+    /// Get the DoAfter Time for Containers and check if it is possible.
+    /// </summary>
+    /// <param name="injector">The injector that is interacting with the container.</param>
+    /// <param name="user">The user using the injector.</param>
+    /// <param name="target">The target container,</param>
+    /// <param name="doAfterTime">The duration of the resulting DoAfter.</param>
+    /// <returns>True if calculating the time was successful, false if not.</returns>
+    private bool GetContainerDoAfterTime(Entity<InjectorComponent> injector, EntityUid user, EntityUid target, out TimeSpan doAfterTime)
+    {
+        doAfterTime = TimeSpan.Zero;
+
+        if (!_prototypeManager.Resolve(injector.Comp.ActiveModeProtoId, out var activeMode))
+            return false;
+
+        // Check if the Injector has a draw time, but only when drawing.
+        if (!activeMode.Behavior.HasAnyFlag(InjectorBehavior.Draw | InjectorBehavior.Dynamic))
+            return true;
+
+        if (!_solutionContainer.ResolveSolution(injector.Owner, injector.Comp.SolutionName, ref injector.Comp.Solution, out var solution)
+            || solution.AvailableVolume == 0)
+        {
+            _popup.PopupClient(Loc.GetString("injector-component-cannot-toggle-draw-message"), user, user);
+            return false; // If already full, fail drawing.
+        }
+
+        if (!_solutionContainer.TryGetDrawableSolution(target, out _, out var drawableSol))
+        {
+            _popup.PopupClient(Loc.GetString("injector-component-cannot-transfer-message", ("target", Identity.Entity(target, EntityManager))), injector, user);
+            return false;
+        }
+
+        if (drawableSol.Volume == 0)
+        {
+            _popup.PopupClient(Loc.GetString("injector-component-target-is-empty-message", ("target", Identity.Entity(target, EntityManager))), injector, user);
+            return false;
+        }
+
+        doAfterTime = activeMode.ContainerDrawTime;
+        return true;
+    }
+    #endregion Container Interaction
+
+    #region Injecting/Drawing
+    /// <summary>
+    /// Depending on the <see cref="InjectorBehavior"/>, this will deal with the result of the DoAfter and draw/inject accordingly.
+    /// </summary>
+    /// <param name="injector">The injector used.</param>
+    /// <param name="user">The entity using the injector.</param>
+    /// <param name="target">The entity targeted by the user.</param>
+    /// <returns>True if the injection/drawing was successful, false if not.</returns>
+    /// <exception cref="ArgumentOutOfRangeException">The injector has a different <see cref="InjectorBehavior"/>.</exception>
+    private bool TryUseInjector(Entity<InjectorComponent> injector, EntityUid user, EntityUid target)
+    {
+        if (!_prototypeManager.Resolve(injector.Comp.ActiveModeProtoId, out var activeMode))
+            return false;
+
+        var isOpenOrIgnored = injector.Comp.IgnoreClosed || !_openable.IsClosed(target);
+
+        LocId msg = target == user ? "injector-component-cannot-transfer-message-self" : "injector-component-cannot-transfer-message";
+
+        switch (activeMode.Behavior)
+        {
+            // Handle injecting/drawing for solutions
+            case InjectorBehavior.Inject:
+            {
+                if (isOpenOrIgnored && _solutionContainer.TryGetInjectableSolution(target, out var injectableSolution, out _))
+                    return TryInject(injector, user, target, injectableSolution.Value, false);
+
+                if (isOpenOrIgnored && _solutionContainer.TryGetRefillableSolution(target, out var refillableSolution, out _))
+                    return TryInject(injector, user, target, refillableSolution.Value, true);
+                break;
+            }
+            case InjectorBehavior.Draw:
+            {
+                // Draw from a bloodstream if the target has that
+                if (TryComp<BloodstreamComponent>(target, out var stream) &&
+                    _solutionContainer.ResolveSolution(target, stream.BloodSolutionName, ref stream.BloodSolution))
+                {
+                    return TryDraw(injector, user, (target, stream), stream.BloodSolution.Value);
+                }
+
+                // Draw from an object (food, beaker, etc)
+                if (isOpenOrIgnored && _solutionContainer.TryGetDrawableSolution(target, out var drawableSolution, out _))
+                    return TryDraw(injector, user, target, drawableSolution.Value);
+
+                msg = target == user ? "injector-component-cannot-draw-message-self" : "injector-component-cannot-draw-message";
+                _popup.PopupClient(Loc.GetString(msg, ("target", Identity.Entity(target, EntityManager))), injector, user);
+                break;
+            }
+            case InjectorBehavior.Dynamic:
+            {
+                // If it's a mob, inject. We're using injectableSolution so I don't have to code a sole method for injecting into bloodstreams.
+                if (HasComp<BloodstreamComponent>(target)
+                    && _solutionContainer.TryGetInjectableSolution(target, out var injectableSolution, out _))
+                {
+                    return TryInject(injector, user, target, injectableSolution.Value, false);
+                }
+
+                // Draw from an object (food, beaker, etc.)
+                if (isOpenOrIgnored && _solutionContainer.TryGetDrawableSolution(target, out var drawableSolution, out _))
+                    return TryDraw(injector, user, target, drawableSolution.Value);
+                break;
+            }
+            default:
+                throw new ArgumentOutOfRangeException();
+        }
+
+        _popup.PopupClient(Loc.GetString(msg, ("target", Identity.Entity(target, EntityManager))), injector, user);
+        return false;
+    }
+
+    /// <summary>
+    /// Attempt to inject the solution of the injector into the target.
+    /// </summary>
+    /// <param name="injector">The injector used.</param>
+    /// <param name="user">The entity using the injector.</param>
+    /// <param name="target">The entity targeted by the user.</param>
+    /// <param name="targetSolution">The solution of the target.</param>
+    /// <param name="asRefill">Whether or not the solution is refillable or injectable.</param>
+    /// <returns>True if the injection was successful, false if not.</returns>
+    private bool TryInject(Entity<InjectorComponent> injector, EntityUid user, EntityUid target, Entity<SolutionComponent> targetSolution, bool asRefill)
+    {
+        if (!_solutionContainer.ResolveSolution(injector.Owner,
+                injector.Comp.SolutionName,
+                ref injector.Comp.Solution,
+                out var injectorSolution) || injectorSolution.Volume == 0)
+        {
+            // If empty, show a popup.
+            _popup.PopupClient(Loc.GetString("injector-component-empty-message", ("injector", injector)), user, user);
+            return false;
+        }
+
+        if (!_prototypeManager.Resolve(injector.Comp.ActiveModeProtoId, out var activeMode))
+            return false;
+
+        var selfEv = new SelfBeforeInjectEvent(user, injector, target);
+        RaiseLocalEvent(user, selfEv);
+
+        if (selfEv.Cancelled)
+        {
+            // Clowns will now also fumble Syringes.
+            if (selfEv.OverrideMessage != null)
+                _popup.PopupPredicted(selfEv.OverrideMessage, user, user);
+            return true;
+        }
+
+        target = selfEv.TargetGettingInjected;
+
+        var ev = new TargetBeforeInjectEvent(user, injector, target);
+        RaiseLocalEvent(target, ref ev);
+
+        // Jugsuit blocking Hyposprays when
+        if (ev.Cancelled)
+        {
+            var userMessage = Loc.GetString("injector-component-blocked-user");
+            var otherMessage = Loc.GetString("injector-component-blocked-other", ("target", target), ("user", user));
+            _popup.PopupPredicted(userMessage, otherMessage, target, user, PopupType.SmallCaution);
+            return true;
+        }
+
+        // Get transfer amount. It may be smaller than _transferAmount if not enough room
+        var plannedTransferAmount = FixedPoint2.Min(injector.Comp.CurrentTransferAmount ?? injectorSolution.Volume, injectorSolution.Volume);
+        var realTransferAmount = FixedPoint2.Min(plannedTransferAmount, targetSolution.Comp.Solution.AvailableVolume);
+
+        if (realTransferAmount <= 0)
+        {
+            LocId msg = target == user ? "injector-component-target-already-full-message-self" : "injector-component-target-already-full-message";
+            _popup.PopupClient(
+                Loc.GetString(msg,
+                    ("target", Identity.Entity(target, EntityManager))),
+                injector.Owner,
+                user);
+            return false;
+        }
+
+        // Move units from attackSolution to targetSolution
+        Solution removedSolution;
+        if (TryComp<StackComponent>(target, out var stack))
+            removedSolution = _solutionContainer.SplitStackSolution(injector.Comp.Solution.Value, realTransferAmount, stack.Count);
+        else
+            removedSolution = _solutionContainer.SplitSolution(injector.Comp.Solution.Value, realTransferAmount);
+
+        _reactiveSystem.DoEntityReaction(target, removedSolution, ReactionMethod.Injection);
+
+        if (!asRefill)
+            _solutionContainer.Inject(target, targetSolution, removedSolution);
+        else
+            _solutionContainer.Refill(target, targetSolution, removedSolution);
+
+        LocId msgSuccess = target == user ? "injector-component-transfer-success-message-self" : "injector-component-transfer-success-message";
+
+        if (selfEv.OverrideMessage != null)
+            msgSuccess = selfEv.OverrideMessage;
+        else if (ev.OverrideMessage != null)
+            msgSuccess = ev.OverrideMessage;
+
+        _popup.PopupClient(Loc.GetString(msgSuccess, ("amount", removedSolution.Volume), ("target", Identity.Entity(target, EntityManager))), target, user);
+
+        // it is IMPERATIVE that when an injector is instant, that it has a pop-up.
+        if (activeMode.InjectPopupTarget != null && target != user)
+            _popup.PopupClient(Loc.GetString(activeMode.InjectPopupTarget), target, target);
+
+        // Some injectors like hyposprays have sound, some like syringes have not.
+        if (activeMode.InjectSound != null)
+            _audio.PlayPredicted(activeMode.InjectSound, injector, user);
+
+        // Log what happened.
+        _adminLogger.Add(LogType.ForceFeed, $"{ToPrettyString(user):user} injected {ToPrettyString(target):target} with a solution {SharedSolutionContainerSystem.ToPrettyString(removedSolution):removedSolution} using a {ToPrettyString(injector):using}");
+
+        AfterInject(injector, user, target);
+        return true;
+    }
+
+    /// <summary>
+    /// Attempt to draw reagents from a container.
+    /// </summary>
+    /// <param name="injector">The injector used.</param>
+    /// <param name="user">The entity using the injector.</param>
+    /// <param name="target">The entity targeted by the user.</param>
+    /// <param name="targetSolution">The solution of the target.</param>
+    /// <returns>True if the drawing was successful, false if not.</returns>
+    private bool TryDraw(Entity<InjectorComponent> injector, EntityUid user, Entity<BloodstreamComponent?> target, Entity<SolutionComponent> targetSolution)
+    {
+        if (!_solutionContainer.ResolveSolution(injector.Owner, injector.Comp.SolutionName, ref injector.Comp.Solution, out var solution) || solution.AvailableVolume == 0)
+        {
+            _popup.PopupClient("injector-component-cannot-toggle-draw-message", user, user);
+            return false;
+        }
+
+        var applicableTargetSolution = targetSolution.Comp.Solution;
+        // If a whitelist exists, remove all non-whitelisted reagents from the target solution temporarily
+        var temporarilyRemovedSolution = new Solution();
+        if (injector.Comp.ReagentWhitelist is { } reagentWhitelist)
+        {
+            temporarilyRemovedSolution = applicableTargetSolution.SplitSolutionWithout(applicableTargetSolution.Volume, reagentWhitelist.ToArray());
+        }
+
+        // If transferAmount is null, fallback to 5 units.
+        var plannedTransferAmount = injector.Comp.CurrentTransferAmount ?? FixedPoint2.New(5);
+        // Get transfer amount. It may be smaller than _transferAmount if not enough room, also make sure there's room in the injector
+        var realTransferAmount = FixedPoint2.Min(plannedTransferAmount,
+            applicableTargetSolution.Volume,
+            solution.AvailableVolume);
+
+        if (realTransferAmount <= 0)
+        {
+            LocId msg = target.Owner == user ? "injector-component-target-is-empty-message-self" : "injector-component-target-is-empty-message";
+            var targetIdentity = Identity.Entity(target, EntityManager);
+            _popup.PopupClient(Loc.GetString(msg, ("target", targetIdentity)), injector.Owner, user);
+            return false;
+        }
+
+        // We have some snowflaked behavior for streams.
+        if (target.Comp != null)
+        {
+            DrawFromBlood(injector, user, (target.Owner, target.Comp), injector.Comp.Solution.Value, realTransferAmount);
+            return true;
+        }
+
+        // Move units from attackSolution to targetSolution
+        var removedSolution = _solutionContainer.Draw(target.Owner, targetSolution, realTransferAmount);
+
+        // Add back non-whitelisted reagents to the target solution
+        _solutionContainer.TryAddSolution(targetSolution, temporarilyRemovedSolution);
+
+        if (!_solutionContainer.TryAddSolution(injector.Comp.Solution.Value, removedSolution))
+        {
+            return false;
+        }
+
+        LocId msgSuccess = target.Owner == user ? "injector-component-draw-success-message-self" : "injector-component-draw-success-message";
+        var targetIdentitySuccess = Identity.Entity(target, EntityManager);
+        _popup.PopupClient(
+            Loc.GetString(msgSuccess, ("amount", removedSolution.Volume), ("target", targetIdentitySuccess)),
+            target,
+            user);
+
+        AfterDraw(injector, user, target);
+        return true;
+    }
+
+    /// <summary>
+    /// Attempt to draw blood from a mob.
+    /// </summary>
+    /// <param name="injector">The injector used.</param>
+    /// <param name="user">The entity using the injector.</param>
+    /// <param name="target">The entity targeted by the user.</param>
+    /// <param name="injectorSolution">The solution of the injector.</param>
+    /// <param name="transferAmount">The amount of blood to draw.</param>
+    private void DrawFromBlood(Entity<InjectorComponent> injector,
+        EntityUid user,
+        Entity<BloodstreamComponent> target,
+        Entity<SolutionComponent> injectorSolution,
+        FixedPoint2 transferAmount)
+    {
+        if (_solutionContainer.ResolveSolution(target.Owner, target.Comp.BloodSolutionName, ref target.Comp.BloodSolution))
+        {
+            var bloodTemp = _solutionContainer.SplitSolution(target.Comp.BloodSolution.Value, transferAmount);
+            _solutionContainer.TryAddSolution(injectorSolution, bloodTemp);
+        }
+
+        LocId msg = target.Owner == user ? "injector-component-draw-success-message-self" : "injector-component-draw-success-message";
+        var targetIdentity = Identity.Entity(target, EntityManager);
+        var finalMessage = Loc.GetString(msg, ("amount", transferAmount), ("target", targetIdentity));
+        _popup.PopupClient(finalMessage, target, user);
+
+        AfterDraw(injector, user, target);
+    }
+
+    /// <summary>
+    /// This handles logic like DNA and Delays after injection.
+    /// </summary>
+    /// <param name="injector">The injector used.</param>
+    /// <param name="user">The entity using the injector.</param>
+    /// <param name="target">The entity targeted by the user.</param>
+    private void AfterInject(Entity<InjectorComponent> injector, EntityUid user, EntityUid target)
+    {
+        // Leave some DNA from the injectee on it
+        _forensics.TransferDna(injector, target);
+        // Reset the delay, if present.
+
+        _useDelay.TryResetDelay(injector);
+
+        // Automatically set syringe to draw after completely draining it.
+        if (!_solutionContainer.ResolveSolution(injector.Owner, injector.Comp.SolutionName, ref injector.Comp.Solution, out var solution)
+            || solution.Volume != 0)
+            return;
+
+        if (!_prototypeManager.Resolve(injector.Comp.ActiveModeProtoId, out var activeMode)
+            || activeMode.Behavior.HasFlag(InjectorBehavior.Dynamic))
+            return;
+
+        foreach (var mode in injector.Comp.AllowedModes)
+        {
+            if (!_prototypeManager.Resolve(mode, out var proto)
+                || !proto.Behavior.HasFlag(InjectorBehavior.Draw))
+                continue;
+
+            ToggleMode(injector, user, proto);
+            return;
+        }
+    }
+
+    /// <summary>
+    /// This handles logic like DNA after drawing.
+    /// </summary>
+    /// <param name="injector">The injector used.</param>
+    /// <param name="user">The entity using the injector.</param>
+    /// <param name="target">The entity targeted by the user.</param>
+    private void AfterDraw(Entity<InjectorComponent> injector, EntityUid user, EntityUid target)
+    {
+        // Leave some DNA from the drawee on it
+        _forensics.TransferDna(injector, target);
+
+        // Automatically set the syringe to inject after completely filling it.
+        if (!_solutionContainer.ResolveSolution(injector.Owner, injector.Comp.SolutionName, ref injector.Comp.Solution, out var solution)
+            || solution.AvailableVolume != 0)
+            return;
+
+        if (!_prototypeManager.Resolve(injector.Comp.ActiveModeProtoId, out var activeMode)
+            || activeMode.Behavior.HasFlag(InjectorBehavior.Dynamic))
+            return;
+
+        foreach (var mode in injector.Comp.AllowedModes)
+        {
+            if (!_prototypeManager.Resolve(mode, out var proto)
+                || !proto.Behavior.HasFlag(InjectorBehavior.Inject))
+                continue;
+
+            ToggleMode(injector, user, proto);
+            return;
+        }
+    }
+    #endregion Injecting/Drawing
+
+    #region Mode Toggling
+    /// <summary>
+    /// Toggle modes of the injector if possible.
+    /// </summary>
+    /// <param name="injector">The injector whose mode is to be toggled.</param>
+    /// <param name="user">The user toggling the mode.</param>
+    /// <param name="mode">The desired mode.</param>
+    /// <remarks>This will still check if the injector can use that mode.</remarks>
+    [PublicAPI]
+    public void ToggleMode(Entity<InjectorComponent> injector, EntityUid user, InjectorModePrototype mode)
+    {
+        var index = injector.Comp.AllowedModes.FindIndex(nextMode => mode == nextMode);
+
+        injector.Comp.ActiveModeProtoId = injector.Comp.AllowedModes[index];
+
+        if (!_prototypeManager.Resolve(injector.Comp.ActiveModeProtoId, out var newMode))
+            return;
+
+        var modeName = Loc.GetString(newMode.Name);
+        var message = Loc.GetString("injector-component-mode-changed-text", ("mode", modeName));
+        _popup.PopupClient(message, user, user);
+        Dirty(injector);
+    }
+
+    /// <summary>
+    /// Toggle the mode of the injector to the next allowed mode.
+    /// </summary>
+    /// <param name="injector">The injector whose mode is to be toggled.</param>
+    /// <param name="user">The user toggling the mode.</param>
+    [PublicAPI]
+    public void ToggleMode(Entity<InjectorComponent> injector, EntityUid user)
+    {
+        if (!_prototypeManager.Resolve(injector.Comp.ActiveModeProtoId, out var activeProto))
+            return;
+
+        string? errorMessage = null;
+
+        foreach (var allowedMode in injector.Comp.AllowedModes)
+        {
+            if (!_prototypeManager.Resolve(allowedMode, out var proto)
+                || proto.Behavior.HasFlag(activeProto.Behavior)
+                || !_solutionContainer.ResolveSolution(injector.Owner, injector.Comp.SolutionName, ref injector.Comp.Solution, out var solution))
+                continue;
+
+            if (proto.Behavior.HasFlag(InjectorBehavior.Inject) && solution.Volume == 0)
+            {
+                errorMessage = "injector-component-cannot-toggle-inject-message";
+                continue;
+            }
+
+            if (proto.Behavior.HasFlag(InjectorBehavior.Draw) && solution.AvailableVolume == 0)
+            {
+                errorMessage = "injector-component-cannot-toggle-draw-message";
+                continue;
+            }
+
+            ToggleMode(injector, user, proto);
+            return;
+        }
+        if (errorMessage != null)
+            _popup.PopupClient(Loc.GetString(errorMessage), user, user);
+    }
+    #endregion Mode Toggling
+}
diff --git a/Content.Shared/Chemistry/EntitySystems/SharedInjectorSystem.cs b/Content.Shared/Chemistry/EntitySystems/SharedInjectorSystem.cs
deleted file mode 100644
index e20045fc78..0000000000
--- a/Content.Shared/Chemistry/EntitySystems/SharedInjectorSystem.cs
+++ /dev/null
@@ -1,536 +0,0 @@
-using System.Linq;
-using Content.Shared.Administration.Logs;
-using Content.Shared.Body.Components;
-using Content.Shared.Body.Systems;
-using Content.Shared.Chemistry.Components;
-using Content.Shared.Chemistry.Components.SolutionManager;
-using Content.Shared.CombatMode;
-using Content.Shared.Database;
-using Content.Shared.DoAfter;
-using Content.Shared.FixedPoint;
-using Content.Shared.Forensics.Systems;
-using Content.Shared.IdentityManagement;
-using Content.Shared.Interaction;
-using Content.Shared.Interaction.Events;
-using Content.Shared.Mobs.Components;
-using Content.Shared.Mobs.Systems;
-using Content.Shared.Nutrition.EntitySystems;
-using Content.Shared.Popups;
-using Content.Shared.Stacks;
-using Content.Shared.Verbs;
-
-namespace Content.Shared.Chemistry.EntitySystems;
-
-public abstract class SharedInjectorSystem : EntitySystem
-{
-    [Dependency] private readonly SharedBloodstreamSystem _blood = default!;
-    [Dependency] private readonly ISharedAdminLogManager _adminLogger = default!;
-    [Dependency] private readonly MobStateSystem _mobState = default!;
-    [Dependency] private readonly OpenableSystem _openable = default!;
-    [Dependency] private readonly ReactiveSystem _reactiveSystem = default!;
-    [Dependency] private readonly SharedCombatModeSystem _combatMode = default!;
-    [Dependency] private readonly SharedDoAfterSystem _doAfter = default!;
-    [Dependency] private readonly SharedPopupSystem _popup = default!;
-    [Dependency] private readonly SharedForensicsSystem _forensics = default!;
-    [Dependency] protected readonly SharedSolutionContainerSystem SolutionContainer = default!;
-
-    public override void Initialize()
-    {
-        SubscribeLocalEvent<InjectorComponent, GetVerbsEvent<AlternativeVerb>>(AddSetTransferVerbs);
-        SubscribeLocalEvent<InjectorComponent, UseInHandEvent>(OnInjectorUse);
-        SubscribeLocalEvent<InjectorComponent, AfterInteractEvent>(OnInjectorAfterInteract);
-        SubscribeLocalEvent<InjectorComponent, InjectorDoAfterEvent>(OnInjectDoAfter);
-    }
-
-    private void AddSetTransferVerbs(Entity<InjectorComponent> ent, ref GetVerbsEvent<AlternativeVerb> args)
-    {
-        if (!args.CanAccess || !args.CanInteract || args.Hands == null)
-            return;
-
-        if (ent.Comp.TransferAmounts.Count <= 1)
-            return; // No options to cycle between
-
-        var user = args.User;
-
-        var min = ent.Comp.TransferAmounts.Min();
-        var max = ent.Comp.TransferAmounts.Max();
-        var cur = ent.Comp.CurrentTransferAmount;
-        var toggleAmount = cur == max ? min : max;
-
-        var priority = 0;
-        AlternativeVerb toggleVerb = new()
-        {
-            Text = Loc.GetString("comp-solution-transfer-verb-toggle", ("amount", toggleAmount)),
-            Category = VerbCategory.SetTransferAmount,
-            Act = () =>
-            {
-                ent.Comp.CurrentTransferAmount = toggleAmount;
-                _popup.PopupClient(Loc.GetString("comp-solution-transfer-set-amount", ("amount", toggleAmount)), user, user);
-                Dirty(ent);
-            },
-
-            Priority = priority
-        };
-        args.Verbs.Add(toggleVerb);
-
-        priority -= 1;
-
-        // Add specific transfer verbs for amounts defined in the component
-        foreach (var amount in ent.Comp.TransferAmounts)
-        {
-            AlternativeVerb verb = new()
-            {
-                Text = Loc.GetString("comp-solution-transfer-verb-amount", ("amount", amount)),
-                Category = VerbCategory.SetTransferAmount,
-                Act = () =>
-                {
-                    ent.Comp.CurrentTransferAmount = amount;
-                    _popup.PopupClient(Loc.GetString("comp-solution-transfer-set-amount", ("amount", amount)), user, user);
-                    Dirty(ent);
-                },
-
-                // we want to sort by size, not alphabetically by the verb text.
-                Priority = priority
-            };
-
-            priority -= 1;
-
-            args.Verbs.Add(verb);
-        }
-    }
-
-    private void OnInjectorUse(Entity<InjectorComponent> ent, ref UseInHandEvent args)
-    {
-        if (args.Handled)
-            return;
-
-        Toggle(ent, args.User);
-        args.Handled = true;
-    }
-
-    private void OnInjectorAfterInteract(Entity<InjectorComponent> ent, ref AfterInteractEvent args)
-    {
-        if (args.Handled || !args.CanReach)
-            return;
-
-        //Make sure we have the attacking entity
-        if (args.Target is not { Valid: true } target || !HasComp<SolutionContainerManagerComponent>(ent))
-            return;
-
-        // Is the target a mob? If yes, use a do-after to give them time to respond.
-        if (HasComp<MobStateComponent>(target) || HasComp<BloodstreamComponent>(target))
-        {
-            // Are use using an injector capable of targeting a mob?
-            if (ent.Comp.IgnoreMobs)
-                return;
-
-            InjectDoAfter(ent, target, args.User);
-            args.Handled = true;
-            return;
-        }
-
-        // Instantly draw from or inject into jugs, bottles etc.
-        args.Handled = TryUseInjector(ent, target, args.User);
-    }
-
-    private void OnInjectDoAfter(Entity<InjectorComponent> ent, ref InjectorDoAfterEvent args)
-    {
-        if (args.Cancelled || args.Handled || args.Args.Target == null)
-            return;
-
-        args.Handled = TryUseInjector(ent, args.Args.Target.Value, args.Args.User);
-    }
-
-    /// <summary>
-    /// Send informative pop-up messages and wait for a do-after to complete.
-    /// </summary>
-    private void InjectDoAfter(Entity<InjectorComponent> injector, EntityUid target, EntityUid user)
-    {
-        // Create a pop-up for the user
-        if (injector.Comp.ToggleState == InjectorToggleMode.Draw)
-        {
-            _popup.PopupClient(Loc.GetString("injector-component-drawing-user"), target, user);
-        }
-        else
-        {
-            _popup.PopupClient(Loc.GetString("injector-component-injecting-user"), target, user);
-        }
-
-        if (!SolutionContainer.ResolveSolution(injector.Owner, injector.Comp.SolutionName, ref injector.Comp.Solution, out var solution))
-            return;
-
-        var actualDelay = injector.Comp.Delay;
-        FixedPoint2 amountToInject;
-        if (injector.Comp.ToggleState == InjectorToggleMode.Draw)
-        {
-            // additional delay is based on actual volume left to draw in syringe when smaller than transfer amount
-            amountToInject = FixedPoint2.Min(injector.Comp.CurrentTransferAmount, solution.MaxVolume - solution.Volume);
-        }
-        else
-        {
-            // additional delay is based on actual volume left to inject in syringe when smaller than transfer amount
-            amountToInject = FixedPoint2.Min(injector.Comp.CurrentTransferAmount, solution.Volume);
-        }
-
-        // Injections take 0.5 seconds longer per 5u of possible space/content
-        // First 5u(MinimumTransferAmount) doesn't incur delay
-        actualDelay += injector.Comp.DelayPerVolume * FixedPoint2.Max(0, amountToInject - injector.Comp.TransferAmounts.Min()).Double();
-
-        // Ensure that minimum delay before incapacitation checks is 1 seconds
-        actualDelay = MathHelper.Max(actualDelay, TimeSpan.FromSeconds(1));
-
-        if (user != target) // injecting someone else
-        {
-            // Create a pop-up for the target
-            var userName = Identity.Entity(user, EntityManager);
-            if (injector.Comp.ToggleState == InjectorToggleMode.Draw)
-            {
-                _popup.PopupEntity(Loc.GetString("injector-component-drawing-target",
-    ("user", userName)), user, target);
-            }
-            else
-            {
-                _popup.PopupEntity(Loc.GetString("injector-component-injecting-target",
-    ("user", userName)), user, target);
-            }
-
-
-            // Check if the target is incapacitated or in combat mode and modify time accordingly.
-            if (_mobState.IsIncapacitated(target))
-            {
-                actualDelay /= 2.5f;
-            }
-            else if (_combatMode.IsInCombatMode(target))
-            {
-                // Slightly increase the delay when the target is in combat mode. Helps prevents cheese injections in
-                // combat with fast syringes & lag.
-                actualDelay += TimeSpan.FromSeconds(1);
-            }
-
-            // Add an admin log, using the "force feed" log type. It's not quite feeding, but the effect is the same.
-            if (injector.Comp.ToggleState == InjectorToggleMode.Inject)
-            {
-                _adminLogger.Add(LogType.ForceFeed,
-                    $"{ToPrettyString(user):user} is attempting to inject {ToPrettyString(target):target} with a solution {SharedSolutionContainerSystem.ToPrettyString(solution):solution}");
-            }
-            else
-            {
-                _adminLogger.Add(LogType.ForceFeed,
-                    $"{ToPrettyString(user):user} is attempting to draw {injector.Comp.CurrentTransferAmount.ToString()} units from {ToPrettyString(target):target}");
-            }
-        }
-        else // injecting yourself
-        {
-            // Self-injections take half as long.
-            actualDelay /= 2;
-
-            if (injector.Comp.ToggleState == InjectorToggleMode.Inject)
-            {
-                _adminLogger.Add(LogType.Ingestion,
-                    $"{ToPrettyString(user):user} is attempting to inject themselves with a solution {SharedSolutionContainerSystem.ToPrettyString(solution):solution}.");
-            }
-            else
-            {
-                _adminLogger.Add(LogType.ForceFeed,
-                    $"{ToPrettyString(user):user} is attempting to draw {injector.Comp.CurrentTransferAmount.ToString()} units from themselves.");
-            }
-        }
-
-        _doAfter.TryStartDoAfter(new DoAfterArgs(EntityManager, user, actualDelay, new InjectorDoAfterEvent(), injector.Owner, target: target, used: injector.Owner)
-        {
-            BreakOnMove = true,
-            BreakOnWeightlessMove = false,
-            BreakOnDamage = true,
-            NeedHand = injector.Comp.NeedHand,
-            BreakOnHandChange = injector.Comp.BreakOnHandChange,
-            MovementThreshold = injector.Comp.MovementThreshold,
-        });
-    }
-
-    private bool TryUseInjector(Entity<InjectorComponent> injector, EntityUid target, EntityUid user)
-    {
-        var isOpenOrIgnored = injector.Comp.IgnoreClosed || !_openable.IsClosed(target);
-        // Handle injecting/drawing for solutions
-        if (injector.Comp.ToggleState == InjectorToggleMode.Inject)
-        {
-            if (isOpenOrIgnored && SolutionContainer.TryGetInjectableSolution(target, out var injectableSolution, out _))
-                return TryInject(injector, target, injectableSolution.Value, user, false);
-
-            if (isOpenOrIgnored && SolutionContainer.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);
-
-            LocId msg = target == user ? "injector-component-cannot-transfer-message-self" : "injector-component-cannot-transfer-message";
-            _popup.PopupClient(Loc.GetString(msg, ("target", Identity.Entity(target, EntityManager))), injector, user);
-        }
-        else if (injector.Comp.ToggleState == InjectorToggleMode.Draw)
-        {
-            // Draw from a bloodstream, if the target has that
-            if (TryComp<BloodstreamComponent>(target, out var stream) &&
-                SolutionContainer.ResolveSolution(target, stream.BloodSolutionName, ref stream.BloodSolution))
-            {
-                return TryDraw(injector, (target, stream), stream.BloodSolution.Value, user);
-            }
-
-            // Draw from an object (food, beaker, etc)
-            if (isOpenOrIgnored && SolutionContainer.TryGetDrawableSolution(target, out var drawableSolution, out _))
-                return TryDraw(injector, target, drawableSolution.Value, user);
-
-            LocId msg = target == user ? "injector-component-cannot-draw-message-self" : "injector-component-cannot-draw-message";
-            _popup.PopupClient(Loc.GetString(msg, ("target", Identity.Entity(target, EntityManager))), injector.Owner, user);
-        }
-        return false;
-    }
-
-    private bool TryInject(Entity<InjectorComponent> injector, EntityUid target,
-        Entity<SolutionComponent> targetSolution, EntityUid user, bool asRefill)
-    {
-        if (!SolutionContainer.ResolveSolution(injector.Owner, injector.Comp.SolutionName, ref injector.Comp.Solution,
-                out var solution) || solution.Volume == 0)
-            return false;
-
-        // Get transfer amount. May be smaller than _transferAmount if not enough room
-        var realTransferAmount =
-            FixedPoint2.Min(injector.Comp.CurrentTransferAmount, targetSolution.Comp.Solution.AvailableVolume);
-
-        if (realTransferAmount <= 0)
-        {
-            LocId msg = target == user ? "injector-component-target-already-full-message-self" : "injector-component-target-already-full-message";
-            _popup.PopupClient(
-                Loc.GetString(msg,
-                    ("target", Identity.Entity(target, EntityManager))),
-                injector.Owner,
-                user);
-            return false;
-        }
-
-        // Move units from attackSolution to targetSolution
-        Solution removedSolution;
-        if (TryComp<StackComponent>(target, out var stack))
-            removedSolution = SolutionContainer.SplitStackSolution(injector.Comp.Solution.Value, realTransferAmount, stack.Count);
-        else
-            removedSolution = SolutionContainer.SplitSolution(injector.Comp.Solution.Value, realTransferAmount);
-
-        _reactiveSystem.DoEntityReaction(target, removedSolution, ReactionMethod.Injection);
-
-        if (!asRefill)
-            SolutionContainer.Inject(target, targetSolution, removedSolution);
-        else
-            SolutionContainer.Refill(target, targetSolution, removedSolution);
-
-        LocId msgSuccess = target == user ? "injector-component-transfer-success-message-self" : "injector-component-transfer-success-message";
-        _popup.PopupClient(
-            Loc.GetString(msgSuccess,
-                ("amount", removedSolution.Volume),
-                ("target", Identity.Entity(target, EntityManager))),
-            injector.Owner, user);
-
-        AfterInject(injector, target);
-        return true;
-    }
-
-    private bool TryInjectIntoBloodstream(Entity<InjectorComponent> injector, Entity<BloodstreamComponent> target,
-        EntityUid user)
-    {
-        // Get transfer amount. May be smaller than _transferAmount if not enough room
-        if (!SolutionContainer.ResolveSolution(target.Owner, target.Comp.BloodSolutionName,
-                ref target.Comp.BloodSolution, out var bloodSolution))
-        {
-            LocId msg = target.Owner == user ? "injector-component-cannot-inject-message-self" : "injector-component-cannot-inject-message";
-            _popup.PopupClient(
-                Loc.GetString(msg,
-                    ("target", Identity.Entity(target, EntityManager))),
-                injector.Owner, user);
-            return false;
-        }
-
-        var realTransferAmount = FixedPoint2.Min(injector.Comp.CurrentTransferAmount, bloodSolution.AvailableVolume);
-        if (realTransferAmount <= 0)
-        {
-            LocId msg = target.Owner == user ? "injector-component-cannot-inject-message-self" : "injector-component-cannot-inject-message";
-            _popup.PopupClient(
-                Loc.GetString(msg,
-                    ("target", Identity.Entity(target, EntityManager))),
-                injector.Owner, user);
-            return false;
-        }
-
-        // Move units from attackSolution to targetSolution
-        var removedSolution = SolutionContainer.SplitSolution(target.Comp.BloodSolution.Value, realTransferAmount);
-
-        _blood.TryAddToBloodstream(target.AsNullable(), removedSolution);
-
-        _reactiveSystem.DoEntityReaction(target, removedSolution, ReactionMethod.Injection);
-
-        LocId msgSuccess = target.Owner == user ? "injector-component-inject-success-message-self" : "injector-component-inject-success-message";
-        _popup.PopupClient(
-            Loc.GetString(msgSuccess,
-                ("amount", removedSolution.Volume),
-                ("target", Identity.Entity(target, EntityManager))),
-            injector.Owner, user);
-
-        AfterInject(injector, target);
-        return true;
-    }
-
-    private bool TryDraw(Entity<InjectorComponent> injector, Entity<BloodstreamComponent?> target,
-        Entity<SolutionComponent> targetSolution, EntityUid user)
-    {
-        if (!SolutionContainer.ResolveSolution(injector.Owner, injector.Comp.SolutionName, ref injector.Comp.Solution,
-                out var solution) || solution.AvailableVolume == 0)
-        {
-            return false;
-        }
-
-        var applicableTargetSolution = targetSolution.Comp.Solution;
-        // If a whitelist exists, remove all non-whitelisted reagents from the target solution temporarily
-        var temporarilyRemovedSolution = new Solution();
-        if (injector.Comp.ReagentWhitelist is { } reagentWhitelist)
-        {
-            temporarilyRemovedSolution = applicableTargetSolution.SplitSolutionWithout(applicableTargetSolution.Volume, reagentWhitelist.ToArray());
-        }
-
-        // Get transfer amount. May be smaller than _transferAmount if not enough room, also make sure there's room in the injector
-        var realTransferAmount = FixedPoint2.Min(injector.Comp.CurrentTransferAmount, applicableTargetSolution.Volume,
-            solution.AvailableVolume);
-
-        if (realTransferAmount <= 0)
-        {
-            LocId msg = target.Owner == user ? "injector-component-target-is-empty-message-self" : "injector-component-target-is-empty-message";
-            _popup.PopupClient(
-                Loc.GetString(msg,
-                    ("target", Identity.Entity(target, EntityManager))),
-                injector.Owner, user);
-            return false;
-        }
-
-        // We have some snowflaked behavior for streams.
-        if (target.Comp != null)
-        {
-            DrawFromBlood(injector, (target.Owner, target.Comp), injector.Comp.Solution.Value, realTransferAmount, user);
-            return true;
-        }
-
-        // Move units from attackSolution to targetSolution
-        var removedSolution = SolutionContainer.Draw(target.Owner, targetSolution, realTransferAmount);
-
-        // Add back non-whitelisted reagents to the target solution
-        SolutionContainer.TryAddSolution(targetSolution, temporarilyRemovedSolution);
-
-        if (!SolutionContainer.TryAddSolution(injector.Comp.Solution.Value, removedSolution))
-        {
-            return false;
-        }
-
-        LocId msgSuccess = target.Owner == user ? "injector-component-draw-success-message-self" : "injector-component-draw-success-message";
-        _popup.PopupClient(
-            Loc.GetString(msgSuccess,
-                ("amount", removedSolution.Volume),
-                ("target", Identity.Entity(target, EntityManager))),
-            injector.Owner, user);
-
-        AfterDraw(injector, target);
-        return true;
-    }
-
-    private void DrawFromBlood(Entity<InjectorComponent> injector, Entity<BloodstreamComponent> target,
-        Entity<SolutionComponent> injectorSolution, FixedPoint2 transferAmount, EntityUid user)
-    {
-        if (SolutionContainer.ResolveSolution(target.Owner, target.Comp.BloodSolutionName,
-                ref target.Comp.BloodSolution))
-        {
-            var bloodTemp = SolutionContainer.SplitSolution(target.Comp.BloodSolution.Value, transferAmount);
-            SolutionContainer.TryAddSolution(injectorSolution, bloodTemp);
-        }
-
-        LocId msg = target.Owner == user ? "injector-component-draw-success-message-self" : "injector-component-draw-success-message";
-        _popup.PopupClient(
-            Loc.GetString(msg,
-                ("amount", transferAmount),
-                ("target", Identity.Entity(target, EntityManager))),
-            injector.Owner, user);
-
-        AfterDraw(injector, target);
-    }
-
-    private void AfterInject(Entity<InjectorComponent> injector, EntityUid target)
-    {
-        // Automatically set syringe to draw after completely draining it.
-        if (SolutionContainer.ResolveSolution(injector.Owner, injector.Comp.SolutionName, ref injector.Comp.Solution,
-                out var solution) && solution.Volume == 0)
-        {
-            SetMode(injector, InjectorToggleMode.Draw);
-        }
-
-        // Leave some DNA from the injectee on it
-        _forensics.TransferDna(injector, target);
-    }
-
-    private void AfterDraw(Entity<InjectorComponent> injector, EntityUid target)
-    {
-        // Automatically set syringe to inject after completely filling it.
-        if (SolutionContainer.ResolveSolution(injector.Owner, injector.Comp.SolutionName, ref injector.Comp.Solution,
-                out var solution) && solution.AvailableVolume == 0)
-        {
-            SetMode(injector, InjectorToggleMode.Inject);
-        }
-
-        // Leave some DNA from the drawee on it
-        _forensics.TransferDna(injector, target);
-    }
-
-    /// <summary>
-    /// Toggle the injector between draw/inject state if applicable.
-    /// </summary>
-    public void Toggle(Entity<InjectorComponent> injector, EntityUid user)
-    {
-        if (injector.Comp.InjectOnly)
-            return;
-
-        if (!SolutionContainer.ResolveSolution(injector.Owner, injector.Comp.SolutionName, ref injector.Comp.Solution, out var solution))
-            return;
-
-        string msg;
-
-        switch (injector.Comp.ToggleState)
-        {
-            case InjectorToggleMode.Inject:
-                if (solution.AvailableVolume > 0) // If solution has empty space to fill up, allow toggling to draw
-                {
-                    SetMode(injector, InjectorToggleMode.Draw);
-                    msg = "injector-component-drawing-text";
-                }
-                else
-                {
-                    msg = "injector-component-cannot-toggle-draw-message";
-                }
-                break;
-            case InjectorToggleMode.Draw:
-                if (solution.Volume > 0) // If solution has anything in it, allow toggling to inject
-                {
-                    SetMode(injector, InjectorToggleMode.Inject);
-                    msg = "injector-component-injecting-text";
-                }
-                else
-                {
-                    msg = "injector-component-cannot-toggle-inject-message";
-                }
-                break;
-            default:
-                throw new ArgumentOutOfRangeException();
-        }
-
-        _popup.PopupClient(Loc.GetString(msg), injector, user);
-    }
-
-    /// <summary>
-    /// Set the mode of the injector to draw or inject.
-    /// </summary>
-    public void SetMode(Entity<InjectorComponent> injector, InjectorToggleMode mode)
-    {
-        injector.Comp.ToggleState = mode;
-        Dirty(injector);
-    }
-}
diff --git a/Content.Shared/Chemistry/Events/HyposprayEvents.cs b/Content.Shared/Chemistry/Events/HyposprayEvents.cs
deleted file mode 100644
index 33293a4049..0000000000
--- a/Content.Shared/Chemistry/Events/HyposprayEvents.cs
+++ /dev/null
@@ -1,38 +0,0 @@
-using Content.Shared.Inventory;
-
-namespace Content.Shared.Chemistry.Hypospray.Events;
-
-public abstract partial class BeforeHyposprayInjectsTargetEvent : CancellableEntityEventArgs, IInventoryRelayEvent
-{
-    public SlotFlags TargetSlots { get; } = SlotFlags.WITHOUT_POCKET;
-    public EntityUid EntityUsingHypospray;
-    public readonly EntityUid Hypospray;
-    public EntityUid TargetGettingInjected;
-    public string? InjectMessageOverride;
-
-    public BeforeHyposprayInjectsTargetEvent(EntityUid user, EntityUid hypospray, EntityUid target)
-    {
-        EntityUsingHypospray = user;
-        Hypospray = hypospray;
-        TargetGettingInjected = target;
-        InjectMessageOverride = null;
-    }
-}
-
-/// <summary>
-///     This event is raised on the user using the hypospray before the hypospray is injected.
-///     The event is triggered on the user and all their clothing.
-/// </summary>
-public sealed class SelfBeforeHyposprayInjectsEvent : BeforeHyposprayInjectsTargetEvent
-{
-    public SelfBeforeHyposprayInjectsEvent(EntityUid user, EntityUid hypospray, EntityUid target) : base(user, hypospray, target) { }
-}
-
-/// <summary>
-///     This event is raised on the target before the hypospray is injected.
-///     The event is triggered on the target itself and all its clothing.
-/// </summary>
-public sealed class TargetBeforeHyposprayInjectsEvent : BeforeHyposprayInjectsTargetEvent
-{
-    public TargetBeforeHyposprayInjectsEvent(EntityUid user, EntityUid hypospray, EntityUid target) : base(user, hypospray, target) { }
-}
diff --git a/Content.Shared/Chemistry/Events/InjectorEvents.cs b/Content.Shared/Chemistry/Events/InjectorEvents.cs
new file mode 100644
index 0000000000..ce4ccb88f1
--- /dev/null
+++ b/Content.Shared/Chemistry/Events/InjectorEvents.cs
@@ -0,0 +1,43 @@
+using Content.Shared.DoAfter;
+using Content.Shared.Inventory;
+using Robust.Shared.Serialization;
+
+namespace Content.Shared.Chemistry.Events;
+
+/// <summary>
+/// Raised on the injector when the doafter has finished.
+/// </summary>
+[Serializable, NetSerializable]
+public sealed partial class InjectorDoAfterEvent : SimpleDoAfterEvent;
+
+/// <summary>
+/// The base injection attempt event. It'll be raised on the user and target when attempting to inject the target.
+/// </summary>
+/// <param name="user">The user who is trying to inject the target.</param>
+/// <param name="usedInjector">The injector being used by the user.</param>
+/// <param name="target">The target who the user is trying to inject.</param>
+/// <param name="overrideMessage">The resulting message that gets displayed per popup.</param>
+public abstract partial class BeforeInjectTargetEvent(EntityUid user, EntityUid usedInjector, EntityUid target, string? overrideMessage = null)
+    : CancellableEntityEventArgs, IInventoryRelayEvent
+{
+    public EntityUid EntityUsingInjector = user;
+    public readonly EntityUid UsedInjector = usedInjector;
+    public EntityUid TargetGettingInjected = target;
+    public string? OverrideMessage = overrideMessage;
+    public SlotFlags TargetSlots => SlotFlags.WITHOUT_POCKET;
+}
+
+/// <summary>
+///     This event is raised on the user using the injector before the injector is injected.
+///     The event is triggered on the user and all their clothing.
+/// </summary>
+public sealed class SelfBeforeInjectEvent(EntityUid user, EntityUid usedInjector, EntityUid target, string? overrideMessage = null)
+    : BeforeInjectTargetEvent(user, usedInjector, target, overrideMessage);
+
+/// <summary>
+///     This event is raised on the target before the injector is injected.
+///     The event is triggered on the target itself and all its clothing.
+/// </summary>
+[ByRefEvent]
+public sealed class TargetBeforeInjectEvent(EntityUid user, EntityUid usedInjector, EntityUid target, string? overrideMessage = null)
+    : BeforeInjectTargetEvent(user, usedInjector, target, overrideMessage);
diff --git a/Content.Shared/Chemistry/Prototypes/InjectorModePrototype.cs b/Content.Shared/Chemistry/Prototypes/InjectorModePrototype.cs
new file mode 100644
index 0000000000..8434309b26
--- /dev/null
+++ b/Content.Shared/Chemistry/Prototypes/InjectorModePrototype.cs
@@ -0,0 +1,145 @@
+using Content.Shared.Chemistry.Components;
+using Content.Shared.FixedPoint;
+using Robust.Shared.Audio;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Serialization;
+using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype.Array;
+
+namespace Content.Shared.Chemistry.Prototypes;
+
+/// <summary>
+/// This defines the behavior of an injector.
+/// Every injector requires this and it defines how much an injector injects, what transferamounts they can switch between, etc.
+/// </summary>
+[Prototype]
+public sealed partial class InjectorModePrototype : IPrototype, IInheritingPrototype
+{
+    /// <inheritdoc/>
+    [IdDataField]
+    public string ID { get; private set; } = default!;
+
+    /// <inheritdoc/>
+    [ParentDataField(typeof(AbstractPrototypeIdArraySerializer<InjectorModePrototype>))]
+    public string[]? Parents { get; }
+
+    /// <inheritdoc/>
+    [AbstractDataField, NeverPushInheritance]
+    public bool Abstract { get; }
+
+    /// <summary>
+    /// The name of the mode that will be shown on the label UI.
+    /// </summary>
+    [DataField(required: true)]
+    public LocId Name;
+
+    /// <summary>
+    /// If true, it'll inject the user when used in hand (Default Key: Y/Z)
+    /// </summary>
+    [DataField]
+    public bool InjectOnUse;
+
+    /// <summary>
+    /// The transfer amounts for the set-transfer verb.
+    /// </summary>
+    [DataField]
+    public List<FixedPoint2> TransferAmounts = new() { 1, 5, 10, 15 };
+
+    /// <summary>
+    /// Injection/Drawing delay (seconds) when the target is a mob.
+    /// </summary>
+    [DataField]
+    public TimeSpan MobTime = TimeSpan.FromSeconds(5);
+
+    /// <summary>
+    /// The delay to draw Reagents from Containers.
+    /// If set, <see cref="RefillableSolutionComponent"/> RefillTime should probably have the same value.
+    /// </summary>
+    [DataField]
+    public TimeSpan ContainerDrawTime = TimeSpan.Zero;
+
+
+    /// <summary>
+    /// The number to multiply <see cref="MobTime"/> and <see cref="DelayPerVolume"/> if the target is the downed.
+    /// Downed counts as crouching, buckled on a bed or critical.
+    /// </summary>
+    [DataField]
+    public float DownedModifier = 0.5f;
+
+    /// <summary>
+    /// The number to multiply <see cref="MobTime"/> and <see cref="DelayPerVolume"/> if the target is the user.
+    /// </summary>
+    [DataField]
+    public float SelfModifier = 0.5f;
+
+    /// <summary>
+    /// This delay will increase the DoAfter time for each Xu above <see cref="IgnoreDelayForVolume"/>.
+    /// </summary>
+    [DataField]
+    public TimeSpan DelayPerVolume = TimeSpan.FromSeconds(0.1);
+
+    /// <summary>
+    /// This works in tandem with <see cref="DelayPerVolume"/>.
+    /// </summary>
+    [DataField]
+    public FixedPoint2 IgnoreDelayForVolume = FixedPoint2.New(5);
+
+    /// <summary>
+    /// What message will be displayed to the user when attempting to inject someone.
+    /// </summary>
+    /// <remarks>
+    /// This is used for when you aren't injecting with a needle or an instant hypospray.
+    /// It would be weird if someone injects with a spray, but the popup says "needle".
+    /// </remarks>
+    [DataField]
+    public LocId PopupUserAttempt = "injector-component-needle-injecting-user";
+
+    /// <summary>
+    /// What message will be displayed to the target when someone attempts to inject into them.
+    /// </summary>
+    [DataField]
+    public LocId PopupTargetAttempt = "injector-component-needle-injecting-target";
+
+    /// <summary>
+    /// The state of the injector. Determines its attack behavior. Containers must have the
+    /// right SolutionCaps to support injection/drawing. For InjectOnly injectors this should
+    /// only ever be set to Inject
+    /// </summary>
+    [DataField]
+    public InjectorBehavior Behavior = InjectorBehavior.Inject;
+
+    /// <summary>
+    ///     Sound that will be played when injecting.
+    /// </summary>
+    [DataField]
+    public SoundSpecifier? InjectSound;
+
+    /// <summary>
+    /// A popup for the target upon a successful injection.
+    /// It's imperative that this is not null when <see cref="MobTime"/> is instant.
+    /// </summary>
+    [DataField]
+    public LocId? InjectPopupTarget;
+
+}
+
+/// <summary>
+/// Possible modes for an <see cref="InjectorModePrototype"/>.
+/// </summary>
+[Serializable, NetSerializable, Flags]
+public enum InjectorBehavior
+{
+    /// <summary>
+    /// The injector will try to inject reagent into things.
+    /// </summary>
+    Inject = 1 << 0,
+
+    /// <summary>
+    /// The injector will try to draw reagent from things.
+    /// </summary>
+    Draw = 1 << 1,
+
+    /// <summary>
+    /// The injector will draw from containers and inject into mobs.
+    /// </summary>
+    Dynamic = 1 << 2,
+}
diff --git a/Content.Shared/Clumsy/ClumsySystem.cs b/Content.Shared/Clumsy/ClumsySystem.cs
index 35866b155a..4650065ad6 100644
--- a/Content.Shared/Clumsy/ClumsySystem.cs
+++ b/Content.Shared/Clumsy/ClumsySystem.cs
@@ -1,5 +1,5 @@
 using Content.Shared.CCVar;
-using Content.Shared.Chemistry.Hypospray.Events;
+using Content.Shared.Chemistry.Events;
 using Content.Shared.Climbing.Components;
 using Content.Shared.Climbing.Events;
 using Content.Shared.Damage.Systems;
@@ -31,7 +31,7 @@ public sealed class ClumsySystem : EntitySystem
 
     public override void Initialize()
     {
-        SubscribeLocalEvent<ClumsyComponent, SelfBeforeHyposprayInjectsEvent>(BeforeHyposprayEvent);
+        SubscribeLocalEvent<ClumsyComponent, SelfBeforeInjectEvent>(BeforeHyposprayEvent);
         SubscribeLocalEvent<ClumsyComponent, SelfBeforeDefibrillatorZapsEvent>(BeforeDefibrillatorZapsEvent);
         SubscribeLocalEvent<ClumsyComponent, SelfBeforeGunShotEvent>(BeforeGunShotEvent);
         SubscribeLocalEvent<ClumsyComponent, CatchAttemptEvent>(OnCatchAttempt);
@@ -40,7 +40,7 @@ public sealed class ClumsySystem : EntitySystem
 
     // If you add more clumsy interactions add them in this section!
     #region Clumsy interaction events
-    private void BeforeHyposprayEvent(Entity<ClumsyComponent> ent, ref SelfBeforeHyposprayInjectsEvent args)
+    private void BeforeHyposprayEvent(Entity<ClumsyComponent> ent, ref SelfBeforeInjectEvent args)
     {
         // Clumsy people sometimes inject themselves! Apparently syringes are clumsy proof...
 
@@ -54,9 +54,9 @@ public sealed class ClumsySystem : EntitySystem
         if (!rand.Prob(ent.Comp.ClumsyDefaultCheck))
             return;
 
-        args.TargetGettingInjected = args.EntityUsingHypospray;
-        args.InjectMessageOverride = Loc.GetString(ent.Comp.HypoFailedMessage);
-        _audio.PlayPredicted(ent.Comp.ClumsySound, ent, args.EntityUsingHypospray);
+        args.TargetGettingInjected = args.EntityUsingInjector;
+        args.OverrideMessage = Loc.GetString(ent.Comp.HypoFailedMessage);
+        _audio.PlayPredicted(ent.Comp.ClumsySound, ent, args.EntityUsingInjector);
     }
 
     private void BeforeDefibrillatorZapsEvent(Entity<ClumsyComponent> ent, ref SelfBeforeDefibrillatorZapsEvent args)
diff --git a/Content.Shared/Fluids/SharedPuddleSystem.Spillable.cs b/Content.Shared/Fluids/SharedPuddleSystem.Spillable.cs
index 05062aed2e..9dcd965492 100644
--- a/Content.Shared/Fluids/SharedPuddleSystem.Spillable.cs
+++ b/Content.Shared/Fluids/SharedPuddleSystem.Spillable.cs
@@ -1,6 +1,7 @@
 using Content.Shared.Chemistry;
 using Content.Shared.Chemistry.Components;
 using Content.Shared.Chemistry.EntitySystems;
+using Content.Shared.Chemistry.Prototypes;
 using Content.Shared.Chemistry.Reaction;
 using Content.Shared.CombatMode.Pacification;
 using Content.Shared.Database;
@@ -22,6 +23,7 @@ namespace Content.Shared.Fluids;
 public abstract partial class SharedPuddleSystem
 {
     private static readonly FixedPoint2 MeleeHitTransferProportion = 0.25;
+    [Dependency] private readonly InjectorSystem _injectorSystem = default!;
 
     protected virtual void InitializeSpillable()
     {
@@ -68,6 +70,7 @@ public abstract partial class SharedPuddleSystem
         if (entity.Comp.SpillDelay == null)
         {
             var target = args.Target;
+            var user = args.User;
             verb.Act = () =>
             {
                 var puddleSolution = _solutionContainerSystem.SplitSolution(soln.Value, solution.Volume);
@@ -75,9 +78,21 @@ public abstract partial class SharedPuddleSystem
 
                 // TODO: Make this an event subscription once spilling puddles is predicted.
                 // Injectors should not be hardcoded here.
-                if (TryComp<InjectorComponent>(entity, out var injectorComp))
+                if (TryComp<InjectorComponent>(entity, out var injectorComp)
+                    && _prototypeManager.Resolve(injectorComp.ActiveModeProtoId, out var activeMode)
+                    && !activeMode.Behavior.HasFlag(InjectorBehavior.Draw))
                 {
-                    injectorComp.ToggleState = InjectorToggleMode.Draw;
+                    foreach (var mode in injectorComp.AllowedModes)
+                    {
+                        if (!_prototypeManager.Resolve(mode, out var protoMode))
+                            continue;
+
+                        if (protoMode.Behavior.HasAnyFlag(InjectorBehavior.Draw | InjectorBehavior.Dynamic))
+                        {
+                            _injectorSystem.ToggleMode((entity, injectorComp), user, protoMode);
+                            break;
+                        }
+                    }
                     Dirty(entity, injectorComp);
                 }
             };
diff --git a/Content.Shared/Inventory/InventorySystem.Relay.cs b/Content.Shared/Inventory/InventorySystem.Relay.cs
index 11b7f61130..242e8d0de9 100644
--- a/Content.Shared/Inventory/InventorySystem.Relay.cs
+++ b/Content.Shared/Inventory/InventorySystem.Relay.cs
@@ -2,10 +2,9 @@ using Content.Shared.Armor;
 using Content.Shared.Atmos;
 using Content.Shared.Chat;
 using Content.Shared.Chemistry;
-using Content.Shared.Chemistry.Hypospray.Events;
+using Content.Shared.Chemistry.Events;
 using Content.Shared.Climbing.Events;
 using Content.Shared.Contraband;
-using Content.Shared.Damage;
 using Content.Shared.Damage.Events;
 using Content.Shared.Damage.Systems;
 using Content.Shared.Electrocution;
@@ -48,8 +47,8 @@ public partial class InventorySystem
         SubscribeLocalEvent<InventoryComponent, GetDefaultRadioChannelEvent>(RelayInventoryEvent);
         SubscribeLocalEvent<InventoryComponent, RefreshNameModifiersEvent>(RelayInventoryEvent);
         SubscribeLocalEvent<InventoryComponent, TransformSpeakerNameEvent>(RelayInventoryEvent);
-        SubscribeLocalEvent<InventoryComponent, SelfBeforeHyposprayInjectsEvent>(RelayInventoryEvent);
-        SubscribeLocalEvent<InventoryComponent, TargetBeforeHyposprayInjectsEvent>(RelayInventoryEvent);
+        SubscribeLocalEvent<InventoryComponent, SelfBeforeInjectEvent>(RelayInventoryEvent);
+        SubscribeLocalEvent<InventoryComponent, BeforeInjectTargetEvent>(RelayInventoryEvent);
         SubscribeLocalEvent<InventoryComponent, SelfBeforeGunShotEvent>(RelayInventoryEvent);
         SubscribeLocalEvent<InventoryComponent, SelfBeforeClimbEvent>(RelayInventoryEvent);
         SubscribeLocalEvent<InventoryComponent, CoefficientQueryEvent>(RelayInventoryEvent);
diff --git a/Resources/Locale/en-US/chemistry/components/hypospray-component.ftl b/Resources/Locale/en-US/chemistry/components/hypospray-component.ftl
deleted file mode 100644
index 36d229e78f..0000000000
--- a/Resources/Locale/en-US/chemistry/components/hypospray-component.ftl
+++ /dev/null
@@ -1,20 +0,0 @@
-## UI
-
-hypospray-all-mode-text = Only Injects
-hypospray-mobs-only-mode-text = Draws and Injects
-hypospray-invalid-text = Invalid
-hypospray-volume-label = Volume: [color=white]{$currentVolume}/{$totalVolume}u[/color]
-    Mode: [color=white]{$modeString}[/color]
-
-## Entity
-
-hypospray-component-inject-other-message = You inject {THE($other)}.
-hypospray-component-inject-self-message = You inject yourself.
-hypospray-component-empty-message = Nothing to inject.
-hypospray-component-feel-prick-message = You feel a tiny prick!
-hypospray-component-transfer-already-full-message = {$owner} is already full!
-hypospray-cant-inject = Can't inject into {$target}!
-
-hypospray-verb-mode-label = Toggle Container Draw
-hypospray-verb-mode-inject-all = You cannot draw from containers anymore.
-hypospray-verb-mode-inject-mobs-only = You can now draw from containers.
diff --git a/Resources/Locale/en-US/chemistry/components/injector-component.ftl b/Resources/Locale/en-US/chemistry/components/injector-component.ftl
index 53387ea1a4..5dc12a1f7d 100644
--- a/Resources/Locale/en-US/chemistry/components/injector-component.ftl
+++ b/Resources/Locale/en-US/chemistry/components/injector-component.ftl
@@ -1,37 +1,50 @@
 ## UI
 
-injector-draw-text = Draw
-injector-inject-text = Inject
-injector-invalid-injector-toggle-mode = Invalid
-injector-volume-label = Volume: [color=white]{$currentVolume}/{$totalVolume}[/color]
+injector-volume-transfer-label = Volume: [color=white]{$currentVolume}/{$totalVolume}u[/color]
     Mode: [color=white]{$modeString}[/color] ([color=white]{$transferVolume}u[/color])
+injector-volume-label = Volume: [color=white]{$currentVolume}/{$totalVolume}u[/color]
+    Mode: [color=white]{$modeString}[/color]
+injector-toggle-verb-text = Toggle Injector Mode
 
 ## Entity
 
-injector-component-drawing-text = Now drawing
-injector-component-injecting-text = Now injecting
-injector-component-cannot-transfer-message = You aren't able to transfer into {THE($target)}!
-injector-component-cannot-transfer-message-self = You aren't able to transfer into yourself!
-injector-component-cannot-draw-message = You aren't able to draw from {THE($target)}!
-injector-component-cannot-draw-message-self = You aren't able to draw from yourself!
-injector-component-cannot-inject-message = You aren't able to inject into {THE($target)}!
-injector-component-cannot-inject-message-self = You aren't able to inject into yourself!
+injector-component-inject-mode-name = Inject
+injector-component-draw-mode-name = Draw
+injector-component-dynamic-mode-name = Dynamic
+injector-component-mode-changed-text = Now {$mode}
 injector-component-inject-success-message = You inject {$amount}u into {THE($target)}!
 injector-component-inject-success-message-self = You inject {$amount}u into yourself!
 injector-component-transfer-success-message = You transfer {$amount}u into {THE($target)}.
 injector-component-transfer-success-message-self = You transfer {$amount}u into yourself.
 injector-component-draw-success-message = You draw {$amount}u from {THE($target)}.
 injector-component-draw-success-message-self = You draw {$amount}u from youself.
+
+## Fail Messages
+
 injector-component-target-already-full-message = {CAPITALIZE(THE($target))} is already full!
 injector-component-target-already-full-message-self = You are already full!
 injector-component-target-is-empty-message = {CAPITALIZE(THE($target))} is empty!
 injector-component-target-is-empty-message-self = You are empty!
 injector-component-cannot-toggle-draw-message = Too full to draw!
 injector-component-cannot-toggle-inject-message = Nothing to inject!
+injector-component-cannot-toggle-dynamic-message = Can't toggle dynamic!
+injector-component-empty-message = {CAPITALIZE(THE($injector))} is empty!
+injector-component-blocked-user = Protective gear blocked your injection!
+injector-component-blocked-other = {CAPITALIZE(THE(POSS-ADJ($target)))} armor blocked {THE($user)}'s injection!
+injector-component-cannot-transfer-message = You aren't able to transfer into {THE($target)}!
+injector-component-cannot-transfer-message-self = You aren't able to transfer into yourself!
+injector-component-cannot-draw-message = You aren't able to draw from {THE($target)}!
+injector-component-cannot-draw-message-self = You aren't able to draw from yourself!
+injector-component-cannot-inject-message = You aren't able to inject into {THE($target)}!
+injector-component-cannot-inject-message-self = You aren't able to inject into yourself!
+injector-component-ignore-mobs = This injector can only interact with containers!
 
 ## mob-inject doafter messages
 
-injector-component-drawing-user = You start drawing the needle.
-injector-component-injecting-user = You start injecting the needle.
-injector-component-drawing-target = {CAPITALIZE(THE($user))} is trying to use a needle to draw from you!
-injector-component-injecting-target = {CAPITALIZE(THE($user))} is trying to inject a needle into you!
+injector-component-needle-injecting-user = You start injecting the needle.
+injector-component-needle-injecting-target = {CAPITALIZE(THE($user))} is trying to inject a needle into you!
+injector-component-needle-drawing-user = You start drawing the needle.
+injector-component-needle-drawing-target = {CAPITALIZE(THE($user))} is trying to use a needle to draw from you!
+
+## Target Popup Success messages
+injector-component-feel-prick-message = You feel a tiny prick!
diff --git a/Resources/Prototypes/Chemistry/injector_modes.yml b/Resources/Prototypes/Chemistry/injector_modes.yml
new file mode 100644
index 0000000000..2a791eb0ac
--- /dev/null
+++ b/Resources/Prototypes/Chemistry/injector_modes.yml
@@ -0,0 +1,118 @@
+## Abstracts
+- type: injectorMode
+  abstract: true
+  id: BaseInjectMode
+  name: injector-component-inject-mode-name
+  behavior: Inject
+  popupUserAttempt: injector-component-needle-injecting-user
+  popupTargetAttempt: injector-component-needle-injecting-target
+
+- type: injectorMode
+  abstract: true
+  id: BaseDrawMode
+  name: injector-component-draw-mode-name
+  behavior: Draw
+  popupUserAttempt: injector-component-needle-drawing-user
+  popupTargetAttempt: injector-component-needle-drawing-target
+
+- type: injectorMode
+  abstract: true
+  id: BaseDynamicMode
+  name: injector-component-dynamic-mode-name
+  behavior: Dynamic
+  popupUserAttempt: injector-component-needle-injecting-user
+  popupTargetAttempt: injector-component-needle-injecting-target
+
+## Syringes
+- type: injectorMode
+  abstract: true
+  id: BaseSyringeMode
+  transferAmounts:
+  - 5
+  - 10
+  - 15
+
+- type: injectorMode
+  abstract: true
+  id: BaseCryostasisSyringeMode
+  transferAmounts:
+  - 5
+  - 10
+
+- type: injectorMode
+  abstract: true
+  id: BaseBluespaceSyringeMode
+  mobTime: 2.5
+  transferAmounts:
+  - 5
+  - 10
+  - 15
+  - 50
+
+- type: injectorMode
+  parent: [ BaseSyringeMode, BaseInjectMode ]
+  id: SyringeInjectMode
+
+- type: injectorMode
+  parent: [ BaseSyringeMode, BaseDrawMode ]
+  id: SyringeDrawMode
+
+- type: injectorMode
+  parent: [ BaseBluespaceSyringeMode, BaseInjectMode ]
+  id: BluespaceSyringeInjectMode
+
+- type: injectorMode
+  parent: [ BaseBluespaceSyringeMode, BaseDrawMode ]
+  id: BluespaceSyringeDrawMode
+
+- type: injectorMode
+  parent: [ BaseCryostasisSyringeMode, BaseInjectMode ]
+  id: CryostasisSyringeInjectMode
+
+- type: injectorMode
+  parent: [ BaseCryostasisSyringeMode, BaseDrawMode ]
+  id: CryostasisSyringeDrawMode
+
+## Dropper
+- type: injectorMode
+  abstract: true
+  id: BaseDropperMode
+  transferAmounts:
+  - 1
+  - 2
+  - 3
+  - 4
+  - 5
+
+- type: injectorMode
+  parent: [ BaseDropperMode, BaseInjectMode ]
+  id: DropperInjectMode
+
+- type: injectorMode
+  parent: [ BaseDropperMode, BaseDrawMode ]
+  id: DropperDrawMode
+
+## Hyposprays
+- type: injectorMode
+  abstract: true
+  id: HyposprayBaseMode
+  injectSound: /Audio/Items/hypospray.ogg
+  injectPopupTarget: injector-component-feel-prick-message
+  injectOnUse: true
+  mobTime: 0
+  delayPerVolume: 0
+  transferAmounts:
+  - 5
+
+- type: injectorMode
+  parent: [ HyposprayBaseMode, BaseInjectMode ]
+  id: HyposprayInjectMode
+
+- type: injectorMode
+  parent: [ HyposprayBaseMode, BaseDynamicMode ]
+  id: HyposprayDynamicMode
+
+- type: injectorMode
+  parent: HyposprayDynamicMode
+  id: HypopenDynamicMode
+  containerDrawTime: 0.75
diff --git a/Resources/Prototypes/Entities/Clothing/Belt/job.yml b/Resources/Prototypes/Entities/Clothing/Belt/job.yml
index 820a59e019..a40740f46a 100644
--- a/Resources/Prototypes/Entities/Clothing/Belt/job.yml
+++ b/Resources/Prototypes/Entities/Clothing/Belt/job.yml
@@ -185,7 +185,6 @@
       - SurgeryTool
       - Dropper
       components:
-      - Hypospray
       - Injector
       - Pill
       - HandLabeler
@@ -198,7 +197,7 @@
           - Bottle
       hypo:
         whitelist:
-          components:
+          tags:
           - Hypospray
       pill:
         whitelist:
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml b/Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml
index 343113e2f0..9b76330d98 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml
@@ -1,5 +1,18 @@
 - type: entity
-  parent: [BaseItem, BaseGrandTheftContraband]
+  abstract: true
+  parent: BaseItem
+  id: BaseHypospray
+  components:
+  - type: Injector
+    solutionName: hypospray
+    ignoreClosed: false
+    activeModeProtoId: HyposprayDynamicMode
+    allowedModes:
+    - HyposprayDynamicMode
+    - HyposprayInjectMode
+
+- type: entity
+  parent: [BaseHypospray, BaseGrandTheftContraband]
   id: Hypospray
   name: hypospray
   description: A sterile injector for rapid administration of drugs to patients.
@@ -7,11 +20,11 @@
   - type: Sprite
     sprite: Objects/Specific/Medical/hypospray.rsi
     layers:
-      - state: hypo
-        map: ["enum.SolutionContainerLayers.Base"]
-      - state: hypo_fill1
-        map: ["enum.SolutionContainerLayers.Fill"]
-        visible: false
+    - state: hypo
+      map: ["enum.SolutionContainerLayers.Base"]
+    - state: hypo_fill1
+      map: ["enum.SolutionContainerLayers.Fill"]
+      visible: false
   - type: Item
     sprite: Objects/Specific/Medical/hypospray.rsi
   - type: SolutionContainerManager
@@ -23,8 +36,6 @@
   - type: ExaminableSolution
     solution: hypospray
     exactVolume: true
-  - type: Hypospray
-    onlyAffectsMobs: false
   - type: UseDelay
     delay: 0.5
   - type: StaticPrice
@@ -41,7 +52,7 @@
     solutionName: hypospray
 
 - type: entity
-  parent: BaseItem
+  parent: [BaseHypospray, BaseSyndicateContraband]
   id: SyndiHypo
   name: gorlex hypospray
   description: A sterile injector for rapid administration of drugs. Reverse-engineered from Nanotrasen designs, Cybersun produces these in limited quantities for Gorlex Marauders' corpsmen.
@@ -60,23 +71,13 @@
     solutions:
       hypospray:
         maxVol: 20
-  - type: RefillableSolution
-    solution: hypospray
-  - type: ExaminableSolution
-    solution: hypospray
-    exactVolume: true
-  - type: Hypospray
-    onlyAffectsMobs: false
-  - type: UseDelay
-    delay: 0.5
-  - type: Appearance
   - type: SolutionContainerVisuals
     maxFillLevels: 4
     fillBaseName: hypo_fill
     solutionName: hypospray
 
 - type: entity
-  parent: BaseItem
+  parent: BaseHypospray
   id: BorgHypo
   name: borghypo
   description: A sterile injector for rapid administration of drugs to patients. This integrated model is specialized for use by medical borgs.
@@ -94,8 +95,6 @@
     solution: hypospray
   - type: ExaminableSolution
     solution: hypospray
-  - type: Hypospray
-    onlyAffectsMobs: false
   - type: UseDelay
     delay: 0.5
 
@@ -114,7 +113,7 @@
       delay: 0.0
 
 - type: entity
-  parent: BaseItem
+  parent: BaseHypospray
   id: ChemicalMedipen
   name: chemical medipen
   description: A single-dose, non-refillable medipen.
@@ -145,11 +144,12 @@
   - type: ExaminableSolution
     solution: pen
     exactVolume: true
-  - type: Hypospray
+  - type: Injector
     solutionName: pen
-    transferAmount: 15
-    onlyAffectsMobs: false
-    injectOnly: true
+    currentTransferAmount: null
+    activeModeProtoId: HyposprayInjectMode
+    allowedModes:
+    - HyposprayInjectMode
   - type: Appearance
   - type: SolutionContainerVisuals
     maxFillLevels: 1
@@ -253,11 +253,6 @@
     maxFillLevels: 1
     changeColor: false
     emptySpriteName: bicpen_empty
-  - type: Hypospray
-    solutionName: pen
-    transferAmount: 20
-    onlyAffectsMobs: false
-    injectOnly: true
   - type: SolutionContainerManager
     solutions:
       pen:
@@ -295,11 +290,6 @@
     maxFillLevels: 1
     changeColor: false
     emptySpriteName: dermpen_empty
-  - type: Hypospray
-    solutionName: pen
-    transferAmount: 20
-    onlyAffectsMobs: false
-    injectOnly: true
   - type: SolutionContainerManager
     solutions:
       pen:
@@ -337,11 +327,6 @@
     maxFillLevels: 1
     changeColor: false
     emptySpriteName: arithpen_empty
-  - type: Hypospray
-    solutionName: pen
-    transferAmount: 20
-    onlyAffectsMobs: false
-    injectOnly: true
   - type: SolutionContainerManager
     solutions:
       pen:
@@ -379,11 +364,6 @@
     maxFillLevels: 1
     changeColor: false
     emptySpriteName: punctpen_empty
-  - type: Hypospray
-    solutionName: pen
-    transferAmount: 15
-    onlyAffectsMobs: false
-    injectOnly: true
   - type: SolutionContainerManager
     solutions:
       pen:
@@ -421,11 +401,6 @@
     maxFillLevels: 1
     changeColor: false
     emptySpriteName: pyrapen_empty
-  - type: Hypospray
-    solutionName: pen
-    transferAmount: 20
-    onlyAffectsMobs: false
-    injectOnly: true
   - type: SolutionContainerManager
     solutions:
       pen:
@@ -463,11 +438,6 @@
     maxFillLevels: 1
     changeColor: false
     emptySpriteName: dexpen_empty
-  - type: Hypospray
-    solutionName: pen
-    transferAmount: 40
-    onlyAffectsMobs: false
-    injectOnly: true
   - type: SolutionContainerManager
     solutions:
       pen:
@@ -506,11 +476,6 @@
     maxFillLevels: 1
     changeColor: false
     emptySpriteName: hypovolemic_empty
-  - type: Hypospray
-    solutionName: pen
-    transferAmount: 30
-    onlyAffectsMobs: false
-    injectOnly: true
   - type: SolutionContainerManager
     solutions:
       pen:
@@ -557,11 +522,6 @@
     maxFillLevels: 1
     changeColor: false
     emptySpriteName: stimpen_empty
-  - type: Hypospray
-    solutionName: pen
-    transferAmount: 30
-    onlyAffectsMobs: false
-    injectOnly: true
   - type: StaticPrice
     price: 1500
 
@@ -640,11 +600,6 @@
           Quantity: 25
         - ReagentId: TranexamicAcid
           Quantity: 5
-  - type: Hypospray
-    solutionName: pen
-    transferAmount: 30
-    onlyAffectsMobs: false
-    injectOnly: true
   - type: StaticPrice
     price: 1500
 
@@ -665,9 +620,12 @@
     solution: hypospray
     heldOnly: true # Allow examination only when held in hand.
     exactVolume: true
-  - type: Hypospray
-    onlyAffectsMobs: false
-    drawTime: 0.75
+  - type: Injector
+    solutionName: hypospray
+    activeModeProtoId: HypopenDynamicMode
+    allowedModes:
+    - HyposprayInjectMode
+    - HypopenDynamicMode
   - type: UseDelay
     delay: 0.5
   - type: StaticPrice # A new shitcurity meta
@@ -714,8 +672,3 @@
         reagents:
         - ReagentId: JuiceThatMakesYouWeh
           Quantity: 60
-  - type: Hypospray
-    solutionName: pen
-    transferAmount: 1
-    onlyAffectsMobs: false
-    injectOnly: true
diff --git a/Resources/Prototypes/Entities/Objects/Specific/chemistry.yml b/Resources/Prototypes/Entities/Objects/Specific/chemistry.yml
index 82cf3dd16b..9548224440 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/chemistry.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/chemistry.yml
@@ -379,16 +379,12 @@
       injector:
         maxVol: 5
   - type: Injector
-    injectOnly: false
     ignoreMobs: true
     ignoreClosed: false
-    transferAmounts:
-    - 1
-    - 2
-    - 3
-    - 4
-    - 5
-    currentTransferAmount: 1
+    activeModeProtoId: DropperDrawMode
+    allowedModes:
+    - DropperDrawMode
+    - DropperInjectMode
   - type: ExaminableSolution
     solution: dropper
     exactVolume: true
@@ -461,11 +457,10 @@
       injector:
         maxVol: 15
   - type: Injector
-    injectOnly: false
-    transferAmounts:
-    - 5
-    - 10
-    - 15
+    activeModeProtoId: SyringeDrawMode
+    allowedModes:
+    - SyringeDrawMode
+    - SyringeInjectMode
   - type: ExaminableSolution
     solution: injector
     exactVolume: true
@@ -487,8 +482,6 @@
   parent: BaseSyringe
   id: Syringe
   components:
-  - type: Injector
-    currentTransferAmount: 15
   - type: Tag
     tags:
     - Syringe
@@ -511,14 +504,6 @@
     solutions:
       injector:
         maxVol: 5
-  - type: Injector
-    transferAmounts:
-    - 1
-    - 2
-    - 3
-    - 4
-    - 5
-    currentTransferAmount: 5
   - type: SolutionContainerVisuals
     maxFillLevels: 3
     fillBaseName: minisyringe
@@ -572,7 +557,7 @@
   id: PrefilledSyringe
   components:
   - type: Injector
-    toggleState: Inject
+    activeModeProtoId: SyringeInjectMode
 
 - type: entity
   id: SyringeBluespace
@@ -595,8 +580,10 @@
       injector:
         maxVol: 100
   - type: Injector
-    delay: 2.5
-    injectOnly: false
+    activeModeProtoId: BluespaceSyringeDrawMode
+    allowedModes:
+    - BluespaceSyringeInjectMode
+    - BluespaceSyringeDrawMode
   - type: SolutionContainerVisuals
     maxFillLevels: 2
     fillBaseName: syringe
@@ -627,11 +614,10 @@
         maxVol: 10
         canReact: false
   - type: Injector
-    injectOnly: false
-    transferAmounts:
-    - 5
-    - 10
-    currentTransferAmount: 10
+    activeModeProtoId: CryostasisSyringeDrawMode
+    allowedModes:
+    - CryostasisSyringeInjectMode
+    - CryostasisSyringeDrawMode
   - type: Tag
     tags:
     - Syringe
diff --git a/Resources/Prototypes/tags.yml b/Resources/Prototypes/tags.yml
index a1e01a14a6..ab7bc3c3ab 100644
--- a/Resources/Prototypes/tags.yml
+++ b/Resources/Prototypes/tags.yml
@@ -787,6 +787,9 @@
 - type: Tag
   id: HudSecurity # ConstructionGraph: HudMedSec, GlassesSecHUD
 
+- type: Tag
+  id: Hypospray # ItemMapper: ClothingBeltMedical
+
 ## I ##
 
 - type: Tag

From 85060d96cf087dba3a80d36fadda7467ad03df62 Mon Sep 17 00:00:00 2001
From: PJBot <pieterjan.briers+bot@gmail.com>
Date: Sun, 21 Dec 2025 00:12:04 +0000
Subject: [PATCH 024/134] Automatic changelog update

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

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index b33b9b9aa6..c30b15ec0b 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -1,11 +1,4 @@
 Entries:
-- author: Krosus
-  changes:
-  - message: Fixed crash when loading saved character profiles
-    type: Fix
-  id: 8823
-  time: '2025-08-02T15:14:17.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/39333
 - author: FairlySadPanda
   changes:
   - message: A new cake, berry delight, that is made with a cake base, berries and
@@ -3922,3 +3915,19 @@
   id: 9322
   time: '2025-12-20T18:37:22.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/41923
+- author: SirWarock
+  changes:
+  - message: Hyposprays and Hypopens now start in their dynamic mode. It functions
+      exactly as the previous Inject/Draw mode.
+    type: Tweak
+  - message: The Gorlex Hypospray is now syndicate contraband.
+    type: Tweak
+  - message: Injectors now inject twice as quick into targets that are lying down
+      for any reason, most notably being buckled on a medical bed or being critical.
+      Before, only critical patients had this luxury.
+    type: Tweak
+  - message: Clumsy now affects syringes when you're self-injecting.
+    type: Tweak
+  id: 9323
+  time: '2025-12-21T00:10:55.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/41833

From 2cb8e9b7fed4cda4e94c2a3437fa18ed647c9587 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Sun, 21 Dec 2025 01:47:22 +0100
Subject: [PATCH 025/134] Update Credits (#41931)

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 5ef762b213..7238ecdf3c 100644
--- a/Resources/Credits/GitHub.txt
+++ b/Resources/Credits/GitHub.txt
@@ -1 +1 @@
-0leshe, 0tito, 0x6273, 12rabbits, 1337dakota, 13spacemen, 154942, 2013HORSEMEATSCANDAL, 20kdc, 21Melkuu, 27alaing, 2DSiggy, 3nderall, 4310v343k, 4dplanner, 5tickman, 612git, 778b, 96flo, aaron, abadaba695, Ablankmann, abregado, Absolute-Potato, Absotively, achookh, Acruid, ActiveMammmoth, actually-reb, ada-please, adamsong, Adeinitas, adm2play, Admiral-Obvious-001, adrian, Adrian16199, Ady4ik, Aearo-Deepwater, Aerocrux, Aeshus, Aexolott, Aexxie, africalimedrop, afrokada, AftrLite, AgentSmithRadio, Agoichi, Ahion, aiden, aidenkrz, Aidenkrz, Aisu9, ajcm, AJCM-git, AjexRose, Alekshhh, alexalexmax, alexkar598, AlexMorgan3817, alexum418, alexumandxgabriel08x, Alice4267, Alithsko, Alkheemist, alliephante, ALMv1, Alpaccalypse, Alpha-Two, AlphaQwerty, Altoids1, amatwiedle, amylizzle, ancientpower, Andre19926, Andrew-Fall, AndrewEyeke, AndrewFenriz, AndreyCamper, anri, Anzarot121, ApolloVector, Appiah, april-gras, ar4ill, Arcane-Waffle, archee1, ArchPigeon, ArchRBX, areitpog, Arendian, areyouconfused, arimah, Arkanic, ArkiveDev, armoks, Arteben, ArthurMousatov, ArtisticRoomba, artur, Artxmisery, ArZarLordOfMango, as334, AsikKEsel, AsnDen, asperger-sind, aspiringLich, astriloqua, Atakku, august-sun, AutoOtter, AverageNotDoingAnythingEnjoyer, avghdev, AwareFoxy, Awlod, AzzyIsNotHere, azzyisnothere, B-Kirill, B3CKDOOR, baa14453, BackeTako, BadaBoomie, Bakke, BananaFlambe, Baptr0b0t, BarryNorfolk, BasedUser, bebr3ght, beck-thompson, beesterman, bellwetherlogic, ben, benbryant0, benev0, benjamin-burges, BGare, bhespiritu, bibbly, BigfootBravo, BIGZi0348, bingojohnson, BismarckShuffle, Bixkitts, Blackern5000, Blazeror, blitzthesquishy, Blobadoodle, bloodrizer, Bloody2372, blueDev2, Boaz1111, BobdaBiscuit, BobTheSleder, boiled-water-tsar, Bokser815, bolantej, Booblesnoot42, Boolean-Buckeye, botanySupremist, brainfood1183, BramvanZijp, Brandon-Huu, breeplayx3, BriBrooo, BRINGit34, brndd, bryce0110, BubblegumBlue, buletsponge, buntobaggins, buunie099, bvelliquette, BWTCK, byondfuckery, c0rigin, c4llv07e, CaasGit, Caconym27, Calecute, Callmore, Camdot, cammusubi, capnsockless, CaptainMaru, captainsqrbeard, Carbonhell, Carolyn3114, Carou02, carteblanche4me, catdotjs, catlord, Catofquestionableethics, CatTheSystem, CawsForConcern, CDWimmer, Centronias, Chaboricks, chairbender, Chaoticaa, Charlese2, charlie, chartman, ChaseFlorom, chavonadelal, Cheackraze, CheddaCheez, cheesePizza2, CheesePlated, Chief-Engineer, chillyconmor, christhirtle, chromiumboy, Chronophylos, Chubbicous, Chubbygummibear, Ciac32, ciaran, citrea, civilCornball, claustro305, Clement-O, cloudyias, clyf, Clyybber, CMDR-Piboy314, cnv41, coco, cohanna, Cohnway, Cojoke-dot, ColdAutumnRain, Colin-Tel, collinlunn, ComicIronic, Compilatron144, CookieMasterT, coolboy911, CoolioDudio, coolmankid12345, Coolsurf6, cooperwallace, corentt, CormosLemming, CrafterKolyan, CraftyRenter, crazybrain23, Crazydave91920, creadth, CrigCrag, CroilBird, Crotalus, CrudeWax, cryals, CrzyPotato, cubixthree, cutemoongod, Cyberboss, d34d10cc, DadeKuma, Daemon, daerSeebaer, dahnte, dakamakat, DamianX, dan, dangerrevolution, daniel-cr, DanSAussieITS, Daracke, Darkenson, david, DawBla, Daxxi3, dch-GH, ddeegan, de0rix, Deahaka, dean, DEATHB4DEFEAT, Deatherd, deathride58, DebugOk, Decappi, Decortex, Deeeeja, deepdarkdepths, DeepwaterCreations, Deerstop, degradka, Delete69, deltanedas, DenisShvalov, DerbyX, derek, dersheppard, Deserty0, Detintinto, DevilishMilk, devinschubert14, dexlerxd, dffdff2423, DieselMohawk, DieselMohawkTheSequel, digitalic, Dimastra, DinnerCalzone, DinoWattz, Disp-Dev, DisposableCrewmember42, dissidentbullet, DjfjdfofdjfjD, doc-michael, docnite, Doctor-Cpu, DogZeroX, dolgovmi, dontbetank, Doomsdrayk, Doru991, DoubleRiceEddiedd, DoutorWhite, DR-DOCTOR-EVIL-EVIL, Dragonjspider, dragonryan06, drakewill-CRL, Drayff, dreamlyjack, DrEnzyme, dribblydrone, DrMelon, drongood12, DrSingh, DrSmugleaf, drteaspoon420, DTanxxx, DubiousDoggo, DuckManZach, Duddino, dukevanity, duskyjay, Dutch-VanDerLinde, dvir001, dylanstrategie, dylanwhittingham, Dynexust, Easypoller, echo, eclips_e, eden077, EEASAS, Efruit, efzapa, Ekkosangen, ElectroSR, elsie, elthundercloud, Elysium206, emberwinters, Emisse, emmafornash, EmoGarbage404, Endecc, EnrichedCaramel, Entvari, eoineoineoin, ephememory, eris, erohrs2, erorr404v1, Errant-4, ertanic, esguard, estacaoespacialpirata, eugene, ewokswagger, exincore, exp111, f0x-n3rd, F1restar4, FacePluslll, Fahasor, FairlySadPanda, farrellka-dev, FATFSAAM2, Feluk6174, ficcialfaint, Fiftyllama, Fildrance, fillervk, FinnishPaladin, firenamefn, Firewars763, FirinMaLazors, Fishfish458, fl-oz, Flareguy, flashgnash, FlipBrooke, FluffiestFloof, FluffMe, FluidRock, flymo5678, foboscheshir, FoLoKe, fooberticus, ForestNoises, forgotmyotheraccount, forkeyboards, forthbridge, Fortune117, foxhorn, freeman2651, freeze2222, frobnic8, Froffy025, Fromoriss, froozigiusz, FrostMando, FrostRibbon, Funce, FungiFellow, FunkySphere, FunTust, Futuristic-OK, GalacticChimp, gamer3107, Gamewar360, gansulalan, GaussiArson, Gaxeer, gbasood, gcoremans, Geekyhobo, genderGeometries, GeneralGaws, Genkail, Gentleman-Bird, geraeumig, Ghagliiarghii, Git-Nivrak, githubuser508, GitHubUser53123, gituhabu, GlassEclipse, GnarpGnarp, GNF54, godisdeadLOL, goet, GoldenCan, Goldminermac, Golinth, golubgik, GoodWheatley, Gorox221, GR1231, gradientvera, graevy, GraniteSidewalk, GreaseMonk, greenrock64, GreyMario, GrownSamoyedDog, GTRsound, gusxyz, Gyrandola, h3half, hamurlik, Hanzdegloker, HappyRoach, happyrobot33, Hardly3D, harikattar, Hayden, he1acdvv, Hebi, Helix-ctrl, helm4142, Henry, HerCoyote23, Hi-Im-Shot, HighTechPuddle, Hitlinemoss, hiucko, hivehum, Hmeister-fake, Hmeister-real, Hobbitmax, hobnob, HoidC, Holinka4ever, holyssss, HoofedEar, Hoolny, hord-brayden, hoshizora-sayo, Hreno, Hrosts, htmlsystem, Huaqas, hubismal, Hugal31, Hyenh, hyperb1, hyperDelegate, hyphenationc, i-justuser-i, iaada, iacore, IamVelcroboy, Ian321, icekot8, icesickleone, iczero, iglov, IgorAnt028, igorsaux, ike709, illersaver, Illiux, Ilushkins33, Ilya246, IlyaElDunaev, imatsoup, IMCB, impubbi, imrenq, imweax, indeano, Injazz, Insineer, insoPL, IntegerTempest, Interrobang01, Intoxicating-Innocence, IProduceWidgets, itsmethom, Itzbenz, iztokbajcar, Jackal298, Jackrost, JackRyd3r, jacksonzck, JackspajfMain, Jacktastic09, Jackw2As, jacob, jamessimo, janekvap-havok, Jark255, Jarmer123, Jaskanbe, JasperJRoth, jbox144, JCGWE30, jerryimmouse, JerryImMouse, Jessetriesagain, jessicamaybe, JesterX666, Jewelots, Jezithyr, jicksaw, JiimBob, JimGamemaster, jimmy12or, JIPDawg, jjtParadox, jkwookee, jmcb, JohnGinnane, johnku1, Jophire, Jopogrechkin, joshepvodka, JpegOfAFrog, jproads, JrInventor05, Jrpl, jukereise, juliangiebel, JustArt1m, JustCone14, justdie12, justin, justintether, JustinTrotter, JustinWinningham, justtne, K-Dynamic, k3yw, Kadeo64, Kaga-404, kaiserbirch, KaiShibaa, kalane15, kalanosh, KamTheSythe, Kanashi-Panda, katzenminer, kbailey-git, Keelin, Keer-Sar, KEEYNy, keikiru, Kelrak, kerisargit, keronshb, KIBORG04, KieueCaprie, Kimpes, kin98, KingFroozy, kira-er, kiri-yoshikage, Kirillcas, Kirus59, Kistras, Kit, Kit0vras, KittenColony, Kittygyat, klaypexx, kleinerstation13, Kmc2000, Ko4ergaPunk, kognise, kokoc9n, komunre, KonstantinAngelov, kontakt, korczoczek, kosticia, koteq, kotobdev, Kowlin, KrasnoshchekovPavel, Krosus777, Krunklehorn, Kryyto, Kupie, kxvvv, Kyoth25f, kyupolaris, kzhanik, LaCumbiaDelCoronavirus, lajolico, Lamrr, lanedon, LankLTE, laok233, lapatison, larryrussian, lawdog4817, Lazzi0706, leah, leander-0, leonardo-dabepis, leonidussaks, leonsfriedrich, LeoSantich, lettern, LetterN, Level10Cybermancer, LEVELcat, lever1209, LevitatingTree, Lgibb18, lgruthes, LightVillet, lilazero, liltenhead, linkbro1, linkuyx, Litraxx, little-meow-meow, LittleBuilderJane, LittleNorthStar, LittleNyanCat, lizelive, ljm862, lmsnoise, localcc, lokachop, lolman360, Lomcastar, Lordbrandon12, LordCarve, LordEclipse, lucas, LucasTheDrgn, luckyshotpictures, LudwigVonChesterfield, luegamer, luizwritescode, LukaSlade, Lukasz825700516, luminight, lunarcomets, Lusatia, Luxeator, lvvova1, Lyndomen, lyroth001, lzimann, lzk228, M1tht1c, M3739, M4rchy-S, M87S, mac6na6na, MACMAN2003, Macoron, magicalus, magmodius, magnuscrowe, maland1, malchanceux, MaloTV, manelnavola, ManelNavola, Mangohydra, marboww, Markek1, MarkerWicker, marlyn, matt, Matz05, max, MaxNox7, maylokana, MDuch369, meganerobot, MehimoNemo, Mehnix, MeltedPixel, memeproof, MendaxxDev, Menshin, Mephisto72, MerrytheManokit, Mervill, metalgearsloth, MetalSage, MFMessage, mhamsterr, michaelcu, micheel665, mifia, MilenVolf, MilonPL, Minemoder5000, Minty642, minus1over12, Mirino97, mirrorcult, misandrie, MishaUnity, MissKay1994, MisterImp, MisterMecky, Mith-randalf, Mixelz, mjarduk, MjrLandWhale, mkanke-real, MLGTASTICa, mnva0, moderatelyaware, modern-nm, mokiros, momo, Moneyl, monotheonist, Moomoobeef, moony, Morb0, MossyGreySlope, mqole, mr-bo-jangles, Mr0maks, MrFippik, MrPersival, mrrobdemo, mtrs163, muburu, MureixloI, murolem, murphyneko, musicmanvr, MWKane, Myakot, Myctai, N3X15, nabegator, nails-n-tape, Nairodian, Naive817, NakataRin, namespace-Memory, Nannek, NazrinNya, neutrino-laser, NickPowers43, nikitosych, nikthechampiongr, Nimfar11, ninruB, Nirnael, NIXC, nkokic, NkoKirkto, nmajask, noctyrnal, noelkathegod, noirogen, nok-ko, NonchalantNoob, NoobyLegion, Nopey, NoreUhh, not-gavnaed, notafet, notquitehadouken, notsodana, noudoit, noverd, Nox38, NuclearWinter, Nuggets219, nukashimika, nuke-haus, NULL882, nullarmo, nyeogmi, Nylux, Nyranu, Nyxilath, och-och, OctoRocket, OldDanceJacket, OliverOtter, onesch, OneZerooo0, OnsenCapy, OnyxTheBrave, opl-, Orange-Winds, OrangeMoronage9622, OrbitSystem07, Orsoniks, osjarw, Ostaf, othymer, OttoMaticode, Owai-Seek, packmore, paige404, paigemaeforrest, pali6, Palladinium, Pangogie, panzer-iv1, partyaddict, patrikturi, PaulRitter, pavlockblaine03, peccneck, Peptide90, peptron1, perryprog, PeterFuto, PetMudstone, pewter-wiz, pgraycs, PGrayCS, Pgriha, phantom-lily, pheenty, philingham, Phill101, Phooooooooooooooooooooooooooooooosphate, phunnyguy, PicklOH, PilgrimViis, Pill-U, pinkbat5, Piras314, Pireax, Pissachu, pissdemon, Pixel8-dev, PixeltheAertistContrib, PixelTheKermit, PJB3005, Plasmaguy, plinyvic, Plykiya, poeMota, pofitlo, pointer-to-null, Pok27, poklj, PolterTzi, PoorMansDreams, PopGamer45, portfiend, potato1234x, PotentiallyTom, PotRoastPiggy, Princess-Cheeseballs, ProfanedBane, PROG-MohamedDwidar, Prole0, ProPandaBear, PrPleGoo, ps3moira, Pspritechologist, Psychpsyo, psykana, psykzz, PuceTint, pumkin69, PuroSlavKing, PursuitInAshes, Putnam3145, py01, Pyrovi, qrtDaniil, qrwas, Quantum-cross, quasr-9, quatre, QueerNB, QuietlyWhisper, qwerltaz, Radezolid, RadioMull, Radosvik, Radrark, Rainbeon, Rainfey, Raitononai, Ramlik, RamZ, randy10122, Rane, Ranger6012, Rapidgame7, ravage123321, rbertoche, RedBookcase, Redfire1331, Redict, RedlineTriad, redmushie, RednoWCirabrab, redspyy, ReeZer2, RemberBM, RemieRichards, RemTim, rene-descartes2021, Renlou, retequizzle, rewafflution, rhailrake, rhsvenson, rich-dunne, RieBi, riggleprime, RIKELOLDABOSS, rinary1, Rinkashikachi, riolume, rlebell33, RobbyTheFish, robinthedragon, Rockdtben, Rohesie, rok-povsic, rokudara-sen, rolfero, RomanNovo, rosieposieeee, Roudenn, router, ruddygreat, rumaks, RumiTiger, Ruzihm, rwrv, S1rFl0, S1ss3l, Saakra, Sadie-silly, saga3152, saintmuntzer, Salex08, sam, samgithubaccount, Samuka-C, SaphireLattice, SapphicOverload, sarahon, sativaleanne, SaveliyM360, sBasalto, ScalyChimp, ScarKy0, ScholarNZL, schrodinger71, scrato, Scribbles0, scrivoy, scruq445, scuffedjays, ScumbagDog, SeamLesss, Segonist, semensponge, sephtasm, ser1-1y, Serkket, sewerpig, SG6732, sh18rw, Shaddap1, ShadeAware, ShadowCommander, shadowtheprotogen546, shaeone, shampunj, shariathotpatrol, SharkSnake98, shibechef, Siginanto, signalsender, SignalWalker, siigiil, silicon14wastaken, Silverfur-underscore, Simyon264, sirdragooon, Sirionaut, SirWarock, Sk1tch, SkaldetSkaeg, Skarletto, skeeka-dev, Skybailey-dev, skye, Skyedra, SlamBamActionman, slarticodefast, Slava0135, sleepyyapril, slimmslamm, Slyfox333, Smugman, SnappingOpossum, snebl, snicket, sniperchance, Snowni, snowsignal, SolidSyn, SolidusSnek, solstar2, SonicHDC, SoulFN, SoulSloth, Soundwavesghost, soupkilove, southbridge-fur, sowelipililimute, Soydium, SpaceLizard24, SpaceLizardSky, SpaceManiac, SpaceRox1244, SpaceyLady, Spangs04, spanky-spanky, Sparlight, spartak, SpartanKadence, spderman3333, SpeltIncorrectyl, Spessmann, SphiraI, SplinterGP, spoogemonster, sporekto, sporkyz, ssdaniel24, stalengd, stanberytrask, Stanislav4ix, StanTheCarpenter, starbuckss14, Stealthbomber16, Steffo99, stellar-novas, stewie523, stomf, Stop-Signs, stopbreaking, stopka-html, StrawberryMoses, Stray-Pyramid, strO0pwafel, Strol20, StStevens, Subversionary, sunbear-dev, SuperGDPWYL, superjj18, Supernorn, SurrealShibe, SweetAplle, SweptWasTaken, SyaoranFox, Sybil, SYNCHRONIC, Szunti, t, Tainakov, takemysoult, taonewt, tap, TaralGit, Taran, taurie, Tayrtahn, tday93, teamaki, TeenSarlacc, TekuNut, telavivgamers, telyonok, temm1ie, TemporalOroboros, tentekal, terezi4real, Terraspark4941, texcruize, Tezzaide, TGODiamond, TGRCdev, tgrkzus, thanosdegraf, ThatGuyUSA, ThatOneGoblin25, thatrandomcanadianguy, TheArturZh, TheBlueYowie, thecopbennet, TheCze, TheDarkElites, thedraccx, TheEmber, theexetron, TheFlyingSentry, TheGrimbeeper, TheIntoxicatedCat, thekilk, themias, theomund, TheProNoob678, TherapyGoth, ThereDrD0, TheSecondLord, TheShuEd, thetolbean, thevinter, TheWaffleJesus, thinbug0, ThunderBear2006, timothyteakettle, TimrodDX, timurjavid, tin-man-tim, TiniestShark, Titian3, tk-a369, tkdrg, tmtmtl30, ToastEnjoyer, Toby222, TokenStyle, Tollhouse, Toly65, tom-leys, tomasalves8, Tomeno, Tonydatguy, topy, tornado-technology, TornadoTechnology, tosatur, TotallyLemon, ToxicSonicFan04, Tr1bute, travis-g-reid, treytipton, trixxedbit, TrixxedHeart, tropicalhibi, truepaintgit, Truoizys, Tryded, TsjipTsjip, tuchila-adi-bogdan, Tunguso4ka, TurboTrackerss14, tyashley, Tyler-IN, TytosB, Tyzemol, UbaserB, Uberration, ubis1, UBlueberry, uhbg, UKNOWH, UltimateJester, Unbelievable-Salmon, underscorex5, UnicornOnLSD, Unisol, unusualcrow, Uriende, UristMcDorf, user424242420, Utmanarn, Vaaankas, valentfingerov, valquaint, Varen, Vasilis, VasilisThePikachu, veliebm, Velken, VelonacepsCalyxEggs, veprolet, VerinSenpai, veritable-calamity, Veritius, Vermidia, vero5123, verslebas, vexerot, vgskye, viceemargo, VigersRay, violet754, Visne, vitopigno, vitusveit, vlad, vlados1408, VMSolidus, vmzd, VoidMeticulous, voidnull000, volotomite, volundr-, Voomra, Vordenburg, vorkathbruh, Vortebo, vulppine, wachte1, wafehling, walksanatora, Warentan, WarMechanic, Watermelon914, weaversam8, wertanchik, whateverusername0, whatston3, widgetbeck, Will-Oliver-Br, Willhelm53, WilliamECrew, willicassi, Winkarst-cpu, wirdal, wixoaGit, WlarusFromDaSpace, Wolfkey-SomeoneElseTookMyUsername, Worldwaker, wrexbe, wtcwr68, xeri7, xkreksx, xprospero, xRiriq, xsainteer, YanehCheck, yathxyz, Ygg01, YotaXP, youarereadingthis, YoungThugSS14, Yousifb26, youtissoum, yunii, YuriyKiss, yuriykiss, zach-hill, Zadeon, Zalycon, zamp, Zandario, Zap527, Zealith-Gamer, ZelteHonor, zero, ZeroDiamond, ZeWaka, zHonys, zionnBE, ZNixian, Zokkie, ZoldorfTheWizard, zonespace27, Zylofan, Zymem, zzylex
+0leshe, 0tito, 0x6273, 12rabbits, 1337dakota, 13spacemen, 154942, 2013HORSEMEATSCANDAL, 20kdc, 21Melkuu, 27alaing, 2DSiggy, 3nderall, 4310v343k, 4dplanner, 5tickman, 612git, 778b, 96flo, aaron, abadaba695, Ablankmann, abregado, Absolute-Potato, Absotively, achookh, Acruid, ActiveMammmoth, actually-reb, ada-please, adamsong, Adeinitas, adm2play, Admiral-Obvious-001, adrian, Adrian16199, Ady4ik, Aearo-Deepwater, Aerocrux, Aeshus, Aexolott, Aexxie, africalimedrop, afrokada, AftrLite, AgentSmithRadio, Agoichi, Ahion, aiden, aidenkrz, Aidenkrz, Aisu9, ajcm, AJCM-git, AjexRose, Alekshhh, alexalexmax, alexkar598, AlexMorgan3817, alexum418, alexumandxgabriel08x, Alice4267, Alithsko, Alkheemist, alliephante, ALMv1, Alpaccalypse, Alpha-Two, AlphaQwerty, Altoids1, amatwiedle, amylizzle, ancientpower, Andre19926, Andrew-Fall, AndrewEyeke, AndrewFenriz, AndreyCamper, anri, Anzarot121, ApolloVector, Appiah, april-gras, ar4ill, Arcane-Waffle, archee1, ArchPigeon, ArchRBX, areitpog, Arendian, areyouconfused, arimah, Arkanic, ArkiveDev, armoks, Arteben, ArthurMousatov, ArtisticRoomba, artur, Artxmisery, ArZarLordOfMango, as334, AshBats, AsikKEsel, AsnDen, asperger-sind, aspiringLich, astriloqua, Atakku, august-sun, AutoOtter, AverageNotDoingAnythingEnjoyer, avghdev, AwareFoxy, Awlod, azzyisnothere, AzzyIsNotHere, B-Kirill, B3CKDOOR, baa14453, BackeTako, BadaBoomie, Bakke, BananaFlambe, Baptr0b0t, BarryNorfolk, BasedUser, bebr3ght, beck-thompson, beesterman, bellwetherlogic, ben, benbryant0, benev0, benjamin-burges, BGare, bhespiritu, bibbly, BigfootBravo, BIGZi0348, bingojohnson, BismarckShuffle, Bixkitts, Blackern5000, Blazeror, blitzthesquishy, Blobadoodle, bloodrizer, Bloody2372, blueDev2, Boaz1111, BobdaBiscuit, BobTheSleder, boiled-water-tsar, Bokser815, bolantej, Booblesnoot42, Boolean-Buckeye, botanySupremist, brainfood1183, BramvanZijp, Brandon-Huu, breeplayx3, BriBrooo, BRINGit34, brndd, bryce0110, BubblegumBlue, buletsponge, buntobaggins, buunie099, bvelliquette, BWTCK, byondfuckery, c0rigin, c4llv07e, CaasGit, Caconym27, Calecute, Callmore, Camdot, cammusubi, capnsockless, CaptainMaru, captainsqrbeard, Carbonhell, Carolyn3114, Carou02, carteblanche4me, catdotjs, catlord, Catofquestionableethics, CatTheSystem, CawsForConcern, CDWimmer, Centronias, Chaboricks, chairbender, Chaoticaa, Charlese2, charlie, chartman, ChaseFlorom, chavonadelal, Cheackraze, CheddaCheez, cheesePizza2, CheesePlated, Chief-Engineer, chillyconmor, christhirtle, chromiumboy, Chronophylos, Chubbicous, Chubbygummibear, Ciac32, ciaran, citrea, civilCornball, claustro305, Clement-O, cloudyias, clyf, Clyybber, CMDR-Piboy314, cnv41, coco, cohanna, Cohnway, Cojoke-dot, ColdAutumnRain, Colin-Tel, collinlunn, ComicIronic, Compilatron144, CookieMasterT, coolboy911, CoolioDudio, coolmankid12345, Coolsurf6, cooperwallace, corentt, CormosLemming, CrafterKolyan, CraftyRenter, crazybrain23, Crazydave91920, creadth, CrigCrag, CroilBird, Crotalus, CrudeWax, cryals, CrzyPotato, cubixthree, cutemoongod, Cyberboss, d34d10cc, DadeKuma, Daemon, daerSeebaer, dahnte, dakamakat, DamianX, dan, dangerrevolution, daniel-cr, DanSAussieITS, Daracke, Darkenson, david, DawBla, Daxxi3, dch-GH, ddeegan, de0rix, Deahaka, dean, DEATHB4DEFEAT, Deatherd, deathride58, DebugOk, Decappi, Decortex, Deeeeja, deepdarkdepths, DeepwaterCreations, Deerstop, degradka, Delete69, deltanedas, DenisShvalov, DerbyX, derek, dersheppard, Deserty0, Detintinto, DevilishMilk, devinschubert14, dexlerxd, dffdff2423, DieselMohawk, DieselMohawkTheSequel, digitalic, Dimastra, DinnerCalzone, DinoWattz, Disp-Dev, DisposableCrewmember42, dissidentbullet, DjfjdfofdjfjD, doc-michael, docnite, Doctor-Cpu, DogZeroX, dolgovmi, dontbetank, Doomsdrayk, Doru991, DoubleRiceEddiedd, DoutorWhite, DR-DOCTOR-EVIL-EVIL, Dragonjspider, dragonryan06, drakewill-CRL, Drayff, dreamlyjack, DrEnzyme, dribblydrone, DrMelon, drongood12, DrSingh, DrSmugleaf, drteaspoon420, DTanxxx, DubiousDoggo, DuckManZach, Duddino, dukevanity, duskyjay, Dutch-VanDerLinde, dvir001, dylanstrategie, dylanwhittingham, Dynexust, Easypoller, echo, eclips_e, eden077, EEASAS, Efruit, efzapa, Ekkosangen, ElectroSR, elsie, elthundercloud, Elysium206, emberwinters, Emisse, emmafornash, EmoGarbage404, Endecc, EnrichedCaramel, Entvari, eoineoineoin, ephememory, eris, erohrs2, erorr404v1, Errant-4, ertanic, esguard, estacaoespacialpirata, eugene, ewokswagger, exincore, exp111, f0x-n3rd, F1restar4, FacePluslll, Fahasor, FairlySadPanda, farrellka-dev, FATFSAAM2, Feluk6174, ficcialfaint, Fiftyllama, Fildrance, fillervk, FinnishPaladin, firenamefn, Firewars763, FirinMaLazors, Fishfish458, fl-oz, Flareguy, flashgnash, FlipBrooke, FluffiestFloof, FluffMe, FluidRock, flymo5678, foboscheshir, FoLoKe, fooberticus, ForestNoises, forgotmyotheraccount, forkeyboards, forthbridge, Fortune117, foxhorn, freeman2651, freeze2222, frobnic8, Froffy025, Fromoriss, froozigiusz, FrostMando, FrostRibbon, Fruitsalad, Funce, FungiFellow, FunkySphere, FunTust, Futuristic-OK, GalacticChimp, gamer3107, Gamewar360, gansulalan, GaussiArson, Gaxeer, gbasood, gcoremans, Geekyhobo, genderGeometries, GeneralGaws, Genkail, Gentleman-Bird, geraeumig, Ghagliiarghii, Git-Nivrak, githubuser508, GitHubUser53123, gituhabu, GlassEclipse, GnarpGnarp, GNF54, godisdeadLOL, goet, GoldenCan, Goldminermac, Golinth, golubgik, GoodWheatley, Gorox221, GR1231, gradientvera, graevy, GraniteSidewalk, GreaseMonk, greenrock64, GreyMario, GrownSamoyedDog, GTRsound, gusxyz, Gyrandola, h3half, hamurlik, Hanzdegloker, HappyRoach, happyrobot33, Hardly3D, harikattar, Hayden, he1acdvv, Hebi, Helix-ctrl, helm4142, Henry, HerCoyote23, Hi-Im-Shot, HighTechPuddle, Hitlinemoss, hiucko, hivehum, Hmeister-fake, Hmeister-real, Hobbitmax, hobnob, HoidC, Holinka4ever, holyssss, HoofedEar, Hoolny, hord-brayden, hoshizora-sayo, Hreno, Hrosts, htmlsystem, Huaqas, hubismal, Hugal31, Hyenh, hyperb1, hyperDelegate, hyphenationc, i-justuser-i, iaada, iacore, IamVelcroboy, Ian321, icekot8, icesickleone, iczero, iglov, IgorAnt028, igorsaux, ike709, illersaver, Illiux, Ilushkins33, Ilya246, IlyaElDunaev, imatsoup, IMCB, impubbi, imrenq, imweax, indeano, Injazz, Insineer, insoPL, IntegerTempest, Interrobang01, Intoxicating-Innocence, IProduceWidgets, itsmethom, Itzbenz, iztokbajcar, Jackal298, Jackrost, JackRyd3r, jacksonzck, JackspajfMain, Jacktastic09, Jackw2As, jacob, jamessimo, janekvap-havok, Jark255, Jarmer123, Jaskanbe, JasperJRoth, jbox144, JCGWE30, JerryImMouse, jerryimmouse, Jessetriesagain, jessicamaybe, JesterX666, Jewelots, Jezithyr, jicksaw, JiimBob, JimGamemaster, jimmy12or, JIPDawg, jjtParadox, jkwookee, jmcb, JohnGinnane, johnku1, Jophire, Jopogrechkin, joshepvodka, JpegOfAFrog, jproads, JrInventor05, Jrpl, jukereise, juliangiebel, JustArt1m, JustCone14, justdie12, justin, justintether, JustinTrotter, JustinWinningham, justtne, K-Dynamic, k3yw, Kadeo64, Kaga-404, kaiserbirch, KaiShibaa, kalane15, kalanosh, KamTheSythe, Kanashi-Panda, katzenminer, kbailey-git, Keelin, Keer-Sar, KEEYNy, keikiru, Kelrak, kerisargit, keronshb, KIBORG04, KieueCaprie, Kimpes, kin98, KingFroozy, kira-er, kiri-yoshikage, Kirillcas, Kirus59, Kistras, Kit, Kit0vras, KittenColony, Kittygyat, klaypexx, kleinerstation13, Kmc2000, Ko4ergaPunk, kognise, kokoc9n, komunre, KonstantinAngelov, kontakt, korczoczek, kosticia, koteq, kotobdev, Kowlin, KrasnoshchekovPavel, Krosus777, Krunklehorn, Kryyto, Kupie, kxvvv, Kyoth25f, kyupolaris, kzhanik, LaCumbiaDelCoronavirus, lajolico, Lamrr, lanedon, LankLTE, laok233, lapatison, larryrussian, lawdog4817, Lazzi0706, leah, leander-0, leonardo-dabepis, leonidussaks, leonsfriedrich, LeoSantich, LetterN, lettern, Level10Cybermancer, LEVELcat, lever1209, LevitatingTree, Lgibb18, lgruthes, LightVillet, lilazero, liltenhead, linkbro1, linkuyx, Litraxx, little-meow-meow, LittleBuilderJane, LittleNorthStar, LittleNyanCat, lizelive, ljm862, lmsnoise, localcc, lokachop, lolman360, Lomcastar, Lordbrandon12, LordCarve, LordEclipse, lucas, LucasTheDrgn, luckyshotpictures, LudwigVonChesterfield, luegamer, luizwritescode, LukaSlade, Lukasz825700516, luminight, lunarcomets, Lusatia, Luxeator, lvvova1, Lyndomen, lyroth001, lzimann, lzk228, M1tht1c, M3739, M4rchy-S, M87S, mac6na6na, MACMAN2003, Macoron, magicalus, magmodius, magnuscrowe, maland1, malchanceux, MaloTV, manelnavola, ManelNavola, Mangohydra, marboww, Markek1, MarkerWicker, marlyn, matt, Matz05, max, MaxNox7, maylokana, MDuch369, meara1179, meganerobot, MehimoNemo, Mehnix, MeltedPixel, memeproof, MendaxxDev, Menshin, Mephisto72, MerrytheManokit, Mervill, metalgearsloth, MetalSage, MFMessage, mhamsterr, michaelcu, micheel665, mifia, MilenVolf, MilonPL, Minemoder5000, Minty642, minus1over12, Mirino97, mirrorcult, misandrie, MishaUnity, MissKay1994, MisterImp, MisterMecky, Mith-randalf, Mixelz, mjarduk, MjrLandWhale, mkanke-real, MLGTASTICa, mnva0, moderatelyaware, modern-nm, mokiros, momo, Moneyl, monotheonist, Moomoobeef, moony, Morb0, MossyGreySlope, mqole, mr-bo-jangles, Mr0maks, MrFippik, MrPersival, mrrobdemo, mtrs163, muburu, MureixloI, murolem, murphyneko, musicmanvr, MWKane, Myakot, Myctai, N3X15, nabegator, nails-n-tape, Nairodian, Naive817, NakataRin, namespace-Memory, Nannek, NazrinNya, neborsh, neutrino-laser, NickPowers43, nikitosych, nikthechampiongr, Nimfar11, ninruB, Nirnael, NIXC, nkokic, NkoKirkto, nmajask, noctyrnal, noelkathegod, noirogen, nok-ko, NonchalantNoob, NoobyLegion, Nopey, NoreUhh, not-gavnaed, notafet, notquitehadouken, notsodana, noudoit, noverd, Nox38, NuclearWinter, Nuggets219, nukashimika, nuke-haus, NULL882, nullarmo, nyeogmi, Nylux, Nyranu, Nyxilath, och-och, OctoRocket, OldDanceJacket, OliverOtter, onesch, OneZerooo0, OnsenCapy, OnyxTheBrave, opl-, Orange-Winds, OrangeMoronage9622, OrbitSystem07, Orsoniks, osjarw, Ostaf, othymer, OttoMaticode, Owai-Seek, packmore, paige404, paigemaeforrest, pali6, Palladinium, Pangogie, panzer-iv1, partyaddict, patrikturi, PaulRitter, pavlockblaine03, peccneck, Peptide90, peptron1, perryprog, PeterFuto, PetMudstone, pewter-wiz, PGrayCS, pgraycs, Pgriha, phantom-lily, pheenty, philingham, Phill101, Phooooooooooooooooooooooooooooooosphate, phunnyguy, PicklOH, PilgrimViis, Pill-U, pinkbat5, Piras314, Pireax, Pissachu, pissdemon, Pixel8-dev, PixeltheAertistContrib, PixelTheKermit, PJB3005, Plasmaguy, plinyvic, Plykiya, poeMota, pofitlo, pointer-to-null, Pok27, poklj, PolterTzi, PoorMansDreams, PopGamer45, portfiend, potato1234x, PotentiallyTom, PotRoastPiggy, Princess-Cheeseballs, ProfanedBane, PROG-MohamedDwidar, Prole0, ProPandaBear, PrPleGoo, ps3moira, Pspritechologist, Psychpsyo, psykana, psykzz, PuceTint, pumkin69, PuroSlavKing, PursuitInAshes, Putnam3145, py01, Pyrovi, qrtDaniil, qrwas, Quantum-cross, quasr-9, quatre, QueerNB, QuietlyWhisper, qwerltaz, Radezolid, RadioMull, Radosvik, Radrark, Rainbeon, Rainfey, Raitononai, Ramlik, RamZ, randy10122, Rane, Ranger6012, Rapidgame7, ravage123321, rbertoche, RedBookcase, Redfire1331, Redict, RedlineTriad, redmushie, RednoWCirabrab, redspyy, ReeZer2, RemberBM, RemieRichards, RemTim, rene-descartes2021, Renlou, retequizzle, rewafflution, rhailrake, rhsvenson, rich-dunne, RieBi, riggleprime, RIKELOLDABOSS, rinary1, Rinkashikachi, riolume, rlebell33, RobbyTheFish, robinthedragon, Rockdtben, Rohesie, rok-povsic, rokudara-sen, rolfero, RomanNovo, rosieposieeee, Roudenn, router, ruddygreat, rumaks, RumiTiger, Ruzihm, rwrv, S1rFl0, S1ss3l, Saakra, Sadie-silly, saga3152, saintmuntzer, Salex08, sam, samgithubaccount, Samuka-C, SaphireLattice, SapphicOverload, sarahon, sativaleanne, SaveliyM360, sBasalto, ScalyChimp, ScarKy0, ScholarNZL, schrodinger71, scrato, Scribbles0, scrivoy, scruq445, scuffedjays, ScumbagDog, SeamLesss, Segonist, semensponge, sephtasm, ser1-1y, Serkket, sewerpig, SG6732, sh18rw, Shaddap1, ShadeAware, ShadowCommander, shadowtheprotogen546, shaeone, shampunj, shariathotpatrol, SharkSnake98, shibechef, Siginanto, signalsender, SignalWalker, siigiil, silicon14wastaken, Silverfur-underscore, Simyon264, sirdragooon, Sirionaut, SirWarock, Sk1tch, SkaldetSkaeg, Skarletto, skeeka-dev, Skybailey-dev, skye, Skyedra, SlamBamActionman, slarticodefast, Slava0135, sleepyyapril, slimmslamm, Slyfox333, Smugman, SnappingOpossum, snebl, snicket, sniperchance, Snowni, snowsignal, SolidSyn, SolidusSnek, solstar2, SonicHDC, SoulFN, SoulSloth, Soundwavesghost, soupkilove, southbridge-fur, sowelipililimute, Soydium, SpaceLizard24, SpaceLizardSky, SpaceManiac, SpaceRox1244, SpaceyLady, Spangs04, spanky-spanky, Sparlight, spartak, SpartanKadence, spderman3333, SpeltIncorrectyl, Spessmann, SphiraI, SplinterGP, spoogemonster, sporekto, sporkyz, ssdaniel24, stalengd, stanberytrask, Stanislav4ix, StanTheCarpenter, starbuckss14, Stealthbomber16, Steffo99, stellar-novas, stewie523, stomf, Stop-Signs, stopbreaking, stopka-html, StrawberryMoses, Stray-Pyramid, strO0pwafel, Strol20, StStevens, Subversionary, sunbear-dev, SuperGDPWYL, superjj18, Supernorn, SurrealShibe, SweetAplle, SweptWasTaken, SyaoranFox, Sybil, SYNCHRONIC, Szunti, t, Tainakov, takemysoult, taonewt, tap, TaralGit, Taran, taurie, Tayrtahn, tday93, teamaki, TeenSarlacc, TekuNut, telavivgamers, telyonok, temm1ie, TemporalOroboros, tentekal, terezi4real, Terraspark4941, texcruize, Tezzaide, TGODiamond, TGRCdev, tgrkzus, thanosdegraf, ThatGuyUSA, ThatOneGoblin25, thatrandomcanadianguy, TheArturZh, TheBlueYowie, thecopbennet, TheCze, TheDarkElites, thedraccx, TheEmber, theexetron, TheFlyingSentry, TheGrimbeeper, TheIntoxicatedCat, thekilk, themias, theomund, TheProNoob678, TherapyGoth, ThereDrD0, TheSecondLord, TheShuEd, thetolbean, thevinter, TheWaffleJesus, thinbug0, ThunderBear2006, timothyteakettle, TimrodDX, timurjavid, tin-man-tim, TiniestShark, Titian3, tk-a369, tkdrg, tmtmtl30, ToastEnjoyer, Toby222, TokenStyle, Tollhouse, Toly65, tom-leys, tomasalves8, Tomeno, Tonydatguy, topy, tornado-technology, TornadoTechnology, tosatur, TotallyLemon, ToxicSonicFan04, Tr1bute, travis-g-reid, treytipton, trixxedbit, TrixxedHeart, tropicalhibi, truepaintgit, Truoizys, Tryded, TsjipTsjip, tuchila-adi-bogdan, Tunguso4ka, TurboTrackerss14, tyashley, Tyler-IN, TytosB, Tyzemol, UbaserB, Uberration, ubis1, UBlueberry, uhbg, UKNOWH, UltimateJester, Unbelievable-Salmon, underscorex5, UnicornOnLSD, Unisol, Unkn0wnGh0st333, unusualcrow, Uriende, UristMcDorf, user424242420, Utmanarn, Vaaankas, valentfingerov, valquaint, Varen, Vasilis, VasilisThePikachu, veliebm, Velken, VelonacepsCalyxEggs, veprolet, VerinSenpai, veritable-calamity, Veritius, Vermidia, vero5123, verslebas, vexerot, vgskye, viceemargo, VigersRay, violet754, Visne, vitopigno, vitusveit, vlad, vlados1408, VMSolidus, vmzd, VoidMeticulous, voidnull000, volotomite, volundr-, Voomra, Vordenburg, vorkathbruh, Vortebo, vulppine, wachte1, wafehling, walksanatora, Warentan, WarMechanic, Watermelon914, weaversam8, wertanchik, whateverusername0, whatston3, widgetbeck, Will-Oliver-Br, Willhelm53, WilliamECrew, willicassi, Winkarst-cpu, wirdal, wixoaGit, WlarusFromDaSpace, Wolfkey-SomeoneElseTookMyUsername, Worldwaker, wrexbe, wtcwr68, xeri7, xkreksx, xprospero, xRiriq, xsainteer, YanehCheck, yathxyz, Ygg01, YotaXP, youarereadingthis, YoungThugSS14, Yousifb26, youtissoum, yunii, yuriykiss, YuriyKiss, zach-hill, Zadeon, Zalycon, zamp, Zandario, Zap527, Zealith-Gamer, ZelteHonor, zero, ZeroDiamond, ZeWaka, zHonys, zionnBE, ZNixian, Zokkie, ZoldorfTheWizard, zonespace27, Zylofan, Zymem, zzylex

From 56bff9aee9f2bf0d0a41774e564e81f9d77bf302 Mon Sep 17 00:00:00 2001
From: Samuka <47865393+Samuka-C@users.noreply.github.com>
Date: Sun, 21 Dec 2025 05:11:11 -0300
Subject: [PATCH 026/134] Fix the mothership again (again) (#41924)

* fix the mothership again

* renamed that lever
---
 Resources/Maps/Shuttles/mothership.yml | 197 +++++++++----------------
 1 file changed, 72 insertions(+), 125 deletions(-)

diff --git a/Resources/Maps/Shuttles/mothership.yml b/Resources/Maps/Shuttles/mothership.yml
index d2414a0340..9803b1fbfe 100644
--- a/Resources/Maps/Shuttles/mothership.yml
+++ b/Resources/Maps/Shuttles/mothership.yml
@@ -4,8 +4,8 @@ meta:
   engineVersion: 268.0.0
   forkId: ""
   forkVersion: ""
-  time: 11/22/2025 23:34:12
-  entityCount: 585
+  time: 12/20/2025 12:50:17
+  entityCount: 581
 maps: []
 grids:
 - 1
@@ -159,6 +159,7 @@ entities:
         chunkSize: 4
     - type: GasTileOverlay
     - type: RadiationGridResistance
+    - type: ExplosionAirtightGrid
 - proto: AirlockGlassShuttleXenoborgLocked
   entities:
   - uid: 107
@@ -194,7 +195,7 @@ entities:
     - type: Transform
       pos: -5.5,0.5
       parent: 1
-  - uid: 338
+  - uid: 248
     components:
     - type: Transform
       pos: 0.5,-2.5
@@ -1007,15 +1008,13 @@ entities:
       rot: 3.141592653589793 rad
       pos: -10.5,-0.5
       parent: 1
-- proto: BlastDoorXenoborg
+- proto: BlastDoorXenoborgOpen
   entities:
-  - uid: 370
+  - uid: 5
     components:
     - type: Transform
       pos: 0.5,-5.5
       parent: 1
-- proto: BlastDoorXenoborgOpen
-  entities:
   - uid: 94
     components:
     - type: Transform
@@ -2002,61 +2001,31 @@ entities:
   - uid: 243
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
       pos: 0.5,-8.5
       parent: 1
   - uid: 244
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
       pos: 0.5,-7.5
       parent: 1
   - uid: 245
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
       pos: 0.5,-6.5
       parent: 1
   - uid: 247
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
       pos: 0.5,-4.5
       parent: 1
-  - uid: 248
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 0.5,-3.5
-      parent: 1
-  - uid: 249
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 0.5,-2.5
-      parent: 1
   - uid: 250
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 0.5,-1.5
+      pos: 0.5,-9.5
       parent: 1
   - uid: 251
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 0.5,-0.5
-      parent: 1
-  - uid: 455
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 0.5,-9.5
-      parent: 1
-  - uid: 456
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
       pos: 0.5,-10.5
       parent: 1
 - proto: CrateGenericSteel
@@ -2886,41 +2855,15 @@ entities:
       parent: 1
 - proto: TwoWayLever
   entities:
-  - uid: 5
+  - uid: 249
     components:
+    - type: MetaData
+      name: conveyor
     - type: Transform
-      pos: 0.5,1.5
+      pos: -0.5,-4.5
       parent: 1
     - type: DeviceLinkSource
       linkedPorts:
-        251:
-        - - Left
-          - Reverse
-        - - Right
-          - Forward
-        - - Middle
-          - Off
-        250:
-        - - Left
-          - Reverse
-        - - Right
-          - Forward
-        - - Middle
-          - Off
-        249:
-        - - Left
-          - Reverse
-        - - Right
-          - Forward
-        - - Middle
-          - Off
-        248:
-        - - Left
-          - Reverse
-        - - Right
-          - Forward
-        - - Middle
-          - Off
         247:
         - - Left
           - Reverse
@@ -2956,14 +2899,14 @@ entities:
           - Forward
         - - Middle
           - Off
-        455:
+        251:
         - - Left
           - Reverse
         - - Right
           - Forward
         - - Middle
           - Off
-        456:
+        250:
         - - Left
           - Reverse
         - - Right
@@ -2972,20 +2915,24 @@ entities:
           - Off
   - uid: 328
     components:
+    - type: MetaData
+      name: blast door
     - type: Transform
       pos: 1.5,-4.5
       parent: 1
     - type: DeviceLinkSource
       linkedPorts:
-        370:
+        5:
         - - Left
           - Open
         - - Right
           - Open
         - - Middle
           - Close
-  - uid: 453
+  - uid: 338
     components:
+    - type: MetaData
+      name: blast doors
     - type: Transform
       pos: -8.5,1.5
       parent: 1
@@ -2993,81 +2940,81 @@ entities:
       linkedPorts:
         445:
         - - Left
-          - Toggle
+          - Open
         - - Right
-          - Toggle
+          - Open
         - - Middle
-          - Toggle
+          - Close
         444:
-        - - Middle
-          - Toggle
-        - - Right
-          - Toggle
         - - Left
-          - Toggle
+          - Open
+        - - Right
+          - Open
+        - - Middle
+          - Close
         443:
-        - - Middle
-          - Toggle
-        - - Right
-          - Toggle
         - - Left
-          - Toggle
+          - Open
+        - - Right
+          - Open
+        - - Middle
+          - Close
         442:
-        - - Middle
-          - Toggle
-        - - Right
-          - Toggle
         - - Left
-          - Toggle
+          - Open
+        - - Right
+          - Open
+        - - Middle
+          - Close
         452:
-        - - Middle
-          - Toggle
-        - - Right
-          - Toggle
         - - Left
-          - Toggle
+          - Open
+        - - Right
+          - Open
+        - - Middle
+          - Close
         451:
-        - - Middle
-          - Toggle
-        - - Right
-          - Toggle
         - - Left
-          - Toggle
+          - Open
+        - - Right
+          - Open
+        - - Middle
+          - Close
         450:
-        - - Middle
-          - Toggle
-        - - Right
-          - Toggle
         - - Left
-          - Toggle
+          - Open
+        - - Right
+          - Open
+        - - Middle
+          - Close
         449:
-        - - Middle
-          - Toggle
-        - - Right
-          - Toggle
         - - Left
-          - Toggle
+          - Open
+        - - Right
+          - Open
+        - - Middle
+          - Close
         448:
-        - - Middle
-          - Toggle
-        - - Right
-          - Toggle
         - - Left
-          - Toggle
+          - Open
+        - - Right
+          - Open
+        - - Middle
+          - Close
         447:
-        - - Middle
-          - Toggle
-        - - Right
-          - Toggle
         - - Left
-          - Toggle
+          - Open
+        - - Right
+          - Open
+        - - Middle
+          - Close
         446:
-        - - Middle
-          - Toggle
-        - - Right
-          - Toggle
         - - Left
-          - Toggle
+          - Open
+        - - Right
+          - Open
+        - - Middle
+          - Close
 - proto: WallXenoborg
   entities:
   - uid: 2

From f3f91e3f6b67530953a397bea0409389f9a4d673 Mon Sep 17 00:00:00 2001
From: Sir Warock <67167466+SirWarock@users.noreply.github.com>
Date: Sun, 21 Dec 2025 21:20:43 +0100
Subject: [PATCH 027/134] Miscellaneous Injector fixes + BorgHypo fill sprites.
 (#41932)

* Various fixes

* Fix Gorlex Hypo not showing visuals

* Give Borg Hypo Fill sprites

* Bluespace Syringe speed increase

* fix

* one whitespace change

* Undo debug change

* Replaced String Message with better

---------

Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
---
 .../Chemistry/EntitySystems/InjectorSystem.cs |  11 +-
 .../components/injector-component.ftl         |  10 +-
 .../Prototypes/Chemistry/injector_modes.yml   |   7 +-
 .../Objects/Specific/Medical/hypospray.yml    |  15 ++-
 .../Medical/hypospray.rsi/borghypo_fill1.png  | Bin 0 -> 111 bytes
 .../Medical/hypospray.rsi/borghypo_fill2.png  | Bin 0 -> 113 bytes
 .../Medical/hypospray.rsi/borghypo_s.png      | Bin 517 -> 532 bytes
 .../Specific/Medical/hypospray.rsi/meta.json  | 106 +++++++++---------
 8 files changed, 85 insertions(+), 64 deletions(-)
 create mode 100644 Resources/Textures/Objects/Specific/Medical/hypospray.rsi/borghypo_fill1.png
 create mode 100644 Resources/Textures/Objects/Specific/Medical/hypospray.rsi/borghypo_fill2.png

diff --git a/Content.Shared/Chemistry/EntitySystems/InjectorSystem.cs b/Content.Shared/Chemistry/EntitySystems/InjectorSystem.cs
index 438da65293..4fa44f2fa4 100644
--- a/Content.Shared/Chemistry/EntitySystems/InjectorSystem.cs
+++ b/Content.Shared/Chemistry/EntitySystems/InjectorSystem.cs
@@ -281,6 +281,13 @@ public sealed partial class InjectorSystem : EntitySystem
         }
         else
         {
+            // Check if we have anything to inject.
+            if (injectorSolution.Volume == 0)
+            {
+                _popup.PopupClient(Loc.GetString("injector-component-empty-message", ("injector", injector)), target, user);
+                return false;
+            }
+
             // additional delay is based on actual volume left to inject in syringe when smaller than transfer amount
             // If CurrentTransferAmount is null, it'll want to inject its entire contents, e.g., epipens.
             amount = injector.Comp.CurrentTransferAmount ?? injectorSolution.Volume;
@@ -348,7 +355,7 @@ public sealed partial class InjectorSystem : EntitySystem
 
         if (!_solutionContainer.TryGetDrawableSolution(target, out _, out var drawableSol))
         {
-            _popup.PopupClient(Loc.GetString("injector-component-cannot-transfer-message", ("target", Identity.Entity(target, EntityManager))), injector, user);
+            _popup.PopupClient(Loc.GetString("injector-component-cannot-draw-message", ("target", Identity.Entity(target, EntityManager))), injector, user);
             return false;
         }
 
@@ -510,7 +517,7 @@ public sealed partial class InjectorSystem : EntitySystem
         else
             _solutionContainer.Refill(target, targetSolution, removedSolution);
 
-        LocId msgSuccess = target == user ? "injector-component-transfer-success-message-self" : "injector-component-transfer-success-message";
+        LocId msgSuccess = target == user ? "injector-component-inject-success-message-self" : "injector-component-inject-success-message";
 
         if (selfEv.OverrideMessage != null)
             msgSuccess = selfEv.OverrideMessage;
diff --git a/Resources/Locale/en-US/chemistry/components/injector-component.ftl b/Resources/Locale/en-US/chemistry/components/injector-component.ftl
index 5dc12a1f7d..2958dda5ed 100644
--- a/Resources/Locale/en-US/chemistry/components/injector-component.ftl
+++ b/Resources/Locale/en-US/chemistry/components/injector-component.ftl
@@ -12,12 +12,12 @@ injector-component-inject-mode-name = Inject
 injector-component-draw-mode-name = Draw
 injector-component-dynamic-mode-name = Dynamic
 injector-component-mode-changed-text = Now {$mode}
-injector-component-inject-success-message = You inject {$amount}u into {THE($target)}!
-injector-component-inject-success-message-self = You inject {$amount}u into yourself!
 injector-component-transfer-success-message = You transfer {$amount}u into {THE($target)}.
 injector-component-transfer-success-message-self = You transfer {$amount}u into yourself.
+injector-component-inject-success-message = You inject {$amount}u into {THE($target)}!
+injector-component-inject-success-message-self = You inject {$amount}u into yourself!
 injector-component-draw-success-message = You draw {$amount}u from {THE($target)}.
-injector-component-draw-success-message-self = You draw {$amount}u from youself.
+injector-component-draw-success-message-self = You draw {$amount}u from yourself.
 
 ## Fail Messages
 
@@ -33,10 +33,10 @@ injector-component-blocked-user = Protective gear blocked your injection!
 injector-component-blocked-other = {CAPITALIZE(THE(POSS-ADJ($target)))} armor blocked {THE($user)}'s injection!
 injector-component-cannot-transfer-message = You aren't able to transfer into {THE($target)}!
 injector-component-cannot-transfer-message-self = You aren't able to transfer into yourself!
-injector-component-cannot-draw-message = You aren't able to draw from {THE($target)}!
-injector-component-cannot-draw-message-self = You aren't able to draw from yourself!
 injector-component-cannot-inject-message = You aren't able to inject into {THE($target)}!
 injector-component-cannot-inject-message-self = You aren't able to inject into yourself!
+injector-component-cannot-draw-message = You aren't able to draw from {THE($target)}!
+injector-component-cannot-draw-message-self = You aren't able to draw from yourself!
 injector-component-ignore-mobs = This injector can only interact with containers!
 
 ## mob-inject doafter messages
diff --git a/Resources/Prototypes/Chemistry/injector_modes.yml b/Resources/Prototypes/Chemistry/injector_modes.yml
index 2a791eb0ac..fd96819df3 100644
--- a/Resources/Prototypes/Chemistry/injector_modes.yml
+++ b/Resources/Prototypes/Chemistry/injector_modes.yml
@@ -43,6 +43,7 @@
   abstract: true
   id: BaseBluespaceSyringeMode
   mobTime: 2.5
+  delayPerVolume: 0.05
   transferAmounts:
   - 5
   - 10
@@ -95,7 +96,7 @@
 ## Hyposprays
 - type: injectorMode
   abstract: true
-  id: HyposprayBaseMode
+  id: BaseHyposprayMode
   injectSound: /Audio/Items/hypospray.ogg
   injectPopupTarget: injector-component-feel-prick-message
   injectOnUse: true
@@ -105,11 +106,11 @@
   - 5
 
 - type: injectorMode
-  parent: [ HyposprayBaseMode, BaseInjectMode ]
+  parent: [ BaseHyposprayMode, BaseInjectMode ]
   id: HyposprayInjectMode
 
 - type: injectorMode
-  parent: [ HyposprayBaseMode, BaseDynamicMode ]
+  parent: [ BaseHyposprayMode, BaseDynamicMode ]
   id: HyposprayDynamicMode
 
 - type: injectorMode
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml b/Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml
index 9b76330d98..3d0180f901 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml
@@ -10,6 +10,7 @@
     allowedModes:
     - HyposprayDynamicMode
     - HyposprayInjectMode
+  - type: Appearance
 
 - type: entity
   parent: [BaseHypospray, BaseGrandTheftContraband]
@@ -45,7 +46,6 @@
     - HighRiskItem
   - type: StealTarget
     stealGroup: Hypospray
-  - type: Appearance
   - type: SolutionContainerVisuals
     maxFillLevels: 6
     fillBaseName: hypo_fill
@@ -84,7 +84,12 @@
   components:
   - type: Sprite
     sprite: Objects/Specific/Medical/hypospray.rsi
-    state: borghypo
+    layers:
+    - state: borghypo
+      map: [ "enum.SolutionContainerLayers.Base" ]
+    - state: borghypo_fill1
+      map: [ "enum.SolutionContainerLayers.Fill" ]
+      visible: false
   - type: Item
     sprite: Objects/Specific/Medical/hypospray.rsi
   - type: SolutionContainerManager
@@ -95,6 +100,10 @@
     solution: hypospray
   - type: ExaminableSolution
     solution: hypospray
+  - type: SolutionContainerVisuals
+    maxFillLevels: 2
+    fillBaseName: borghypo_fill
+    solutionName: hypospray
   - type: UseDelay
     delay: 0.5
 
@@ -150,7 +159,6 @@
     activeModeProtoId: HyposprayInjectMode
     allowedModes:
     - HyposprayInjectMode
-  - type: Appearance
   - type: SolutionContainerVisuals
     maxFillLevels: 1
     changeColor: false
@@ -471,7 +479,6 @@
     layers:
     - state: hypovolemic
       map: [ "enum.SolutionContainerLayers.Fill" ]
-  - type: Appearance
   - type: SolutionContainerVisuals
     maxFillLevels: 1
     changeColor: false
diff --git a/Resources/Textures/Objects/Specific/Medical/hypospray.rsi/borghypo_fill1.png b/Resources/Textures/Objects/Specific/Medical/hypospray.rsi/borghypo_fill1.png
new file mode 100644
index 0000000000000000000000000000000000000000..56fed4db91ad4e00b37ea16ea0abea6ce066942b
GIT binary patch
literal 111
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}nw~C>ArY-_
z&n#qQFyJ}7;o1Mi#@pDr*whNE*%*Grnibx@7r3d4k>R{d{6!X~MSXhLfSMRQUHx3v
IIVCg!01Rs&qW}N^

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Specific/Medical/hypospray.rsi/borghypo_fill2.png b/Resources/Textures/Objects/Specific/Medical/hypospray.rsi/borghypo_fill2.png
new file mode 100644
index 0000000000000000000000000000000000000000..9cc96a693eeb6bcda597b879a164d2ea2d3c57b8
GIT binary patch
literal 113
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}+MX_sArY-_
z&urvnFyJ}7;m7~Qce$-nv;&I7Oqdz|=*`}dyMA%XS0;veg$(m2vM?!1R+j>`F?hQA
KxvX<aXaWFVlOXv3

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Specific/Medical/hypospray.rsi/borghypo_s.png b/Resources/Textures/Objects/Specific/Medical/hypospray.rsi/borghypo_s.png
index 4adc13c448a40cf02e1cbe10c87b518aee3c501b..3d53f56f711cacc86e8178cdb4d8771a27e599bc 100644
GIT binary patch
delta 507
zcmV<X0R;Yq1e64jBYyw^b5ch_0Itp)=>Px$&PhZ;R9J=WmCJ6MKoo{Qd{I!1WNM{x
z@uITm2DcKO2be`(!OxNx?9xj%k#|<uSj~nI70_5|N;hFdTnugttMYBm+?fBLGY5d4
zo}QkbGjLru?`rQs(*oc3^DIrf(r-5K<LRk0aR8%k^8I|C4}XS3?CBJBIOuVu6sBqF
zSjBF)tKGX`RPNN>wRv%&+gX}oS(c6k<!qJrsxzY}a>xNbuU4qT;gujj6h$O8wO~yq
zT+Qdd83DN6ZZS?|Ti3ux*X4`vGa8Qp7>&oe4UnWM-;;!!B&m#Pmg%+SXK%M#-d$ee
zI8J4DTg||1Hh-&}tINQv!E@jDEKPYcndn%BQcAb?`+ai_RIykrasYceC4PL=<3FFD
z84QOyR#7K<wgG@ot5qIF5#R3b4FDlTZpX2nk8PVE2+k6#Vj!j5{K*4B5E!v-^Y!k|
zDEfaZt`S1inmDcvDP<0@_Plof5o^!eNGUhh%VlFWgme&E^m@7ccLRlJk%cA`t)IS3
zVPfrhl_pw0{qf(>vMdMSK`Ezdaq-<>dtP1?Ve1GX!WWV7XuS2)pF~O-z6gbs?wt<q
x{$v`35TRvRBuRoD#~<FBCJ#!{S?d2=egW&(%+bIWzF+_V002ovPDHLkV1gL*^w9tS

delta 492
zcmV<I0Tcd|1cd~UBYy$RNkl<Zc%1E(%Wj)M6ox;1QBaL!YNd7YqO#})w-TKPm_=T}
z&(as{(n~gxcUIU~&4v&atg+H`vN0p#VsKl$<J+9M|Nk5g039729UUEK;QPM5)Y-kJ
z1z{NKU7lY`zuCaAr>BdF16XyFAEr~?>-TZTW7K|c#+6dowtsD66`Reb_UwW|xl{M7
z?W-%(-sL%t<Cs`b&Q|%XIx}WMg9iArSfKX%SAqaZl91KZf-@TNemecb2*B-njddd1
zrUpLwK3~I-!Egw`U^p~wfGp4XnPq&-vdWn6c4lpP@9lccyX$K_&#TOCs~MO~CY5t_
z8F)2#?)$#WbAR59MkZFFlrrt@cH3M7Rm^5H4d9N)q>qng{P*)Sy?)=sD(XbfHURK>
zvCv79@Z<j80uVxIH%-la>bgWxbe32ZJt^htZ#G0xWTmdl_q#i*=>My@K?qT6;<z@X
zlp0_e1nvAImO-$RQm$_1^TuolA&ltFeE$Ci3eh49O=TupzkQj)#4-pfO|*V{j{b&@
z<9GlMN_ka_i|_t22y{_|ts{hp4<hl=c<Z-6iIg%v2*roK5p4U}pG>0=B6b{yEX#1y
i^y6FG=0PdiPW=mZCCt%#;`1c{0000<MNUMnLSTa4Wc+;q

diff --git a/Resources/Textures/Objects/Specific/Medical/hypospray.rsi/meta.json b/Resources/Textures/Objects/Specific/Medical/hypospray.rsi/meta.json
index 904543f6e5..8ad20c2eff 100644
--- a/Resources/Textures/Objects/Specific/Medical/hypospray.rsi/meta.json
+++ b/Resources/Textures/Objects/Specific/Medical/hypospray.rsi/meta.json
@@ -1,53 +1,59 @@
 {
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from vgstation at commit https://github.com/vgstation-coders/vgstation13/commit/1cdfb0230cc96d0ba751fa002d04f8aa2f25ad7d, modified with fill sprites by SlamBamActionman (github)",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "borghypo"
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Taken from vgstation at commit https://github.com/vgstation-coders/vgstation13/commit/1cdfb0230cc96d0ba751fa002d04f8aa2f25ad7d, modified with fill sprites by SlamBamActionman (github), borghypo  fill sprites by SirWarock (Github)",
+    "size": {
+        "x": 32,
+        "y": 32
     },
-    {
-      "name": "borghypo_s"
-    },
-    {
-      "name": "combat_hypo"
-    },
-    {
-      "name": "hypo"
-    },
-    {
-      "name": "hypo_fill1"
-    },
-    {
-      "name": "hypo_fill2"
-    },
-    {
-      "name": "hypo_fill3"
-    },
-    {
-      "name": "hypo_fill4"
-    },
-    {
-      "name": "hypo_fill5"
-    },
-    {
-      "name": "hypo_fill6"
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    },
-    {
-      "name": "equipped-BELT",
-      "directions": 4
-    }
-  ]
+    "states": [
+        {
+            "name": "borghypo"
+        },
+        {
+            "name": "borghypo_s"
+        },
+        {
+            "name": "borghypo_fill1"
+        },
+        {
+            "name": "borghypo_fill2"
+        },
+        {
+            "name": "combat_hypo"
+        },
+        {
+            "name": "hypo"
+        },
+        {
+            "name": "hypo_fill1"
+        },
+        {
+            "name": "hypo_fill2"
+        },
+        {
+            "name": "hypo_fill3"
+        },
+        {
+            "name": "hypo_fill4"
+        },
+        {
+            "name": "hypo_fill5"
+        },
+        {
+            "name": "hypo_fill6"
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "equipped-BELT",
+            "directions": 4
+        }
+    ]
 }

From 0a6ad5dcff58a8366d97d35816c334ecb76abeea Mon Sep 17 00:00:00 2001
From: PJBot <pieterjan.briers+bot@gmail.com>
Date: Sun, 21 Dec 2025 20:34:17 +0000
Subject: [PATCH 028/134] Automatic changelog update

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

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index c30b15ec0b..44f407c13d 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -1,12 +1,4 @@
 Entries:
-- author: FairlySadPanda
-  changes:
-  - message: A new cake, berry delight, that is made with a cake base, berries and
-      milk.
-    type: Add
-  id: 8824
-  time: '2025-08-02T18:35:09.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/38881
 - author: DrSmugleaf
   changes:
   - message: Fixed rotate verbs being delayed when used, and your right click UI bounce
@@ -3931,3 +3923,15 @@
   id: 9323
   time: '2025-12-21T00:10:55.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/41833
+- author: SirWarock
+  changes:
+  - message: Medical Cyborg Hyposprays now finally have a fillsprite!
+    type: Add
+  - message: Fixed Gorlex Hyposprays not showing their fill sprites!
+    type: Fix
+  - message: Bluespace syringes are now slightly faster when injecting large amounts,
+      usually twice as fast as normal syringes.
+    type: Tweak
+  id: 9324
+  time: '2025-12-21T20:33:07.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/41932

From 7750e3ca2e54fde0fb10d2456c41f6b121112a9e Mon Sep 17 00:00:00 2001
From: SlamBamActionman <83650252+SlamBamActionman@users.noreply.github.com>
Date: Mon, 22 Dec 2025 01:34:06 +0100
Subject: [PATCH 029/134] Rename LOOC chat to Help chat (#41933)

Initial commit
---
 .../administration/ui/tabs/server-tab.ftl     |  2 +-
 .../en-US/chat/managers/chat-manager.ftl      | 14 +++++-----
 Resources/Locale/en-US/chat/ui/chat-box.ftl   |  4 +--
 .../Guidebook/NewPlayer/Controls/Radio.xml    | 28 +++++++++++--------
 4 files changed, 26 insertions(+), 22 deletions(-)

diff --git a/Resources/Locale/en-US/administration/ui/tabs/server-tab.ftl b/Resources/Locale/en-US/administration/ui/tabs/server-tab.ftl
index 7a41cbe2c7..87e52a4b7e 100644
--- a/Resources/Locale/en-US/administration/ui/tabs/server-tab.ftl
+++ b/Resources/Locale/en-US/administration/ui/tabs/server-tab.ftl
@@ -1,3 +1,3 @@
 server-shutdown = Shutdown
 server-ooc-toggle = Toggle OOC
-server-looc-toggle = Toggle LOOC
+server-looc-toggle = Toggle Help (LOOC)
diff --git a/Resources/Locale/en-US/chat/managers/chat-manager.ftl b/Resources/Locale/en-US/chat/managers/chat-manager.ftl
index 93f149bed9..fbdd60d89e 100644
--- a/Resources/Locale/en-US/chat/managers/chat-manager.ftl
+++ b/Resources/Locale/en-US/chat/managers/chat-manager.ftl
@@ -3,12 +3,12 @@
 chat-manager-max-message-length = Your message exceeds {$maxMessageLength} character limit
 chat-manager-ooc-chat-enabled-message = OOC chat has been enabled.
 chat-manager-ooc-chat-disabled-message = OOC chat has been disabled.
-chat-manager-looc-chat-enabled-message = LOOC chat has been enabled.
-chat-manager-looc-chat-disabled-message = LOOC chat has been disabled.
-chat-manager-dead-looc-chat-enabled-message = Dead players can now use LOOC.
-chat-manager-dead-looc-chat-disabled-message = Dead players can no longer use LOOC.
-chat-manager-crit-looc-chat-enabled-message = Crit players can now use LOOC.
-chat-manager-crit-looc-chat-disabled-message = Crit players can no longer use LOOC.
+chat-manager-looc-chat-enabled-message = Help chat has been enabled.
+chat-manager-looc-chat-disabled-message = Help chat has been disabled.
+chat-manager-dead-looc-chat-enabled-message = Dead players can now use Help.
+chat-manager-dead-looc-chat-disabled-message = Dead players can no longer use Help.
+chat-manager-crit-looc-chat-enabled-message = Crit players can now use Help.
+chat-manager-crit-looc-chat-disabled-message = Crit players can no longer use Help.
 chat-manager-admin-ooc-chat-enabled-message = Admin OOC chat has been enabled.
 chat-manager-admin-ooc-chat-disabled-message = Admin OOC chat has been disabled.
 
@@ -34,7 +34,7 @@ chat-manager-entity-me-wrap-message = [italic]{ PROPER($entity) ->
      [true] {CAPITALIZE($entityName)} {$message}[/italic]
     }
 
-chat-manager-entity-looc-wrap-message = LOOC: [bold]{$entityName}:[/bold] {$message}
+chat-manager-entity-looc-wrap-message = Help: [bold]{$entityName}:[/bold] {$message}
 chat-manager-send-ooc-wrap-message = OOC: [bold]{$playerName}:[/bold] {$message}
 chat-manager-send-ooc-patron-wrap-message = OOC: [bold][color={$patronColor}]{$playerName}[/color]:[/bold] {$message}
 
diff --git a/Resources/Locale/en-US/chat/ui/chat-box.ftl b/Resources/Locale/en-US/chat/ui/chat-box.ftl
index e00eae702a..0da3264d03 100644
--- a/Resources/Locale/en-US/chat/ui/chat-box.ftl
+++ b/Resources/Locale/en-US/chat/ui/chat-box.ftl
@@ -10,7 +10,7 @@ hud-chatbox-select-channel-Dead = Dead
 hud-chatbox-select-channel-Emotes = Emotes
 hud-chatbox-select-channel-Local = Local
 hud-chatbox-select-channel-Whisper = Whisper
-hud-chatbox-select-channel-LOOC = LOOC
+hud-chatbox-select-channel-LOOC = Help
 hud-chatbox-select-channel-OOC = OOC
 hud-chatbox-select-channel-Damage = Damage
 hud-chatbox-select-channel-Visual = Actions
@@ -23,7 +23,7 @@ hud-chatbox-channel-Dead = Dead
 hud-chatbox-channel-Emotes = Emotes
 hud-chatbox-channel-Local = Local
 hud-chatbox-channel-Whisper = Whisper
-hud-chatbox-channel-LOOC = LOOC
+hud-chatbox-channel-LOOC = Help
 hud-chatbox-channel-OOC = OOC
 hud-chatbox-channel-Radio = Radio
 hud-chatbox-channel-Notifications = Notifications
diff --git a/Resources/ServerInfo/Guidebook/NewPlayer/Controls/Radio.xml b/Resources/ServerInfo/Guidebook/NewPlayer/Controls/Radio.xml
index 39ee8ae3ff..69e9355d6b 100644
--- a/Resources/ServerInfo/Guidebook/NewPlayer/Controls/Radio.xml
+++ b/Resources/ServerInfo/Guidebook/NewPlayer/Controls/Radio.xml
@@ -1,17 +1,17 @@
 <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.
+Talking is a key part of Space Station 14. You can press [color=yellow][bold][keybind="FocusChatInputWindow"/][/bold][/color] 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.
+[bold]Local[/bold] 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.
+[bold]Whisper[/bold] 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.
+[bold]Emotes[/bold] 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"/].
+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 [color=yellow][bold][keybind="CycleChatChannelForward"/][/bold][/color].
 
 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.
 
@@ -23,7 +23,7 @@ Your radio allows you to communicate across the entire station and to your speci
   <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].
+To send a [color=#a4885c]station-wide[/color] message over the radio preface, use the [color=#32cd32][bold]Common[/bold][/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
@@ -43,22 +43,26 @@ For example, if you're a Station Engineer then [color=#a4885c]:h[/color] will de
 
 ## 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.
+OOC (out-of-character) channels exist outside of the game world; in them you are not speaking as your character, but as yourself! They are the Help, Dead and OOC 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.
+[bold]Help[/bold] chat lets you ask other players near you questions about the game. It has the same range as Local chat and can be used even if your character couldn't normally speak.
+
+[bold]Dead[/bold] chat is the main chat you use when you're dead. It's global and can be heard across the game, but only by other dead players.
+
+[bold]OOC[/bold] is the main global chat heard by every player, and is therefore typically off until the round ends.
 
 Do not discuss the current round in the Discord or in OOC if it's on during the round.
 </Document>

From fab0fe14ccbd732d4648feb23e8c957535fc1ec3 Mon Sep 17 00:00:00 2001
From: PJBot <pieterjan.briers+bot@gmail.com>
Date: Mon, 22 Dec 2025 00:47:34 +0000
Subject: [PATCH 030/134] 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 44f407c13d..d5614581e7 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -1,12 +1,4 @@
 Entries:
-- author: DrSmugleaf
-  changes:
-  - message: Fixed rotate verbs being delayed when used, and your right click UI bounce
-      when they appear after a short delay.
-    type: Fix
-  id: 8825
-  time: '2025-08-03T00:34:37.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/38165
 - author: alexalexmax
   changes:
   - message: Updated the syndicate throwing knives uplink entry to include the fact
@@ -3935,3 +3927,11 @@
   id: 9324
   time: '2025-12-21T20:33:07.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/41932
+- author: SlamBamActionman
+  changes:
+  - message: 'EXPERIMENTAL: Changed the name of the "LOOC" chat channel to "Help"
+      to reflect its primary usage.'
+    type: Tweak
+  id: 9325
+  time: '2025-12-22T00:46:26.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/41933

From 787330f5c6c256c53c2ed6f9b0909ab4265476a5 Mon Sep 17 00:00:00 2001
From: Pieter-Jan Briers <pieterjan.briers+git@gmail.com>
Date: Mon, 22 Dec 2025 02:24:24 +0100
Subject: [PATCH 031/134] v269.0.0 RT update - .NET 10 (#41855)

* Make ServerPackaging automatically get extra server assemblies

* Make the switch

* Use Content.Server.deps.json instead

* Remove debug

* Rewrite

Now recursively fetches dependencies from Content.Server

Only copies dependencies not covered by Robust

This removes the need to manually specify most of the dependencies, even the content ones!

Also look at runtime key properly to figure out the proper dll name.

This actually removes some assemblies that were duplicated between the main directory and assemblies (various Microsoft.Extensions stuff)

* Fix test compile errors when updating dependencies

Ran across this while updating dependencies on the RT .NET 10 update. Should be fine to merge immediately.

* More .NET 10 prep

* Convert to SLNX

Hell yeah

* slnx now has size-2 indents

* Update SLNX with new RT system

* Remove reference to RT test in toolshed test

* Remove accidental usage of transitive RT dependencies

* Move Robust project references to RobustApi

* Update solution file

* Fix warnings in pow3r

* Fix nullable warnings in integration tests

idk where these came from

* gitignore binlog files

* Fix transitive dependency warnings in Content.Benchmarks

* Update slnx

* Okay, the Robust API thing didn't pan out. New plan.

It apparently broke clean builds, as the dependencies aren't in the project asset list or something anymore. I tried to fix this, but it seems impossible to do without relying on .NET SDK internals, as there's no point in the NuGet graph walk process that seems cleanly extensible.

Instead let's just do the much dumber thing: a bunch of .props files for content to import. Hooray!

This also means that I have to go through and *explicitly* disable transitive dependencies everywhere in RT. This thankfully isn't too hard.

* Update RT to 269.0.0

* One last solution update

* Fix more data definition issues

* Update RT to 269.0.1

* Fix it again

---------

Co-authored-by: DrSmugleaf <drsmugleaf@gmail.com>
---
 .editorconfig                                 |   2 +-
 .github/workflows/build-docfx.yml             |   2 +-
 .github/workflows/build-map-renderer.yml      |   2 +-
 .github/workflows/build-test-debug.yml        |   2 +-
 .github/workflows/publish-testing.yml         |   2 +-
 .github/workflows/publish.yml                 |   2 +-
 .github/workflows/test-packaging.yml          |   2 +-
 .github/workflows/yaml-linter.yml             |   2 +-
 .gitignore                                    |   3 +
 BuildChecker/git_helper.py                    |   2 +-
 Content.Benchmarks/Content.Benchmarks.csproj  |  23 +-
 Content.Client/Cargo/UI/BountyEntry.xaml.cs   |   1 -
 Content.Client/Content.Client.csproj          |  20 +-
 .../UI/LobbyCharacterPreviewPanel.xaml.cs     |   1 -
 .../Content.IntegrationTests.csproj           |  16 +-
 .../Tests/Commands/ObjectiveCommandsTest.cs   |   2 +-
 .../Tests/Minds/MindTests.EntityDeletion.cs   |   6 +-
 .../Tests/Toolshed/AdminTest.cs               |   2 +-
 .../Tests/Toolshed/LocTest.cs                 |   2 +-
 .../Content.MapRenderer.csproj                |  12 +-
 Content.Packaging/Content.Packaging.csproj    |   8 +-
 Content.Packaging/DepsHandler.cs              |  80 +++
 Content.Packaging/ServerPackaging.cs          |  48 +-
 .../Content.PatreonParser.csproj              |   2 +-
 Content.Replay/Content.Replay.csproj          |  13 +-
 .../Content.Server.Database.csproj            |   7 +-
 .../Codewords/CodewordFactionPrototype.cs     |   4 +-
 .../Codewords/CodewordGeneratorPrototype.cs   |   4 +-
 Content.Server/Content.Server.csproj          |  17 +-
 .../Commands/SetGamePresetCommand.cs          |   3 +-
 .../JobWhitelist/JobWhitelistManager.cs       |   6 +-
 .../Content.Shared.Database.csproj            |   3 +-
 .../Actions/Components/ActionComponent.cs     |   2 +-
 .../Chat/Prototypes/EmoteSoundsPrototype.cs   |   2 +-
 .../Prototypes/InjectorModePrototype.cs       |   4 +-
 Content.Shared/Content.Shared.csproj          |  21 +-
 .../CrewManifest/SharedCrewManifestSystem.cs  |   1 -
 Content.Shared/Lathe/LatheMessages.cs         |   1 -
 .../Nutrition/Prototypes/EdiblePrototype.cs   |   2 +-
 .../Loadouts/LoadoutGroupPrototype.cs         |   2 +-
 .../SmartFridge/SmartFridgeComponent.cs       |   2 +-
 Content.Tests/Content.Tests.csproj            |  17 +-
 Content.Tools/Content.Tools.csproj            |   9 +-
 Content.YAMLLinter/Content.YAMLLinter.csproj  |  15 +-
 Directory.Packages.props                      |  10 +-
 MSBuild/Content.props                         |  12 +
 Pow3r/Pow3r.csproj                            |   9 +-
 RobustToolbox                                 |   2 +-
 SpaceStation14.sln                            | 494 ------------------
 SpaceStation14.slnx                           | 168 ++++++
 ...ettings => SpaceStation14.slnx.DotSettings |   0
 global.json                                   |   2 +-
 52 files changed, 417 insertions(+), 659 deletions(-)
 create mode 100644 Content.Packaging/DepsHandler.cs
 create mode 100644 MSBuild/Content.props
 delete mode 100644 SpaceStation14.sln
 create mode 100644 SpaceStation14.slnx
 rename SpaceStation14.sln.DotSettings => SpaceStation14.slnx.DotSettings (100%)

diff --git a/.editorconfig b/.editorconfig
index a87e5e0651..fa740a7511 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -351,7 +351,7 @@ resharper_csharp_qualified_using_at_nested_scope = false
 resharper_csharp_prefer_qualified_reference = false
 resharper_csharp_allow_alias = false
 
-[*.{csproj,xml,yml,yaml,dll.config,msbuildproj,targets,props}]
+[*.{csproj,xml,yml,yaml,dll.config,msbuildproj,targets,props,slnx}]
 indent_size = 2
 
 [nuget.config]
diff --git a/.github/workflows/build-docfx.yml b/.github/workflows/build-docfx.yml
index 1f010b7291..dee31e9b31 100644
--- a/.github/workflows/build-docfx.yml
+++ b/.github/workflows/build-docfx.yml
@@ -21,7 +21,7 @@ jobs:
     - name: Setup .NET Core
       uses: actions/setup-dotnet@v4.1.0
       with:
-        dotnet-version: 9.0.x
+        dotnet-version: 10.0.x
 
     - name: Install dependencies
       run: dotnet restore
diff --git a/.github/workflows/build-map-renderer.yml b/.github/workflows/build-map-renderer.yml
index f93f4b25ae..fb6be1603c 100644
--- a/.github/workflows/build-map-renderer.yml
+++ b/.github/workflows/build-map-renderer.yml
@@ -36,7 +36,7 @@ jobs:
       - name: Setup .NET Core
         uses: actions/setup-dotnet@v4.1.0
         with:
-          dotnet-version: 9.0.x
+          dotnet-version: 10.0.x
 
       - name: Install dependencies
         run: dotnet restore
diff --git a/.github/workflows/build-test-debug.yml b/.github/workflows/build-test-debug.yml
index 4e391b2aef..ad1fbf29ac 100644
--- a/.github/workflows/build-test-debug.yml
+++ b/.github/workflows/build-test-debug.yml
@@ -36,7 +36,7 @@ jobs:
     - name: Setup .NET Core
       uses: actions/setup-dotnet@v4.1.0
       with:
-        dotnet-version: 9.0.x
+        dotnet-version: 10.0.x
 
     - name: Install dependencies
       run: dotnet restore
diff --git a/.github/workflows/publish-testing.yml b/.github/workflows/publish-testing.yml
index 7a792ed2df..1b1344315a 100644
--- a/.github/workflows/publish-testing.yml
+++ b/.github/workflows/publish-testing.yml
@@ -20,7 +20,7 @@ jobs:
     - name: Setup .NET Core
       uses: actions/setup-dotnet@v3.2.0
       with:
-        dotnet-version: 9.0.x
+        dotnet-version: 10.0.x
 
     - name: Get Engine Tag
       run: |
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index 3d54fef530..e7359c3be8 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -27,7 +27,7 @@ jobs:
     - name: Setup .NET Core
       uses: actions/setup-dotnet@v4.1.0
       with:
-        dotnet-version: 9.0.x
+        dotnet-version: 10.0.x
 
     - name: Get Engine Tag
       run: |
diff --git a/.github/workflows/test-packaging.yml b/.github/workflows/test-packaging.yml
index 325d8d04d9..6cb6d836d5 100644
--- a/.github/workflows/test-packaging.yml
+++ b/.github/workflows/test-packaging.yml
@@ -51,7 +51,7 @@ jobs:
       - name: Setup .NET Core
         uses: actions/setup-dotnet@v4.1.0
         with:
-          dotnet-version: 9.0.x
+          dotnet-version: 10.0.x
 
       - name: Install dependencies
         run: dotnet restore
diff --git a/.github/workflows/yaml-linter.yml b/.github/workflows/yaml-linter.yml
index c10549bcb4..d8ce557134 100644
--- a/.github/workflows/yaml-linter.yml
+++ b/.github/workflows/yaml-linter.yml
@@ -26,7 +26,7 @@ jobs:
       - name: Setup .NET Core
         uses: actions/setup-dotnet@v4.1.0
         with:
-          dotnet-version: 9.0.x
+          dotnet-version: 10.0.x
       - name: Install dependencies
         run: dotnet restore
       - name: Build
diff --git a/.gitignore b/.gitignore
index 2dd5912047..76f5837d75 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,6 @@
+# MSbuild binlog files
+*.binlog
+
 ## Ignore Visual Studio temporary files, build results, and
 ## files generated by popular Visual Studio add-ons.
 
diff --git a/BuildChecker/git_helper.py b/BuildChecker/git_helper.py
index bd6603bd34..4e42b1e70e 100644
--- a/BuildChecker/git_helper.py
+++ b/BuildChecker/git_helper.py
@@ -11,7 +11,7 @@ import time
 from pathlib import Path
 from typing import List
 
-SOLUTION_PATH = Path("..") / "SpaceStation14.sln"
+SOLUTION_PATH = Path("..") / "SpaceStation14.slnx"
 # If this doesn't match the saved version we overwrite them all.
 CURRENT_HOOKS_VERSION = "4"
 QUIET = len(sys.argv) == 2 and sys.argv[1] == "--quiet"
diff --git a/Content.Benchmarks/Content.Benchmarks.csproj b/Content.Benchmarks/Content.Benchmarks.csproj
index c3b60a1c69..8d4dfa31bd 100644
--- a/Content.Benchmarks/Content.Benchmarks.csproj
+++ b/Content.Benchmarks/Content.Benchmarks.csproj
@@ -1,17 +1,20 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <Import Project="..\RobustToolbox\MSBuild\Robust.Properties.targets" />
   <PropertyGroup>
-    <!-- Work around https://github.com/dotnet/project-system/issues/4314 -->
-    <TargetFramework>$(TargetFramework)</TargetFramework>
     <OutputPath>..\bin\Content.Benchmarks\</OutputPath>
-    <IsPackable>false</IsPackable>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <LangVersion>12</LangVersion>
+    <IsTestingPlatformApplication>false</IsTestingPlatformApplication>
+    <Nullable>disable</Nullable>
   </PropertyGroup>
+  <Import Project="../MSBuild/Content.props" />
   <ItemGroup>
     <PackageReference Include="BenchmarkDotNet" />
+
+    <!-- pin transitive deps -->
+    <PackageReference Include="System.Management" />
+    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Content.Client\Content.Client.csproj" />
@@ -19,10 +22,12 @@
     <ProjectReference Include="..\Content.Shared\Content.Shared.csproj" />
     <ProjectReference Include="..\Content.Tests\Content.Tests.csproj" />
     <ProjectReference Include="..\Content.IntegrationTests\Content.IntegrationTests.csproj" />
-    <ProjectReference Include="..\RobustToolbox\Robust.Benchmarks\Robust.Benchmarks.csproj" />
-    <ProjectReference Include="..\RobustToolbox\Robust.Client\Robust.Client.csproj" />
-    <ProjectReference Include="..\RobustToolbox\Robust.Server\Robust.Server.csproj" />
-    <ProjectReference Include="..\RobustToolbox\Robust.Shared.Maths\Robust.Shared.Maths.csproj" />
-    <ProjectReference Include="..\RobustToolbox\Robust.Shared\Robust.Shared.csproj" />
   </ItemGroup>
+
+  <Import Project="..\RobustToolbox\Imports\Lidgren.props" />
+  <Import Project="..\RobustToolbox\Imports\Client.props" />
+  <Import Project="..\RobustToolbox\Imports\Server.props" />
+  <Import Project="..\RobustToolbox\Imports\Shared.props" />
+  <Import Project="..\RobustToolbox\Imports\Benchmarks.props" />
+  <Import Project="..\RobustToolbox\Imports\Testing.props" />
 </Project>
diff --git a/Content.Client/Cargo/UI/BountyEntry.xaml.cs b/Content.Client/Cargo/UI/BountyEntry.xaml.cs
index d813f70ff4..bac7d84bf7 100644
--- a/Content.Client/Cargo/UI/BountyEntry.xaml.cs
+++ b/Content.Client/Cargo/UI/BountyEntry.xaml.cs
@@ -7,7 +7,6 @@ using Robust.Client.UserInterface.Controls;
 using Robust.Client.UserInterface.XAML;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Timing;
-using Serilog;
 
 namespace Content.Client.Cargo.UI;
 
diff --git a/Content.Client/Content.Client.csproj b/Content.Client/Content.Client.csproj
index d8855ce508..e849d9313b 100644
--- a/Content.Client/Content.Client.csproj
+++ b/Content.Client/Content.Client.csproj
@@ -1,26 +1,24 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <!-- Work around https://github.com/dotnet/project-system/issues/4314 -->
-    <TargetFramework>$(TargetFramework)</TargetFramework>
-    <LangVersion>12</LangVersion>
-    <IsPackable>false</IsPackable>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
     <OutputPath>..\bin\Content.Client\</OutputPath>
     <OutputType Condition="'$(FullRelease)' != 'True'">Exe</OutputType>
     <WarningsAsErrors>RA0032;nullable</WarningsAsErrors>
-    <Nullable>enable</Nullable>
-    <Configurations>Debug;Release;Tools;DebugOpt</Configurations>
-    <Platforms>AnyCPU</Platforms>
   </PropertyGroup>
+  <Import Project="../MSBuild/Content.props" />
   <ItemGroup>
     <PackageReference Include="Nett" />
     <PackageReference Include="JetBrains.Annotations" PrivateAssets="All" />
+    <PackageReference Include="SixLabors.ImageSharp" />
+    <PackageReference Include="Pidgin" />
+    <PackageReference Include="Robust.Shared.AuthLib" />
   </ItemGroup>
+
+  <Import Project="..\RobustToolbox\Imports\Lidgren.props" />
+  <Import Project="..\RobustToolbox\Imports\Client.props" />
+  <Import Project="..\RobustToolbox\Imports\Shared.props" />
+
   <ItemGroup>
-    <ProjectReference Include="..\RobustToolbox\Lidgren.Network\Lidgren.Network.csproj" />
-    <ProjectReference Include="..\RobustToolbox\Robust.Shared.Maths\Robust.Shared.Maths.csproj" />
-    <ProjectReference Include="..\RobustToolbox\Robust.Shared\Robust.Shared.csproj" />
-    <ProjectReference Include="..\RobustToolbox\Robust.Client\Robust.Client.csproj" />
     <ProjectReference Include="..\Content.Shared\Content.Shared.csproj" />
   </ItemGroup>
   <Import Project="..\RobustToolbox\MSBuild\Robust.Properties.targets" />
diff --git a/Content.Client/Lobby/UI/LobbyCharacterPreviewPanel.xaml.cs b/Content.Client/Lobby/UI/LobbyCharacterPreviewPanel.xaml.cs
index 9b1e7d50f8..988ece124f 100644
--- a/Content.Client/Lobby/UI/LobbyCharacterPreviewPanel.xaml.cs
+++ b/Content.Client/Lobby/UI/LobbyCharacterPreviewPanel.xaml.cs
@@ -1,6 +1,5 @@
 using System.Numerics;
 using Content.Client.UserInterface.Controls;
-using Prometheus;
 using Robust.Client.AutoGenerated;
 using Robust.Client.UserInterface;
 using Robust.Client.UserInterface.Controls;
diff --git a/Content.IntegrationTests/Content.IntegrationTests.csproj b/Content.IntegrationTests/Content.IntegrationTests.csproj
index 2e922d2509..8c62806f74 100644
--- a/Content.IntegrationTests/Content.IntegrationTests.csproj
+++ b/Content.IntegrationTests/Content.IntegrationTests.csproj
@@ -1,12 +1,10 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <!-- Work around https://github.com/dotnet/project-system/issues/4314 -->
-    <TargetFramework>$(TargetFramework)</TargetFramework>
     <OutputPath>..\bin\Content.IntegrationTests\</OutputPath>
-    <IsPackable>false</IsPackable>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
-    <LangVersion>12</LangVersion>
+    <Nullable>disable</Nullable>
   </PropertyGroup>
+  <Import Project="../MSBuild/Content.props" />
   <ItemGroup>
     <PackageReference Include="NUnit" />
     <PackageReference Include="NUnit3TestAdapter" />
@@ -17,12 +15,12 @@
     <ProjectReference Include="..\Content.Server\Content.Server.csproj" />
     <ProjectReference Include="..\Content.Shared\Content.Shared.csproj" />
     <ProjectReference Include="..\Content.Tests\Content.Tests.csproj" />
-    <ProjectReference Include="..\RobustToolbox\Robust.Client\Robust.Client.csproj" />
-    <ProjectReference Include="..\RobustToolbox\Robust.Server\Robust.Server.csproj" />
-    <ProjectReference Include="..\RobustToolbox\Robust.Shared.Maths\Robust.Shared.Maths.csproj" />
-    <ProjectReference Include="..\RobustToolbox\Robust.Shared\Robust.Shared.csproj" />
-    <ProjectReference Include="..\RobustToolbox\Robust.UnitTesting\Robust.UnitTesting.csproj" />
   </ItemGroup>
   <Import Project="..\RobustToolbox\MSBuild\Robust.Properties.targets" />
   <Import Project="..\RobustToolbox\MSBuild\Robust.CompNetworkGenerator.targets" />
+
+  <Import Project="..\RobustToolbox\Imports\Client.props" />
+  <Import Project="..\RobustToolbox\Imports\Server.props" />
+  <Import Project="..\RobustToolbox\Imports\Shared.props" />
+  <Import Project="..\RobustToolbox\Imports\Testing.props" />
 </Project>
diff --git a/Content.IntegrationTests/Tests/Commands/ObjectiveCommandsTest.cs b/Content.IntegrationTests/Tests/Commands/ObjectiveCommandsTest.cs
index a77761a7d1..d430325e31 100644
--- a/Content.IntegrationTests/Tests/Commands/ObjectiveCommandsTest.cs
+++ b/Content.IntegrationTests/Tests/Commands/ObjectiveCommandsTest.cs
@@ -54,7 +54,7 @@ public sealed class ObjectiveCommandsTest
         });
 
         Assert.That(mindEnt, Is.Not.Null);
-        var mindComp = mindEnt.Value.Comp;
+        var mindComp = mindEnt!.Value.Comp;
         Assert.That(mindComp.Objectives, Is.Empty, "Dummy player started with objectives.");
 
         await pair.WaitCommand($"addobjective {playerSession.Name} {ObjectiveProtoId}");
diff --git a/Content.IntegrationTests/Tests/Minds/MindTests.EntityDeletion.cs b/Content.IntegrationTests/Tests/Minds/MindTests.EntityDeletion.cs
index 6f33188813..513049bcad 100644
--- a/Content.IntegrationTests/Tests/Minds/MindTests.EntityDeletion.cs
+++ b/Content.IntegrationTests/Tests/Minds/MindTests.EntityDeletion.cs
@@ -112,7 +112,7 @@ public sealed partial class MindTests
             Assert.That(entMan.EntityExists(attachedEntity), Is.True);
             Assert.That(attachedEntity, Is.Not.EqualTo(playerEnt));
             Assert.That(entMan.HasComponent<GhostComponent>(attachedEntity));
-            var transform = entMan.GetComponent<TransformComponent>(attachedEntity.Value);
+            var transform = entMan.GetComponent<TransformComponent>(attachedEntity!.Value);
             Assert.That(transform.MapID, Is.Not.EqualTo(MapId.Nullspace));
             Assert.That(transform.MapID, Is.Not.EqualTo(testMap.MapId));
 #pragma warning restore NUnit2045
@@ -175,7 +175,7 @@ public sealed partial class MindTests
         Assert.That(player.AttachedEntity, Is.Not.Null);
         Assert.That(entMan.EntityExists(player.AttachedEntity));
 #pragma warning restore NUnit2045
-        var originalEntity = player.AttachedEntity.Value;
+        var originalEntity = player.AttachedEntity!.Value;
 
         EntityUid ghost = default!;
         await server.WaitAssertion(() =>
@@ -248,7 +248,7 @@ public sealed partial class MindTests
         var mindId = player.ContentData()?.Mind;
         Assert.That(mindId, Is.Not.Null);
 
-        var mind = entMan.GetComponent<MindComponent>(mindId.Value);
+        var mind = entMan.GetComponent<MindComponent>(mindId!.Value);
         Assert.That(mind.VisitingEntity, Is.Null);
 
         await pair.CleanReturnAsync();
diff --git a/Content.IntegrationTests/Tests/Toolshed/AdminTest.cs b/Content.IntegrationTests/Tests/Toolshed/AdminTest.cs
index ca70120ee9..cc440d0ccb 100644
--- a/Content.IntegrationTests/Tests/Toolshed/AdminTest.cs
+++ b/Content.IntegrationTests/Tests/Toolshed/AdminTest.cs
@@ -14,7 +14,7 @@ public sealed class AdminTest : ToolshedTest
         var toolMan = Server.ResolveDependency<ToolshedManager>();
         var admin = Server.ResolveDependency<IAdminManager>();
         var ignored = new HashSet<Assembly>()
-            {typeof(LocTest).Assembly, typeof(Robust.UnitTesting.Shared.Toolshed.LocTest).Assembly};
+            {typeof(LocTest).Assembly};
 
         await Server.WaitAssertion(() =>
         {
diff --git a/Content.IntegrationTests/Tests/Toolshed/LocTest.cs b/Content.IntegrationTests/Tests/Toolshed/LocTest.cs
index fb210eba50..849f9e55d3 100644
--- a/Content.IntegrationTests/Tests/Toolshed/LocTest.cs
+++ b/Content.IntegrationTests/Tests/Toolshed/LocTest.cs
@@ -19,7 +19,7 @@ public sealed class LocTest : ToolshedTest
         var locStrings = new HashSet<string>();
 
         var ignored = new HashSet<Assembly>()
-            {typeof(LocTest).Assembly, typeof(Robust.UnitTesting.Shared.Toolshed.LocTest).Assembly};
+            {typeof(LocTest).Assembly};
 
         await Server.WaitAssertion(() =>
         {
diff --git a/Content.MapRenderer/Content.MapRenderer.csproj b/Content.MapRenderer/Content.MapRenderer.csproj
index 4320717732..98fb446bd5 100644
--- a/Content.MapRenderer/Content.MapRenderer.csproj
+++ b/Content.MapRenderer/Content.MapRenderer.csproj
@@ -3,19 +3,27 @@
     <OutputType>Exe</OutputType>
     <OutputPath>..\bin\Content.MapRenderer\</OutputPath>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
-    <Nullable>enable</Nullable>
     <ServerGarbageCollection>true</ServerGarbageCollection>
+    <IsTestingPlatformApplication>false</IsTestingPlatformApplication>
   </PropertyGroup>
 
+  <Import Project="../MSBuild/Content.props" />
+
   <ItemGroup>
     <ProjectReference Include="..\Content.IntegrationTests\Content.IntegrationTests.csproj" />
-    <ProjectReference Include="..\RobustToolbox\Robust.UnitTesting\Robust.UnitTesting.csproj" />
   </ItemGroup>
 
   <ItemGroup>
     <PackageReference Include="NUnit" />
+    <PackageReference Include="Moq" />
     <PackageReference Include="SixLabors.ImageSharp" />
   </ItemGroup>
 
   <Import Project="..\RobustToolbox\MSBuild\Robust.Properties.targets" />
+
+  <Import Project="..\RobustToolbox\Imports\Client.props" />
+  <Import Project="..\RobustToolbox\Imports\Server.props" />
+  <Import Project="..\RobustToolbox\Imports\Shared.props" />
+  <Import Project="..\RobustToolbox\Imports\Testing.props" />
+
 </Project>
diff --git a/Content.Packaging/Content.Packaging.csproj b/Content.Packaging/Content.Packaging.csproj
index 9823e40b8e..d278b48734 100644
--- a/Content.Packaging/Content.Packaging.csproj
+++ b/Content.Packaging/Content.Packaging.csproj
@@ -2,13 +2,13 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <ImplicitUsings>enable</ImplicitUsings>
-    <Nullable>enable</Nullable>
     <ServerGarbageCollection>True</ServerGarbageCollection>
   </PropertyGroup>
 
-  <ItemGroup>
-    <ProjectReference Include="..\RobustToolbox\Robust.Packaging\Robust.Packaging.csproj" />
-  </ItemGroup>
+  <Import Project="../MSBuild/Content.props" />
 
   <Import Project="..\RobustToolbox\MSBuild\Robust.Properties.targets" />
+
+  <Import Project="..\RobustToolbox\Imports\Shared.props" />
+  <Import Project="..\RobustToolbox\Imports\Packaging.props" />
 </Project>
diff --git a/Content.Packaging/DepsHandler.cs b/Content.Packaging/DepsHandler.cs
new file mode 100644
index 0000000000..9907b97ba9
--- /dev/null
+++ b/Content.Packaging/DepsHandler.cs
@@ -0,0 +1,80 @@
+using System.Text.Json;
+using System.Text.Json.Serialization;
+
+namespace Content.Packaging;
+
+/// <summary>
+/// Helper class for working with <c>.deps.json</c> files.
+/// </summary>
+public sealed class DepsHandler
+{
+    public readonly Dictionary<string, LibraryInfo> Libraries = new();
+
+    public DepsHandler(DepsData data)
+    {
+        if (data.Targets.Count != 1)
+            throw new Exception("Expected exactly one target");
+
+        var target = data.Targets.Single().Value;
+
+        foreach (var (libNameAndVersion, libInfo) in target)
+        {
+            var split = libNameAndVersion.Split('/', 2);
+
+            Libraries.Add(split[0], libInfo);
+        }
+    }
+
+    public static DepsHandler Load(string depsFile)
+    {
+        using var f = File.OpenRead(depsFile);
+        var depsData = JsonSerializer.Deserialize<DepsData>(f) ?? throw new InvalidOperationException("Deps are null!");
+
+        return new DepsHandler(depsData);
+    }
+
+    public HashSet<string> RecursiveGetLibrariesFrom(string start)
+    {
+        var found = new HashSet<string>();
+
+        RecursiveAddLibraries(start, found);
+
+        return found;
+    }
+
+    private void RecursiveAddLibraries(string start, HashSet<string> set)
+    {
+        if (!set.Add(start))
+            return;
+
+        var lib = Libraries[start];
+        if (lib.Dependencies == null)
+            return;
+
+        foreach (var dep in lib.Dependencies.Keys)
+        {
+            RecursiveAddLibraries(dep, set);
+        }
+    }
+
+    public sealed class DepsData
+    {
+        [JsonInclude, JsonPropertyName("targets")]
+        public required Dictionary<string, Dictionary<string, LibraryInfo>> Targets;
+    }
+
+    public sealed class LibraryInfo
+    {
+        [JsonInclude, JsonPropertyName("dependencies")]
+        public Dictionary<string, string>? Dependencies;
+
+        [JsonInclude, JsonPropertyName("runtime")]
+        public Dictionary<string, object>? Runtime;
+
+        // Paths are like lib/netstandard2.0/JetBrains.Annotations.dll
+        public IEnumerable<string> GetDllNames()
+        {
+            return Runtime == null ? [] : Runtime.Keys.Select(p => p.Split('/')[^1]);
+        }
+    }
+}
diff --git a/Content.Packaging/ServerPackaging.cs b/Content.Packaging/ServerPackaging.cs
index 2715e7a900..8e559d5a65 100644
--- a/Content.Packaging/ServerPackaging.cs
+++ b/Content.Packaging/ServerPackaging.cs
@@ -37,25 +37,9 @@ public static class ServerPackaging
         .Select(o => o.Rid)
         .ToList();
 
-    private static readonly List<string> ServerContentAssemblies = new()
-    {
-        "Content.Server.Database",
-        "Content.Server",
-        "Content.Shared",
-        "Content.Shared.Database",
-    };
-
-    private static readonly List<string> ServerExtraAssemblies = new()
-    {
-        // Python script had Npgsql. though we want Npgsql.dll as well soooo
-        "Npgsql",
-        "Microsoft",
-        "NetCord",
-    };
-
     private static readonly List<string> ServerNotExtraAssemblies = new()
     {
-        "Microsoft.CodeAnalysis",
+        "JetBrains.Annotations",
     };
 
     private static readonly HashSet<string> BinSkipFolders = new()
@@ -181,23 +165,13 @@ public static class ServerPackaging
 
         var inputPassCore = graph.InputCore;
         var inputPassResources = graph.InputResources;
-        var contentAssemblies = new List<string>(ServerContentAssemblies);
 
         // Additional assemblies that need to be copied such as EFCore.
         var sourcePath = Path.Combine(contentDir, "bin", "Content.Server");
 
-        // Should this be an asset pass?
-        // For future archaeologists I just want audio rework to work and need the audio pass so
-        // just porting this as is from python.
-        foreach (var fullPath in Directory.EnumerateFiles(sourcePath, "*.*", SearchOption.AllDirectories))
-        {
-            var fileName = Path.GetFileNameWithoutExtension(fullPath);
+        var deps = DepsHandler.Load(Path.Combine(sourcePath, "Content.Server.deps.json"));
 
-            if (!ServerNotExtraAssemblies.Any(o => fileName.StartsWith(o)) && ServerExtraAssemblies.Any(o => fileName.StartsWith(o)))
-            {
-                contentAssemblies.Add(fileName);
-            }
-        }
+        var contentAssemblies = GetContentAssemblyNamesToCopy(deps);
 
         await RobustSharedPackaging.DoResourceCopy(
             Path.Combine("RobustToolbox", "bin", "Server",
@@ -229,5 +203,21 @@ public static class ServerPackaging
         inputPassResources.InjectFinished();
     }
 
+    // This returns both content assemblies (e.g. Content.Server.dll) and dependencies (e.g. Npgsql)
+    private static IEnumerable<string> GetContentAssemblyNamesToCopy(DepsHandler deps)
+    {
+        var depsContent = deps.RecursiveGetLibrariesFrom("Content.Server").SelectMany(GetLibraryNames);
+        var depsRobust = deps.RecursiveGetLibrariesFrom("Robust.Server").SelectMany(GetLibraryNames);
+
+        var depsContentExclusive = depsContent.Except(depsRobust).ToHashSet();
+
+        // Remove .dll suffix and apply filtering.
+        var names = depsContentExclusive.Select(p => p[..^4]).Where(p => !ServerNotExtraAssemblies.Any(p.StartsWith));
+
+        return names;
+
+        IEnumerable<string> GetLibraryNames(string library) => deps.Libraries[library].GetDllNames();
+    }
+
     private readonly record struct PlatformReg(string Rid, string TargetOs, bool BuildByDefault);
 }
diff --git a/Content.PatreonParser/Content.PatreonParser.csproj b/Content.PatreonParser/Content.PatreonParser.csproj
index 1724ec0cea..bba47a062d 100644
--- a/Content.PatreonParser/Content.PatreonParser.csproj
+++ b/Content.PatreonParser/Content.PatreonParser.csproj
@@ -2,7 +2,7 @@
 
     <PropertyGroup>
         <OutputType>Exe</OutputType>
-        <TargetFramework>net9.0</TargetFramework>
+        <TargetFramework>net10.0</TargetFramework>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
       <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
diff --git a/Content.Replay/Content.Replay.csproj b/Content.Replay/Content.Replay.csproj
index 28cfc7f666..5008214522 100644
--- a/Content.Replay/Content.Replay.csproj
+++ b/Content.Replay/Content.Replay.csproj
@@ -1,26 +1,23 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>$(TargetFramework)</TargetFramework>
-    <LangVersion>12</LangVersion>
-    <IsPackable>false</IsPackable>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
     <OutputPath>..\bin\Content.Replay\</OutputPath>
     <OutputType Condition="'$(FullRelease)' != 'True'">Exe</OutputType>
     <WarningsAsErrors>RA0032;nullable</WarningsAsErrors>
-    <Nullable>enable</Nullable>
   </PropertyGroup>
+  <Import Project="../MSBuild/Content.props" />
+
   <ItemGroup>
     <PackageReference Include="Nett" />
     <PackageReference Include="JetBrains.Annotations" PrivateAssets="All" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\RobustToolbox\Lidgren.Network\Lidgren.Network.csproj" />
-    <ProjectReference Include="..\RobustToolbox\Robust.Shared.Maths\Robust.Shared.Maths.csproj" />
-    <ProjectReference Include="..\RobustToolbox\Robust.Shared\Robust.Shared.csproj" />
-    <ProjectReference Include="..\RobustToolbox\Robust.Client\Robust.Client.csproj" />
     <ProjectReference Include="..\Content.Shared\Content.Shared.csproj" />
     <ProjectReference Include="..\Content.Client\Content.Client.csproj" />
   </ItemGroup>
   <Import Project="..\RobustToolbox\MSBuild\XamlIL.targets" />
   <Import Project="..\RobustToolbox\MSBuild\Robust.Properties.targets" />
+
+  <Import Project="..\RobustToolbox\Imports\Client.props" />
+  <Import Project="..\RobustToolbox\Imports\Shared.props" />
 </Project>
diff --git a/Content.Server.Database/Content.Server.Database.csproj b/Content.Server.Database/Content.Server.Database.csproj
index d98d0642db..22b718b363 100644
--- a/Content.Server.Database/Content.Server.Database.csproj
+++ b/Content.Server.Database/Content.Server.Database.csproj
@@ -1,16 +1,13 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <!-- Work around https://github.com/dotnet/project-system/issues/4314 -->
-    <TargetFramework>$(TargetFramework)</TargetFramework>
-    <LangVersion>12</LangVersion>
-    <IsPackable>false</IsPackable>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
     <OutputPath>..\bin\Content.Server.Database\</OutputPath>
     <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
-    <Nullable>enable</Nullable>
     <NoWarn>RA0003</NoWarn>
   </PropertyGroup>
 
+  <Import Project="../MSBuild/Content.props" />
+
   <ItemGroup>
     <PackageReference Include="Microsoft.EntityFrameworkCore.Design">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
diff --git a/Content.Server/Codewords/CodewordFactionPrototype.cs b/Content.Server/Codewords/CodewordFactionPrototype.cs
index 72d24b1dcd..62552c1966 100644
--- a/Content.Server/Codewords/CodewordFactionPrototype.cs
+++ b/Content.Server/Codewords/CodewordFactionPrototype.cs
@@ -10,11 +10,11 @@ public sealed partial class CodewordFactionPrototype : IPrototype
 {
     /// <inheritdoc/>
     [IdDataField]
-    public string ID { get; } = default!;
+    public string ID { get; private set; } = default!;
 
     /// <summary>
     /// The generator to use for this faction.
     /// </summary>
     [DataField(required:true)]
-    public ProtoId<CodewordGeneratorPrototype> Generator { get; } = default!;
+    public ProtoId<CodewordGeneratorPrototype> Generator { get; private set; } = default!;
 }
diff --git a/Content.Server/Codewords/CodewordGeneratorPrototype.cs b/Content.Server/Codewords/CodewordGeneratorPrototype.cs
index 15e50ebf73..b17a40fc6a 100644
--- a/Content.Server/Codewords/CodewordGeneratorPrototype.cs
+++ b/Content.Server/Codewords/CodewordGeneratorPrototype.cs
@@ -11,13 +11,13 @@ public sealed partial class CodewordGeneratorPrototype : IPrototype
 {
     /// <inheritdoc/>
     [IdDataField]
-    public string ID { get; } = default!;
+    public string ID { get; private set; } = default!;
 
     /// <summary>
     /// List of datasets to use for word generation. All values will be concatenated into one list and then randomly chosen from
     /// </summary>
     [DataField]
-    public List<ProtoId<LocalizedDatasetPrototype>> Words { get; } =
+    public List<ProtoId<LocalizedDatasetPrototype>> Words { get; private set; } =
     [
         "Adjectives",
         "Verbs",
diff --git a/Content.Server/Content.Server.csproj b/Content.Server/Content.Server.csproj
index e2b65b873c..10d4bd56ab 100644
--- a/Content.Server/Content.Server.csproj
+++ b/Content.Server/Content.Server.csproj
@@ -1,31 +1,30 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <!-- Work around https://github.com/dotnet/project-system/issues/4314 -->
-    <TargetFramework>$(TargetFramework)</TargetFramework>
-    <LangVersion>12</LangVersion>
-    <IsPackable>false</IsPackable>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
     <OutputPath>..\bin\Content.Server\</OutputPath>
     <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
     <OutputType Condition="'$(FullRelease)' != 'True'">Exe</OutputType>
     <NoWarn>1998</NoWarn>
     <WarningsAsErrors>RA0032;nullable</WarningsAsErrors>
-    <Nullable>enable</Nullable>
     <ServerGarbageCollection>true</ServerGarbageCollection>
   </PropertyGroup>
+  <Import Project="../MSBuild/Content.props" />
   <ItemGroup>
     <PackageReference Include="JetBrains.Annotations" PrivateAssets="All" />
     <PackageReference Include="NetCord" />
+    <PackageReference Include="prometheus-net" />
+    <PackageReference Include="Microsoft.Extensions.ObjectPool" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Content.Packaging\Content.Packaging.csproj" />
     <ProjectReference Include="..\Content.Server.Database\Content.Server.Database.csproj" />
     <ProjectReference Include="..\Content.Shared.Database\Content.Shared.Database.csproj" />
-    <ProjectReference Include="..\RobustToolbox\Lidgren.Network\Lidgren.Network.csproj" />
-    <ProjectReference Include="..\RobustToolbox\Robust.Shared.Maths\Robust.Shared.Maths.csproj" />
-    <ProjectReference Include="..\RobustToolbox\Robust.Shared\Robust.Shared.csproj" />
-    <ProjectReference Include="..\RobustToolbox\Robust.Server\Robust.Server.csproj" />
     <ProjectReference Include="..\Content.Shared\Content.Shared.csproj" />
   </ItemGroup>
   <Import Project="..\RobustToolbox\MSBuild\Robust.Properties.targets" />
+
+  <Import Project="..\RobustToolbox\Imports\Lidgren.props" />
+  <Import Project="..\RobustToolbox\Imports\Server.props" />
+  <Import Project="..\RobustToolbox\Imports\Shared.props" />
+  <Import Project="..\RobustToolbox\Imports\Packaging.props" />
 </Project>
diff --git a/Content.Server/GameTicking/Commands/SetGamePresetCommand.cs b/Content.Server/GameTicking/Commands/SetGamePresetCommand.cs
index 10ec2a5e9b..894460fe3f 100644
--- a/Content.Server/GameTicking/Commands/SetGamePresetCommand.cs
+++ b/Content.Server/GameTicking/Commands/SetGamePresetCommand.cs
@@ -2,7 +2,6 @@
 using Content.Server.Administration;
 using Content.Server.GameTicking.Presets;
 using Content.Shared.Administration;
-using Linguini.Shared.Util;
 using Robust.Shared.Console;
 
 namespace Content.Server.GameTicking.Commands
@@ -18,7 +17,7 @@ namespace Content.Server.GameTicking.Commands
 
         public void Execute(IConsoleShell shell, string argStr, string[] args)
         {
-            if (!args.Length.InRange(1, 3))
+            if (args.Length is <= 1 or >= 3)
             {
                 shell.WriteError(Loc.GetString("shell-need-between-arguments", ("lower", 1), ("upper", 3), ("currentAmount", args.Length)));
                 return;
diff --git a/Content.Server/Players/JobWhitelist/JobWhitelistManager.cs b/Content.Server/Players/JobWhitelist/JobWhitelistManager.cs
index c47ffa691f..635e99666f 100644
--- a/Content.Server/Players/JobWhitelist/JobWhitelistManager.cs
+++ b/Content.Server/Players/JobWhitelist/JobWhitelistManager.cs
@@ -10,7 +10,6 @@ using Robust.Shared.Configuration;
 using Robust.Shared.Network;
 using Robust.Shared.Player;
 using Robust.Shared.Prototypes;
-using Serilog;
 
 namespace Content.Server.Players.JobWhitelist;
 
@@ -22,8 +21,10 @@ public sealed class JobWhitelistManager : IPostInjectInit
     [Dependency] private readonly IPlayerManager _player = default!;
     [Dependency] private readonly IPrototypeManager _prototypes = default!;
     [Dependency] private readonly UserDbDataManager _userDb = default!;
+    [Dependency] private readonly ILogManager _logManager = default!;
 
     private readonly Dictionary<NetUserId, HashSet<string>> _whitelists = new();
+    private ISawmill _sawmill = default!;
 
     public void Initialize()
     {
@@ -79,7 +80,7 @@ public sealed class JobWhitelistManager : IPostInjectInit
     {
         if (!_whitelists.TryGetValue(player, out var whitelists))
         {
-            Log.Error("Unable to check if player {Player} is whitelisted for {Job}. Stack trace:\\n{StackTrace}",
+            _sawmill.Error("Unable to check if player {Player} is whitelisted for {Job}. Stack trace:\\n{StackTrace}",
                 player,
                 job,
                 Environment.StackTrace);
@@ -113,5 +114,6 @@ public sealed class JobWhitelistManager : IPostInjectInit
         _userDb.AddOnLoadPlayer(LoadData);
         _userDb.AddOnFinishLoad(FinishLoad);
         _userDb.AddOnPlayerDisconnect(ClientDisconnected);
+        _sawmill = _logManager.GetSawmill("job_whitelist");
     }
 }
diff --git a/Content.Shared.Database/Content.Shared.Database.csproj b/Content.Shared.Database/Content.Shared.Database.csproj
index bc2cc300bf..5b14175f4f 100644
--- a/Content.Shared.Database/Content.Shared.Database.csproj
+++ b/Content.Shared.Database/Content.Shared.Database.csproj
@@ -1,8 +1,9 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <ImplicitUsings>enable</ImplicitUsings>
-    <Nullable>enable</Nullable>
   </PropertyGroup>
 
+  <Import Project="../MSBuild/Content.props" />
+
   <Import Project="..\RobustToolbox\MSBuild\Robust.Properties.targets" />
 </Project>
diff --git a/Content.Shared/Actions/Components/ActionComponent.cs b/Content.Shared/Actions/Components/ActionComponent.cs
index 2833aa1798..8f9b7fa925 100644
--- a/Content.Shared/Actions/Components/ActionComponent.cs
+++ b/Content.Shared/Actions/Components/ActionComponent.cs
@@ -197,7 +197,7 @@ public sealed partial class ActionComponent : Component
 }
 
 [DataRecord, Serializable, NetSerializable]
-public record struct ActionCooldown
+public partial record struct ActionCooldown
 {
     [DataField(required: true, customTypeSerializer: typeof(TimeOffsetSerializer))]
     public TimeSpan Start;
diff --git a/Content.Shared/Chat/Prototypes/EmoteSoundsPrototype.cs b/Content.Shared/Chat/Prototypes/EmoteSoundsPrototype.cs
index 0138009ef9..b75ed796e2 100644
--- a/Content.Shared/Chat/Prototypes/EmoteSoundsPrototype.cs
+++ b/Content.Shared/Chat/Prototypes/EmoteSoundsPrototype.cs
@@ -21,7 +21,7 @@ public sealed partial class EmoteSoundsPrototype : IPrototype, IInheritingProtot
     /// <inheritdoc/>
     [AbstractDataField]
     [NeverPushInheritance]
-    public bool Abstract { get; }
+    public bool Abstract { get; private set; }
 
     /// <summary>
     ///     Optional fallback sound that will play if collection
diff --git a/Content.Shared/Chemistry/Prototypes/InjectorModePrototype.cs b/Content.Shared/Chemistry/Prototypes/InjectorModePrototype.cs
index 8434309b26..0255d8798f 100644
--- a/Content.Shared/Chemistry/Prototypes/InjectorModePrototype.cs
+++ b/Content.Shared/Chemistry/Prototypes/InjectorModePrototype.cs
@@ -20,11 +20,11 @@ public sealed partial class InjectorModePrototype : IPrototype, IInheritingProto
 
     /// <inheritdoc/>
     [ParentDataField(typeof(AbstractPrototypeIdArraySerializer<InjectorModePrototype>))]
-    public string[]? Parents { get; }
+    public string[]? Parents { get; private set; }
 
     /// <inheritdoc/>
     [AbstractDataField, NeverPushInheritance]
-    public bool Abstract { get; }
+    public bool Abstract { get; private set; }
 
     /// <summary>
     /// The name of the mode that will be shown on the label UI.
diff --git a/Content.Shared/Content.Shared.csproj b/Content.Shared/Content.Shared.csproj
index 52ed717e96..da32cdf817 100644
--- a/Content.Shared/Content.Shared.csproj
+++ b/Content.Shared/Content.Shared.csproj
@@ -1,28 +1,21 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <!-- Work around https://github.com/dotnet/project-system/issues/4314 -->
-    <TargetFramework>$(TargetFramework)</TargetFramework>
-    <LangVersion>12</LangVersion>
-    <IsPackable>false</IsPackable>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
     <WarningsAsErrors>RA0032;nullable</WarningsAsErrors>
-    <Nullable>enable</Nullable>
   </PropertyGroup>
+  <Import Project="../MSBuild/Content.props" />
   <ItemGroup>
     <PackageReference Include="JetBrains.Annotations" PrivateAssets="All" />
+    <PackageReference Include="YamlDotNet" />
   </ItemGroup>
+
+  <Import Project="..\RobustToolbox\Imports\Lidgren.props" />
+  <Import Project="..\RobustToolbox\Imports\Shared.props" />
+
   <ItemGroup>
     <ProjectReference Include="..\Content.Shared.Database\Content.Shared.Database.csproj" />
-    <ProjectReference Include="..\RobustToolbox\Lidgren.Network\Lidgren.Network.csproj">
-      <Private>false</Private>
-    </ProjectReference>
-    <ProjectReference Include="..\RobustToolbox\Robust.Shared.Maths\Robust.Shared.Maths.csproj">
-      <Private>false</Private>
-    </ProjectReference>
-    <ProjectReference Include="..\RobustToolbox\Robust.Shared\Robust.Shared.csproj">
-      <Private>false</Private>
-    </ProjectReference>
   </ItemGroup>
+
   <Import Project="..\RobustToolbox\MSBuild\Robust.Properties.targets" />
   <Import Project="..\RobustToolbox\MSBuild\Robust.CompNetworkGenerator.targets" />
 </Project>
diff --git a/Content.Shared/CrewManifest/SharedCrewManifestSystem.cs b/Content.Shared/CrewManifest/SharedCrewManifestSystem.cs
index a9279cc7f1..72c6a7bde8 100644
--- a/Content.Shared/CrewManifest/SharedCrewManifestSystem.cs
+++ b/Content.Shared/CrewManifest/SharedCrewManifestSystem.cs
@@ -1,5 +1,4 @@
 using Content.Shared.Eui;
-using NetSerializer;
 using Robust.Shared.Serialization;
 
 namespace Content.Shared.CrewManifest;
diff --git a/Content.Shared/Lathe/LatheMessages.cs b/Content.Shared/Lathe/LatheMessages.cs
index fe72eed367..d37aa96a61 100644
--- a/Content.Shared/Lathe/LatheMessages.cs
+++ b/Content.Shared/Lathe/LatheMessages.cs
@@ -1,5 +1,4 @@
 using Content.Shared.Research.Prototypes;
-using NetSerializer;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization;
 
diff --git a/Content.Shared/Nutrition/Prototypes/EdiblePrototype.cs b/Content.Shared/Nutrition/Prototypes/EdiblePrototype.cs
index 2cfe900167..864383610c 100644
--- a/Content.Shared/Nutrition/Prototypes/EdiblePrototype.cs
+++ b/Content.Shared/Nutrition/Prototypes/EdiblePrototype.cs
@@ -12,7 +12,7 @@ public sealed partial class EdiblePrototype : IPrototype
 {
     /// <inheritdoc/>
     [IdDataField]
-    public string ID { get; } = default!;
+    public string ID { get; private set; } = default!;
 
     /// <summary>
     /// The sound we make when eaten.
diff --git a/Content.Shared/Preferences/Loadouts/LoadoutGroupPrototype.cs b/Content.Shared/Preferences/Loadouts/LoadoutGroupPrototype.cs
index 40a168c067..9cecd9df51 100644
--- a/Content.Shared/Preferences/Loadouts/LoadoutGroupPrototype.cs
+++ b/Content.Shared/Preferences/Loadouts/LoadoutGroupPrototype.cs
@@ -19,7 +19,7 @@ public sealed partial class LoadoutGroupPrototype : IPrototype, IInheritingProto
     /// <inheritdoc />
     [NeverPushInheritance]
     [AbstractDataField]
-    public bool Abstract { get; }
+    public bool Abstract { get; private set; }
 
     /// <summary>
     /// User-friendly name for the group.
diff --git a/Content.Shared/SmartFridge/SmartFridgeComponent.cs b/Content.Shared/SmartFridge/SmartFridgeComponent.cs
index db132c586d..a9e9d95753 100644
--- a/Content.Shared/SmartFridge/SmartFridgeComponent.cs
+++ b/Content.Shared/SmartFridge/SmartFridgeComponent.cs
@@ -76,7 +76,7 @@ public sealed partial class SmartFridgeComponent : Component
 }
 
 [Serializable, NetSerializable, DataRecord]
-public record struct SmartFridgeEntry
+public partial record struct SmartFridgeEntry
 {
     public string Name;
 
diff --git a/Content.Tests/Content.Tests.csproj b/Content.Tests/Content.Tests.csproj
index ff295728fc..75a077839a 100644
--- a/Content.Tests/Content.Tests.csproj
+++ b/Content.Tests/Content.Tests.csproj
@@ -1,26 +1,25 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <!-- Work around https://github.com/dotnet/project-system/issues/4314 -->
-    <TargetFramework>$(TargetFramework)</TargetFramework>
-    <LangVersion>12</LangVersion>
-    <IsPackable>false</IsPackable>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
     <OutputPath>..\bin\Content.Tests\</OutputPath>
+    <Nullable>disable</Nullable>
   </PropertyGroup>
+  <Import Project="../MSBuild/Content.props" />
   <ItemGroup>
     <PackageReference Include="NUnit" />
     <PackageReference Include="NUnit3TestAdapter" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" />
+    <PackageReference Include="Moq" />
   </ItemGroup>
+
+  <Import Project="..\RobustToolbox\Imports\Client.props" />
+  <Import Project="..\RobustToolbox\Imports\Server.props" />
+  <Import Project="..\RobustToolbox\Imports\Shared.props" />
+  <Import Project="..\RobustToolbox\Imports\Testing.props" />
   <ItemGroup>
     <ProjectReference Include="..\Content.Client\Content.Client.csproj" />
     <ProjectReference Include="..\Content.Server\Content.Server.csproj" />
     <ProjectReference Include="..\Content.Shared\Content.Shared.csproj" />
-    <ProjectReference Include="..\RobustToolbox\Robust.Client\Robust.Client.csproj" />
-    <ProjectReference Include="..\RobustToolbox\Robust.Server\Robust.Server.csproj" />
-    <ProjectReference Include="..\RobustToolbox\Robust.Shared.Maths\Robust.Shared.Maths.csproj" />
-    <ProjectReference Include="..\RobustToolbox\Robust.Shared\Robust.Shared.csproj" />
-    <ProjectReference Include="..\RobustToolbox\Robust.UnitTesting\Robust.UnitTesting.csproj" />
   </ItemGroup>
 
   <Import Project="..\RobustToolbox\MSBuild\Robust.Properties.targets" />
diff --git a/Content.Tools/Content.Tools.csproj b/Content.Tools/Content.Tools.csproj
index f611924c58..06a9b790db 100644
--- a/Content.Tools/Content.Tools.csproj
+++ b/Content.Tools/Content.Tools.csproj
@@ -1,16 +1,15 @@
 <Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
         <OutputType>Exe</OutputType>
-        <TargetFramework>$(TargetFramework)</TargetFramework>
     </PropertyGroup>
 
+  <Import Project="../MSBuild/Content.props" />
+
     <ItemGroup>
       <PackageReference Include="YamlDotNet" />
     </ItemGroup>
 
-    <ItemGroup>
-      <ProjectReference Include="..\RobustToolbox\Robust.Shared\Robust.Shared.csproj" />
-    </ItemGroup>
-
   <Import Project="..\RobustToolbox\MSBuild\Robust.Properties.targets" />
+
+  <Import Project="..\RobustToolbox\Imports\Shared.props" />
 </Project>
diff --git a/Content.YAMLLinter/Content.YAMLLinter.csproj b/Content.YAMLLinter/Content.YAMLLinter.csproj
index 4e7344beaa..bc2b7d1cb6 100644
--- a/Content.YAMLLinter/Content.YAMLLinter.csproj
+++ b/Content.YAMLLinter/Content.YAMLLinter.csproj
@@ -1,21 +1,20 @@
 <Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
         <OutputType>Exe</OutputType>
-        <TargetFramework>$(TargetFramework)</TargetFramework>
         <OutputPath>..\bin\Content.YAMLLinter\</OutputPath>
         <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
         <ServerGarbageCollection>true</ServerGarbageCollection>
+        <IsTestingPlatformApplication>false</IsTestingPlatformApplication>
+      <Nullable>disable</Nullable>
     </PropertyGroup>
 
+  <Import Project="../MSBuild/Content.props" />
+
   <ItemGroup>
       <ProjectReference Include="..\Content.Client\Content.Client.csproj" />
       <ProjectReference Include="..\Content.Server\Content.Server.csproj" />
       <ProjectReference Include="..\Content.Shared\Content.Shared.csproj" />
       <ProjectReference Include="..\Content.IntegrationTests\Content.IntegrationTests.csproj" />
-      <ProjectReference Include="..\RobustToolbox\Robust.Client\Robust.Client.csproj" />
-      <ProjectReference Include="..\RobustToolbox\Robust.Server\Robust.Server.csproj" />
-      <ProjectReference Include="..\RobustToolbox\Robust.Shared.Maths\Robust.Shared.Maths.csproj" />
-      <ProjectReference Include="..\RobustToolbox\Robust.Shared\Robust.Shared.csproj" />
     </ItemGroup>
 
   <ItemGroup>
@@ -23,4 +22,10 @@
   </ItemGroup>
 
   <Import Project="..\RobustToolbox\MSBuild\Robust.Properties.targets" />
+
+  <Import Project="..\RobustToolbox\Imports\Client.props" />
+  <Import Project="..\RobustToolbox\Imports\Server.props" />
+  <Import Project="..\RobustToolbox\Imports\Shared.props" />
+  <Import Project="..\RobustToolbox\Imports\Testing.props" />
+
 </Project>
diff --git a/Directory.Packages.props b/Directory.Packages.props
index 643b105b76..3604412933 100644
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -6,17 +6,17 @@
     -->
     <PackageVersion Remove="Npgsql.EntityFrameworkCore.PostgreSQL" />
     <PackageVersion Remove="Microsoft.EntityFrameworkCore.Design" />
-    <PackageVersion Include="CsvHelper" Version="33.0.1" />
+    <PackageVersion Include="CsvHelper" Version="33.1.0" />
     <PackageVersion Include="ImGui.NET" Version="1.87.3" />
-    <PackageVersion Include="Microsoft.EntityFrameworkCore.Design" Version="9.0.1">
+    <PackageVersion Include="Microsoft.EntityFrameworkCore.Design" Version="10.0.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageVersion>
-    <PackageVersion Include="Microsoft.EntityFrameworkCore.Sqlite.Core" Version="9.0.1" />
+    <PackageVersion Include="Microsoft.EntityFrameworkCore.Sqlite.Core" Version="10.0.0" />
     <PackageVersion Include="NetCord" Version="1.0.0-alpha.388" />
-    <PackageVersion Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="9.0.3" />
+    <PackageVersion Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="10.0.0" />
     <PackageVersion Include="OpenTK" Version="4.9.4" />
     <PackageVersion Include="Veldrid" Version="4.8.0" />
     <PackageVersion Include="Veldrid.SPIRV" Version="1.0.15" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/MSBuild/Content.props b/MSBuild/Content.props
new file mode 100644
index 0000000000..7216961fa0
--- /dev/null
+++ b/MSBuild/Content.props
@@ -0,0 +1,12 @@
+<Project>
+  <!--
+  Content specific properties
+  Import *before* Robust.Properties.targets
+  -->
+
+  <PropertyGroup>
+    <LangVersion Condition="'$(LangVersion)' == ''">14</LangVersion>
+    <IsPackable Condition="'$(IsPackable)' == ''">false</IsPackable>
+    <Nullable Condition="'$(Nullable)' == ''">enable</Nullable>
+  </PropertyGroup>
+</Project>
diff --git a/Pow3r/Pow3r.csproj b/Pow3r/Pow3r.csproj
index 4f2d20087a..20181910b4 100644
--- a/Pow3r/Pow3r.csproj
+++ b/Pow3r/Pow3r.csproj
@@ -1,10 +1,12 @@
 <Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
         <OutputType>Exe</OutputType>
-        <TargetFramework>$(TargetFramework)</TargetFramework>
         <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+      <Nullable>disable</Nullable>
     </PropertyGroup>
 
+    <Import Project="../MSBuild/Content.props" />
+
     <ItemGroup>
       <PackageReference Include="ImGui.NET" />
       <PackageReference Include="OpenTK" />
@@ -14,9 +16,10 @@
 
     <ItemGroup>
       <ProjectReference Include="..\Content.Server\Content.Server.csproj" />
-      <ProjectReference Include="..\RobustToolbox\Robust.Shared.Maths\Robust.Shared.Maths.csproj" />
-      <ProjectReference Include="..\RobustToolbox\Robust.UnitTesting\Robust.UnitTesting.csproj" />
     </ItemGroup>
 
   <Import Project="..\RobustToolbox\MSBuild\Robust.Properties.targets" />
+
+  <Import Project="..\RobustToolbox\Imports\Shared.props" />
+  <Import Project="..\RobustToolbox\Imports\Testing.props" />
 </Project>
diff --git a/RobustToolbox b/RobustToolbox
index dbde8023ed..c7ba63ed8e 160000
--- a/RobustToolbox
+++ b/RobustToolbox
@@ -1 +1 @@
-Subproject commit dbde8023ed256ac69ae4b419422c936f78361653
+Subproject commit c7ba63ed8e9c8087b7a78bada55057ac7aa0812d
diff --git a/SpaceStation14.sln b/SpaceStation14.sln
deleted file mode 100644
index 0e00fe5b12..0000000000
--- a/SpaceStation14.sln
+++ /dev/null
@@ -1,494 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 17
-VisualStudioVersion = 17.8.34330.188
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Content.Shared", "Content.Shared\Content.Shared.csproj", "{26AEEBB3-DDE7-443A-9F43-7BC7F4ACF6B5}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Content.Server", "Content.Server\Content.Server.csproj", "{B38DBBD0-04C2-4D1A-84E2-B3446F6ADF2A}"
-	ProjectSection(ProjectDependencies) = postProject
-		{59250BAF-0000-0000-0000-000000000000} = {59250BAF-0000-0000-0000-000000000000}
-		{26AEEBB3-DDE7-443A-9F43-7BC7F4ACF6B5} = {26AEEBB3-DDE7-443A-9F43-7BC7F4ACF6B5}
-	EndProjectSection
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Content.Client", "Content.Client\Content.Client.csproj", "{A2E5F175-78AF-4DDD-8F97-E2D2552372ED}"
-	ProjectSection(ProjectDependencies) = postProject
-		{59250BAF-0000-0000-0000-000000000000} = {59250BAF-0000-0000-0000-000000000000}
-	EndProjectSection
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Build Checker", "Build Checker", "{3202E94D-E985-4181-9F69-F458A7F6574F}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BuildChecker", "BuildChecker\BuildChecker.csproj", "{C899FCA4-7037-4E49-ABC2-44DE72487110}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Content.Tests", "Content.Tests\Content.Tests.csproj", "{8EDF4429-251A-416D-BB68-93F227191BCF}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "RobustToolbox", "RobustToolbox", "{83B4CBBA-547A-42F0-A7CD-8A67D93196CE}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Lidgren.Network", "RobustToolbox\Lidgren.Network\Lidgren.Network.csproj", "{59250BAF-0000-0000-0000-000000000000}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Robust.Client", "RobustToolbox\Robust.Client\Robust.Client.csproj", "{83429BD6-6358-4B18-BE51-401DF8EA2673}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Robust.Server", "RobustToolbox\Robust.Server\Robust.Server.csproj", "{B04AAE71-0000-0000-0000-000000000000}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Robust.Shared.Maths", "RobustToolbox\Robust.Shared.Maths\Robust.Shared.Maths.csproj", "{93F23A82-00C5-4572-964E-E7C9457726D4}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Robust.UnitTesting", "RobustToolbox\Robust.UnitTesting\Robust.UnitTesting.csproj", "{F0ADA779-40B8-4F7E-BA6C-CDB19F3065D9}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Robust.Shared", "RobustToolbox\Robust.Shared\Robust.Shared.csproj", "{0529F740-0000-0000-0000-000000000000}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Content.IntegrationTests", "Content.IntegrationTests\Content.IntegrationTests.csproj", "{AB7AF1C8-30FF-4436-9DF0-179BE5B0C132}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Content.Benchmarks", "Content.Benchmarks\Content.Benchmarks.csproj", "{7AC832A1-2461-4EB5-AC26-26F6AFFA9E46}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OpenToolkit.GraphicsLibraryFramework", "RobustToolbox\OpenToolkit.GraphicsLibraryFramework\OpenToolkit.GraphicsLibraryFramework.csproj", "{4809F412-3132-419E-BF9D-CCF7593C3533}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Content.Server.Database", "Content.Server.Database\Content.Server.Database.csproj", "{45C9B43F-305D-4651-9863-F6384CBC847F}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "MSBuild", "MSBuild", "{50404922-9637-4394-BF59-165D0850ADC8}"
-	ProjectSection(SolutionItems) = preProject
-		RobustToolbox\MSBuild\Robust.Analyzers.targets = RobustToolbox\MSBuild\Robust.Analyzers.targets
-		RobustToolbox\MSBuild\Robust.CompNetworkGenerator.targets = RobustToolbox\MSBuild\Robust.CompNetworkGenerator.targets
-		RobustToolbox\MSBuild\Robust.Configurations.props = RobustToolbox\MSBuild\Robust.Configurations.props
-		RobustToolbox\MSBuild\Robust.DefineConstants.targets = RobustToolbox\MSBuild\Robust.DefineConstants.targets
-		RobustToolbox\MSBuild\Robust.Engine.props = RobustToolbox\MSBuild\Robust.Engine.props
-		RobustToolbox\MSBuild\Robust.Engine.targets = RobustToolbox\MSBuild\Robust.Engine.targets
-		RobustToolbox\MSBuild\Robust.Engine.Version.props = RobustToolbox\MSBuild\Robust.Engine.Version.props
-		RobustToolbox\MSBuild\Robust.Platform.props = RobustToolbox\MSBuild\Robust.Platform.props
-		RobustToolbox\MSBuild\Robust.Properties.targets = RobustToolbox\MSBuild\Robust.Properties.targets
-		RobustToolbox\MSBuild\Robust.Trimming.targets = RobustToolbox\MSBuild\Robust.Trimming.targets
-		RobustToolbox\MSBuild\XamlIL.targets = RobustToolbox\MSBuild\XamlIL.targets
-	EndProjectSection
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Build", "Build", "{806ED41A-411B-4B3B-BEB6-DEC6DCA4C205}"
-	ProjectSection(SolutionItems) = preProject
-		Tools\generate_hashes.ps1 = Tools\generate_hashes.ps1
-	EndProjectSection
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Robust.Shared.Scripting", "RobustToolbox\Robust.Shared.Scripting\Robust.Shared.Scripting.csproj", "{41B450C0-A361-4CD7-8121-7072B8995CFC}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NetSerializer", "RobustToolbox\NetSerializer\NetSerializer\NetSerializer.csproj", "{7B9472D3-79D4-48D1-9B22-BCDE518FE842}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Robust.LoaderApi", "RobustToolbox\Robust.LoaderApi\Robust.LoaderApi\Robust.LoaderApi.csproj", "{1FAE651D-29D8-437A-9864-47CE0D180016}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Robust.Client.NameGenerator", "RobustToolbox\Robust.Client.NameGenerator\Robust.Client.NameGenerator.csproj", "{3CFEB7DB-12C6-46F3-89FC-1450F3016FFA}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Robust.Client.Injectors", "RobustToolbox\Robust.Client.Injectors\Robust.Client.Injectors.csproj", "{8922428F-17C3-47A7-BFE9-570DEB2464DA}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XamlX.IL.Cecil", "RobustToolbox\XamlX\src\XamlX.IL.Cecil\XamlX.IL.Cecil.csproj", "{16F7DE32-0186-44B9-9345-0C20D1BF2422}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "XamlX", "XamlX", "{AFF53804-115F-4E67-B81F-26265EA27880}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XamlX", "RobustToolbox\XamlX\src\XamlX\XamlX.csproj", "{23F09C45-950E-4DB7-A465-E937450FF008}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XamlX.Runtime", "RobustToolbox\XamlX\src\XamlX.Runtime\XamlX.Runtime.csproj", "{440426C1-8DCA-43F6-967F-94439B8DAF47}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Content.Tools", "Content.Tools\Content.Tools.csproj", "{75AB8F8D-9E56-4B12-85E3-E03A852B31CC}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Robust.Analyzers", "RobustToolbox\Robust.Analyzers\Robust.Analyzers.csproj", "{88B0FC0F-7209-40E2-AF16-EB90AF727C5B}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Content.YAMLLinter", "Content.YAMLLinter\Content.YAMLLinter.csproj", "{A59E2FCC-93CF-4886-8EA7-94F021A7475D}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Avalonia.Base", "RobustToolbox\Avalonia.Base\Avalonia.Base.csproj", "{A3C5B00A-D232-4A01-B82E-B0E58BFD5C12}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Robust.Benchmarks", "RobustToolbox\Robust.Benchmarks\Robust.Benchmarks.csproj", "{8A21C7CA-2EB8-40E5-8043-33582C06D139}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Pow3r", "Pow3r\Pow3r.csproj", "{1C048C9F-00A9-4796-BE4D-BB36B7769720}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Content.Shared.Database", "Content.Shared.Database\Content.Shared.Database.csproj", "{8842381D-3426-4BA8-93DA-599AB14D88E9}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Content.MapRenderer", "Content.MapRenderer\Content.MapRenderer.csproj", "{199BBEA1-7627-434B-B6F6-0F52A7C0E1E0}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Robust.Packaging", "RobustToolbox\Robust.Packaging\Robust.Packaging.csproj", "{952AAF2A-DF63-4A7D-8094-3453893EBA80}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Content.Packaging", "Content.Packaging\Content.Packaging.csproj", "{424445D4-F5D9-4CA9-A435-0A36E8AA28F3}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Project Files", "Project Files", "{EC27A16C-9412-4AA6-AE68-CAAB28882802}"
-	ProjectSection(SolutionItems) = preProject
-		.editorconfig = .editorconfig
-		.gitattributes = .gitattributes
-		.gitignore = .gitignore
-		Directory.Packages.props = Directory.Packages.props
-		README.md = README.md
-	EndProjectSection
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Project Files", "Project Files", "{A965CB3B-FD31-44AF-8872-85ABA436098D}"
-	ProjectSection(SolutionItems) = preProject
-		RobustToolbox\Directory.Packages.props = RobustToolbox\Directory.Packages.props
-		RobustToolbox\README.md = RobustToolbox\README.md
-		RobustToolbox\RELEASE-NOTES.md = RobustToolbox\RELEASE-NOTES.md
-	EndProjectSection
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Content.Replay", "Content.Replay\Content.Replay.csproj", "{A493616C-338D-47B7-8072-A7F14D034D0B}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Robust.Shared.CompNetworkGenerator", "RobustToolbox\Robust.Shared.CompNetworkGenerator\Robust.Shared.CompNetworkGenerator.csproj", "{07CA34A1-1D37-4771-A2E3-495A1044AE0B}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Robust.Serialization.Generator", "RobustToolbox\Robust.Serialization.Generator\Robust.Serialization.Generator.csproj", "{6FBF108E-5CB5-47DE-8D7E-B496ABA9E3E2}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Content.PatreonParser", "Content.PatreonParser\Content.PatreonParser.csproj", "{D97D8258-D915-4D1D-B1E3-1A8D00CF9EB5}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Robust.Analyzers.Tests", "RobustToolbox\Robust.Analyzers.Tests\Robust.Analyzers.Tests.csproj", "{83F510FE-9B50-4D96-AFAB-CC13998D6AFE}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Roslyn", "Roslyn", "{7844DA69-B0F0-49FB-A05E-ECA37372277A}"
-	ProjectSection(SolutionItems) = preProject
-		RobustToolbox\Robust.Roslyn.Shared\Robust.Roslyn.Shared.props = RobustToolbox\Robust.Roslyn.Shared\Robust.Roslyn.Shared.props
-	EndProjectSection
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Robust.Xaml", "RobustToolbox\Robust.Xaml\Robust.Xaml.csproj", "{5C05B9B4-6AFE-4884-AA6A-5A26C0FFF2F6}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
-		DebugOpt|Any CPU = DebugOpt|Any CPU
-		Release|Any CPU = Release|Any CPU
-		Tools|Any CPU = Tools|Any CPU
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{26AEEBB3-DDE7-443A-9F43-7BC7F4ACF6B5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{26AEEBB3-DDE7-443A-9F43-7BC7F4ACF6B5}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{26AEEBB3-DDE7-443A-9F43-7BC7F4ACF6B5}.DebugOpt|Any CPU.ActiveCfg = DebugOpt|Any CPU
-		{26AEEBB3-DDE7-443A-9F43-7BC7F4ACF6B5}.DebugOpt|Any CPU.Build.0 = DebugOpt|Any CPU
-		{26AEEBB3-DDE7-443A-9F43-7BC7F4ACF6B5}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{26AEEBB3-DDE7-443A-9F43-7BC7F4ACF6B5}.Release|Any CPU.Build.0 = Release|Any CPU
-		{26AEEBB3-DDE7-443A-9F43-7BC7F4ACF6B5}.Tools|Any CPU.ActiveCfg = Tools|Any CPU
-		{26AEEBB3-DDE7-443A-9F43-7BC7F4ACF6B5}.Tools|Any CPU.Build.0 = Tools|Any CPU
-		{B38DBBD0-04C2-4D1A-84E2-B3446F6ADF2A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B38DBBD0-04C2-4D1A-84E2-B3446F6ADF2A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B38DBBD0-04C2-4D1A-84E2-B3446F6ADF2A}.DebugOpt|Any CPU.ActiveCfg = DebugOpt|Any CPU
-		{B38DBBD0-04C2-4D1A-84E2-B3446F6ADF2A}.DebugOpt|Any CPU.Build.0 = DebugOpt|Any CPU
-		{B38DBBD0-04C2-4D1A-84E2-B3446F6ADF2A}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{B38DBBD0-04C2-4D1A-84E2-B3446F6ADF2A}.Release|Any CPU.Build.0 = Release|Any CPU
-		{B38DBBD0-04C2-4D1A-84E2-B3446F6ADF2A}.Tools|Any CPU.ActiveCfg = Tools|Any CPU
-		{B38DBBD0-04C2-4D1A-84E2-B3446F6ADF2A}.Tools|Any CPU.Build.0 = Tools|Any CPU
-		{A2E5F175-78AF-4DDD-8F97-E2D2552372ED}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A2E5F175-78AF-4DDD-8F97-E2D2552372ED}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A2E5F175-78AF-4DDD-8F97-E2D2552372ED}.DebugOpt|Any CPU.ActiveCfg = DebugOpt|Any CPU
-		{A2E5F175-78AF-4DDD-8F97-E2D2552372ED}.DebugOpt|Any CPU.Build.0 = DebugOpt|Any CPU
-		{A2E5F175-78AF-4DDD-8F97-E2D2552372ED}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{A2E5F175-78AF-4DDD-8F97-E2D2552372ED}.Release|Any CPU.Build.0 = Release|Any CPU
-		{A2E5F175-78AF-4DDD-8F97-E2D2552372ED}.Tools|Any CPU.ActiveCfg = Tools|Any CPU
-		{A2E5F175-78AF-4DDD-8F97-E2D2552372ED}.Tools|Any CPU.Build.0 = Tools|Any CPU
-		{C899FCA4-7037-4E49-ABC2-44DE72487110}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{C899FCA4-7037-4E49-ABC2-44DE72487110}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{C899FCA4-7037-4E49-ABC2-44DE72487110}.DebugOpt|Any CPU.ActiveCfg = DebugOpt|Any CPU
-		{C899FCA4-7037-4E49-ABC2-44DE72487110}.DebugOpt|Any CPU.Build.0 = DebugOpt|Any CPU
-		{C899FCA4-7037-4E49-ABC2-44DE72487110}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{C899FCA4-7037-4E49-ABC2-44DE72487110}.Tools|Any CPU.ActiveCfg = Tools|Any CPU
-		{C899FCA4-7037-4E49-ABC2-44DE72487110}.Tools|Any CPU.Build.0 = Tools|Any CPU
-		{8EDF4429-251A-416D-BB68-93F227191BCF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{8EDF4429-251A-416D-BB68-93F227191BCF}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{8EDF4429-251A-416D-BB68-93F227191BCF}.DebugOpt|Any CPU.ActiveCfg = DebugOpt|Any CPU
-		{8EDF4429-251A-416D-BB68-93F227191BCF}.DebugOpt|Any CPU.Build.0 = DebugOpt|Any CPU
-		{8EDF4429-251A-416D-BB68-93F227191BCF}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{8EDF4429-251A-416D-BB68-93F227191BCF}.Release|Any CPU.Build.0 = Release|Any CPU
-		{8EDF4429-251A-416D-BB68-93F227191BCF}.Tools|Any CPU.ActiveCfg = Tools|Any CPU
-		{8EDF4429-251A-416D-BB68-93F227191BCF}.Tools|Any CPU.Build.0 = Tools|Any CPU
-		{59250BAF-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{59250BAF-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{59250BAF-0000-0000-0000-000000000000}.DebugOpt|Any CPU.ActiveCfg = DebugOpt|Any CPU
-		{59250BAF-0000-0000-0000-000000000000}.DebugOpt|Any CPU.Build.0 = DebugOpt|Any CPU
-		{59250BAF-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{59250BAF-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-		{59250BAF-0000-0000-0000-000000000000}.Tools|Any CPU.ActiveCfg = Tools|Any CPU
-		{59250BAF-0000-0000-0000-000000000000}.Tools|Any CPU.Build.0 = Tools|Any CPU
-		{83429BD6-6358-4B18-BE51-401DF8EA2673}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{83429BD6-6358-4B18-BE51-401DF8EA2673}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{83429BD6-6358-4B18-BE51-401DF8EA2673}.DebugOpt|Any CPU.ActiveCfg = DebugOpt|Any CPU
-		{83429BD6-6358-4B18-BE51-401DF8EA2673}.DebugOpt|Any CPU.Build.0 = DebugOpt|Any CPU
-		{83429BD6-6358-4B18-BE51-401DF8EA2673}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{83429BD6-6358-4B18-BE51-401DF8EA2673}.Release|Any CPU.Build.0 = Release|Any CPU
-		{83429BD6-6358-4B18-BE51-401DF8EA2673}.Tools|Any CPU.ActiveCfg = Tools|Any CPU
-		{83429BD6-6358-4B18-BE51-401DF8EA2673}.Tools|Any CPU.Build.0 = Tools|Any CPU
-		{B04AAE71-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B04AAE71-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B04AAE71-0000-0000-0000-000000000000}.DebugOpt|Any CPU.ActiveCfg = DebugOpt|Any CPU
-		{B04AAE71-0000-0000-0000-000000000000}.DebugOpt|Any CPU.Build.0 = DebugOpt|Any CPU
-		{B04AAE71-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{B04AAE71-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-		{B04AAE71-0000-0000-0000-000000000000}.Tools|Any CPU.ActiveCfg = Tools|Any CPU
-		{B04AAE71-0000-0000-0000-000000000000}.Tools|Any CPU.Build.0 = Tools|Any CPU
-		{93F23A82-00C5-4572-964E-E7C9457726D4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{93F23A82-00C5-4572-964E-E7C9457726D4}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{93F23A82-00C5-4572-964E-E7C9457726D4}.DebugOpt|Any CPU.ActiveCfg = DebugOpt|Any CPU
-		{93F23A82-00C5-4572-964E-E7C9457726D4}.DebugOpt|Any CPU.Build.0 = DebugOpt|Any CPU
-		{93F23A82-00C5-4572-964E-E7C9457726D4}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{93F23A82-00C5-4572-964E-E7C9457726D4}.Release|Any CPU.Build.0 = Release|Any CPU
-		{93F23A82-00C5-4572-964E-E7C9457726D4}.Tools|Any CPU.ActiveCfg = Tools|Any CPU
-		{93F23A82-00C5-4572-964E-E7C9457726D4}.Tools|Any CPU.Build.0 = Tools|Any CPU
-		{F0ADA779-40B8-4F7E-BA6C-CDB19F3065D9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F0ADA779-40B8-4F7E-BA6C-CDB19F3065D9}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F0ADA779-40B8-4F7E-BA6C-CDB19F3065D9}.DebugOpt|Any CPU.ActiveCfg = DebugOpt|Any CPU
-		{F0ADA779-40B8-4F7E-BA6C-CDB19F3065D9}.DebugOpt|Any CPU.Build.0 = DebugOpt|Any CPU
-		{F0ADA779-40B8-4F7E-BA6C-CDB19F3065D9}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{F0ADA779-40B8-4F7E-BA6C-CDB19F3065D9}.Release|Any CPU.Build.0 = Release|Any CPU
-		{F0ADA779-40B8-4F7E-BA6C-CDB19F3065D9}.Tools|Any CPU.ActiveCfg = Tools|Any CPU
-		{F0ADA779-40B8-4F7E-BA6C-CDB19F3065D9}.Tools|Any CPU.Build.0 = Tools|Any CPU
-		{0529F740-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{0529F740-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{0529F740-0000-0000-0000-000000000000}.DebugOpt|Any CPU.ActiveCfg = DebugOpt|Any CPU
-		{0529F740-0000-0000-0000-000000000000}.DebugOpt|Any CPU.Build.0 = DebugOpt|Any CPU
-		{0529F740-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{0529F740-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-		{0529F740-0000-0000-0000-000000000000}.Tools|Any CPU.ActiveCfg = Tools|Any CPU
-		{0529F740-0000-0000-0000-000000000000}.Tools|Any CPU.Build.0 = Tools|Any CPU
-		{AB7AF1C8-30FF-4436-9DF0-179BE5B0C132}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{AB7AF1C8-30FF-4436-9DF0-179BE5B0C132}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{AB7AF1C8-30FF-4436-9DF0-179BE5B0C132}.DebugOpt|Any CPU.ActiveCfg = DebugOpt|Any CPU
-		{AB7AF1C8-30FF-4436-9DF0-179BE5B0C132}.DebugOpt|Any CPU.Build.0 = DebugOpt|Any CPU
-		{AB7AF1C8-30FF-4436-9DF0-179BE5B0C132}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{AB7AF1C8-30FF-4436-9DF0-179BE5B0C132}.Release|Any CPU.Build.0 = Release|Any CPU
-		{AB7AF1C8-30FF-4436-9DF0-179BE5B0C132}.Tools|Any CPU.ActiveCfg = Tools|Any CPU
-		{AB7AF1C8-30FF-4436-9DF0-179BE5B0C132}.Tools|Any CPU.Build.0 = Tools|Any CPU
-		{7AC832A1-2461-4EB5-AC26-26F6AFFA9E46}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{7AC832A1-2461-4EB5-AC26-26F6AFFA9E46}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{7AC832A1-2461-4EB5-AC26-26F6AFFA9E46}.DebugOpt|Any CPU.ActiveCfg = DebugOpt|Any CPU
-		{7AC832A1-2461-4EB5-AC26-26F6AFFA9E46}.DebugOpt|Any CPU.Build.0 = DebugOpt|Any CPU
-		{7AC832A1-2461-4EB5-AC26-26F6AFFA9E46}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{7AC832A1-2461-4EB5-AC26-26F6AFFA9E46}.Release|Any CPU.Build.0 = Release|Any CPU
-		{7AC832A1-2461-4EB5-AC26-26F6AFFA9E46}.Tools|Any CPU.ActiveCfg = Tools|Any CPU
-		{7AC832A1-2461-4EB5-AC26-26F6AFFA9E46}.Tools|Any CPU.Build.0 = Tools|Any CPU
-		{4809F412-3132-419E-BF9D-CCF7593C3533}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{4809F412-3132-419E-BF9D-CCF7593C3533}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{4809F412-3132-419E-BF9D-CCF7593C3533}.DebugOpt|Any CPU.ActiveCfg = DebugOpt|Any CPU
-		{4809F412-3132-419E-BF9D-CCF7593C3533}.DebugOpt|Any CPU.Build.0 = DebugOpt|Any CPU
-		{4809F412-3132-419E-BF9D-CCF7593C3533}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{4809F412-3132-419E-BF9D-CCF7593C3533}.Release|Any CPU.Build.0 = Release|Any CPU
-		{4809F412-3132-419E-BF9D-CCF7593C3533}.Tools|Any CPU.ActiveCfg = Tools|Any CPU
-		{4809F412-3132-419E-BF9D-CCF7593C3533}.Tools|Any CPU.Build.0 = Tools|Any CPU
-		{45C9B43F-305D-4651-9863-F6384CBC847F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{45C9B43F-305D-4651-9863-F6384CBC847F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{45C9B43F-305D-4651-9863-F6384CBC847F}.DebugOpt|Any CPU.ActiveCfg = DebugOpt|Any CPU
-		{45C9B43F-305D-4651-9863-F6384CBC847F}.DebugOpt|Any CPU.Build.0 = DebugOpt|Any CPU
-		{45C9B43F-305D-4651-9863-F6384CBC847F}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{45C9B43F-305D-4651-9863-F6384CBC847F}.Release|Any CPU.Build.0 = Release|Any CPU
-		{45C9B43F-305D-4651-9863-F6384CBC847F}.Tools|Any CPU.ActiveCfg = Tools|Any CPU
-		{45C9B43F-305D-4651-9863-F6384CBC847F}.Tools|Any CPU.Build.0 = Tools|Any CPU
-		{41B450C0-A361-4CD7-8121-7072B8995CFC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{41B450C0-A361-4CD7-8121-7072B8995CFC}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{41B450C0-A361-4CD7-8121-7072B8995CFC}.DebugOpt|Any CPU.ActiveCfg = DebugOpt|Any CPU
-		{41B450C0-A361-4CD7-8121-7072B8995CFC}.DebugOpt|Any CPU.Build.0 = DebugOpt|Any CPU
-		{41B450C0-A361-4CD7-8121-7072B8995CFC}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{41B450C0-A361-4CD7-8121-7072B8995CFC}.Release|Any CPU.Build.0 = Release|Any CPU
-		{41B450C0-A361-4CD7-8121-7072B8995CFC}.Tools|Any CPU.ActiveCfg = Tools|Any CPU
-		{41B450C0-A361-4CD7-8121-7072B8995CFC}.Tools|Any CPU.Build.0 = Tools|Any CPU
-		{7B9472D3-79D4-48D1-9B22-BCDE518FE842}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{7B9472D3-79D4-48D1-9B22-BCDE518FE842}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{7B9472D3-79D4-48D1-9B22-BCDE518FE842}.DebugOpt|Any CPU.ActiveCfg = Debug|Any CPU
-		{7B9472D3-79D4-48D1-9B22-BCDE518FE842}.DebugOpt|Any CPU.Build.0 = Debug|Any CPU
-		{7B9472D3-79D4-48D1-9B22-BCDE518FE842}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{7B9472D3-79D4-48D1-9B22-BCDE518FE842}.Release|Any CPU.Build.0 = Release|Any CPU
-		{7B9472D3-79D4-48D1-9B22-BCDE518FE842}.Tools|Any CPU.ActiveCfg = Release|Any CPU
-		{7B9472D3-79D4-48D1-9B22-BCDE518FE842}.Tools|Any CPU.Build.0 = Release|Any CPU
-		{1FAE651D-29D8-437A-9864-47CE0D180016}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{1FAE651D-29D8-437A-9864-47CE0D180016}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{1FAE651D-29D8-437A-9864-47CE0D180016}.DebugOpt|Any CPU.ActiveCfg = Debug|Any CPU
-		{1FAE651D-29D8-437A-9864-47CE0D180016}.DebugOpt|Any CPU.Build.0 = Debug|Any CPU
-		{1FAE651D-29D8-437A-9864-47CE0D180016}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{1FAE651D-29D8-437A-9864-47CE0D180016}.Release|Any CPU.Build.0 = Release|Any CPU
-		{1FAE651D-29D8-437A-9864-47CE0D180016}.Tools|Any CPU.ActiveCfg = Release|Any CPU
-		{1FAE651D-29D8-437A-9864-47CE0D180016}.Tools|Any CPU.Build.0 = Release|Any CPU
-		{3CFEB7DB-12C6-46F3-89FC-1450F3016FFA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{3CFEB7DB-12C6-46F3-89FC-1450F3016FFA}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{3CFEB7DB-12C6-46F3-89FC-1450F3016FFA}.DebugOpt|Any CPU.ActiveCfg = Debug|Any CPU
-		{3CFEB7DB-12C6-46F3-89FC-1450F3016FFA}.DebugOpt|Any CPU.Build.0 = Debug|Any CPU
-		{3CFEB7DB-12C6-46F3-89FC-1450F3016FFA}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{3CFEB7DB-12C6-46F3-89FC-1450F3016FFA}.Release|Any CPU.Build.0 = Release|Any CPU
-		{3CFEB7DB-12C6-46F3-89FC-1450F3016FFA}.Tools|Any CPU.ActiveCfg = Release|Any CPU
-		{3CFEB7DB-12C6-46F3-89FC-1450F3016FFA}.Tools|Any CPU.Build.0 = Release|Any CPU
-		{8922428F-17C3-47A7-BFE9-570DEB2464DA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{8922428F-17C3-47A7-BFE9-570DEB2464DA}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{8922428F-17C3-47A7-BFE9-570DEB2464DA}.DebugOpt|Any CPU.ActiveCfg = Debug|Any CPU
-		{8922428F-17C3-47A7-BFE9-570DEB2464DA}.DebugOpt|Any CPU.Build.0 = Debug|Any CPU
-		{8922428F-17C3-47A7-BFE9-570DEB2464DA}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{8922428F-17C3-47A7-BFE9-570DEB2464DA}.Release|Any CPU.Build.0 = Release|Any CPU
-		{8922428F-17C3-47A7-BFE9-570DEB2464DA}.Tools|Any CPU.ActiveCfg = Release|Any CPU
-		{8922428F-17C3-47A7-BFE9-570DEB2464DA}.Tools|Any CPU.Build.0 = Release|Any CPU
-		{16F7DE32-0186-44B9-9345-0C20D1BF2422}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{16F7DE32-0186-44B9-9345-0C20D1BF2422}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{16F7DE32-0186-44B9-9345-0C20D1BF2422}.DebugOpt|Any CPU.ActiveCfg = Debug|Any CPU
-		{16F7DE32-0186-44B9-9345-0C20D1BF2422}.DebugOpt|Any CPU.Build.0 = Debug|Any CPU
-		{16F7DE32-0186-44B9-9345-0C20D1BF2422}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{16F7DE32-0186-44B9-9345-0C20D1BF2422}.Release|Any CPU.Build.0 = Release|Any CPU
-		{16F7DE32-0186-44B9-9345-0C20D1BF2422}.Tools|Any CPU.ActiveCfg = Release|Any CPU
-		{16F7DE32-0186-44B9-9345-0C20D1BF2422}.Tools|Any CPU.Build.0 = Release|Any CPU
-		{23F09C45-950E-4DB7-A465-E937450FF008}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{23F09C45-950E-4DB7-A465-E937450FF008}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{23F09C45-950E-4DB7-A465-E937450FF008}.DebugOpt|Any CPU.ActiveCfg = Debug|Any CPU
-		{23F09C45-950E-4DB7-A465-E937450FF008}.DebugOpt|Any CPU.Build.0 = Debug|Any CPU
-		{23F09C45-950E-4DB7-A465-E937450FF008}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{23F09C45-950E-4DB7-A465-E937450FF008}.Release|Any CPU.Build.0 = Release|Any CPU
-		{23F09C45-950E-4DB7-A465-E937450FF008}.Tools|Any CPU.ActiveCfg = Release|Any CPU
-		{23F09C45-950E-4DB7-A465-E937450FF008}.Tools|Any CPU.Build.0 = Release|Any CPU
-		{440426C1-8DCA-43F6-967F-94439B8DAF47}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{440426C1-8DCA-43F6-967F-94439B8DAF47}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{440426C1-8DCA-43F6-967F-94439B8DAF47}.DebugOpt|Any CPU.ActiveCfg = Debug|Any CPU
-		{440426C1-8DCA-43F6-967F-94439B8DAF47}.DebugOpt|Any CPU.Build.0 = Debug|Any CPU
-		{440426C1-8DCA-43F6-967F-94439B8DAF47}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{440426C1-8DCA-43F6-967F-94439B8DAF47}.Release|Any CPU.Build.0 = Release|Any CPU
-		{440426C1-8DCA-43F6-967F-94439B8DAF47}.Tools|Any CPU.ActiveCfg = Release|Any CPU
-		{440426C1-8DCA-43F6-967F-94439B8DAF47}.Tools|Any CPU.Build.0 = Release|Any CPU
-		{75AB8F8D-9E56-4B12-85E3-E03A852B31CC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{75AB8F8D-9E56-4B12-85E3-E03A852B31CC}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{75AB8F8D-9E56-4B12-85E3-E03A852B31CC}.DebugOpt|Any CPU.ActiveCfg = DebugOpt|Any CPU
-		{75AB8F8D-9E56-4B12-85E3-E03A852B31CC}.DebugOpt|Any CPU.Build.0 = DebugOpt|Any CPU
-		{75AB8F8D-9E56-4B12-85E3-E03A852B31CC}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{75AB8F8D-9E56-4B12-85E3-E03A852B31CC}.Release|Any CPU.Build.0 = Release|Any CPU
-		{75AB8F8D-9E56-4B12-85E3-E03A852B31CC}.Tools|Any CPU.ActiveCfg = Tools|Any CPU
-		{75AB8F8D-9E56-4B12-85E3-E03A852B31CC}.Tools|Any CPU.Build.0 = Tools|Any CPU
-		{88B0FC0F-7209-40E2-AF16-EB90AF727C5B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{88B0FC0F-7209-40E2-AF16-EB90AF727C5B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{88B0FC0F-7209-40E2-AF16-EB90AF727C5B}.DebugOpt|Any CPU.ActiveCfg = Debug|Any CPU
-		{88B0FC0F-7209-40E2-AF16-EB90AF727C5B}.DebugOpt|Any CPU.Build.0 = Debug|Any CPU
-		{88B0FC0F-7209-40E2-AF16-EB90AF727C5B}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{88B0FC0F-7209-40E2-AF16-EB90AF727C5B}.Release|Any CPU.Build.0 = Release|Any CPU
-		{88B0FC0F-7209-40E2-AF16-EB90AF727C5B}.Tools|Any CPU.ActiveCfg = Release|Any CPU
-		{88B0FC0F-7209-40E2-AF16-EB90AF727C5B}.Tools|Any CPU.Build.0 = Release|Any CPU
-		{A59E2FCC-93CF-4886-8EA7-94F021A7475D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A59E2FCC-93CF-4886-8EA7-94F021A7475D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A59E2FCC-93CF-4886-8EA7-94F021A7475D}.DebugOpt|Any CPU.ActiveCfg = DebugOpt|Any CPU
-		{A59E2FCC-93CF-4886-8EA7-94F021A7475D}.DebugOpt|Any CPU.Build.0 = DebugOpt|Any CPU
-		{A59E2FCC-93CF-4886-8EA7-94F021A7475D}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{A59E2FCC-93CF-4886-8EA7-94F021A7475D}.Release|Any CPU.Build.0 = Release|Any CPU
-		{A59E2FCC-93CF-4886-8EA7-94F021A7475D}.Tools|Any CPU.ActiveCfg = Tools|Any CPU
-		{A59E2FCC-93CF-4886-8EA7-94F021A7475D}.Tools|Any CPU.Build.0 = Tools|Any CPU
-		{A3C5B00A-D232-4A01-B82E-B0E58BFD5C12}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A3C5B00A-D232-4A01-B82E-B0E58BFD5C12}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A3C5B00A-D232-4A01-B82E-B0E58BFD5C12}.DebugOpt|Any CPU.ActiveCfg = Debug|Any CPU
-		{A3C5B00A-D232-4A01-B82E-B0E58BFD5C12}.DebugOpt|Any CPU.Build.0 = Debug|Any CPU
-		{A3C5B00A-D232-4A01-B82E-B0E58BFD5C12}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{A3C5B00A-D232-4A01-B82E-B0E58BFD5C12}.Release|Any CPU.Build.0 = Release|Any CPU
-		{A3C5B00A-D232-4A01-B82E-B0E58BFD5C12}.Tools|Any CPU.ActiveCfg = Release|Any CPU
-		{A3C5B00A-D232-4A01-B82E-B0E58BFD5C12}.Tools|Any CPU.Build.0 = Release|Any CPU
-		{8A21C7CA-2EB8-40E5-8043-33582C06D139}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{8A21C7CA-2EB8-40E5-8043-33582C06D139}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{8A21C7CA-2EB8-40E5-8043-33582C06D139}.DebugOpt|Any CPU.ActiveCfg = DebugOpt|Any CPU
-		{8A21C7CA-2EB8-40E5-8043-33582C06D139}.DebugOpt|Any CPU.Build.0 = DebugOpt|Any CPU
-		{8A21C7CA-2EB8-40E5-8043-33582C06D139}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{8A21C7CA-2EB8-40E5-8043-33582C06D139}.Release|Any CPU.Build.0 = Release|Any CPU
-		{8A21C7CA-2EB8-40E5-8043-33582C06D139}.Tools|Any CPU.ActiveCfg = Tools|Any CPU
-		{8A21C7CA-2EB8-40E5-8043-33582C06D139}.Tools|Any CPU.Build.0 = Tools|Any CPU
-		{1C048C9F-00A9-4796-BE4D-BB36B7769720}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{1C048C9F-00A9-4796-BE4D-BB36B7769720}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{1C048C9F-00A9-4796-BE4D-BB36B7769720}.DebugOpt|Any CPU.ActiveCfg = DebugOpt|Any CPU
-		{1C048C9F-00A9-4796-BE4D-BB36B7769720}.DebugOpt|Any CPU.Build.0 = DebugOpt|Any CPU
-		{1C048C9F-00A9-4796-BE4D-BB36B7769720}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{1C048C9F-00A9-4796-BE4D-BB36B7769720}.Release|Any CPU.Build.0 = Release|Any CPU
-		{1C048C9F-00A9-4796-BE4D-BB36B7769720}.Tools|Any CPU.ActiveCfg = Tools|Any CPU
-		{1C048C9F-00A9-4796-BE4D-BB36B7769720}.Tools|Any CPU.Build.0 = Tools|Any CPU
-		{8842381D-3426-4BA8-93DA-599AB14D88E9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{8842381D-3426-4BA8-93DA-599AB14D88E9}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{8842381D-3426-4BA8-93DA-599AB14D88E9}.DebugOpt|Any CPU.ActiveCfg = DebugOpt|Any CPU
-		{8842381D-3426-4BA8-93DA-599AB14D88E9}.DebugOpt|Any CPU.Build.0 = DebugOpt|Any CPU
-		{8842381D-3426-4BA8-93DA-599AB14D88E9}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{8842381D-3426-4BA8-93DA-599AB14D88E9}.Release|Any CPU.Build.0 = Release|Any CPU
-		{8842381D-3426-4BA8-93DA-599AB14D88E9}.Tools|Any CPU.ActiveCfg = Tools|Any CPU
-		{8842381D-3426-4BA8-93DA-599AB14D88E9}.Tools|Any CPU.Build.0 = Tools|Any CPU
-		{199BBEA1-7627-434B-B6F6-0F52A7C0E1E0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{199BBEA1-7627-434B-B6F6-0F52A7C0E1E0}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{199BBEA1-7627-434B-B6F6-0F52A7C0E1E0}.DebugOpt|Any CPU.ActiveCfg = DebugOpt|Any CPU
-		{199BBEA1-7627-434B-B6F6-0F52A7C0E1E0}.DebugOpt|Any CPU.Build.0 = DebugOpt|Any CPU
-		{199BBEA1-7627-434B-B6F6-0F52A7C0E1E0}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{199BBEA1-7627-434B-B6F6-0F52A7C0E1E0}.Release|Any CPU.Build.0 = Release|Any CPU
-		{199BBEA1-7627-434B-B6F6-0F52A7C0E1E0}.Tools|Any CPU.ActiveCfg = Tools|Any CPU
-		{199BBEA1-7627-434B-B6F6-0F52A7C0E1E0}.Tools|Any CPU.Build.0 = Tools|Any CPU
-		{952AAF2A-DF63-4A7D-8094-3453893EBA80}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{952AAF2A-DF63-4A7D-8094-3453893EBA80}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{952AAF2A-DF63-4A7D-8094-3453893EBA80}.DebugOpt|Any CPU.ActiveCfg = DebugOpt|Any CPU
-		{952AAF2A-DF63-4A7D-8094-3453893EBA80}.DebugOpt|Any CPU.Build.0 = DebugOpt|Any CPU
-		{952AAF2A-DF63-4A7D-8094-3453893EBA80}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{952AAF2A-DF63-4A7D-8094-3453893EBA80}.Release|Any CPU.Build.0 = Release|Any CPU
-		{952AAF2A-DF63-4A7D-8094-3453893EBA80}.Tools|Any CPU.ActiveCfg = Tools|Any CPU
-		{952AAF2A-DF63-4A7D-8094-3453893EBA80}.Tools|Any CPU.Build.0 = Tools|Any CPU
-		{424445D4-F5D9-4CA9-A435-0A36E8AA28F3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{424445D4-F5D9-4CA9-A435-0A36E8AA28F3}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{424445D4-F5D9-4CA9-A435-0A36E8AA28F3}.DebugOpt|Any CPU.ActiveCfg = DebugOpt|Any CPU
-		{424445D4-F5D9-4CA9-A435-0A36E8AA28F3}.DebugOpt|Any CPU.Build.0 = DebugOpt|Any CPU
-		{424445D4-F5D9-4CA9-A435-0A36E8AA28F3}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{424445D4-F5D9-4CA9-A435-0A36E8AA28F3}.Release|Any CPU.Build.0 = Release|Any CPU
-		{424445D4-F5D9-4CA9-A435-0A36E8AA28F3}.Tools|Any CPU.ActiveCfg = Tools|Any CPU
-		{424445D4-F5D9-4CA9-A435-0A36E8AA28F3}.Tools|Any CPU.Build.0 = Tools|Any CPU
-		{A493616C-338D-47B7-8072-A7F14D034D0B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A493616C-338D-47B7-8072-A7F14D034D0B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A493616C-338D-47B7-8072-A7F14D034D0B}.DebugOpt|Any CPU.ActiveCfg = DebugOpt|Any CPU
-		{A493616C-338D-47B7-8072-A7F14D034D0B}.DebugOpt|Any CPU.Build.0 = DebugOpt|Any CPU
-		{A493616C-338D-47B7-8072-A7F14D034D0B}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{A493616C-338D-47B7-8072-A7F14D034D0B}.Release|Any CPU.Build.0 = Release|Any CPU
-		{A493616C-338D-47B7-8072-A7F14D034D0B}.Tools|Any CPU.ActiveCfg = Tools|Any CPU
-		{A493616C-338D-47B7-8072-A7F14D034D0B}.Tools|Any CPU.Build.0 = Tools|Any CPU
-		{07CA34A1-1D37-4771-A2E3-495A1044AE0B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{07CA34A1-1D37-4771-A2E3-495A1044AE0B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{07CA34A1-1D37-4771-A2E3-495A1044AE0B}.DebugOpt|Any CPU.ActiveCfg = DebugOpt|Any CPU
-		{07CA34A1-1D37-4771-A2E3-495A1044AE0B}.DebugOpt|Any CPU.Build.0 = DebugOpt|Any CPU
-		{07CA34A1-1D37-4771-A2E3-495A1044AE0B}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{07CA34A1-1D37-4771-A2E3-495A1044AE0B}.Release|Any CPU.Build.0 = Release|Any CPU
-		{07CA34A1-1D37-4771-A2E3-495A1044AE0B}.Tools|Any CPU.ActiveCfg = Tools|Any CPU
-		{07CA34A1-1D37-4771-A2E3-495A1044AE0B}.Tools|Any CPU.Build.0 = Tools|Any CPU
-		{6FBF108E-5CB5-47DE-8D7E-B496ABA9E3E2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{6FBF108E-5CB5-47DE-8D7E-B496ABA9E3E2}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{6FBF108E-5CB5-47DE-8D7E-B496ABA9E3E2}.DebugOpt|Any CPU.ActiveCfg = Debug|Any CPU
-		{6FBF108E-5CB5-47DE-8D7E-B496ABA9E3E2}.DebugOpt|Any CPU.Build.0 = Debug|Any CPU
-		{6FBF108E-5CB5-47DE-8D7E-B496ABA9E3E2}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{6FBF108E-5CB5-47DE-8D7E-B496ABA9E3E2}.Release|Any CPU.Build.0 = Release|Any CPU
-		{6FBF108E-5CB5-47DE-8D7E-B496ABA9E3E2}.Tools|Any CPU.ActiveCfg = Debug|Any CPU
-		{6FBF108E-5CB5-47DE-8D7E-B496ABA9E3E2}.Tools|Any CPU.Build.0 = Debug|Any CPU
-		{D97D8258-D915-4D1D-B1E3-1A8D00CF9EB5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{D97D8258-D915-4D1D-B1E3-1A8D00CF9EB5}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D97D8258-D915-4D1D-B1E3-1A8D00CF9EB5}.DebugOpt|Any CPU.ActiveCfg = Debug|Any CPU
-		{D97D8258-D915-4D1D-B1E3-1A8D00CF9EB5}.DebugOpt|Any CPU.Build.0 = Debug|Any CPU
-		{D97D8258-D915-4D1D-B1E3-1A8D00CF9EB5}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{D97D8258-D915-4D1D-B1E3-1A8D00CF9EB5}.Release|Any CPU.Build.0 = Release|Any CPU
-		{D97D8258-D915-4D1D-B1E3-1A8D00CF9EB5}.Tools|Any CPU.ActiveCfg = Debug|Any CPU
-		{D97D8258-D915-4D1D-B1E3-1A8D00CF9EB5}.Tools|Any CPU.Build.0 = Debug|Any CPU
-		{83F510FE-9B50-4D96-AFAB-CC13998D6AFE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{83F510FE-9B50-4D96-AFAB-CC13998D6AFE}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{83F510FE-9B50-4D96-AFAB-CC13998D6AFE}.DebugOpt|Any CPU.ActiveCfg = DebugOpt|Any CPU
-		{83F510FE-9B50-4D96-AFAB-CC13998D6AFE}.DebugOpt|Any CPU.Build.0 = DebugOpt|Any CPU
-		{83F510FE-9B50-4D96-AFAB-CC13998D6AFE}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{83F510FE-9B50-4D96-AFAB-CC13998D6AFE}.Release|Any CPU.Build.0 = Release|Any CPU
-		{83F510FE-9B50-4D96-AFAB-CC13998D6AFE}.Tools|Any CPU.ActiveCfg = Tools|Any CPU
-		{83F510FE-9B50-4D96-AFAB-CC13998D6AFE}.Tools|Any CPU.Build.0 = Tools|Any CPU
-		{5C05B9B4-6AFE-4884-AA6A-5A26C0FFF2F6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{5C05B9B4-6AFE-4884-AA6A-5A26C0FFF2F6}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{5C05B9B4-6AFE-4884-AA6A-5A26C0FFF2F6}.DebugOpt|Any CPU.ActiveCfg = Debug|Any CPU
-		{5C05B9B4-6AFE-4884-AA6A-5A26C0FFF2F6}.DebugOpt|Any CPU.Build.0 = Debug|Any CPU
-		{5C05B9B4-6AFE-4884-AA6A-5A26C0FFF2F6}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{5C05B9B4-6AFE-4884-AA6A-5A26C0FFF2F6}.Release|Any CPU.Build.0 = Release|Any CPU
-		{5C05B9B4-6AFE-4884-AA6A-5A26C0FFF2F6}.Tools|Any CPU.ActiveCfg = Debug|Any CPU
-		{5C05B9B4-6AFE-4884-AA6A-5A26C0FFF2F6}.Tools|Any CPU.Build.0 = Debug|Any CPU
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{C899FCA4-7037-4E49-ABC2-44DE72487110} = {3202E94D-E985-4181-9F69-F458A7F6574F}
-		{59250BAF-0000-0000-0000-000000000000} = {83B4CBBA-547A-42F0-A7CD-8A67D93196CE}
-		{83429BD6-6358-4B18-BE51-401DF8EA2673} = {83B4CBBA-547A-42F0-A7CD-8A67D93196CE}
-		{B04AAE71-0000-0000-0000-000000000000} = {83B4CBBA-547A-42F0-A7CD-8A67D93196CE}
-		{93F23A82-00C5-4572-964E-E7C9457726D4} = {83B4CBBA-547A-42F0-A7CD-8A67D93196CE}
-		{F0ADA779-40B8-4F7E-BA6C-CDB19F3065D9} = {83B4CBBA-547A-42F0-A7CD-8A67D93196CE}
-		{0529F740-0000-0000-0000-000000000000} = {83B4CBBA-547A-42F0-A7CD-8A67D93196CE}
-		{4809F412-3132-419E-BF9D-CCF7593C3533} = {83B4CBBA-547A-42F0-A7CD-8A67D93196CE}
-		{50404922-9637-4394-BF59-165D0850ADC8} = {83B4CBBA-547A-42F0-A7CD-8A67D93196CE}
-		{41B450C0-A361-4CD7-8121-7072B8995CFC} = {83B4CBBA-547A-42F0-A7CD-8A67D93196CE}
-		{7B9472D3-79D4-48D1-9B22-BCDE518FE842} = {83B4CBBA-547A-42F0-A7CD-8A67D93196CE}
-		{1FAE651D-29D8-437A-9864-47CE0D180016} = {83B4CBBA-547A-42F0-A7CD-8A67D93196CE}
-		{8922428F-17C3-47A7-BFE9-570DEB2464DA} = {83B4CBBA-547A-42F0-A7CD-8A67D93196CE}
-		{16F7DE32-0186-44B9-9345-0C20D1BF2422} = {AFF53804-115F-4E67-B81F-26265EA27880}
-		{AFF53804-115F-4E67-B81F-26265EA27880} = {83B4CBBA-547A-42F0-A7CD-8A67D93196CE}
-		{23F09C45-950E-4DB7-A465-E937450FF008} = {AFF53804-115F-4E67-B81F-26265EA27880}
-		{440426C1-8DCA-43F6-967F-94439B8DAF47} = {AFF53804-115F-4E67-B81F-26265EA27880}
-		{A3C5B00A-D232-4A01-B82E-B0E58BFD5C12} = {83B4CBBA-547A-42F0-A7CD-8A67D93196CE}
-		{8A21C7CA-2EB8-40E5-8043-33582C06D139} = {83B4CBBA-547A-42F0-A7CD-8A67D93196CE}
-		{952AAF2A-DF63-4A7D-8094-3453893EBA80} = {83B4CBBA-547A-42F0-A7CD-8A67D93196CE}
-		{A965CB3B-FD31-44AF-8872-85ABA436098D} = {83B4CBBA-547A-42F0-A7CD-8A67D93196CE}
-		{7844DA69-B0F0-49FB-A05E-ECA37372277A} = {83B4CBBA-547A-42F0-A7CD-8A67D93196CE}
-		{3CFEB7DB-12C6-46F3-89FC-1450F3016FFA} = {7844DA69-B0F0-49FB-A05E-ECA37372277A}
-		{6FBF108E-5CB5-47DE-8D7E-B496ABA9E3E2} = {7844DA69-B0F0-49FB-A05E-ECA37372277A}
-		{07CA34A1-1D37-4771-A2E3-495A1044AE0B} = {7844DA69-B0F0-49FB-A05E-ECA37372277A}
-		{88B0FC0F-7209-40E2-AF16-EB90AF727C5B} = {7844DA69-B0F0-49FB-A05E-ECA37372277A}
-		{83F510FE-9B50-4D96-AFAB-CC13998D6AFE} = {7844DA69-B0F0-49FB-A05E-ECA37372277A}
-		{5C05B9B4-6AFE-4884-AA6A-5A26C0FFF2F6} = {83B4CBBA-547A-42F0-A7CD-8A67D93196CE}
-	EndGlobalSection
-	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {AA37ED9F-F8D6-468E-A101-658AD605B09A}
-	EndGlobalSection
-EndGlobal
diff --git a/SpaceStation14.slnx b/SpaceStation14.slnx
new file mode 100644
index 0000000000..5fdcaafd73
--- /dev/null
+++ b/SpaceStation14.slnx
@@ -0,0 +1,168 @@
+<Solution>
+  <Configurations>
+    <BuildType Name="Debug" />
+    <BuildType Name="DebugOpt" />
+    <BuildType Name="Release" />
+    <BuildType Name="Tools" />
+  </Configurations>
+  <Folder Name="/Build Checker/">
+    <Project Path="BuildChecker/BuildChecker.csproj">
+      <Build Solution="Release|*" Project="false" />
+    </Project>
+  </Folder>
+  <Folder Name="/Build/">
+    <File Path="Tools/generate_hashes.ps1" />
+  </Folder>
+  <Folder Name="/MSBuild/">
+    <File Path="MSBuild/Content.props" />
+  </Folder>
+  <Folder Name="/Project Files/">
+    <File Path=".editorconfig" />
+    <File Path=".gitattributes" />
+    <File Path=".gitignore" />
+    <File Path="Directory.Packages.props" />
+    <File Path="README.md" />
+  </Folder>
+  <Project Path="Content.Benchmarks/Content.Benchmarks.csproj" />
+  <Project Path="Content.Client/Content.Client.csproj" />
+  <Project Path="Content.IntegrationTests/Content.IntegrationTests.csproj" />
+  <Project Path="Content.MapRenderer/Content.MapRenderer.csproj" />
+  <Project Path="Content.Packaging/Content.Packaging.csproj" />
+  <Project Path="Content.PatreonParser/Content.PatreonParser.csproj">
+    <BuildType Solution="DebugOpt|*" Project="Debug" />
+    <BuildType Solution="Tools|*" Project="Debug" />
+  </Project>
+  <Project Path="Content.Replay/Content.Replay.csproj" />
+  <Project Path="Content.Server.Database/Content.Server.Database.csproj" />
+  <Project Path="Content.Server/Content.Server.csproj" />
+  <Project Path="Content.Shared.Database/Content.Shared.Database.csproj" />
+  <Project Path="Content.Shared/Content.Shared.csproj" />
+  <Project Path="Content.Tests/Content.Tests.csproj" />
+  <Project Path="Content.Tools/Content.Tools.csproj" />
+  <Project Path="Content.YAMLLinter/Content.YAMLLinter.csproj" />
+  <Project Path="Pow3r/Pow3r.csproj" />
+  <Folder Name="/RobustToolbox/.github/workflows/">
+    <File Path="RobustToolbox/.github/workflows/benchmarks.yml" />
+    <File Path="RobustToolbox/.github/workflows/build-all-configurations.yml" />
+    <File Path="RobustToolbox/.github/workflows/build-docfx.yml" />
+    <File Path="RobustToolbox/.github/workflows/build-test.yml" />
+    <File Path="RobustToolbox/.github/workflows/codeql-analysis.yml" />
+    <File Path="RobustToolbox/.github/workflows/publish-client.yml" />
+    <File Path="RobustToolbox/.github/workflows/test-content.yml" />
+  </Folder>
+  <Folder Name="/RobustToolbox/Imports/">
+    <File Path="RobustToolbox/Imports/Benchmarks.props" />
+    <File Path="RobustToolbox/Imports/Client.props" />
+    <File Path="RobustToolbox/Imports/Lidgren.props" />
+    <File Path="RobustToolbox/Imports/Packaging.props" />
+    <File Path="RobustToolbox/Imports/Server.props" />
+    <File Path="RobustToolbox/Imports/Shared.props" />
+    <File Path="RobustToolbox/Imports/Testing.props" />
+    <File Path="RobustToolbox/Imports/WebView.props" />
+  </Folder>
+  <Folder Name="/RobustToolbox/MSBuild/">
+    <File Path="RobustToolbox/MSBuild/Robust.Analyzers.targets" />
+    <File Path="RobustToolbox/MSBuild/Robust.CompNetworkGenerator.targets" />
+    <File Path="RobustToolbox/MSBuild/Robust.Configurations.props" />
+    <File Path="RobustToolbox/MSBuild/Robust.DefineConstants.targets" />
+    <File Path="RobustToolbox/MSBuild/Robust.Engine.props" />
+    <File Path="RobustToolbox/MSBuild/Robust.Engine.targets" />
+    <File Path="RobustToolbox/MSBuild/Robust.Engine.Version.props" />
+    <File Path="RobustToolbox/MSBuild/Robust.Platform.props" />
+    <File Path="RobustToolbox/MSBuild/Robust.ProjectReferences.targets" />
+    <File Path="RobustToolbox/MSBuild/Robust.Properties.targets" />
+    <File Path="RobustToolbox/MSBuild/Robust.Trimming.targets" />
+    <File Path="RobustToolbox/MSBuild/XamlIL.targets" />
+  </Folder>
+  <Folder Name="/RobustToolbox/NetSerializer/">
+    <Project Path="RobustToolbox/NetSerializer/NetSerializer/NetSerializer.csproj">
+      <BuildType Solution="DebugOpt|*" Project="Debug" />
+      <BuildType Solution="Tools|*" Project="Release" />
+    </Project>
+  </Folder>
+  <Folder Name="/RobustToolbox/Project Files/">
+    <File Path="RobustToolbox/Directory.Build.props" />
+    <File Path="RobustToolbox/Directory.Packages.props" />
+    <File Path="RobustToolbox/README.md" />
+    <File Path="RobustToolbox/RELEASE-NOTES.md" />
+  </Folder>
+  <Folder Name="/RobustToolbox/Robust.LoaderApi/">
+    <Project Path="RobustToolbox/Robust.LoaderApi/Robust.LoaderApi/Robust.LoaderApi.csproj">
+      <BuildType Solution="DebugOpt|*" Project="Debug" />
+      <BuildType Solution="Tools|*" Project="Release" />
+    </Project>
+  </Folder>
+  <Folder Name="/RobustToolbox/Roslyn/">
+    <Project Path="RobustToolbox/Robust.Analyzers.Tests/Robust.Analyzers.Tests.csproj" />
+    <Project Path="RobustToolbox/Robust.Analyzers/Robust.Analyzers.csproj">
+      <BuildType Solution="DebugOpt|*" Project="Debug" />
+      <BuildType Solution="Tools|*" Project="Release" />
+    </Project>
+    <Project Path="RobustToolbox/Robust.Client.NameGenerator/Robust.Client.NameGenerator.csproj">
+      <BuildType Solution="DebugOpt|*" Project="Debug" />
+      <BuildType Solution="Tools|*" Project="Release" />
+    </Project>
+    <Project Path="RobustToolbox/Robust.Serialization.Generator/Robust.Serialization.Generator.csproj">
+      <BuildType Solution="DebugOpt|*" Project="Debug" />
+      <BuildType Solution="Tools|*" Project="Release" />
+    </Project>
+    <Project Path="RobustToolbox/Robust.Shared.CompNetworkGenerator/Robust.Shared.CompNetworkGenerator.csproj">
+      <BuildType Solution="DebugOpt|*" Project="Debug" />
+      <BuildType Solution="Tools|*" Project="Release" />
+    </Project>
+  </Folder>
+  <Folder Name="/RobustToolbox/Tools/">
+    <Project Path="RobustToolbox/Tools/Robust.SolutionGen/Robust.SolutionGen.csproj">
+      <BuildType Solution="DebugOpt|*" Project="Debug" />
+      <BuildType Solution="Tools|*" Project="Release" />
+    </Project>
+  </Folder>
+  <Folder Name="/RobustToolbox/XamlX/">
+    <Project Path="RobustToolbox/XamlX/src/XamlX.IL.Cecil/XamlX.IL.Cecil.csproj">
+      <BuildType Solution="DebugOpt|*" Project="Debug" />
+      <BuildType Solution="Tools|*" Project="Release" />
+    </Project>
+    <Project Path="RobustToolbox/XamlX/src/XamlX.Runtime/XamlX.Runtime.csproj">
+      <BuildType Solution="DebugOpt|*" Project="Debug" />
+      <BuildType Solution="Tools|*" Project="Release" />
+    </Project>
+    <Project Path="RobustToolbox/XamlX/src/XamlX/XamlX.csproj">
+      <BuildType Solution="DebugOpt|*" Project="Debug" />
+      <BuildType Solution="Tools|*" Project="Release" />
+    </Project>
+  </Folder>
+  <Folder Name="/RobustToolbox/">
+    <Project Path="RobustToolbox/Avalonia.Base/Avalonia.Base.csproj">
+      <BuildType Solution="DebugOpt|*" Project="Debug" />
+      <BuildType Solution="Tools|*" Project="Release" />
+    </Project>
+    <Project Path="RobustToolbox/Lidgren.Network/Lidgren.Network.csproj" />
+    <Project Path="RobustToolbox/Robust.Benchmarks/Robust.Benchmarks.csproj" />
+    <Project Path="RobustToolbox/Robust.Client.Injectors/Robust.Client.Injectors.csproj">
+      <BuildType Solution="DebugOpt|*" Project="Debug" />
+      <BuildType Solution="Tools|*" Project="Release" />
+    </Project>
+    <Project Path="RobustToolbox/Robust.Client.IntegrationTests/Robust.Client.IntegrationTests.csproj" />
+    <Project Path="RobustToolbox/Robust.Client.Tests/Robust.Client.Tests.csproj" />
+    <Project Path="RobustToolbox/Robust.Client/Robust.Client.csproj" />
+    <Project Path="RobustToolbox/Robust.Packaging.Tests/Robust.Packaging.Tests.csproj" />
+    <Project Path="RobustToolbox/Robust.Packaging/Robust.Packaging.csproj" />
+    <Project Path="RobustToolbox/Robust.Server.IntegrationTests/Robust.Server.IntegrationTests.csproj" />
+    <Project Path="RobustToolbox/Robust.Server.Testing/Robust.Server.Testing.csproj" />
+    <Project Path="RobustToolbox/Robust.Server/Robust.Server.csproj" />
+    <Project Path="RobustToolbox/Robust.Shared.IntegrationTests/Robust.Shared.IntegrationTests.csproj" />
+    <Project Path="RobustToolbox/Robust.Shared.Maths.Testing/Robust.Shared.Maths.Testing.csproj" />
+    <Project Path="RobustToolbox/Robust.Shared.Maths.Tests/Robust.Shared.Maths.Tests.csproj" />
+    <Project Path="RobustToolbox/Robust.Shared.Maths/Robust.Shared.Maths.csproj" />
+    <Project Path="RobustToolbox/Robust.Shared.Scripting/Robust.Shared.Scripting.csproj" />
+    <Project Path="RobustToolbox/Robust.Shared.Testing/Robust.Shared.Testing.csproj" />
+    <Project Path="RobustToolbox/Robust.Shared.Tests/Robust.Shared.Tests.csproj" />
+    <Project Path="RobustToolbox/Robust.Shared/Robust.Shared.csproj" />
+    <Project Path="RobustToolbox/Robust.UnitTesting/Robust.UnitTesting.csproj" />
+    <Project Path="RobustToolbox/Robust.Xaml/Robust.Xaml.csproj">
+      <BuildType Solution="DebugOpt|*" Project="Debug" />
+      <BuildType Solution="Tools|*" Project="Release" />
+    </Project>
+    <File Path="RobustToolbox/RobustToolbox.slnx" />
+  </Folder>
+</Solution>
\ No newline at end of file
diff --git a/SpaceStation14.sln.DotSettings b/SpaceStation14.slnx.DotSettings
similarity index 100%
rename from SpaceStation14.sln.DotSettings
rename to SpaceStation14.slnx.DotSettings
diff --git a/global.json b/global.json
index cdbb589eda..512142d2be 100644
--- a/global.json
+++ b/global.json
@@ -1,6 +1,6 @@
 {
   "sdk": {
-    "version": "9.0.100",
+    "version": "10.0.100",
     "rollForward": "latestFeature"
   }
 }

From eb41d5010b1ae9d517b258e087d43e6663d775d3 Mon Sep 17 00:00:00 2001
From: Princess Cheeseballs
 <66055347+Princess-Cheeseballs@users.noreply.github.com>
Date: Sun, 21 Dec 2025 18:42:39 -0800
Subject: [PATCH 032/134] Physics Assert in SharedMoverController (#37970)

* Physics asserts and Xenoarch fixes

* Fix blocking asserts

* Alright ready for the test fails

* Fix whitespace issues

* Fix whitespace

* Okay fix whitespace issues for real

* Fix test fails

* Temp fix

* Fix

* Whitespace

* Added a big ass comment

* Right

* A

* Should work

* Debug performance

* Mothership

* fix test fails real

* push

* fix

---------

Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
---
 .../Tests/Buckle/BuckleTest.cs                |  2 ++
 Content.Shared/Blocking/BlockingSystem.cs     |  2 +-
 .../Friction/TileFrictionController.cs        | 20 +++++++++--
 .../Components/BlockMovementComponent.cs      |  9 +++++
 .../SharedInteractionSystem.Blocking.cs       | 18 ++++++++--
 .../Movement/Systems/SharedMoverController.cs | 33 +++++++++++++++++--
 .../Entities/Mobs/Player/admin_ghost.yml      |  1 -
 .../Entities/Mobs/Player/mothershipcore.yml   |  6 ++--
 .../Entities/Mobs/Player/narsie.yml           |  1 -
 .../Entities/Mobs/Player/ratvar.yml           |  1 -
 .../Entities/Objects/Fun/immovable_rod.yml    |  2 ++
 .../Xenoarchaeology/item_xenoartifacts.yml    |  2 +-
 .../structure_xenoartifacts.yml               |  2 ++
 .../Xenoarchaeology/xenoartifacts.yml         |  2 +-
 14 files changed, 85 insertions(+), 16 deletions(-)

diff --git a/Content.IntegrationTests/Tests/Buckle/BuckleTest.cs b/Content.IntegrationTests/Tests/Buckle/BuckleTest.cs
index b90e1bd13c..bbc8b67c53 100644
--- a/Content.IntegrationTests/Tests/Buckle/BuckleTest.cs
+++ b/Content.IntegrationTests/Tests/Buckle/BuckleTest.cs
@@ -31,6 +31,8 @@ namespace Content.IntegrationTests.Tests.Buckle
   - type: Hands
   - type: ComplexInteraction
   - type: InputMover
+  - type: Physics
+    bodyType: KinematicController
   - type: Body
     prototype: Human
   - type: StandingState
diff --git a/Content.Shared/Blocking/BlockingSystem.cs b/Content.Shared/Blocking/BlockingSystem.cs
index 6223f8e840..2e17485bde 100644
--- a/Content.Shared/Blocking/BlockingSystem.cs
+++ b/Content.Shared/Blocking/BlockingSystem.cs
@@ -245,7 +245,7 @@ public sealed partial class BlockingSystem : EntitySystem
         if (TryComp<BlockingUserComponent>(user, out var blockingUserComponent) && TryComp<PhysicsComponent>(user, out var physicsComponent))
         {
             if (xform.Anchored)
-                _transformSystem.Unanchor(user, xform);
+                _transformSystem.Unanchor(user, xform, false);
 
             _actionsSystem.SetToggled(component.BlockingToggleActionEntity, false);
             _fixtureSystem.DestroyFixture(user, BlockingComponent.BlockFixtureID, body: physicsComponent);
diff --git a/Content.Shared/Friction/TileFrictionController.cs b/Content.Shared/Friction/TileFrictionController.cs
index 4b29b9a9de..71c51c55f1 100644
--- a/Content.Shared/Friction/TileFrictionController.cs
+++ b/Content.Shared/Friction/TileFrictionController.cs
@@ -1,7 +1,9 @@
 using System.Numerics;
 using Content.Shared.CCVar;
 using Content.Shared.Gravity;
+using Content.Shared.Interaction.Components;
 using Content.Shared.Interaction.Events;
+using Content.Shared.Movement.Components;
 using Content.Shared.Movement.Events;
 using Content.Shared.Movement.Pulling.Components;
 using Content.Shared.Movement.Systems;
@@ -14,6 +16,7 @@ using Robust.Shared.Physics.Components;
 using Robust.Shared.Physics.Controllers;
 using Robust.Shared.Physics.Dynamics;
 using Robust.Shared.Physics.Systems;
+using Robust.Shared.Utility;
 
 namespace Content.Shared.Friction
 {
@@ -26,11 +29,14 @@ namespace Content.Shared.Friction
         [Dependency] private readonly SharedMapSystem _map = default!;
 
         private EntityQuery<TileFrictionModifierComponent> _frictionQuery;
-        private EntityQuery<TransformComponent> _xformQuery;
         private EntityQuery<PullerComponent> _pullerQuery;
         private EntityQuery<PullableComponent> _pullableQuery;
         private EntityQuery<MapGridComponent> _gridQuery;
 
+        // For debug purposes only
+        private EntityQuery<InputMoverComponent> _moverQuery;
+        private EntityQuery<BlockMovementComponent> _blockMoverQuery;
+
         private float _frictionModifier;
         private float _minDamping;
         private float _airDamping;
@@ -45,10 +51,11 @@ namespace Content.Shared.Friction
             Subs.CVar(_configManager, CCVars.AirFriction, value => _airDamping = value, true);
             Subs.CVar(_configManager, CCVars.OffgridFriction, value => _offGridDamping = value, true);
             _frictionQuery = GetEntityQuery<TileFrictionModifierComponent>();
-            _xformQuery = GetEntityQuery<TransformComponent>();
             _pullerQuery = GetEntityQuery<PullerComponent>();
             _pullableQuery = GetEntityQuery<PullableComponent>();
             _gridQuery = GetEntityQuery<MapGridComponent>();
+            _moverQuery = GetEntityQuery<InputMoverComponent>();
+            _blockMoverQuery = GetEntityQuery<BlockMovementComponent>();
         }
 
         public override void UpdateBeforeSolve(bool prediction, float frameTime)
@@ -107,7 +114,16 @@ namespace Content.Shared.Friction
                 PhysicsSystem.SetAngularDamping(uid, body, friction);
 
                 if (body.BodyType != BodyType.KinematicController)
+                {
+                    /*
+                     * Extra catch for input movers that may be temporarily unable to move for whatever reason.
+                     * Block movement shouldn't be added and removed frivolously so it should be reliable to use this
+                     * as a check for brains and such which have input mover purely for ghosting behavior.
+                     */
+                    DebugTools.Assert(!_moverQuery.HasComp(uid) || _blockMoverQuery.HasComp(uid),
+                        $"Input mover: {ToPrettyString(uid)} in TileFrictionController is not the correct BodyType, BodyType found: {body.BodyType}, expected: KinematicController.");
                     continue;
+                }
 
                 // Physics engine doesn't apply damping to Kinematic Controllers so we have to do it here.
                 // BEWARE YE TRAVELLER:
diff --git a/Content.Shared/Interaction/Components/BlockMovementComponent.cs b/Content.Shared/Interaction/Components/BlockMovementComponent.cs
index 2125f16efe..a40e2b9e3c 100644
--- a/Content.Shared/Interaction/Components/BlockMovementComponent.cs
+++ b/Content.Shared/Interaction/Components/BlockMovementComponent.cs
@@ -8,6 +8,15 @@ namespace Content.Shared.Interaction.Components;
 [RegisterComponent, NetworkedComponent]
 public sealed partial class BlockMovementComponent : Component
 {
+    /// <summary>
+    /// Blocks generic interactions such as container insertion, pick up, drop and such.
+    /// </summary>
     [DataField]
     public bool BlockInteraction = true;
+
+    /// <summary>
+    /// Blocks being able to use entities.
+    /// </summary>
+    [DataField]
+    public bool BlockUse = true;
 }
diff --git a/Content.Shared/Interaction/SharedInteractionSystem.Blocking.cs b/Content.Shared/Interaction/SharedInteractionSystem.Blocking.cs
index f6f4d8605d..5d566b850e 100644
--- a/Content.Shared/Interaction/SharedInteractionSystem.Blocking.cs
+++ b/Content.Shared/Interaction/SharedInteractionSystem.Blocking.cs
@@ -17,10 +17,10 @@ public partial class SharedInteractionSystem
     private void InitializeBlocking()
     {
         SubscribeLocalEvent<BlockMovementComponent, UpdateCanMoveEvent>(OnMoveAttempt);
-        SubscribeLocalEvent<BlockMovementComponent, UseAttemptEvent>(CancelEvent);
+        SubscribeLocalEvent<BlockMovementComponent, UseAttemptEvent>(CancelUseEvent);
         SubscribeLocalEvent<BlockMovementComponent, InteractionAttemptEvent>(CancelInteractEvent);
-        SubscribeLocalEvent<BlockMovementComponent, DropAttemptEvent>(CancelEvent);
-        SubscribeLocalEvent<BlockMovementComponent, PickupAttemptEvent>(CancelEvent);
+        SubscribeLocalEvent<BlockMovementComponent, DropAttemptEvent>(CancellableInteractEvent);
+        SubscribeLocalEvent<BlockMovementComponent, PickupAttemptEvent>(CancellableInteractEvent);
         SubscribeLocalEvent<BlockMovementComponent, ChangeDirectionAttemptEvent>(CancelEvent);
 
         SubscribeLocalEvent<BlockMovementComponent, ComponentStartup>(OnBlockingStartup);
@@ -33,6 +33,12 @@ public partial class SharedInteractionSystem
             args.Cancelled = true;
     }
 
+    private void CancelUseEvent(Entity<BlockMovementComponent> ent, ref UseAttemptEvent args)
+    {
+        if (ent.Comp.BlockUse)
+            args.Cancel();
+    }
+
     private void OnMoveAttempt(EntityUid uid, BlockMovementComponent component, UpdateCanMoveEvent args)
     {
         // If we're relaying then don't cancel.
@@ -42,6 +48,12 @@ public partial class SharedInteractionSystem
         args.Cancel(); // no more scurrying around
     }
 
+    private void CancellableInteractEvent(EntityUid uid, BlockMovementComponent component, CancellableEntityEventArgs args)
+    {
+        if (component.BlockInteraction)
+            args.Cancel();
+    }
+
     private void CancelEvent(EntityUid uid, BlockMovementComponent component, CancellableEntityEventArgs args)
     {
         args.Cancel();
diff --git a/Content.Shared/Movement/Systems/SharedMoverController.cs b/Content.Shared/Movement/Systems/SharedMoverController.cs
index ff034a9c07..b3607b8463 100644
--- a/Content.Shared/Movement/Systems/SharedMoverController.cs
+++ b/Content.Shared/Movement/Systems/SharedMoverController.cs
@@ -20,6 +20,7 @@ using Robust.Shared.Map.Components;
 using Robust.Shared.Physics;
 using Robust.Shared.Physics.Components;
 using Robust.Shared.Physics.Controllers;
+using Robust.Shared.Physics.Events;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Timing;
 using Robust.Shared.Utility;
@@ -102,6 +103,8 @@ public abstract partial class SharedMoverController : VirtualController
 
         SubscribeLocalEvent<MovementSpeedModifierComponent, TileFrictionEvent>(OnTileFriction);
         SubscribeLocalEvent<InputMoverComponent, ComponentStartup>(OnMoverStartup);
+        SubscribeLocalEvent<InputMoverComponent, PhysicsBodyTypeChangedEvent>(OnPhysicsBodyChanged);
+        SubscribeLocalEvent<InputMoverComponent, UpdateCanMoveEvent>(OnCanMove);
 
         InitializeInput();
         InitializeRelay();
@@ -207,6 +210,21 @@ public abstract partial class SharedMoverController : VirtualController
             return;
         }
 
+        /*
+         * This assert is here because any entity using inputs to move should be a Kinematic Controller.
+         * Kinematic Controllers are not built to use the entirety of the Physics engine by intention and
+         * setting an input mover to Dynamic will cause the Physics engine to occasionally throw asserts.
+         * In addition, SharedMoverController applies its own forms of fake impulses and friction outside
+         * Physics simulation, which will cause issues for Dynamic bodies (Such as Friction being applied twice).
+         * Kinematic bodies have even less Physics options and as such aren't suitable for a player, especially
+         * when we move to Box2D v3 where there will be more support for players updating outside of simulation.
+         * Lastly, static bodies can't move so they shouldn't be updated. If a static body makes it here we're
+         * doing unnecessary calculations.
+         * Only a Kinematic Controller should be making it to this point.
+         */
+        DebugTools.Assert(physicsComponent.BodyType == BodyType.KinematicController,
+            $"Input mover: {ToPrettyString(uid)} in HandleMobMovement is not the correct BodyType, BodyType found: {physicsComponent.BodyType}, expected: KinematicController.");
+
         // If the body is in air but isn't weightless then it can't move
         var weightless = _gravity.IsWeightless(uid);
         var inAirHelpless = false;
@@ -344,8 +362,7 @@ public abstract partial class SharedMoverController : VirtualController
             if (!weightless && MobMoverQuery.TryGetComponent(uid, out var mobMover) &&
                 TryGetSound(weightless, uid, mover, mobMover, xform, out var sound, tileDef: tileDef))
             {
-                var soundModifier = mover.Sprinting ? InputMoverComponent.SprintingSoundModifier
-                    : InputMoverComponent.WalkingSoundModifier;
+                var soundModifier = mover.Sprinting ? InputMoverComponent.SprintingSoundModifier : InputMoverComponent.WalkingSoundModifier;
 
                 var audioParams = sound.Params
                     .WithVolume(sound.Params.Volume + soundModifier)
@@ -642,4 +659,16 @@ public abstract partial class SharedMoverController : VirtualController
         else
             args.Modifier *= ent.Comp.BaseFriction;
     }
+
+    private void OnPhysicsBodyChanged(Entity<InputMoverComponent> entity, ref PhysicsBodyTypeChangedEvent args)
+    {
+        _blocker.UpdateCanMove(entity);
+    }
+
+    private void OnCanMove(Entity<InputMoverComponent> entity, ref UpdateCanMoveEvent args)
+    {
+        // If we don't have a physics component, or have a static body type then we can't move.
+        if (!PhysicsQuery.TryComp(entity, out var body) || body.BodyType == BodyType.Static)
+            args.Cancel();
+    }
 }
diff --git a/Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml b/Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml
index e5fdfe7336..088c0f3ba1 100644
--- a/Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml
+++ b/Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml
@@ -37,7 +37,6 @@
   - type: CombatMode
   - type: Physics
     ignorePaused: true
-    bodyType: Kinematic
   - type: Access
     groups:
     - AllAccess
diff --git a/Resources/Prototypes/Entities/Mobs/Player/mothershipcore.yml b/Resources/Prototypes/Entities/Mobs/Player/mothershipcore.yml
index 9e681dca87..f5897fd2c9 100644
--- a/Resources/Prototypes/Entities/Mobs/Player/mothershipcore.yml
+++ b/Resources/Prototypes/Entities/Mobs/Player/mothershipcore.yml
@@ -5,9 +5,9 @@
   description: A sentient machine that can produce Xenoborgs. Without this the Xenoborgs are doomed.
   components:
   - type: InputMover # needs this to pilot the mothership
-  - type: MovementSpeedModifier
-    baseWalkSpeed : 0 # shouldn't move
-    baseSprintSpeed : 0 # shouldn't move
+  - type: BlockMovement # They should never be moving!
+    blockInteraction: false
+    blockUse: false
   - type: Appearance
   - type: WiresVisuals
   - type: Damageable
diff --git a/Resources/Prototypes/Entities/Mobs/Player/narsie.yml b/Resources/Prototypes/Entities/Mobs/Player/narsie.yml
index f2b81f796c..e9bda23d15 100644
--- a/Resources/Prototypes/Entities/Mobs/Player/narsie.yml
+++ b/Resources/Prototypes/Entities/Mobs/Player/narsie.yml
@@ -84,7 +84,6 @@
     - Syndicate
     globalReceive: true
   - type: Physics
-    bodyType: Dynamic
     bodyStatus: InAir
   - type: CanMoveInAir
   # singulose components
diff --git a/Resources/Prototypes/Entities/Mobs/Player/ratvar.yml b/Resources/Prototypes/Entities/Mobs/Player/ratvar.yml
index 658f14a6d4..2da87d0d34 100644
--- a/Resources/Prototypes/Entities/Mobs/Player/ratvar.yml
+++ b/Resources/Prototypes/Entities/Mobs/Player/ratvar.yml
@@ -80,7 +80,6 @@
     - Syndicate
     globalReceive: true
   - type: Physics
-    bodyType: Dynamic
     bodyStatus: InAir
   - type: CanMoveInAir
   - type: EventHorizon
diff --git a/Resources/Prototypes/Entities/Objects/Fun/immovable_rod.yml b/Resources/Prototypes/Entities/Objects/Fun/immovable_rod.yml
index 15f67245f1..5fe9a6a68e 100644
--- a/Resources/Prototypes/Entities/Objects/Fun/immovable_rod.yml
+++ b/Resources/Prototypes/Entities/Objects/Fun/immovable_rod.yml
@@ -80,6 +80,8 @@
     damage:
       types:
         Blunt: 190
+  - type: Physics
+    bodyType: KinematicController
   - type: InputMover
   - type: MovementSpeedModifier
     baseWeightlessAcceleration: 5
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Xenoarchaeology/item_xenoartifacts.yml b/Resources/Prototypes/Entities/Objects/Specific/Xenoarchaeology/item_xenoartifacts.yml
index 83a04a809b..31daa0f4e0 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Xenoarchaeology/item_xenoartifacts.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Xenoarchaeology/item_xenoartifacts.yml
@@ -20,7 +20,7 @@
       map: [ "enum.ArtifactsVisualLayers.ActivationEffect" ]
       visible: false
   - type: Physics
-    bodyType: Dynamic
+    bodyType: KinematicController
   - type: CollisionWake
     enabled: false
   - type: InteractionOutline
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Xenoarchaeology/structure_xenoartifacts.yml b/Resources/Prototypes/Entities/Objects/Specific/Xenoarchaeology/structure_xenoartifacts.yml
index 8edbbd71f4..7d85e375b2 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Xenoarchaeology/structure_xenoartifacts.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Xenoarchaeology/structure_xenoartifacts.yml
@@ -19,6 +19,8 @@
     - state: artifact-activation
       map: [ "enum.ArtifactsVisualLayers.ActivationEffect" ]
       visible: false
+  - type: Physics
+    bodyType: KinematicController
   - type: RandomArtifactSprite
     maxSprite: 36
   - type: RandomSprite
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Xenoarchaeology/xenoartifacts.yml b/Resources/Prototypes/Entities/Objects/Specific/Xenoarchaeology/xenoartifacts.yml
index c634e86912..265e93d720 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Xenoarchaeology/xenoartifacts.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Xenoarchaeology/xenoartifacts.yml
@@ -29,7 +29,7 @@
   - type: Damageable
   - type: Actions
   - type: Physics
-    bodyType: Dynamic
+    bodyType: KinematicController
   - type: MovementSpeedModifier
     baseWalkSpeed: 0.25
     baseSprintSpeed: 0.5

From f59ef4b986bba91c5755c9dc6fcdf9a82581e2fe Mon Sep 17 00:00:00 2001
From: Milon <milonpl.git@proton.me>
Date: Mon, 22 Dec 2025 08:59:30 +0100
Subject: [PATCH 033/134] fix solution contents duplication on spill behavior
 (#33231)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* I’M SCREAMING INTO THE VOID AND IT’S NOT LISTENING

* review

* explodes pancakes with mind

* graaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa

* Meteors RAAAAAAAAAAH

* I'm so tired of solutions

* whhop

* revert

---------

Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
---
 Content.Client/Fluids/PuddleSystem.cs         | 14 +++-
 .../Thresholds/Behaviors/SpillBehavior.cs     | 64 +++++++++----------
 .../EntitySystems/PuddleSystem.Spillable.cs   | 13 +---
 .../Fluids/EntitySystems/PuddleSystem.cs      | 47 ++++++++++----
 Content.Shared/Fluids/SharedPuddleSystem.cs   | 13 +++-
 .../PressurizedSolutionSystem.cs              |  4 +-
 6 files changed, 93 insertions(+), 62 deletions(-)

diff --git a/Content.Client/Fluids/PuddleSystem.cs b/Content.Client/Fluids/PuddleSystem.cs
index 1ab1ded3e8..ab96d24d85 100644
--- a/Content.Client/Fluids/PuddleSystem.cs
+++ b/Content.Client/Fluids/PuddleSystem.cs
@@ -73,7 +73,19 @@ public sealed class PuddleSystem : SharedPuddleSystem
     // Maybe someday we'll have clientside prediction for entity spawning, but not today.
     // Until then, these methods do nothing on the client.
     /// <inheritdoc/>
-    public override bool TrySplashSpillAt(EntityUid uid, EntityCoordinates coordinates, Solution solution, out EntityUid puddleUid, bool sound = true, EntityUid? user = null)
+    public override bool TrySplashSpillAt(Entity<SpillableComponent?> entity, EntityCoordinates coordinates, out EntityUid puddleUid, out Solution solution, bool sound = true, EntityUid? user = null)
+    {
+        puddleUid = EntityUid.Invalid;
+        solution = new Solution();
+        return false;
+    }
+
+    public override bool TrySplashSpillAt(EntityUid entity,
+        EntityCoordinates coordinates,
+        Solution spilled,
+        out EntityUid puddleUid,
+        bool sound = true,
+        EntityUid? user = null)
     {
         puddleUid = EntityUid.Invalid;
         return false;
diff --git a/Content.Server/Destructible/Thresholds/Behaviors/SpillBehavior.cs b/Content.Server/Destructible/Thresholds/Behaviors/SpillBehavior.cs
index ff050ce2cd..ad34f05edd 100644
--- a/Content.Server/Destructible/Thresholds/Behaviors/SpillBehavior.cs
+++ b/Content.Server/Destructible/Thresholds/Behaviors/SpillBehavior.cs
@@ -1,42 +1,38 @@
-using Content.Shared.Chemistry.EntitySystems;
 using Content.Server.Fluids.EntitySystems;
-using Content.Shared.Fluids.Components;
+using Content.Shared.Chemistry.EntitySystems;
 using JetBrains.Annotations;
 
-namespace Content.Server.Destructible.Thresholds.Behaviors
+namespace Content.Server.Destructible.Thresholds.Behaviors;
+
+[UsedImplicitly]
+[DataDefinition]
+public sealed partial class SpillBehavior : IThresholdBehavior
 {
-    [UsedImplicitly]
-    [DataDefinition]
-    public sealed partial class SpillBehavior : IThresholdBehavior
+    /// <summary>
+    /// Optional fallback solution name if SpillableComponent is not present.
+    /// </summary>
+    [DataField]
+    public string? Solution;
+
+    /// <summary>
+    /// When triggered, spills the entity's solution onto the ground.
+    /// Will first try to use the solution from a SpillableComponent if present,
+    /// otherwise falls back to the solution specified in the behavior's data fields.
+    /// The solution is properly drained/split before spilling to prevent double-spilling with other behaviors.
+    /// </summary>
+    /// <param name="owner">Entity whose solution will be spilled</param>
+    /// <param name="system">System calling this behavior</param>
+    /// <param name="cause">Optional entity that caused this behavior to trigger</param>
+    public void Execute(EntityUid owner, DestructibleSystem system, EntityUid? cause = null)
     {
-        [DataField]
-        public string? Solution;
+        var puddleSystem = system.EntityManager.System<PuddleSystem>();
+        var solutionContainer = system.EntityManager.System<SharedSolutionContainerSystem>();
+        var coordinates = system.EntityManager.GetComponent<TransformComponent>(owner).Coordinates;
 
-        /// <summary>
-        /// If there is a SpillableComponent on EntityUidowner use it to create a puddle/smear.
-        /// Or whatever solution is specified in the behavior itself.
-        /// If none are available do nothing.
-        /// </summary>
-        /// <param name="owner">Entity on which behavior is executed</param>
-        /// <param name="system">system calling the behavior</param>
-        /// <param name="cause"></param>
-        public void Execute(EntityUid owner, DestructibleSystem system, EntityUid? cause = null)
-        {
-            var solutionContainerSystem = system.EntityManager.System<SharedSolutionContainerSystem>();
-            var spillableSystem = system.EntityManager.System<PuddleSystem>();
-
-            var coordinates = system.EntityManager.GetComponent<TransformComponent>(owner).Coordinates;
-
-            if (system.EntityManager.TryGetComponent(owner, out SpillableComponent? spillableComponent) &&
-                solutionContainerSystem.TryGetSolution(owner, spillableComponent.SolutionName, out _, out var compSolution))
-            {
-                spillableSystem.TrySplashSpillAt(owner, coordinates, compSolution, out _, false, user: cause);
-            }
-            else if (Solution != null &&
-                     solutionContainerSystem.TryGetSolution(owner, Solution, out _, out var behaviorSolution))
-            {
-                spillableSystem.TrySplashSpillAt(owner, coordinates, behaviorSolution, out _, user: cause);
-            }
-        }
+        // Spill the solution that was drained/split
+        if (solutionContainer.TryGetSolution(owner, Solution, out _, out var solution))
+            puddleSystem.TrySplashSpillAt(owner, coordinates, solution, out _, false, cause);
+        else
+            puddleSystem.TrySplashSpillAt(owner, coordinates, out _, out _, false, cause);
     }
 }
diff --git a/Content.Server/Fluids/EntitySystems/PuddleSystem.Spillable.cs b/Content.Server/Fluids/EntitySystems/PuddleSystem.Spillable.cs
index 01526d4ee5..e632d6efb3 100644
--- a/Content.Server/Fluids/EntitySystems/PuddleSystem.Spillable.cs
+++ b/Content.Server/Fluids/EntitySystems/PuddleSystem.Spillable.cs
@@ -29,23 +29,14 @@ public sealed partial class PuddleSystem
 
     private void SpillOnLand(Entity<SpillableComponent> entity, ref LandEvent args)
     {
-        if (!_solutionContainerSystem.TryGetSolution(entity.Owner, entity.Comp.SolutionName, out var soln, out var solution))
+        if (!entity.Comp.SpillWhenThrown || Openable.IsClosed(entity.Owner))
             return;
 
-        if (Openable.IsClosed(entity.Owner))
-            return;
-
-        if (!entity.Comp.SpillWhenThrown)
-            return;
-
-        if (args.User != null)
+        if (TrySplashSpillAt(entity.Owner, Transform(entity).Coordinates, out _, out var solution) && args.User != null)
         {
             AdminLogger.Add(LogType.Landed,
                 $"{ToPrettyString(entity.Owner):entity} spilled a solution {SharedSolutionContainerSystem.ToPrettyString(solution):solution} on landing");
         }
-
-        var drainedSolution = _solutionContainerSystem.Drain(entity.Owner, soln.Value, solution.Volume);
-        TrySplashSpillAt(entity.Owner, Transform(entity).Coordinates, drainedSolution, out _);
     }
 
     private void OnDoAfter(Entity<SpillableComponent> entity, ref SpillDoAfterEvent args)
diff --git a/Content.Server/Fluids/EntitySystems/PuddleSystem.cs b/Content.Server/Fluids/EntitySystems/PuddleSystem.cs
index 2f966354ec..c756a8e696 100644
--- a/Content.Server/Fluids/EntitySystems/PuddleSystem.cs
+++ b/Content.Server/Fluids/EntitySystems/PuddleSystem.cs
@@ -369,16 +369,37 @@ public sealed partial class PuddleSystem : SharedPuddleSystem
 
     // TODO: This can be predicted once https://github.com/space-wizards/RobustToolbox/pull/5849 is merged
     /// <inheritdoc/>
-    public override bool TrySplashSpillAt(EntityUid uid,
+    public override bool TrySplashSpillAt(Entity<SpillableComponent?> entity,
         EntityCoordinates coordinates,
-        Solution solution,
+        out EntityUid puddleUid,
+        out Solution spilled,
+        bool sound = true,
+        EntityUid? user = null)
+    {
+        puddleUid = EntityUid.Invalid;
+        spilled = new Solution();
+
+        if (!Resolve(entity, ref entity.Comp))
+            return false;
+
+        if (!_solutionContainerSystem.TryGetSolution(entity.Owner, entity.Comp.SolutionName, out var solution))
+            return false;
+
+        spilled = solution.Value.Comp.Solution;
+
+        return TrySplashSpillAt(entity, coordinates, spilled, out puddleUid, sound, user);
+    }
+
+    public override bool TrySplashSpillAt(EntityUid entity,
+        EntityCoordinates coordinates,
+        Solution spilled,
         out EntityUid puddleUid,
         bool sound = true,
         EntityUid? user = null)
     {
         puddleUid = EntityUid.Invalid;
 
-        if (solution.Volume == 0)
+        if (spilled.Volume == 0)
             return false;
 
         var targets = new List<EntityUid>();
@@ -392,26 +413,28 @@ public sealed partial class PuddleSystem : SharedPuddleSystem
             var owner = ent.Owner;
 
             // between 5 and 30%
-            var splitAmount = solution.Volume * _random.NextFloat(0.05f, 0.30f);
-            var splitSolution = solution.SplitSolution(splitAmount);
+            var splitAmount = spilled.Volume * _random.NextFloat(0.05f, 0.30f);
+            var splitSolution = spilled.SplitSolution(splitAmount);
 
             if (user != null)
             {
                 AdminLogger.Add(LogType.Landed,
-                    $"{ToPrettyString(user.Value):user} threw {ToPrettyString(uid):entity} which splashed a solution {SharedSolutionContainerSystem.ToPrettyString(solution):solution} onto {ToPrettyString(owner):target}");
+                    $"{ToPrettyString(user.Value):user} threw {ToPrettyString(entity):entity} which splashed a solution {SharedSolutionContainerSystem.ToPrettyString(spilled):solution} onto {ToPrettyString(owner):target}");
             }
 
             targets.Add(owner);
             Reactive.DoEntityReaction(owner, splitSolution, ReactionMethod.Touch);
-            Popups.PopupEntity(
-                Loc.GetString("spill-land-spilled-on-other", ("spillable", uid),
-                    ("target", Identity.Entity(owner, EntityManager))), owner, PopupType.SmallCaution);
+            Popups.PopupEntity(Loc.GetString("spill-land-spilled-on-other",
+                    ("spillable", entity),
+                    ("target", Identity.Entity(owner, EntityManager))),
+                owner,
+                PopupType.SmallCaution);
         }
 
-        _color.RaiseEffect(solution.GetColor(_prototypeManager), targets,
-            Filter.Pvs(uid, entityManager: EntityManager));
+        _color.RaiseEffect(spilled.GetColor(_prototypeManager), targets,
+            Filter.Pvs(entity, entityManager: EntityManager));
 
-        return TrySpillAt(coordinates, solution, out puddleUid, sound);
+        return TrySpillAt(coordinates, spilled, out puddleUid, sound);
     }
 
     /// <inheritdoc/>
diff --git a/Content.Shared/Fluids/SharedPuddleSystem.cs b/Content.Shared/Fluids/SharedPuddleSystem.cs
index e81d1c9d11..8f87734717 100644
--- a/Content.Shared/Fluids/SharedPuddleSystem.cs
+++ b/Content.Shared/Fluids/SharedPuddleSystem.cs
@@ -354,6 +354,15 @@ public abstract partial class SharedPuddleSystem : EntitySystem
     }
 
     #region Spill
+
+    /// <inheritdoc cref="TrySplashSpillAt(EntityUid,EntityCoordinates,Solution,out EntityUid,bool,EntityUid?)"/>
+    public abstract bool TrySplashSpillAt(Entity<SpillableComponent?> entity,
+        EntityCoordinates coordinates,
+        out EntityUid puddleUid,
+        out Solution spilled,
+        bool sound = true,
+        EntityUid? user = null);
+
     // These methods are in Shared to make it easier to interact with PuddleSystem in Shared code.
     // Note that they always fail when run on the client, not creating a puddle and returning false.
     // Adding proper prediction to this system would require spawning temporary puddle entities on the
@@ -367,9 +376,9 @@ public abstract partial class SharedPuddleSystem : EntitySystem
     /// <remarks>
     /// On the client, this will always set <paramref name="puddleUid"/> to <see cref="EntityUid.Invalid"/> and return false.
     /// </remarks>
-    public abstract bool TrySplashSpillAt(EntityUid uid,
+    public abstract bool TrySplashSpillAt(EntityUid entity,
         EntityCoordinates coordinates,
-        Solution solution,
+        Solution spilled,
         out EntityUid puddleUid,
         bool sound = true,
         EntityUid? user = null);
diff --git a/Content.Shared/Nutrition/EntitySystems/PressurizedSolutionSystem.cs b/Content.Shared/Nutrition/EntitySystems/PressurizedSolutionSystem.cs
index 82d90f4c92..9a0e3e79fa 100644
--- a/Content.Shared/Nutrition/EntitySystems/PressurizedSolutionSystem.cs
+++ b/Content.Shared/Nutrition/EntitySystems/PressurizedSolutionSystem.cs
@@ -179,8 +179,8 @@ public sealed partial class PressurizedSolutionSystem : EntitySystem
         var solution = _solutionContainer.SplitSolution(soln.Value, interactions.Volume);
 
         // Spray the solution onto the ground and anyone nearby
-        if (TryComp(entity, out TransformComponent? transform))
-            _puddle.TrySplashSpillAt(entity, transform.Coordinates, solution, out _, sound: false);
+        var coordinates = Transform(entity).Coordinates;
+        _puddle.TrySplashSpillAt(entity.Owner, coordinates, out _, out _, sound: false);
 
         var drinkName = Identity.Entity(entity, EntityManager);
 

From 853570662ea781818030a46ffc9d0928e09fe82d Mon Sep 17 00:00:00 2001
From: PJBot <pieterjan.briers+bot@gmail.com>
Date: Mon, 22 Dec 2025 08:13:45 +0000
Subject: [PATCH 034/134] 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 d5614581e7..cc09c8c790 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -1,12 +1,4 @@
 Entries:
-- author: alexalexmax
-  changes:
-  - message: Updated the syndicate throwing knives uplink entry to include the fact
-      that they ignore armor.
-    type: Tweak
-  id: 8826
-  time: '2025-08-04T19:19:20.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/39374
 - author: TrixxedHeart
   changes:
   - message: Added canes to the trinkets loadout tab.
@@ -3935,3 +3927,10 @@
   id: 9325
   time: '2025-12-22T00:46:26.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/41933
+- author: MilonPL
+  changes:
+  - message: Fixed beaker solutions duplicating whenever it's thrown.
+    type: Fix
+  id: 9326
+  time: '2025-12-22T08:12:37.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/33231

From b436e2a937235c72c317cdf3be7fbc4cab3048cd Mon Sep 17 00:00:00 2001
From: eoineoineoin <helloworld@eoinrul.es>
Date: Mon, 22 Dec 2025 16:41:02 +0000
Subject: [PATCH 035/134] Fix missing scrollbars in Admin Player List window
 (#40525)

* Fix missing scrollbars in Admin Player List window

* Revert "Fix missing scrollbars in Admin Player List window"

This reverts commit c5aea1a0550deb1d1d7aae4e2dec964e93d2d8ae.

* Invalidate cached item height when item generation callback changes
---
 .../UserInterface/Controls/ListContainer.cs          | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/Content.Client/UserInterface/Controls/ListContainer.cs b/Content.Client/UserInterface/Controls/ListContainer.cs
index 53dddf110c..cf9ad681e5 100644
--- a/Content.Client/UserInterface/Controls/ListContainer.cs
+++ b/Content.Client/UserInterface/Controls/ListContainer.cs
@@ -28,7 +28,16 @@ public class ListContainer : Control
     /// 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<ListData, ListContainerButton>? GenerateItem
+    {
+        get => _generateItem;
+        set {
+            _generateItem = value;
+            // Invalidate _itemHeight so we recalculate the size of children the next
+            // time PopulateList() is called
+            _itemHeight = 0;
+        }
+    }
 
     /// <inheritdoc cref="BaseButton.OnPressed"/>
     public Action<BaseButton.ButtonEventArgs, ListData>? ItemPressed;
@@ -59,6 +68,7 @@ public class ListContainer : Control
     private bool _updateChildren = false;
     private bool _suppressScrollValueChanged;
     private ButtonGroup? _buttonGroup;
+    public Action<ListData, ListContainerButton>? _generateItem;
 
     public int ScrollSpeedY { get; set; } = 50;
 

From 347a728ab7d58f2a493cdc155dcd727599f8e881 Mon Sep 17 00:00:00 2001
From: PJBot <pieterjan.briers+bot@gmail.com>
Date: Mon, 22 Dec 2025 16:55:39 +0000
Subject: [PATCH 036/134] 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 6cb1369a68..20e0055a3c 100644
--- a/Resources/Changelog/Admin.yml
+++ b/Resources/Changelog/Admin.yml
@@ -1567,5 +1567,12 @@ Entries:
   id: 190
   time: '2025-12-20T18:23:43.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/41911
+- author: eoineoineoin
+  changes:
+  - message: Fix bug where scrollbars were missing from player list
+    type: Fix
+  id: 191
+  time: '2025-12-22T16:54:32.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/40525
 Name: Admin
 Order: 3

From dde01f746f81e3381f3a16f2eae560d699ffe3f7 Mon Sep 17 00:00:00 2001
From: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com>
Date: Mon, 22 Dec 2025 08:43:02 -0800
Subject: [PATCH 037/134] Basic Dynamic Power Consumption Systems (#41885)

* init commit

* Addr reviews
---
 .../Tests/Power/PowerStateTest.cs             | 186 ++++++++++++++++++
 .../Power/Components/PowerStateComponent.cs   |  32 +++
 .../Power/Components/UIPowerStateComponent.cs |  16 ++
 .../Power/EntitySystems/PowerStateSystem.cs   |  44 +++++
 .../Power/EntitySystems/UIPowerStateSystem.cs |  46 +++++
 5 files changed, 324 insertions(+)
 create mode 100644 Content.IntegrationTests/Tests/Power/PowerStateTest.cs
 create mode 100644 Content.Shared/Power/Components/PowerStateComponent.cs
 create mode 100644 Content.Shared/Power/Components/UIPowerStateComponent.cs
 create mode 100644 Content.Shared/Power/EntitySystems/PowerStateSystem.cs
 create mode 100644 Content.Shared/Power/EntitySystems/UIPowerStateSystem.cs

diff --git a/Content.IntegrationTests/Tests/Power/PowerStateTest.cs b/Content.IntegrationTests/Tests/Power/PowerStateTest.cs
new file mode 100644
index 0000000000..dec398212d
--- /dev/null
+++ b/Content.IntegrationTests/Tests/Power/PowerStateTest.cs
@@ -0,0 +1,186 @@
+using Content.Shared.Coordinates;
+using Content.Shared.Power.Components;
+using Content.Shared.Power.EntitySystems;
+using Robust.Shared.GameObjects;
+using Robust.Shared.Map;
+using Robust.Shared.Maths;
+
+namespace Content.IntegrationTests.Tests.Power;
+
+[TestFixture]
+public sealed class PowerStateTest
+{
+    [TestPrototypes]
+    private const string Prototypes = @"
+- type: entity
+  id: PowerStateApcReceiverDummy
+  components:
+  - type: ApcPowerReceiver
+  - type: ExtensionCableReceiver
+  - type: Transform
+    anchored: true
+  - type: PowerState
+    isWorking: false
+    idlePowerDraw: 10
+    workingPowerDraw: 50
+";
+
+    /// <summary>
+    /// Asserts that switching from idle to working updates the power receiver load to the working draw.
+    /// </summary>
+    [Test]
+    public async Task SetWorkingState_IdleToWorking_UpdatesLoad()
+    {
+        await using var pair = await PoolManager.GetServerClient();
+        var server = pair.Server;
+
+        var mapManager = server.ResolveDependency<IMapManager>();
+        var entManager = server.ResolveDependency<IEntityManager>();
+        var mapSys = entManager.System<SharedMapSystem>();
+
+        await server.WaitAssertion(() =>
+        {
+            mapSys.CreateMap(out var mapId);
+            var grid = mapManager.CreateGridEntity(mapId);
+
+            mapSys.SetTile(grid, Vector2i.Zero, new Tile(1));
+
+            var ent = entManager.SpawnEntity("PowerStateApcReceiverDummy", grid.Owner.ToCoordinates());
+
+            var receiver = entManager.GetComponent<Server.Power.Components.ApcPowerReceiverComponent>(ent);
+            var powerState = entManager.GetComponent<PowerStateComponent>(ent);
+
+            Assert.Multiple(() =>
+            {
+                Assert.That(powerState.IsWorking, Is.False);
+                Assert.That(receiver.Load, Is.EqualTo(powerState.IdlePowerDraw).Within(0.01f));
+            });
+
+            var system = entManager.System<PowerStateSystem>();
+            system.SetWorkingState((ent, powerState), true);
+
+            Assert.Multiple(() =>
+            {
+                Assert.That(powerState.IsWorking, Is.True);
+                Assert.That(receiver.Load, Is.EqualTo(powerState.WorkingPowerDraw).Within(0.01f));
+            });
+        });
+
+        await pair.CleanReturnAsync();
+    }
+
+    /// <summary>
+    /// Asserts that switching from working to idle updates the power receiver load to the idle draw.
+    /// </summary>
+    [Test]
+    public async Task SetWorkingState_WorkingToIdle_UpdatesLoad()
+    {
+        await using var pair = await PoolManager.GetServerClient();
+        var server = pair.Server;
+
+        var mapManager = server.ResolveDependency<IMapManager>();
+        var entManager = server.ResolveDependency<IEntityManager>();
+        var mapSys = entManager.System<SharedMapSystem>();
+
+        await server.WaitAssertion(() =>
+        {
+            mapSys.CreateMap(out var mapId);
+            var grid = mapManager.CreateGridEntity(mapId);
+
+            mapSys.SetTile(grid, Vector2i.Zero, new Tile(1));
+
+            var ent = entManager.SpawnEntity("PowerStateApcReceiverDummy", grid.Owner.ToCoordinates());
+
+            var receiver = entManager.GetComponent<Server.Power.Components.ApcPowerReceiverComponent>(ent);
+            var powerState = entManager.GetComponent<PowerStateComponent>(ent);
+            var system = entManager.System<PowerStateSystem>();
+            Entity<PowerStateComponent> newEnt = (ent, powerState);
+
+            Assert.Multiple(() =>
+            {
+                Assert.That(powerState.IsWorking, Is.False);
+                Assert.That(receiver.Load, Is.EqualTo(powerState.IdlePowerDraw).Within(0.01f));
+            });
+
+            system.SetWorkingState(newEnt, true);
+
+            Assert.Multiple(() =>
+            {
+                Assert.That(powerState.IsWorking, Is.True);
+                Assert.That(receiver.Load, Is.EqualTo(powerState.WorkingPowerDraw).Within(0.01f));
+            });
+
+            system.SetWorkingState(newEnt, false);
+
+            Assert.Multiple(() =>
+            {
+                Assert.That(powerState.IsWorking, Is.False);
+                Assert.That(receiver.Load, Is.EqualTo(powerState.IdlePowerDraw).Within(0.01f));
+            });
+        });
+
+        await pair.CleanReturnAsync();
+    }
+
+    /// <summary>
+    /// Asserts that setting the working state to the current state does not change the power receiver load.
+    /// </summary>
+    [Test]
+    public async Task SetWorkingState_AlreadyInState_NoChange()
+    {
+        await using var pair = await PoolManager.GetServerClient();
+        var server = pair.Server;
+
+        var mapManager = server.ResolveDependency<IMapManager>();
+        var entManager = server.ResolveDependency<IEntityManager>();
+        var mapSys = entManager.System<SharedMapSystem>();
+
+        await server.WaitAssertion(() =>
+        {
+            mapSys.CreateMap(out var mapId);
+            var grid = mapManager.CreateGridEntity(mapId);
+
+            mapSys.SetTile(grid, Vector2i.Zero, new Tile(1));
+
+            var ent = entManager.SpawnEntity("PowerStateApcReceiverDummy", grid.Owner.ToCoordinates());
+
+            var receiver = entManager.GetComponent<Server.Power.Components.ApcPowerReceiverComponent>(ent);
+            var powerState = entManager.GetComponent<PowerStateComponent>(ent);
+            var system = entManager.System<PowerStateSystem>();
+            Entity<PowerStateComponent> valueTuple = (ent, powerState);
+
+            Assert.Multiple(() =>
+            {
+                Assert.That(powerState.IsWorking, Is.False);
+                Assert.That(receiver.Load, Is.EqualTo(powerState.IdlePowerDraw).Within(0.01f));
+            });
+
+            system.SetWorkingState(valueTuple, false);
+
+            Assert.Multiple(() =>
+            {
+                Assert.That(powerState.IsWorking, Is.False);
+                Assert.That(receiver.Load, Is.EqualTo(powerState.IdlePowerDraw).Within(0.01f));
+            });
+
+            system.SetWorkingState(valueTuple, true);
+
+            Assert.Multiple(() =>
+            {
+                Assert.That(powerState.IsWorking, Is.True);
+                Assert.That(receiver.Load, Is.EqualTo(powerState.WorkingPowerDraw).Within(0.01f));
+            });
+
+            system.SetWorkingState(valueTuple, true);
+
+            Assert.Multiple(() =>
+            {
+                Assert.That(powerState.IsWorking, Is.True);
+                Assert.That(receiver.Load, Is.EqualTo(powerState.WorkingPowerDraw).Within(0.01f));
+            });
+        });
+
+        await pair.CleanReturnAsync();
+    }
+}
+
diff --git a/Content.Shared/Power/Components/PowerStateComponent.cs b/Content.Shared/Power/Components/PowerStateComponent.cs
new file mode 100644
index 0000000000..d1fc0d2aeb
--- /dev/null
+++ b/Content.Shared/Power/Components/PowerStateComponent.cs
@@ -0,0 +1,32 @@
+namespace Content.Shared.Power.Components;
+
+/// <summary>
+/// Generic component for giving entities "idle" and "working" power states.
+/// </summary>
+/// <remarks><para>Entities that have more complex power draw
+/// (ex. a thermomachine whose heating power is directly tied to its power consumption)
+/// should just directly set their load on the <see cref="SharedApcPowerReceiverComponent"/>.</para>
+///
+/// <para>This is also applicable if you would like to add
+/// more complex power behavior that is tied to a generic component.</para></remarks>
+[RegisterComponent]
+public sealed partial class PowerStateComponent : Component
+{
+    /// <summary>
+    /// Whether the entity is currently in the working state.
+    /// </summary>
+    [DataField]
+    public bool IsWorking;
+
+    /// <summary>
+    /// The idle power draw of this entity when not working, in watts.
+    /// </summary>
+    [DataField]
+    public float IdlePowerDraw = 20f;
+
+    /// <summary>
+    /// The working power draw of this entity when working, in watts.
+    /// </summary>
+    [DataField]
+    public float WorkingPowerDraw = 350f;
+}
diff --git a/Content.Shared/Power/Components/UIPowerStateComponent.cs b/Content.Shared/Power/Components/UIPowerStateComponent.cs
new file mode 100644
index 0000000000..9210f63c55
--- /dev/null
+++ b/Content.Shared/Power/Components/UIPowerStateComponent.cs
@@ -0,0 +1,16 @@
+namespace Content.Shared.Power.Components;
+
+/// <summary>
+/// Component for entities that want to increase their power usage to a working state when
+/// a UI on the machine is open. Requires <see cref="PowerStateComponent"/>.
+/// </summary>
+[RegisterComponent]
+public sealed partial class UIPowerStateComponent : Component
+{
+    /// <summary>
+    /// List of UI keys that will trigger the working state.
+    /// If null, any UI open will trigger the working state.
+    /// </summary>
+    [DataField]
+    public List<Enum>? Keys;
+}
diff --git a/Content.Shared/Power/EntitySystems/PowerStateSystem.cs b/Content.Shared/Power/EntitySystems/PowerStateSystem.cs
new file mode 100644
index 0000000000..dd47708d2d
--- /dev/null
+++ b/Content.Shared/Power/EntitySystems/PowerStateSystem.cs
@@ -0,0 +1,44 @@
+using Content.Shared.Power.Components;
+using JetBrains.Annotations;
+
+namespace Content.Shared.Power.EntitySystems;
+
+/// <summary>
+/// Generic system that handles entities with <see cref="PowerStateComponent"/>.
+/// Used for simple machines that only need to switch between "idle" and "working" power states.
+/// </summary>
+public sealed class PowerStateSystem : EntitySystem
+{
+    [Dependency] private readonly SharedPowerReceiverSystem _powerReceiverSystem = default!;
+
+    private EntityQuery<PowerStateComponent> _powerStateQuery;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<PowerStateComponent, ComponentStartup>(OnComponentStartup);
+
+        _powerStateQuery = GetEntityQuery<PowerStateComponent>();
+    }
+
+    private void OnComponentStartup(Entity<PowerStateComponent> ent, ref ComponentStartup args)
+    {
+        SetWorkingState(ent.Owner, ent.Comp.IsWorking);
+    }
+
+    /// <summary>
+    /// Sets the working state of the entity, adjusting its power draw accordingly.
+    /// </summary>
+    /// <param name="ent">The entity to set the working state for.</param>
+    /// <param name="working">Whether the entity should be in the working state.</param>
+    [PublicAPI]
+    public void SetWorkingState(Entity<PowerStateComponent?> ent, bool working)
+    {
+        if (!_powerStateQuery.Resolve(ent, ref ent.Comp))
+            return;
+
+        _powerReceiverSystem.SetLoad(ent.Owner, working ? ent.Comp.WorkingPowerDraw : ent.Comp.IdlePowerDraw);
+        ent.Comp.IsWorking = working;
+    }
+}
diff --git a/Content.Shared/Power/EntitySystems/UIPowerStateSystem.cs b/Content.Shared/Power/EntitySystems/UIPowerStateSystem.cs
new file mode 100644
index 0000000000..bf2d08adbf
--- /dev/null
+++ b/Content.Shared/Power/EntitySystems/UIPowerStateSystem.cs
@@ -0,0 +1,46 @@
+using Content.Shared.Power.Components;
+
+namespace Content.Shared.Power.EntitySystems;
+
+/// <summary>
+/// System for entities with <see cref="UIPowerStateComponent"/>.
+/// Entities with this component will increase their power usage to a working state
+/// when a UI on the entity is open.
+/// </summary>
+public sealed class UIPowerStateSystem : EntitySystem
+{
+    [Dependency] private readonly SharedUserInterfaceSystem _ui = default!;
+    [Dependency] private readonly PowerStateSystem _powerState = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<UIPowerStateComponent, BoundUIOpenedEvent>(OnUiOpened);
+        SubscribeLocalEvent<UIPowerStateComponent, BoundUIClosedEvent>(OnUiClosed);
+    }
+
+    private void OnUiClosed(Entity<UIPowerStateComponent> ent, ref BoundUIClosedEvent args)
+    {
+        if (ent.Comp.Keys is null)
+        {
+            if (_ui.IsAnyUiOpen(ent.Owner))
+                return;
+        }
+        else
+        {
+            if (_ui.IsUiOpen(ent.Owner, ent.Comp.Keys))
+                return;
+        }
+
+        _powerState.SetWorkingState(ent.Owner, false);
+    }
+
+    private void OnUiOpened(Entity<UIPowerStateComponent> ent, ref BoundUIOpenedEvent args)
+    {
+        if (ent.Comp.Keys is not null && !ent.Comp.Keys.Contains(args.UiKey))
+            return;
+
+        _powerState.SetWorkingState(ent.Owner, true);
+    }
+}

From 8b8f621b8c16da663596b60153e60c8a54b1678d Mon Sep 17 00:00:00 2001
From: JohnJohn <189290423+JohnJJohn@users.noreply.github.com>
Date: Mon, 22 Dec 2025 16:57:51 +0000
Subject: [PATCH 038/134] Allow cable coils to be destroyed (#41279)

Add damageable and destructible types to cable coils
---
 .../Prototypes/Entities/Objects/Tools/cable_coils.yml | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/Resources/Prototypes/Entities/Objects/Tools/cable_coils.yml b/Resources/Prototypes/Entities/Objects/Tools/cable_coils.yml
index d8b05addca..0fa0d6aa57 100644
--- a/Resources/Prototypes/Entities/Objects/Tools/cable_coils.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/cable_coils.yml
@@ -33,6 +33,17 @@
     guides:
     - VoltageNetworks
     - Power
+  - type: Damageable
+    damageContainer: Inorganic
+    damageModifierSet: Metallic
+  - type: Destructible
+    thresholds:
+    - trigger:
+        !type:DamageTrigger
+        damage: 50
+      behaviors:
+      - !type:DoActsBehavior
+        acts: ["Destruction"]
 
 - type: entity
   id: CableHVStack

From 28fd00b7ea503674fdabe9ad8f0276d35ee956c3 Mon Sep 17 00:00:00 2001
From: PJBot <pieterjan.briers+bot@gmail.com>
Date: Mon, 22 Dec 2025 17:12:41 +0000
Subject: [PATCH 039/134] 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 cc09c8c790..f8e387257c 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -1,14 +1,4 @@
 Entries:
-- author: TrixxedHeart
-  changes:
-  - message: Added canes to the trinkets loadout tab.
-    type: Add
-  - message: Added offset canes for roleplay flair. They can be crafted in the medical
-      lathe.
-    type: Add
-  id: 8827
-  time: '2025-08-04T23:39:40.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/39272
 - author: qwerltaz
   changes:
   - message: The air alarm window scrubber controller now has buttons to select and
@@ -3934,3 +3924,10 @@
   id: 9326
   time: '2025-12-22T08:12:37.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/33231
+- author: JohnJJohn
+  changes:
+  - message: Cable items, such as wire coils can now be destroyed.
+    type: Tweak
+  id: 9327
+  time: '2025-12-22T17:11:34.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/41279

From 760463a67a8b06e0fad30e30c36530e988f04e44 Mon Sep 17 00:00:00 2001
From: Crude Oil <124208219+CroilBird@users.noreply.github.com>
Date: Mon, 22 Dec 2025 22:01:56 +0100
Subject: [PATCH 040/134] Port FTL arrival effect fix from
 https://github.com/new-frontiers-14/frontier-station-14/pull/3495 (#41951)

Port FTL arrival fix from https://github.com/new-frontiers-14/frontier-station-14/pull/3495
---
 Content.Server/Shuttles/Systems/DockingSystem.Shuttle.cs | 3 ++-
 Resources/Prototypes/Entities/Effects/shuttle.yml        | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/Content.Server/Shuttles/Systems/DockingSystem.Shuttle.cs b/Content.Server/Shuttles/Systems/DockingSystem.Shuttle.cs
index 5e3029333e..57ebf13e73 100644
--- a/Content.Server/Shuttles/Systems/DockingSystem.Shuttle.cs
+++ b/Content.Server/Shuttles/Systems/DockingSystem.Shuttle.cs
@@ -203,7 +203,8 @@ public sealed partial class DockingSystem
                     var spawnPosition = new EntityCoordinates(targetGridXform.MapUid!.Value, _transform.ToMapCoordinates(gridPosition).Position);
 
                     // TODO: use tight bounds
-                    var dockedBounds = new Box2Rotated(shuttleAABB.Translated(spawnPosition.Position), targetAngle, spawnPosition.Position);
+                    var targetWorldAngle = (targetGridAngle + targetAngle).Reduced();
+                    var dockedBounds = new Box2Rotated(shuttleAABB.Translated(spawnPosition.Position), targetWorldAngle, spawnPosition.Position);
 
                     // Check if there's no intersecting grids (AKA oh god it's docking at cargo).
                     grids.Clear();
diff --git a/Resources/Prototypes/Entities/Effects/shuttle.yml b/Resources/Prototypes/Entities/Effects/shuttle.yml
index 4dae76a48a..9b1fc1e4c3 100644
--- a/Resources/Prototypes/Entities/Effects/shuttle.yml
+++ b/Resources/Prototypes/Entities/Effects/shuttle.yml
@@ -4,7 +4,7 @@
   description: Visualizer for shuttles arriving. You shouldn't see this!
   components:
   - type: Transform
-    noRot: true
+    noRot: false
     gridTraversal: false
   - type: FtlVisualizer
     sprite:

From cabf9d51246ba29a516ca3339c48ca7fe9e8afc8 Mon Sep 17 00:00:00 2001
From: PJBot <pieterjan.briers+bot@gmail.com>
Date: Mon, 22 Dec 2025 21:16:46 +0000
Subject: [PATCH 041/134] 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 f8e387257c..861a0ecba4 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -1,12 +1,4 @@
 Entries:
-- author: qwerltaz
-  changes:
-  - message: The air alarm window scrubber controller now has buttons to select and
-      deselect all gases.
-    type: Add
-  id: 8828
-  time: '2025-08-05T00:34:10.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/39296
 - author: perryprog
   changes:
   - message: Players no longer have the ability to cycle a timer in the verb menu
@@ -3931,3 +3923,11 @@
   id: 9327
   time: '2025-12-22T17:11:34.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/41279
+- author: whatston3, Crude Oil
+  changes:
+  - message: FTL Arrival visualization displays properly again when arriving at a
+      dock
+    type: Fix
+  id: 9328
+  time: '2025-12-22T21:15:36.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/41951

From 5363a9f2faa047611c1d043f4028e5fa229e17fc Mon Sep 17 00:00:00 2001
From: imatsoup <93290208+imatsoup@users.noreply.github.com>
Date: Tue, 23 Dec 2025 04:30:22 +0000
Subject: [PATCH 042/134] Update debug backpacks to use the proper suffix
 (#41959)

Update backpacks.yml
---
 Resources/Prototypes/Entities/Clothing/Back/backpacks.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Resources/Prototypes/Entities/Clothing/Back/backpacks.yml b/Resources/Prototypes/Entities/Clothing/Back/backpacks.yml
index b5d0692a0b..4f2a4550b9 100644
--- a/Resources/Prototypes/Entities/Clothing/Back/backpacks.yml
+++ b/Resources/Prototypes/Entities/Clothing/Back/backpacks.yml
@@ -364,7 +364,7 @@
   id: ClothingBackpackDebug
   name: wackpack
   description: What the fuck is this?
-  suffix: Debug
+  suffix: DEBUG
   components:
   - type: Storage
     grid:
@@ -380,7 +380,7 @@
   id: ClothingBackpackDebug2
   name: big wackpack
   description: What the fuck is this?
-  suffix: Debug
+  suffix: DEBUG
   components:
   - type: Storage
     grid:
@@ -391,7 +391,7 @@
   id: ClothingBackpackDebug3
   name: gay wackpack
   description: What the fuck is this?
-  suffix: Debug
+  suffix: DEBUG
   components:
   - type: Storage
     grid:
@@ -412,7 +412,7 @@
   id: ClothingBackpackDebug4
   name: offset wackpack
   description: What the fuck is this?
-  suffix: Debug
+  suffix: DEBUG
   components:
   - type: Storage
     grid:

From 3a3707d2a2283ebb3f202708c98f9ba52ee499a7 Mon Sep 17 00:00:00 2001
From: Kowlin <10947836+Kowlin@users.noreply.github.com>
Date: Tue, 23 Dec 2025 06:59:36 +0100
Subject: [PATCH 043/134] Fix Setgamepreset (#41963)

---
 Content.Server/GameTicking/Commands/SetGamePresetCommand.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Content.Server/GameTicking/Commands/SetGamePresetCommand.cs b/Content.Server/GameTicking/Commands/SetGamePresetCommand.cs
index 894460fe3f..5c02dea513 100644
--- a/Content.Server/GameTicking/Commands/SetGamePresetCommand.cs
+++ b/Content.Server/GameTicking/Commands/SetGamePresetCommand.cs
@@ -17,7 +17,7 @@ namespace Content.Server.GameTicking.Commands
 
         public void Execute(IConsoleShell shell, string argStr, string[] args)
         {
-            if (args.Length is <= 1 or >= 3)
+            if (args.Length is < 1 or > 3)
             {
                 shell.WriteError(Loc.GetString("shell-need-between-arguments", ("lower", 1), ("upper", 3), ("currentAmount", args.Length)));
                 return;

From 0ed5619e8bd85d39e3d7f635a859d9984da6bd9e Mon Sep 17 00:00:00 2001
From: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com>
Date: Tue, 23 Dec 2025 00:12:52 -0800
Subject: [PATCH 044/134] Fix atmos devices not correctly reffing the changed
 atmos (#41585)

---
 .../Tests/Atmos/AtmosMonitoringTest.cs        | 130 +++++++++++++++++
 .../AtmosphereSystem.Commands.cs              | 138 ++++++++++--------
 .../AtmosphereSystem.Processing.cs            |   5 +
 .../EntitySystems/AtmosphereSystem.Utils.cs   |  21 ++-
 .../Atmos/EntitySystems/AtmosphereSystem.cs   |   2 +-
 .../Monitor/Systems/AtmosMonitoringSystem.cs  |   7 +
 .../Components/AtmosDeviceTileChangedEvent.cs |   9 ++
 7 files changed, 246 insertions(+), 66 deletions(-)
 create mode 100644 Content.IntegrationTests/Tests/Atmos/AtmosMonitoringTest.cs
 create mode 100644 Content.Shared/Atmos/Piping/Components/AtmosDeviceTileChangedEvent.cs

diff --git a/Content.IntegrationTests/Tests/Atmos/AtmosMonitoringTest.cs b/Content.IntegrationTests/Tests/Atmos/AtmosMonitoringTest.cs
new file mode 100644
index 0000000000..83d7b9be53
--- /dev/null
+++ b/Content.IntegrationTests/Tests/Atmos/AtmosMonitoringTest.cs
@@ -0,0 +1,130 @@
+using System.Numerics;
+using Content.Server.Atmos.Monitor.Components;
+using Content.Shared.Atmos;
+using Robust.Shared.Console;
+using Robust.Shared.Map;
+using Robust.Shared.Maths;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Utility;
+
+namespace Content.IntegrationTests.Tests.Atmos;
+
+/// <summary>
+/// Test for determining that an AtmosMonitoringComponent/System correctly references
+/// the GasMixture of the tile it is on if the tile's GasMixture ever changes.
+/// </summary>
+[TestOf(typeof(Atmospherics))]
+public sealed class AtmosMonitoringTest : AtmosTest
+{
+    // We can just reuse the dP test, I just want a grid.
+    protected override ResPath? TestMapPath => new("Maps/Test/Atmospherics/DeltaPressure/deltapressuretest.yml");
+
+    private readonly EntProtoId _airSensorProto = new("AirSensor");
+    private readonly EntProtoId _wallProto = new("WallSolid");
+
+    /// <summary>
+    /// Tests if the monitor properly nulls out its reference to the tile mixture
+    /// when a wall is placed on top of it, and restores the reference when the wall is removed.
+    /// </summary>
+    [Test]
+    public async Task NullOutTileAtmosphereGasMixture()
+    {
+        // run an atmos update to initialize everything For Real surely
+        SAtmos.RunProcessingFull(ProcessEnt, MapData.Grid.Owner, SAtmos.AtmosTickRate);
+
+        var gridNetEnt = SEntMan.GetNetEntity(RelevantAtmos.Owner);
+        TargetCoords = new NetCoordinates(gridNetEnt, Vector2.Zero);
+        var netEnt = await Spawn(_airSensorProto);
+        var airSensorUid = SEntMan.GetEntity(netEnt);
+        Transform.TryGetGridTilePosition(airSensorUid, out var vec);
+
+        // run another one to ensure that the ref to the GasMixture was picked up
+        SAtmos.RunProcessingFull(ProcessEnt, MapData.Grid.Owner, SAtmos.AtmosTickRate);
+
+        // should be in the middle
+        Assert.That(vec,
+            Is.EqualTo(Vector2i.Zero),
+            "Air sensor not in expected position on grid (0, 0)");
+
+        var atmosMonitor = SEntMan.GetComponent<AtmosMonitorComponent>(airSensorUid);
+        var tileMixture = SAtmos.GetTileMixture(airSensorUid);
+
+        Assert.That(tileMixture,
+            Is.SameAs(atmosMonitor.TileGas),
+            "Atmos monitor's TileGas does not match actual tile mixture after spawn.");
+
+        // ok now spawn a wall or something on top of it
+        var wall = await Spawn(_wallProto);
+        var wallUid = SEntMan.GetEntity(wall);
+
+        // ensure that atmospherics registers the change - the gas mixture should no longer exist
+        SAtmos.RunProcessingFull(ProcessEnt, MapData.Grid.Owner, SAtmos.AtmosTickRate);
+
+        // the monitor's ref to the gas should be null now
+        Assert.That(atmosMonitor.TileGas,
+            Is.Null,
+            "Atmos monitor's TileGas is not null after wall placed on top. Possible dead reference.");
+        // the actual mixture on the tile should be null now too
+        var nullTileMixture = SAtmos.GetTileMixture(airSensorUid);
+        Assert.That(nullTileMixture, Is.Null, "Tile mixture is not null after wall placed on top.");
+
+        // ok now delete the wall
+        await Delete(wallUid);
+
+        // ensure that atmospherics registers the change - the gas mixture should be back
+        SAtmos.RunProcessingFull(ProcessEnt, MapData.Grid.Owner, SAtmos.AtmosTickRate);
+
+        // gas mixture should now exist again
+        var newTileMixture = SAtmos.GetTileMixture(airSensorUid);
+        Assert.That(newTileMixture, Is.Not.Null, "Tile mixture is null after wall removed.");
+        // monitor's ref to the gas should be back too
+        Assert.That(atmosMonitor.TileGas,
+            Is.SameAs(newTileMixture),
+            "Atmos monitor's TileGas does not match actual tile mixture after wall removed.");
+    }
+
+    /// <summary>
+    /// Tests if the monitor properly updates its reference to the tile mixture
+    /// when the FixGridAtmos command is called.
+    /// </summary>
+    [Test]
+    public async Task FixGridAtmosReplaceMixtureOnTileChange()
+    {
+        // run an atmos update to initialize everything For Real surely
+        SAtmos.RunProcessingFull(ProcessEnt, MapData.Grid.Owner, SAtmos.AtmosTickRate);
+
+        var gridNetEnt = SEntMan.GetNetEntity(RelevantAtmos.Owner);
+        TargetCoords = new NetCoordinates(gridNetEnt, Vector2.Zero);
+        var netEnt = await Spawn(_airSensorProto);
+        var airSensorUid = SEntMan.GetEntity(netEnt);
+        Transform.TryGetGridTilePosition(airSensorUid, out var vec);
+
+        // run another one to ensure that the ref to the GasMixture was picked up
+        SAtmos.RunProcessingFull(ProcessEnt, MapData.Grid.Owner, SAtmos.AtmosTickRate);
+
+        // should be in the middle
+        Assert.That(vec,
+            Is.EqualTo(Vector2i.Zero),
+            "Air sensor not in expected position on grid (0, 0)");
+
+        var atmosMonitor = SEntMan.GetComponent<AtmosMonitorComponent>(airSensorUid);
+        var tileMixture = SAtmos.GetTileMixture(airSensorUid);
+
+        Assert.That(tileMixture,
+            Is.SameAs(atmosMonitor.TileGas),
+            "Atmos monitor's TileGas does not match actual tile mixture after spawn.");
+
+        SAtmos.RebuildGridAtmosphere((ProcessEnt.Owner, ProcessEnt.Comp1, ProcessEnt.Comp3));
+
+        // EXTREMELY IMPORTANT: The reference to the tile mixture on the tile should be completely different.
+        var newTileMixture = SAtmos.GetTileMixture(airSensorUid);
+        Assert.That(newTileMixture,
+            Is.Not.SameAs(tileMixture),
+            "Tile mixture is the same instance after fixgridatmos was ran. It should be a new instance.");
+
+        // The monitor's ref to the tile mixture should have updated too.
+        Assert.That(atmosMonitor.TileGas,
+            Is.SameAs(newTileMixture),
+            "Atmos monitor's TileGas does not match actual tile mixture after fixgridatmos was ran.");
+    }
+}
diff --git a/Content.Server/Atmos/EntitySystems/AtmosphereSystem.Commands.cs b/Content.Server/Atmos/EntitySystems/AtmosphereSystem.Commands.cs
index 246c3a571f..11ebfe2066 100644
--- a/Content.Server/Atmos/EntitySystems/AtmosphereSystem.Commands.cs
+++ b/Content.Server/Atmos/EntitySystems/AtmosphereSystem.Commands.cs
@@ -19,7 +19,9 @@ public sealed partial class AtmosphereSystem
         // Fix Grid Atmos command.
         _consoleHost.RegisterCommand("fixgridatmos",
             "Makes every tile on a grid have a roundstart gas mix.",
-            "fixgridatmos <grid Ids>", FixGridAtmosCommand, FixGridAtmosCommandCompletions);
+            "fixgridatmos <grid Ids>",
+            FixGridAtmosCommand,
+            FixGridAtmosCommandCompletions);
     }
 
     private void ShutdownCommands()
@@ -36,42 +38,6 @@ public sealed partial class AtmosphereSystem
            return;
        }
 
-       var mixtures = new GasMixture[9];
-       for (var i = 0; i < mixtures.Length; i++)
-           mixtures[i] = new GasMixture(Atmospherics.CellVolume) { Temperature = Atmospherics.T20C };
-
-       // 0: Air
-       mixtures[0].AdjustMoles(Gas.Oxygen, Atmospherics.OxygenMolesStandard);
-       mixtures[0].AdjustMoles(Gas.Nitrogen, Atmospherics.NitrogenMolesStandard);
-
-       // 1: Vaccum
-
-       // 2: Oxygen (GM)
-       mixtures[2].AdjustMoles(Gas.Oxygen, Atmospherics.MolesCellGasMiner);
-
-       // 3: Nitrogen (GM)
-       mixtures[3].AdjustMoles(Gas.Nitrogen, Atmospherics.MolesCellGasMiner);
-
-       // 4: Plasma (GM)
-       mixtures[4].AdjustMoles(Gas.Plasma, Atmospherics.MolesCellGasMiner);
-
-       // 5: Instant Plasmafire (r)
-       mixtures[5].AdjustMoles(Gas.Oxygen, Atmospherics.MolesCellGasMiner);
-       mixtures[5].AdjustMoles(Gas.Plasma, Atmospherics.MolesCellGasMiner);
-       mixtures[5].Temperature = 5000f;
-
-       // 6: (Walk-In) Freezer
-       mixtures[6].AdjustMoles(Gas.Oxygen, Atmospherics.OxygenMolesFreezer);
-       mixtures[6].AdjustMoles(Gas.Nitrogen, Atmospherics.NitrogenMolesFreezer);
-       mixtures[6].Temperature = Atmospherics.FreezerTemp; // Little colder than an actual freezer but gives a grace period to get e.g. themomachines set up, should keep warm for a few door openings
-
-       // 7: Nitrogen (101kpa) for vox rooms
-       mixtures[7].AdjustMoles(Gas.Nitrogen, Atmospherics.MolesCellStandard);
-
-       // 8: Air (GM)
-       mixtures[8].AdjustMoles(Gas.Oxygen, Atmospherics.OxygenMolesGasMiner);
-       mixtures[8].AdjustMoles(Gas.Nitrogen, Atmospherics.NitrogenMolesGasMiner);
-
        foreach (var arg in args)
        {
            if (!NetEntity.TryParse(arg, out var netEntity) || !TryGetEntity(netEntity, out var euid))
@@ -92,34 +58,82 @@ public sealed partial class AtmosphereSystem
                continue;
            }
 
-           // Force Invalidate & update air on all tiles
-           Entity<GridAtmosphereComponent, GasTileOverlayComponent, MapGridComponent, TransformComponent> grid =
-               new(euid.Value, gridAtmosphere, Comp<GasTileOverlayComponent>(euid.Value), gridComp, Transform(euid.Value));
-
-           RebuildGridTiles(grid);
-
-           var query = GetEntityQuery<AtmosFixMarkerComponent>();
-           foreach (var (indices, tile) in gridAtmosphere.Tiles.ToArray())
-           {
-               if (tile.Air is not {Immutable: false} air)
-                   continue;
-
-               air.Clear();
-               var mixtureId = 0;
-               var enumerator = _mapSystem.GetAnchoredEntitiesEnumerator(grid, grid, indices);
-               while (enumerator.MoveNext(out var entUid))
-               {
-                   if (query.TryComp(entUid, out var marker))
-                       mixtureId = marker.Mode;
-               }
-
-               var mixture = mixtures[mixtureId];
-               Merge(air, mixture);
-               air.Temperature = mixture.Temperature;
-           }
+           RebuildGridAtmosphere((euid.Value, gridAtmosphere, gridComp));
        }
     }
 
+    /// <summary>
+    /// Rebuilds all <see cref="TileAtmosphere"/>s on a grid to have roundstart gas mixes.
+    /// </summary>
+    /// <remarks>Please be responsible with this method. Used only by tests and fixgridatmos.</remarks>
+    public void RebuildGridAtmosphere(Entity<GridAtmosphereComponent, MapGridComponent> ent)
+    {
+        var mixtures = new GasMixture[9];
+        for (var i = 0; i < mixtures.Length; i++)
+        {
+            mixtures[i] = new GasMixture(Atmospherics.CellVolume) { Temperature = Atmospherics.T20C };
+        }
+
+        // 0: Air
+        mixtures[0].AdjustMoles(Gas.Oxygen, Atmospherics.OxygenMolesStandard);
+        mixtures[0].AdjustMoles(Gas.Nitrogen, Atmospherics.NitrogenMolesStandard);
+
+        // 1: Vaccum
+
+        // 2: Oxygen (GM)
+        mixtures[2].AdjustMoles(Gas.Oxygen, Atmospherics.MolesCellGasMiner);
+
+        // 3: Nitrogen (GM)
+        mixtures[3].AdjustMoles(Gas.Nitrogen, Atmospherics.MolesCellGasMiner);
+
+        // 4: Plasma (GM)
+        mixtures[4].AdjustMoles(Gas.Plasma, Atmospherics.MolesCellGasMiner);
+
+        // 5: Instant Plasmafire (r)
+        mixtures[5].AdjustMoles(Gas.Oxygen, Atmospherics.MolesCellGasMiner);
+        mixtures[5].AdjustMoles(Gas.Plasma, Atmospherics.MolesCellGasMiner);
+        mixtures[5].Temperature = 5000f;
+
+        // 6: (Walk-In) Freezer
+        mixtures[6].AdjustMoles(Gas.Oxygen, Atmospherics.OxygenMolesFreezer);
+        mixtures[6].AdjustMoles(Gas.Nitrogen, Atmospherics.NitrogenMolesFreezer);
+        mixtures[6].Temperature = Atmospherics.FreezerTemp; // Little colder than an actual freezer but gives a grace period to get e.g. themomachines set up, should keep warm for a few door openings
+
+        // 7: Nitrogen (101kpa) for vox rooms
+        mixtures[7].AdjustMoles(Gas.Nitrogen, Atmospherics.MolesCellStandard);
+
+        // 8: Air (GM)
+        mixtures[8].AdjustMoles(Gas.Oxygen, Atmospherics.OxygenMolesGasMiner);
+        mixtures[8].AdjustMoles(Gas.Nitrogen, Atmospherics.NitrogenMolesGasMiner);
+
+
+        // Force Invalidate & update air on all tiles
+        Entity<GridAtmosphereComponent, GasTileOverlayComponent, MapGridComponent, TransformComponent> grid =
+            new(ent.Owner, ent.Comp1, Comp<GasTileOverlayComponent>(ent), ent.Comp2, Transform(ent));
+
+        RebuildGridTiles(grid);
+
+        var query = GetEntityQuery<AtmosFixMarkerComponent>();
+        foreach (var (indices, tile) in ent.Comp1.Tiles.ToArray())
+        {
+            if (tile.Air is not {Immutable: false} air)
+                continue;
+
+            air.Clear();
+            var mixtureId = 0;
+            var enumerator = _mapSystem.GetAnchoredEntitiesEnumerator(grid, grid, indices);
+            while (enumerator.MoveNext(out var entUid))
+            {
+                if (query.TryComp(entUid, out var marker))
+                    mixtureId = marker.Mode;
+            }
+
+            var mixture = mixtures[mixtureId];
+            Merge(air, mixture);
+            air.Temperature = mixture.Temperature;
+        }
+    }
+
     /// <summary>
     /// Clears & re-creates all references to <see cref="TileAtmosphere"/>s stored on a grid.
     /// </summary>
diff --git a/Content.Server/Atmos/EntitySystems/AtmosphereSystem.Processing.cs b/Content.Server/Atmos/EntitySystems/AtmosphereSystem.Processing.cs
index c0f081f9ba..d562fe5111 100644
--- a/Content.Server/Atmos/EntitySystems/AtmosphereSystem.Processing.cs
+++ b/Content.Server/Atmos/EntitySystems/AtmosphereSystem.Processing.cs
@@ -265,6 +265,7 @@ namespace Content.Server.Atmos.EntitySystems
                 tile.ArchivedCycle = 0;
                 tile.LastShare = 0f;
                 tile.Hotspot = new Hotspot();
+                NotifyDeviceTileChanged((ent.Owner, ent.Comp1, ent.Comp3), tile.GridIndices);
                 return;
             }
 
@@ -275,6 +276,10 @@ namespace Content.Server.Atmos.EntitySystems
 
             if (data.FixVacuum)
                 GridFixTileVacuum(tile);
+
+            // Since we assigned the tile a new GasMixture we need to tell any devices
+            // on this tile that the reference has changed.
+            NotifyDeviceTileChanged((ent.Owner, ent.Comp1, ent.Comp3), tile.GridIndices);
         }
 
         private void QueueRunTiles(
diff --git a/Content.Server/Atmos/EntitySystems/AtmosphereSystem.Utils.cs b/Content.Server/Atmos/EntitySystems/AtmosphereSystem.Utils.cs
index a402cf20f3..9b53d0d16c 100644
--- a/Content.Server/Atmos/EntitySystems/AtmosphereSystem.Utils.cs
+++ b/Content.Server/Atmos/EntitySystems/AtmosphereSystem.Utils.cs
@@ -1,10 +1,8 @@
 using System.Runtime.CompilerServices;
 using Content.Server.Atmos.Components;
-using Content.Server.Maps;
 using Content.Shared.Atmos;
 using Content.Shared.Atmos.Components;
-using Content.Shared.Maps;
-using Robust.Shared.Map;
+using Content.Shared.Atmos.Piping.Components;
 using Robust.Shared.Map.Components;
 
 namespace Content.Server.Atmos.EntitySystems;
@@ -176,4 +174,21 @@ public partial class AtmosphereSystem
 
         _tile.PryTile(tileRef);
     }
+
+    /// <summary>
+    /// Notifies all subscribing entities on a particular tile that the tile has changed.
+    /// Atmos devices may store references to tiles, so this is used to properly resync devices
+    /// after a significant atmos change on that tile, for example a tile getting a new <see cref="GasMixture"/>.
+    /// </summary>
+    /// <param name="ent">The grid atmosphere entity.</param>
+    /// <param name="tile">The tile to check for devices on.</param>
+    private void NotifyDeviceTileChanged(Entity<GridAtmosphereComponent, MapGridComponent> ent, Vector2i tile)
+    {
+        var inTile = _mapSystem.GetAnchoredEntities(ent.Owner, ent.Comp2, tile);
+        var ev = new AtmosDeviceTileChangedEvent();
+        foreach (var uid in inTile)
+        {
+            RaiseLocalEvent(uid, ref ev);
+        }
+    }
 }
diff --git a/Content.Server/Atmos/EntitySystems/AtmosphereSystem.cs b/Content.Server/Atmos/EntitySystems/AtmosphereSystem.cs
index 8120caca4e..df380912b6 100644
--- a/Content.Server/Atmos/EntitySystems/AtmosphereSystem.cs
+++ b/Content.Server/Atmos/EntitySystems/AtmosphereSystem.cs
@@ -64,8 +64,8 @@ public sealed partial class AtmosphereSystem : SharedAtmosphereSystem
         InitializeGridAtmosphere();
         InitializeMap();
 
-        _mapAtmosQuery = GetEntityQuery<MapAtmosphereComponent>();
         _atmosQuery = GetEntityQuery<GridAtmosphereComponent>();
+        _mapAtmosQuery = GetEntityQuery<MapAtmosphereComponent>();
         _airtightQuery = GetEntityQuery<AirtightComponent>();
         _firelockQuery = GetEntityQuery<FirelockComponent>();
 
diff --git a/Content.Server/Atmos/Monitor/Systems/AtmosMonitoringSystem.cs b/Content.Server/Atmos/Monitor/Systems/AtmosMonitoringSystem.cs
index 452b300331..7333b7b814 100644
--- a/Content.Server/Atmos/Monitor/Systems/AtmosMonitoringSystem.cs
+++ b/Content.Server/Atmos/Monitor/Systems/AtmosMonitoringSystem.cs
@@ -57,6 +57,13 @@ public sealed class AtmosMonitorSystem : EntitySystem
         SubscribeLocalEvent<AtmosMonitorComponent, DeviceNetworkPacketEvent>(OnPacketRecv);
         SubscribeLocalEvent<AtmosMonitorComponent, AtmosDeviceDisabledEvent>(OnAtmosDeviceLeaveAtmosphere);
         SubscribeLocalEvent<AtmosMonitorComponent, AtmosDeviceEnabledEvent>(OnAtmosDeviceEnterAtmosphere);
+        SubscribeLocalEvent<AtmosMonitorComponent, AtmosDeviceTileChangedEvent>(OnAtmosDeviceTileChangedEvent);
+    }
+
+    private void OnAtmosDeviceTileChangedEvent(Entity<AtmosMonitorComponent> ent, ref AtmosDeviceTileChangedEvent args)
+    {
+        if (!ent.Comp.MonitorsPipeNet)
+            ent.Comp.TileGas = _atmosphereSystem.GetContainingMixture(ent.Owner, true);
     }
 
     private void OnAtmosDeviceLeaveAtmosphere(EntityUid uid, AtmosMonitorComponent atmosMonitor, ref AtmosDeviceDisabledEvent args)
diff --git a/Content.Shared/Atmos/Piping/Components/AtmosDeviceTileChangedEvent.cs b/Content.Shared/Atmos/Piping/Components/AtmosDeviceTileChangedEvent.cs
new file mode 100644
index 0000000000..daedcfdaa5
--- /dev/null
+++ b/Content.Shared/Atmos/Piping/Components/AtmosDeviceTileChangedEvent.cs
@@ -0,0 +1,9 @@
+namespace Content.Shared.Atmos.Piping.Components;
+
+/// <summary>
+/// Raised directed on entities when the tile that they reside in has had their
+/// associated TileAtmosphere changed significantly, i.e. a tile/<see cref="GasMixture"/> being added, removed,
+/// or replaced. Important when atmos devices need to update any stored references to their tile's atmosphere.
+/// </summary>
+[ByRefEvent]
+public readonly record struct AtmosDeviceTileChangedEvent;

From c47f3ca9067387096bbdd8a3cb8c1082e54b6d8f Mon Sep 17 00:00:00 2001
From: PJBot <pieterjan.briers+bot@gmail.com>
Date: Tue, 23 Dec 2025 08:14:01 +0000
Subject: [PATCH 045/134] 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 861a0ecba4..0359831a63 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -1,12 +1,4 @@
 Entries:
-- author: perryprog
-  changes:
-  - message: Players no longer have the ability to cycle a timer in the verb menu
-      on a cyborg.
-    type: Fix
-  id: 8829
-  time: '2025-08-05T03:26:02.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/39388
 - author: Luxeator
   changes:
   - message: Fixed error upon exploding buckled mobs (and other near instantaneous
@@ -3931,3 +3923,12 @@
   id: 9328
   time: '2025-12-22T21:15:36.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/41951
+- author: ArtisticRoomba
+  changes:
+  - message: Devices that collect atmospheric data or reference the grid's atmosphere
+      will now properly reference the new atmosphere if the grid's atmosphere is ever
+      rebuilt or changed significantly.
+    type: Fix
+  id: 9329
+  time: '2025-12-23T08:12:52.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/41585

From 38d6b7a119c2e83389ba57c8d30df554bb1efa13 Mon Sep 17 00:00:00 2001
From: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com>
Date: Tue, 23 Dec 2025 01:10:36 -0800
Subject: [PATCH 046/134] Fix DeltaPressureTest race condition when using LINDA
 (#41388)

---
 .../Tests/Atmos/DeltaPressureTest.cs          | 245 ++++++------------
 1 file changed, 81 insertions(+), 164 deletions(-)

diff --git a/Content.IntegrationTests/Tests/Atmos/DeltaPressureTest.cs b/Content.IntegrationTests/Tests/Atmos/DeltaPressureTest.cs
index c3b3877c98..d4283568e8 100644
--- a/Content.IntegrationTests/Tests/Atmos/DeltaPressureTest.cs
+++ b/Content.IntegrationTests/Tests/Atmos/DeltaPressureTest.cs
@@ -1,15 +1,11 @@
-using System.Linq;
 using System.Numerics;
 using Content.Server.Atmos;
 using Content.Server.Atmos.Components;
 using Content.Server.Atmos.EntitySystems;
 using Content.Shared.Atmos;
 using Content.Shared.Atmos.Components;
-using Robust.Shared.EntitySerialization;
-using Robust.Shared.EntitySerialization.Systems;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Map;
-using Robust.Shared.Map.Components;
 using Robust.Shared.Utility;
 
 namespace Content.IntegrationTests.Tests.Atmos;
@@ -20,7 +16,7 @@ namespace Content.IntegrationTests.Tests.Atmos;
 /// </summary>
 [TestFixture]
 [TestOf(typeof(DeltaPressureSystem))]
-public sealed class DeltaPressureTest
+public sealed class DeltaPressureTest : AtmosTest
 {
     #region Prototypes
 
@@ -92,7 +88,7 @@ public sealed class DeltaPressureTest
 
     #endregion
 
-    private readonly ResPath _testMap = new("Maps/Test/Atmospherics/DeltaPressure/deltapressuretest.yml");
+    protected override ResPath? TestMapPath => new("Maps/Test/Atmospherics/DeltaPressure/deltapressuretest.yml");
 
     // TODO ATMOS TESTS
     // - Check for directional windows (partial airtight ents) properly computing pressure differences
@@ -111,40 +107,15 @@ public sealed class DeltaPressureTest
     [Test]
     public async Task ProcessingListAutoJoinTest()
     {
-        await using var pair = await PoolManager.GetServerClient();
-        var server = pair.Server;
-
-        var entMan = server.EntMan;
-        var mapLoader = entMan.System<MapLoaderSystem>();
-        var atmosphereSystem = entMan.System<AtmosphereSystem>();
-        var deserializationOptions = DeserializationOptions.Default with { InitializeMaps = true };
-
-        Entity<MapGridComponent> grid = default;
-        Entity<DeltaPressureComponent> dpEnt;
-
-        // Load our test map in and assert that it exists.
-        await server.WaitPost(() =>
+        await Server.WaitAssertion(() =>
         {
-#pragma warning disable NUnit2045
-            Assert.That(mapLoader.TryLoadMap(_testMap, out _, out var gridSet, deserializationOptions),
-                $"Failed to load map {_testMap}.");
-            Assert.That(gridSet, Is.Not.Null, "There were no grids loaded from the map!");
-#pragma warning restore NUnit2045
+            var uid = SEntMan.SpawnAtPosition("DeltaPressureSolidTest", new EntityCoordinates(ProcessEnt, Vector2.Zero));
+            var dpEnt = new Entity<DeltaPressureComponent>(uid, SEntMan.GetComponent<DeltaPressureComponent>(uid));
 
-            grid = gridSet.First();
+            Assert.That(SAtmos.IsDeltaPressureEntityInList(RelevantAtmos, dpEnt), "Entity was not in processing list when it should have automatically joined!");
+            SEntMan.DeleteEntity(uid);
+            Assert.That(!SAtmos.IsDeltaPressureEntityInList(RelevantAtmos, dpEnt), "Entity was still in processing list after deletion!");
         });
-
-        await server.WaitAssertion(() =>
-        {
-            var uid = entMan.SpawnAtPosition("DeltaPressureSolidTest", new EntityCoordinates(grid.Owner, Vector2.Zero));
-            dpEnt = new Entity<DeltaPressureComponent>(uid, entMan.GetComponent<DeltaPressureComponent>(uid));
-
-            Assert.That(atmosphereSystem.IsDeltaPressureEntityInList(grid.Owner, dpEnt), "Entity was not in processing list when it should have automatically joined!");
-            entMan.DeleteEntity(uid);
-            Assert.That(!atmosphereSystem.IsDeltaPressureEntityInList(grid.Owner, dpEnt), "Entity was still in processing list after deletion!");
-        });
-
-        await pair.CleanReturnAsync();
     }
 
     /// <summary>
@@ -154,45 +125,27 @@ public sealed class DeltaPressureTest
     [Test]
     public async Task ProcessingDeltaStandbyTest()
     {
-        await using var pair = await PoolManager.GetServerClient();
-        var server = pair.Server;
-
-        var entMan = server.EntMan;
-        var mapLoader = entMan.System<MapLoaderSystem>();
-        var atmosphereSystem = entMan.System<AtmosphereSystem>();
-        var transformSystem = entMan.System<SharedTransformSystem>();
-        var deserializationOptions = DeserializationOptions.Default with { InitializeMaps = true };
-
-        Entity<MapGridComponent> grid = default;
         Entity<DeltaPressureComponent> dpEnt = default;
         TileAtmosphere tile = null!;
         AtmosDirection direction = default;
 
         // Load our test map in and assert that it exists.
-        await server.WaitPost(() =>
+        await Server.WaitPost(() =>
         {
-#pragma warning disable NUnit2045
-            Assert.That(mapLoader.TryLoadMap(_testMap, out _, out var gridSet, deserializationOptions),
-                $"Failed to load map {_testMap}.");
-            Assert.That(gridSet, Is.Not.Null, "There were no grids loaded from the map!");
-#pragma warning restore NUnit2045
-
-            grid = gridSet.First();
-            var uid = entMan.SpawnAtPosition("DeltaPressureSolidTest", new EntityCoordinates(grid.Owner, Vector2.Zero));
-            dpEnt = new Entity<DeltaPressureComponent>(uid, entMan.GetComponent<DeltaPressureComponent>(uid));
-            Assert.That(atmosphereSystem.IsDeltaPressureEntityInList(grid.Owner, dpEnt), "Entity was not in processing list when it should have been added!");
+            var uid = SEntMan.SpawnAtPosition("DeltaPressureSolidTest", new EntityCoordinates(ProcessEnt, Vector2.Zero));
+            dpEnt = new Entity<DeltaPressureComponent>(uid, SEntMan.GetComponent<DeltaPressureComponent>(uid));
+            Assert.That(SAtmos.IsDeltaPressureEntityInList(ProcessEnt, dpEnt), "Entity was not in processing list when it should have been added!");
         });
 
         for (var i = 0; i < Atmospherics.Directions; i++)
         {
-            await server.WaitPost(() =>
+            await Server.WaitPost(() =>
             {
-                var indices = transformSystem.GetGridOrMapTilePosition(dpEnt);
-                var gridAtmosComp = entMan.GetComponent<GridAtmosphereComponent>(grid);
+                var indices = Transform.GetGridOrMapTilePosition(dpEnt);
 
                 direction = (AtmosDirection)(1 << i);
                 var offsetIndices = indices.Offset(direction);
-                tile = gridAtmosComp.Tiles[offsetIndices];
+                tile = RelevantAtmos.Comp.Tiles[offsetIndices];
 
                 Assert.That(tile.Air, Is.Not.Null, $"Tile at {offsetIndices} should have air!");
 
@@ -202,19 +155,17 @@ public sealed class DeltaPressureTest
                 tile.Air!.AdjustMoles(Gas.Nitrogen, moles);
             });
 
-            await server.WaitRunTicks(30);
+            await Server.WaitRunTicks(30);
 
             // Entity should exist, if it took one tick of damage then it should be instantly destroyed.
-            await server.WaitAssertion(() =>
+            await Server.WaitAssertion(() =>
             {
-                Assert.That(!entMan.Deleted(dpEnt), $"{dpEnt} should still exist after experiencing non-threshold pressure from {direction} side!");
+                Assert.That(!SEntMan.Deleted(dpEnt), $"{dpEnt} should still exist after experiencing non-threshold pressure from {direction} side!");
                 tile.Air!.Clear();
             });
 
-            await server.WaitRunTicks(30);
+            await Server.WaitRunTicks(30);
         }
-
-        await pair.CleanReturnAsync();
     }
 
     /// <summary>
@@ -224,47 +175,43 @@ public sealed class DeltaPressureTest
     [Test]
     public async Task ProcessingDeltaDamageTest()
     {
-        await using var pair = await PoolManager.GetServerClient();
-        var server = pair.Server;
-
-        var entMan = server.EntMan;
-        var mapLoader = entMan.System<MapLoaderSystem>();
-        var atmosphereSystem = entMan.System<AtmosphereSystem>();
-        var transformSystem = entMan.System<SharedTransformSystem>();
-        var deserializationOptions = DeserializationOptions.Default with { InitializeMaps = true };
-
-        Entity<MapGridComponent> grid = default;
         Entity<DeltaPressureComponent> dpEnt = default;
-        TileAtmosphere tile = null!;
         AtmosDirection direction = default;
 
         // Load our test map in and assert that it exists.
-        await server.WaitPost(() =>
+        await Server.WaitPost(() =>
         {
-#pragma warning disable NUnit2045
-            Assert.That(mapLoader.TryLoadMap(_testMap, out _, out var gridSet, deserializationOptions),
-                $"Failed to load map {_testMap}.");
-            Assert.That(gridSet, Is.Not.Null, "There were no grids loaded from the map!");
-#pragma warning restore NUnit2045
-
-            grid = gridSet.First();
+            SAtmos.SetAtmosphereSimulation(ProcessEnt, false);
         });
 
         for (var i = 0; i < Atmospherics.Directions; i++)
         {
-            await server.WaitPost(() =>
+            /*
+             RUNNING REGULAR TICKS USING WaitRunTicks AND GUESSING AS TO HOW MANY ATMOS SIMULATION TICKS ARE HAPPENING
+             WILL CAUSE A RACE CONDITION THAT IS A PAIN IN THE ASS TO DEBUG
+
+             AN ENTITY MAY BE REMOVED AND ADDED BETWEEN A SUBTICK. IF LINDA PROCESSING IS ENABLED IT MIGHT CAUSE
+             AN EQUALIZATION TO PUT AIR IN OTHER TILES IN THE SMALL WINDOW WHERE THE TILE IS NOT AIRTIGHT
+             WHICH WILL THROW OFF DELTAS
+             */
+
+            await Server.WaitPost(() =>
+            {
+                SAtmos.RunProcessingFull(ProcessEnt,ProcessEnt.Owner, SAtmos.AtmosTickRate);
+            });
+
+            await Server.WaitPost(() =>
             {
                 // Need to spawn an entity each run to ensure it works for all directions.
-                var uid = entMan.SpawnAtPosition("DeltaPressureSolidTest", new EntityCoordinates(grid.Owner, Vector2.Zero));
-                dpEnt = new Entity<DeltaPressureComponent>(uid, entMan.GetComponent<DeltaPressureComponent>(uid));
-                Assert.That(atmosphereSystem.IsDeltaPressureEntityInList(grid.Owner, dpEnt), "Entity was not in processing list when it should have been added!");
+                var uid = SEntMan.SpawnAtPosition("DeltaPressureSolidTest", new EntityCoordinates(ProcessEnt.Owner, Vector2.Zero));
+                dpEnt = new Entity<DeltaPressureComponent>(uid, SEntMan.GetComponent<DeltaPressureComponent>(uid));
+                Assert.That(SAtmos.IsDeltaPressureEntityInList(ProcessEnt.Owner, dpEnt), "Entity was not in processing list when it should have been added!");
 
-                var indices = transformSystem.GetGridOrMapTilePosition(dpEnt);
-                var gridAtmosComp = entMan.GetComponent<GridAtmosphereComponent>(grid);
+                var indices = Transform.GetGridOrMapTilePosition(dpEnt);
 
                 direction = (AtmosDirection)(1 << i);
                 var offsetIndices = indices.Offset(direction);
-                tile = gridAtmosComp.Tiles[offsetIndices];
+                var tile = ProcessEnt.Comp1.Tiles[offsetIndices];
 
                 Assert.That(tile.Air, Is.Not.Null, $"Tile at {offsetIndices} should have air!");
 
@@ -274,19 +221,29 @@ public sealed class DeltaPressureTest
                 tile.Air!.AdjustMoles(Gas.Nitrogen, moles);
             });
 
-            await server.WaitRunTicks(30);
-
-            // Entity should exist, if it took one tick of damage then it should be instantly destroyed.
-            await server.WaitAssertion(() =>
+            // get jiggy with it! hit that dance white boy!
+            await Server.WaitPost(() =>
             {
-                Assert.That(entMan.Deleted(dpEnt), $"{dpEnt} still exists after experiencing threshold pressure from {direction} side!");
-                tile.Air!.Clear();
+                SAtmos.RunProcessingFull(ProcessEnt,ProcessEnt.Owner, SAtmos.AtmosTickRate);
             });
 
-            await server.WaitRunTicks(30);
-        }
+            // need to run some ticks as deleted entities are queued for removal
+            // and not removed instantly
+            await Server.WaitRunTicks(30);
 
-        await pair.CleanReturnAsync();
+            // Entity shouldn't exist, if it took one tick of damage then it should be instantly destroyed.
+            await Server.WaitAssertion(() =>
+            {
+                Assert.That(SEntMan.Deleted(dpEnt), $"{dpEnt} still exists after experiencing threshold pressure from {direction} side!");
+
+                // Double whammy: in case any unintended gas leak occured due to a race condition,
+                // clear out all the tiles.
+                foreach (var mix in SAtmos.GetAllMixtures(ProcessEnt))
+                {
+                    mix.Clear();
+                }
+            });
+        }
     }
 
     /// <summary>
@@ -296,39 +253,23 @@ public sealed class DeltaPressureTest
     [Test]
     public async Task ProcessingAbsoluteStandbyTest()
     {
-        await using var pair = await PoolManager.GetServerClient();
-        var server = pair.Server;
-
-        var entMan = server.EntMan;
-        var mapLoader = entMan.System<MapLoaderSystem>();
-        var atmosphereSystem = entMan.System<AtmosphereSystem>();
-        var transformSystem = entMan.System<SharedTransformSystem>();
-        var deserializationOptions = DeserializationOptions.Default with { InitializeMaps = true };
-
-        Entity<MapGridComponent> grid = default;
         Entity<DeltaPressureComponent> dpEnt = default;
         TileAtmosphere tile = null!;
         AtmosDirection direction = default;
 
-        await server.WaitPost(() =>
+        await Server.WaitPost(() =>
         {
-#pragma warning disable NUnit2045
-            Assert.That(mapLoader.TryLoadMap(_testMap, out _, out var gridSet, deserializationOptions),
-                $"Failed to load map {_testMap}.");
-            Assert.That(gridSet, Is.Not.Null, "There were no grids loaded from the map!");
-#pragma warning restore NUnit2045
-            grid = gridSet.First();
-            var uid = entMan.SpawnAtPosition("DeltaPressureSolidTestAbsolute", new EntityCoordinates(grid.Owner, Vector2.Zero));
-            dpEnt = new Entity<DeltaPressureComponent>(uid, entMan.GetComponent<DeltaPressureComponent>(uid));
-            Assert.That(atmosphereSystem.IsDeltaPressureEntityInList(grid.Owner, dpEnt), "Entity was not in processing list when it should have been added!");
+            var uid = SEntMan.SpawnAtPosition("DeltaPressureSolidTestAbsolute", new EntityCoordinates(ProcessEnt.Owner, Vector2.Zero));
+            dpEnt = new Entity<DeltaPressureComponent>(uid, SEntMan.GetComponent<DeltaPressureComponent>(uid));
+            Assert.That(SAtmos.IsDeltaPressureEntityInList(ProcessEnt.Owner, dpEnt), "Entity was not in processing list when it should have been added!");
         });
 
         for (var i = 0; i < Atmospherics.Directions; i++)
         {
-            await server.WaitPost(() =>
+            await Server.WaitPost(() =>
             {
-                var indices = transformSystem.GetGridOrMapTilePosition(dpEnt);
-                var gridAtmosComp = entMan.GetComponent<GridAtmosphereComponent>(grid);
+                var indices = Transform.GetGridOrMapTilePosition(dpEnt);
+                var gridAtmosComp = SEntMan.GetComponent<GridAtmosphereComponent>(ProcessEnt);
 
                 direction = (AtmosDirection)(1 << i);
                 var offsetIndices = indices.Offset(direction);
@@ -340,18 +281,16 @@ public sealed class DeltaPressureTest
                 tile.Air!.AdjustMoles(Gas.Nitrogen, moles);
             });
 
-            await server.WaitRunTicks(30);
+            await Server.WaitRunTicks(30);
 
-            await server.WaitAssertion(() =>
+            await Server.WaitAssertion(() =>
             {
-                Assert.That(!entMan.Deleted(dpEnt), $"{dpEnt} should still exist after experiencing non-threshold absolute pressure from {direction} side!");
+                Assert.That(!SEntMan.Deleted(dpEnt), $"{dpEnt} should still exist after experiencing non-threshold absolute pressure from {direction} side!");
                 tile.Air!.Clear();
             });
 
-            await server.WaitRunTicks(30);
+            await Server.WaitRunTicks(30);
         }
-
-        await pair.CleanReturnAsync();
     }
 
     /// <summary>
@@ -361,41 +300,21 @@ public sealed class DeltaPressureTest
     [Test]
     public async Task ProcessingAbsoluteDamageTest()
     {
-        await using var pair = await PoolManager.GetServerClient();
-        var server = pair.Server;
-
-        var entMan = server.EntMan;
-        var mapLoader = entMan.System<MapLoaderSystem>();
-        var atmosphereSystem = entMan.System<AtmosphereSystem>();
-        var transformSystem = entMan.System<SharedTransformSystem>();
-        var deserializationOptions = DeserializationOptions.Default with { InitializeMaps = true };
-
-        Entity<MapGridComponent> grid = default;
         Entity<DeltaPressureComponent> dpEnt = default;
         TileAtmosphere tile = null!;
         AtmosDirection direction = default;
 
-        await server.WaitPost(() =>
-        {
-#pragma warning disable NUnit2045
-            Assert.That(mapLoader.TryLoadMap(_testMap, out _, out var gridSet, deserializationOptions),
-                $"Failed to load map {_testMap}.");
-            Assert.That(gridSet, Is.Not.Null, "There were no grids loaded from the map!");
-#pragma warning restore NUnit2045
-            grid = gridSet.First();
-        });
-
         for (var i = 0; i < Atmospherics.Directions; i++)
         {
-            await server.WaitPost(() =>
+            await Server.WaitPost(() =>
             {
                 // Spawn fresh entity each iteration to verify all directions work
-                var uid = entMan.SpawnAtPosition("DeltaPressureSolidTestAbsolute", new EntityCoordinates(grid.Owner, Vector2.Zero));
-                dpEnt = new Entity<DeltaPressureComponent>(uid, entMan.GetComponent<DeltaPressureComponent>(uid));
-                Assert.That(atmosphereSystem.IsDeltaPressureEntityInList(grid.Owner, dpEnt), "Entity was not in processing list when it should have been added!");
+                var uid = SEntMan.SpawnAtPosition("DeltaPressureSolidTestAbsolute", new EntityCoordinates(ProcessEnt.Owner, Vector2.Zero));
+                dpEnt = new Entity<DeltaPressureComponent>(uid, SEntMan.GetComponent<DeltaPressureComponent>(uid));
+                Assert.That(SAtmos.IsDeltaPressureEntityInList(ProcessEnt.Owner, dpEnt), "Entity was not in processing list when it should have been added!");
 
-                var indices = transformSystem.GetGridOrMapTilePosition(dpEnt);
-                var gridAtmosComp = entMan.GetComponent<GridAtmosphereComponent>(grid);
+                var indices = Transform.GetGridOrMapTilePosition(dpEnt);
+                var gridAtmosComp = SEntMan.GetComponent<GridAtmosphereComponent>(ProcessEnt);
 
                 direction = (AtmosDirection)(1 << i);
                 var offsetIndices = indices.Offset(direction);
@@ -408,17 +327,15 @@ public sealed class DeltaPressureTest
                 tile.Air!.AdjustMoles(Gas.Nitrogen, moles);
             });
 
-            await server.WaitRunTicks(30);
+            await Server.WaitRunTicks(30);
 
-            await server.WaitAssertion(() =>
+            await Server.WaitAssertion(() =>
             {
-                Assert.That(entMan.Deleted(dpEnt), $"{dpEnt} still exists after experiencing threshold absolute pressure from {direction} side!");
+                Assert.That(SEntMan.Deleted(dpEnt), $"{dpEnt} still exists after experiencing threshold absolute pressure from {direction} side!");
                 tile.Air!.Clear();
             });
 
-            await server.WaitRunTicks(30);
+            await Server.WaitRunTicks(30);
         }
-
-        await pair.CleanReturnAsync();
     }
 }

From 9f84b2473307965b02d8f5d2ab48d5b664b9f9b2 Mon Sep 17 00:00:00 2001
From: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com>
Date: Tue, 23 Dec 2025 01:44:31 -0800
Subject: [PATCH 047/134] Use cached Atmospherics AirtightData when applicable
 (#41390)

---
 .../Anomaly/AnomalySystem.Generator.cs        |  2 +-
 .../EntitySystems/AtmosphereSystem.API.cs     | 28 ++++++++++++++++++-
 .../EntitySystems/HeatExchangerSystem.cs      |  2 +-
 .../Rules/GameRuleSystem.Utility.cs           |  2 +-
 4 files changed, 30 insertions(+), 4 deletions(-)

diff --git a/Content.Server/Anomaly/AnomalySystem.Generator.cs b/Content.Server/Anomaly/AnomalySystem.Generator.cs
index 46ad9278f8..09af0419bb 100644
--- a/Content.Server/Anomaly/AnomalySystem.Generator.cs
+++ b/Content.Server/Anomaly/AnomalySystem.Generator.cs
@@ -100,7 +100,7 @@ public sealed partial class AnomalySystem
 
             // no air-blocked areas.
             if (_atmosphere.IsTileSpace(grid, xform.MapUid, tile) ||
-                _atmosphere.IsTileAirBlocked(grid, tile, mapGridComp: gridComp))
+                _atmosphere.IsTileAirBlockedCached(grid, tile))
             {
                 continue;
             }
diff --git a/Content.Server/Atmos/EntitySystems/AtmosphereSystem.API.cs b/Content.Server/Atmos/EntitySystems/AtmosphereSystem.API.cs
index 96a5c69457..5cce6075b7 100644
--- a/Content.Server/Atmos/EntitySystems/AtmosphereSystem.API.cs
+++ b/Content.Server/Atmos/EntitySystems/AtmosphereSystem.API.cs
@@ -306,6 +306,8 @@ public partial class AtmosphereSystem
     /// <param name="directions">The directions to check for air-blockage.</param>
     /// <param name="mapGridComp">Optional map grid component associated with the grid.</param>
     /// <returns>True if the tile is air-blocked in the specified directions, false otherwise.</returns>
+    /// <remarks>This rebuilds airtight data on-the-fly. You should only use this if you've just
+    /// invalidated airtight data, and you cannot wait one atmostick to revalidate it.</remarks>
     [PublicAPI]
     public bool IsTileAirBlocked(EntityUid gridUid,
         Vector2i tile,
@@ -315,11 +317,35 @@ public partial class AtmosphereSystem
         if (!Resolve(gridUid, ref mapGridComp, false))
             return false;
 
-        // TODO ATMOS: This reconstructs the data instead of getting the cached version. Might want to include a method to get the cached version later.
         var data = GetAirtightData(gridUid, mapGridComp, tile);
         return data.BlockedDirections.IsFlagSet(directions);
     }
 
+    /// <summary>
+    /// Checks if a tile on a grid is air-blocked in the specified directions, using cached data.
+    /// </summary>
+    /// <param name="grid">The grid to check.</param>
+    /// <param name="tile">The tile on the grid to check.</param>
+    /// <param name="directions">The directions to check for air-blockage.</param>
+    /// <returns>True if the tile is air-blocked in the specified directions, false otherwise.</returns>
+    /// <remarks>Returns data that is currently cached by Atmospherics.
+    /// You should always use this method over <see cref="IsTileAirBlocked"/> as it's more performant.
+    /// If you need to get up-to-date data because you've just invalidated airtight data,
+    /// use <see cref="IsTileAirBlocked"/>.</remarks>
+    [PublicAPI]
+    public bool IsTileAirBlockedCached(Entity<GridAtmosphereComponent?> grid,
+        Vector2i tile,
+        AtmosDirection directions = AtmosDirection.All)
+    {
+        if (!_atmosQuery.Resolve(grid, ref grid.Comp, false))
+            return false;
+
+        if (!grid.Comp.Tiles.TryGetValue(tile, out var atmosTile))
+            return false;
+
+        return atmosTile.AirtightData.BlockedDirections.IsFlagSet(directions);
+    }
+
     /// <summary>
     /// Checks if a tile on a grid or map is space as defined by a tile's definition of space.
     /// Some tiles can hold back space and others cannot - for example, plating can hold
diff --git a/Content.Server/Atmos/EntitySystems/HeatExchangerSystem.cs b/Content.Server/Atmos/EntitySystems/HeatExchangerSystem.cs
index b3644e88b7..8183bb99e4 100644
--- a/Content.Server/Atmos/EntitySystems/HeatExchangerSystem.cs
+++ b/Content.Server/Atmos/EntitySystems/HeatExchangerSystem.cs
@@ -43,7 +43,7 @@ public sealed class HeatExchangerSystem : EntitySystem
         // make sure that the tile the device is on isn't blocked by a wall or something similar.
         if (args.Grid is {} grid
             && _transform.TryGetGridTilePosition(uid, out var tile)
-            && _atmosphereSystem.IsTileAirBlocked(grid, tile))
+            && _atmosphereSystem.IsTileAirBlockedCached(grid, tile))
         {
             return;
         }
diff --git a/Content.Server/GameTicking/Rules/GameRuleSystem.Utility.cs b/Content.Server/GameTicking/Rules/GameRuleSystem.Utility.cs
index cd93eae502..8f1f08269b 100644
--- a/Content.Server/GameTicking/Rules/GameRuleSystem.Utility.cs
+++ b/Content.Server/GameTicking/Rules/GameRuleSystem.Utility.cs
@@ -116,7 +116,7 @@ public abstract partial class GameRuleSystem<T> where T: IComponent
 
             tile = new Vector2i(randomX, randomY);
             if (_atmosphere.IsTileSpace(targetGrid, Transform(targetGrid).MapUid, tile)
-                || _atmosphere.IsTileAirBlocked(targetGrid, tile, mapGridComp: gridComp))
+                || _atmosphere.IsTileAirBlockedCached(targetGrid, tile))
             {
                 continue;
             }

From d601ed5f4aeccd31fe7e1b0bbf3cb1a641a9d310 Mon Sep 17 00:00:00 2001
From: imatsoup <93290208+imatsoup@users.noreply.github.com>
Date: Tue, 23 Dec 2025 09:47:46 +0000
Subject: [PATCH 048/134] Make donk co. microwave syndicate contraband (#41960)

add BaseSyndicateContraband parentages to donk co microwave and donk co microwave machineboard
---
 .../Objects/Devices/Circuitboards/Machine/production.yml        | 2 +-
 Resources/Prototypes/Entities/Structures/Machines/microwave.yml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/production.yml b/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/production.yml
index 22205bf60d..5f9c1ac839 100644
--- a/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/production.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/production.yml
@@ -1050,7 +1050,7 @@
 
 - type: entity
   id: SyndicateMicrowaveMachineCircuitboard
-  parent: BaseMachineCircuitboard
+  parent: [ BaseMachineCircuitboard, BaseSyndicateContraband ]
   name: donk co. microwave machine board
   components:
     - type: Sprite
diff --git a/Resources/Prototypes/Entities/Structures/Machines/microwave.yml b/Resources/Prototypes/Entities/Structures/Machines/microwave.yml
index 072fadbc7e..b7c5b194ef 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/microwave.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/microwave.yml
@@ -148,7 +148,7 @@
 
 - type: entity
   id: SyndicateMicrowave
-  parent: KitchenMicrowave
+  parent: [ KitchenMicrowave, BaseSyndicateContraband ]
   name: donk co. microwave
   description: So advanced, it can cook donk-pockets in a mere 2.5 seconds!
   components:

From ad6644afd4f558145fb4a149173a1d3b88620a0b Mon Sep 17 00:00:00 2001
From: PJBot <pieterjan.briers+bot@gmail.com>
Date: Tue, 23 Dec 2025 10:02:44 +0000
Subject: [PATCH 049/134] 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 0359831a63..74666f467b 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -1,12 +1,4 @@
 Entries:
-- author: Luxeator
-  changes:
-  - message: Fixed error upon exploding buckled mobs (and other near instantaneous
-      changes)
-    type: Fix
-  id: 8830
-  time: '2025-08-05T23:15:16.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/39410
 - author: ScarKy0, beck-thompson
   changes:
   - message: Various canines will now sometimes clumsily spill things they drink.
@@ -3932,3 +3924,12 @@
   id: 9329
   time: '2025-12-23T08:12:52.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/41585
+- author: imatsoup
+  changes:
+  - message: The donk co. microwave is now considered Syndicate contraband.
+    type: Tweak
+  - message: The donk co. microwave circuitboard is now considered Syndicate contraband.
+    type: Tweak
+  id: 9330
+  time: '2025-12-23T10:01:37.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/41960

From 860f1418cdccb5a1d1ce120c2514faf7223fe88e Mon Sep 17 00:00:00 2001
From: B_Kirill <153602297+B-Kirill@users.noreply.github.com>
Date: Tue, 23 Dec 2025 23:13:39 +1000
Subject: [PATCH 050/134] Fix incorrect table breakage sound (#41968)

* Fix incorrect table breakage sound

* review

* retry

* are you kidding me
---
 .../Entities/Structures/Furniture/Tables/tables.yml       | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/Resources/Prototypes/Entities/Structures/Furniture/Tables/tables.yml b/Resources/Prototypes/Entities/Structures/Furniture/Tables/tables.yml
index 5442816d4f..d41346d220 100644
--- a/Resources/Prototypes/Entities/Structures/Furniture/Tables/tables.yml
+++ b/Resources/Prototypes/Entities/Structures/Furniture/Tables/tables.yml
@@ -534,7 +534,7 @@
         acts: [ "Destruction" ]
       - !type:PlaySoundBehavior
         sound:
-          collection: GlassBreak
+          collection: WoodDestroy
     - trigger:
         !type:DamageTrigger
         damage: 15
@@ -715,6 +715,12 @@
     damageModifierSet: Wood
   - type: Destructible
     thresholds:
+    - trigger: # Excess damage, don't spawn entities
+        !type:DamageTrigger
+        damage: 100
+      behaviors:
+      - !type:DoActsBehavior
+        acts: [ "Destruction" ]
     - trigger:
         !type:DamageTrigger
         damage: 25

From 229c08c5605bc970e8ebdc195de84d52d82b2e32 Mon Sep 17 00:00:00 2001
From: Princess Cheeseballs
 <66055347+Princess-Cheeseballs@users.noreply.github.com>
Date: Tue, 23 Dec 2025 11:47:46 -0800
Subject: [PATCH 051/134] Fix the Infinite Spill (#42022)

i hate solutions i hate solutions

Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
---
 .../Fluids/EntitySystems/PuddleSystem.cs      | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/Content.Server/Fluids/EntitySystems/PuddleSystem.cs b/Content.Server/Fluids/EntitySystems/PuddleSystem.cs
index c756a8e696..aca8c5383d 100644
--- a/Content.Server/Fluids/EntitySystems/PuddleSystem.cs
+++ b/Content.Server/Fluids/EntitySystems/PuddleSystem.cs
@@ -387,21 +387,34 @@ public sealed partial class PuddleSystem : SharedPuddleSystem
 
         spilled = solution.Value.Comp.Solution;
 
-        return TrySplashSpillAt(entity, coordinates, spilled, out puddleUid, sound, user);
+        return TrySplashSpillAt(entity, coordinates, solution.Value, out puddleUid, sound, user);
+    }
+
+    private bool TrySplashSpillAt(EntityUid entity,
+        EntityCoordinates coordinates,
+        Entity<SolutionComponent> solution,
+        out EntityUid puddleUid,
+        bool sound = true,
+        EntityUid? user = null)
+    {
+        var result = TrySplashSpillAt(entity, coordinates, solution.Comp.Solution, out puddleUid, sound, user);
+        _solutionContainerSystem.UpdateChemicals(solution);
+        return result;
     }
 
     public override bool TrySplashSpillAt(EntityUid entity,
         EntityCoordinates coordinates,
-        Solution spilled,
+        Solution solution,
         out EntityUid puddleUid,
         bool sound = true,
         EntityUid? user = null)
     {
         puddleUid = EntityUid.Invalid;
 
-        if (spilled.Volume == 0)
+        if (solution.Volume == 0)
             return false;
 
+        var spilled = solution.SplitSolution(solution.Volume);
         var targets = new List<EntityUid>();
         var reactive = new HashSet<Entity<ReactiveComponent>>();
         _lookup.GetEntitiesInRange(coordinates, 1.0f, reactive);

From 402cc654773b74ac0d8fdd778cfd7abedd9dcb0c Mon Sep 17 00:00:00 2001
From: Stefano Pigozzi <me@steffo.eu>
Date: Tue, 23 Dec 2025 21:42:32 +0100
Subject: [PATCH 052/134] Change "mafioso" (singular) to "mafiosi" (plural) in
 the Italian accent. (#42026)

Change "mafioso" (singular) to "mafiosi" (plural)
---
 Resources/Locale/en-US/accent/italian.ftl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Resources/Locale/en-US/accent/italian.ftl b/Resources/Locale/en-US/accent/italian.ftl
index cc8641417f..7b7ff4c94b 100644
--- a/Resources/Locale/en-US/accent/italian.ftl
+++ b/Resources/Locale/en-US/accent/italian.ftl
@@ -112,7 +112,7 @@ accent-italian-words-35 = traitor
 accent-italian-words-replace-35 = mafioso
 
 accent-italian-words-36 = traitors
-accent-italian-words-replace-36 = mafioso
+accent-italian-words-replace-36 = mafiosi
 
 accent-italian-words-37 = use
 accent-italian-words-replace-37 = use-a

From 503052bca7b5b78aed783d001149eb6553196656 Mon Sep 17 00:00:00 2001
From: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>
Date: Tue, 23 Dec 2025 16:52:42 -0500
Subject: [PATCH 053/134] Fix spreaders not re-spreading on deletion (#42016)

* Fix spreaders not re-spreading on deletion

* Rename another variable for clarity
---
 Content.Server/Spreader/SpreaderSystem.cs | 33 +++++++++++++----------
 1 file changed, 19 insertions(+), 14 deletions(-)

diff --git a/Content.Server/Spreader/SpreaderSystem.cs b/Content.Server/Spreader/SpreaderSystem.cs
index 2bc067542d..7ea41431da 100644
--- a/Content.Server/Spreader/SpreaderSystem.cs
+++ b/Content.Server/Spreader/SpreaderSystem.cs
@@ -295,35 +295,38 @@ public sealed class SpreaderSystem : EntitySystem
     /// This function activates all spreaders that are adjacent to a given entity. This also activates other spreaders
     /// on the same tile as the current entity (for thin airtight entities like windoors).
     /// </summary>
-    public void ActivateSpreadableNeighbors(EntityUid uid, (EntityUid Grid, Vector2i Tile)? position = null)
+    public void ActivateSpreadableNeighbors(EntityUid origin, (EntityUid Grid, Vector2i Tile)? position = null)
     {
         Vector2i tile;
-        EntityUid ent;
-        MapGridComponent? grid;
+        EntityUid gridUid;
+        MapGridComponent? gridComp;
 
         if (position == null)
         {
-            var transform = Transform(uid);
-            if (!TryComp(transform.GridUid, out grid) || TerminatingOrDeleted(transform.GridUid.Value))
+            var transform = Transform(origin);
+            if (!TryComp(transform.GridUid, out gridComp) || TerminatingOrDeleted(transform.GridUid.Value))
                 return;
 
-            tile = _map.TileIndicesFor(transform.GridUid.Value, grid, transform.Coordinates);
-            ent = transform.GridUid.Value;
+            tile = _map.TileIndicesFor(transform.GridUid.Value, gridComp, transform.Coordinates);
+            gridUid = transform.GridUid.Value;
         }
         else
         {
-            if (!TryComp(position.Value.Grid, out grid))
+            if (!TryComp(position.Value.Grid, out gridComp))
                 return;
-            (ent, tile) = position.Value;
+            (gridUid, tile) = position.Value;
         }
 
-        var anchored = _map.GetAnchoredEntitiesEnumerator(ent, grid, tile);
+        var anchored = _map.GetAnchoredEntitiesEnumerator(gridUid, gridComp, tile);
         while (anchored.MoveNext(out var entity))
         {
-            if (entity == ent)
+            // Don't re-activate the terminating entity
+            if (entity == origin)
                 continue;
             DebugTools.Assert(Transform(entity.Value).Anchored);
-            if (_query.HasComponent(ent) && !TerminatingOrDeleted(entity.Value))
+
+            // Activate any edge spreaders that are non-terminating
+            if (_query.HasComponent(entity) && !TerminatingOrDeleted(entity))
                 EnsureComp<ActiveEdgeSpreaderComponent>(entity.Value);
         }
 
@@ -331,12 +334,14 @@ public sealed class SpreaderSystem : EntitySystem
         {
             var direction = (AtmosDirection) (1 << i);
             var adjacentTile = SharedMapSystem.GetDirection(tile, direction.ToDirection());
-            anchored = _map.GetAnchoredEntitiesEnumerator(ent, grid, adjacentTile);
+            anchored = _map.GetAnchoredEntitiesEnumerator(gridUid, gridComp, adjacentTile);
 
             while (anchored.MoveNext(out var entity))
             {
                 DebugTools.Assert(Transform(entity.Value).Anchored);
-                if (_query.HasComponent(ent) && !TerminatingOrDeleted(entity.Value))
+
+                // Activate any edge spreaders that are non-terminating
+                if (_query.HasComponent(entity) && !TerminatingOrDeleted(entity))
                     EnsureComp<ActiveEdgeSpreaderComponent>(entity.Value);
             }
         }

From dbda861cade19c83f64be5ef405efb03d93934b4 Mon Sep 17 00:00:00 2001
From: ahandleman <ahandleman@wustl.edu>
Date: Tue, 23 Dec 2025 16:15:51 -0600
Subject: [PATCH 054/134] Change Botany Minimum Quantity For Random Chems
 (#41955)

* Initial change to fix minimums

* Switch to clamp for setting min
---
 .../Effects/Botany/PlantMutateChemicalsEntityEffectSystem.cs | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/Content.Server/EntityEffects/Effects/Botany/PlantMutateChemicalsEntityEffectSystem.cs b/Content.Server/EntityEffects/Effects/Botany/PlantMutateChemicalsEntityEffectSystem.cs
index d5589966b1..1f8f3fc946 100644
--- a/Content.Server/EntityEffects/Effects/Botany/PlantMutateChemicalsEntityEffectSystem.cs
+++ b/Content.Server/EntityEffects/Effects/Botany/PlantMutateChemicalsEntityEffectSystem.cs
@@ -33,8 +33,9 @@ public sealed partial class PlantMutateChemicalsEntityEffectSystem : EntityEffec
         }
         else
         {
-            seedChemQuantity.Min = FixedPoint2.Epsilon;
-            seedChemQuantity.Max = FixedPoint2.Zero + amount;
+            //Set the minimum to a fifth of the quantity to give some level of bad luck protection
+            seedChemQuantity.Min = FixedPoint2.Clamp(pick.Quantity / 5f, FixedPoint2.Epsilon, 1f);
+            seedChemQuantity.Max = seedChemQuantity.Min + amount;
             seedChemQuantity.Inherent = false;
         }
         var potencyDivisor = 100f / seedChemQuantity.Max;

From 428df6a58a387757f65de4b8d81a713506a73f4c Mon Sep 17 00:00:00 2001
From: Jessica M <jessica@jessicamaybe.com>
Date: Tue, 23 Dec 2025 16:29:55 -0800
Subject: [PATCH 055/134] Add botany equipment to marathon brig (#42028)

add botany tools to marathon

Co-authored-by: Jessica M <jessica@maybe.sh>
---
 Resources/Maps/marathon.yml | 493 ++++++++++++++++++++----------------
 1 file changed, 272 insertions(+), 221 deletions(-)

diff --git a/Resources/Maps/marathon.yml b/Resources/Maps/marathon.yml
index 4d60e79763..00075e4985 100644
--- a/Resources/Maps/marathon.yml
+++ b/Resources/Maps/marathon.yml
@@ -1,11 +1,11 @@
 meta:
   format: 7
   category: Map
-  engineVersion: 267.3.0
+  engineVersion: 269.0.1
   forkId: ""
   forkVersion: ""
-  time: 11/07/2025 10:28:48
-  entityCount: 23873
+  time: 12/23/2025 21:10:24
+  entityCount: 23881
 maps:
 - 5350
 grids:
@@ -169,11 +169,11 @@ entities:
           version: 7
         -3,4:
           ind: -3,4
-          tiles: LwAAAAABAGsAAAAAAgBdAAAAAAAAXQAAAAAAAF0AAAAAAgB+AAAAAAAAAAAAAAAAAAAAAAAAAAB9AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAC8AAAAAAgBrAAAAAAMAXQAAAAACAF0AAAAAAQBdAAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH0AAAAAAAB9AAAAAAAAfQAAAAAAAH0AAAAAAAB9AAAAAAAAfQAAAAAAAH0AAAAAAAAvAAAAAAIAawAAAAACAF0AAAAAAgBdAAAAAAMAXQAAAAACAH4AAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAB9AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAALwAAAAAAAGsAAAAAAwBdAAAAAAIAXQAAAAAAAF0AAAAAAgB+AAAAAAAAAAAAAAAAAH0AAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAB+AAAAAAAAfgAAAAAAAAAAAAAAAAB9AAAAAAAAAAAAAAAAAH0AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAfgAAAAAAAAAAAAAAAAB9AAAAAAAAfQAAAAAAAH0AAAAAAAB9AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB9AAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAH0AAAAAAAAAAAAAAAAAfQAAAAAAAH0AAAAAAAB9AAAAAAAAfQAAAAAAAH0AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB9AAAAAAAAfQAAAAAAAH0AAAAAAAB9AAAAAAAAfQAAAAAAAH0AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==
+          tiles: LwAAAAABAGsAAAAAAgBdAAAAAAAAXQAAAAAAAF0AAAAAAgB+AAAAAAAAAAAAAAAAAAAAAAAAAAB9AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAC8AAAAAAgBrAAAAAAMAXQAAAAACAF0AAAAAAQBdAAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH0AAAAAAAB9AAAAAAAAfQAAAAAAAH0AAAAAAAB9AAAAAAAAfQAAAAAAAH0AAAAAAAAvAAAAAAIAawAAAAACAF0AAAAAAgBdAAAAAAMAXQAAAAACAH4AAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAB9AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAALwAAAAAAAGsAAAAAAwBdAAAAAAIAXQAAAAAAAF0AAAAAAgB+AAAAAAAAAAAAAAAAAH0AAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAB+AAAAAAAAfgAAAAAAAAAAAAAAAAB9AAAAAAAAAAAAAAAAAH0AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAfgAAAAAAAAAAAAAAAAB9AAAAAAAAfQAAAAAAAH0AAAAAAAB9AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAAH4AAAAAAAB9AAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAH0AAAAAAAB9AAAAAAAAfQAAAAAAAH0AAAAAAAB9AAAAAAAAfQAAAAAAAH0AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB9AAAAAAAAAAAAAAAAAH0AAAAAAAB9AAAAAAAAfQAAAAAAAH0AAAAAAAB9AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAH0AAAAAAAB9AAAAAAAAfQAAAAAAAH0AAAAAAAB9AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAH0AAAAAAAB9AAAAAAAAfQAAAAAAAH0AAAAAAAB9AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==
           version: 7
         -4,4:
           ind: -4,4
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB9AAAAAAAAfgAAAAAAAH0AAAAAAAB+AAAAAAAAXQAAAAAAAF0AAAAAAABdAAAAAAMAawAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAH4AAAAAAAB9AAAAAAAAfgAAAAAAAF0AAAAAAgBdAAAAAAMAXQAAAAADAGsAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAH0AAAAAAAB+AAAAAAAAfQAAAAAAAH4AAAAAAABdAAAAAAAAXQAAAAABAF0AAAAAAABrAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB9AAAAAAAAfgAAAAAAAH0AAAAAAAB+AAAAAAAAXQAAAAAAAF0AAAAAAQBdAAAAAAAAawAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAH4AAAAAAAB9AAAAAAAAfgAAAAAAAH4AAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAH0AAAAAAAB9AAAAAAAAAAAAAAAAAH0AAAAAAAB+AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAH0AAAAAAAB9AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAH0AAAAAAAAAAAAAAAAAfQAAAAAAAH0AAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAH0AAAAAAAB9AAAAAAAAfQAAAAAAAH0AAAAAAAB9AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB9AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB9AAAAAAAAfgAAAAAAAH0AAAAAAAB+AAAAAAAAXQAAAAAAAF0AAAAAAABdAAAAAAMAawAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAH4AAAAAAAB9AAAAAAAAfgAAAAAAAF0AAAAAAgBdAAAAAAMAXQAAAAADAGsAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAH0AAAAAAAB+AAAAAAAAfQAAAAAAAH4AAAAAAABdAAAAAAAAXQAAAAABAF0AAAAAAABrAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB9AAAAAAAAfgAAAAAAAH0AAAAAAAB+AAAAAAAAXQAAAAAAAF0AAAAAAQBdAAAAAAAAawAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAH4AAAAAAAB9AAAAAAAAfgAAAAAAAH4AAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAH0AAAAAAAB9AAAAAAAAAAAAAAAAAH0AAAAAAAB+AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAH0AAAAAAAB9AAAAAAAAfgAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAH0AAAAAAAAAAAAAAAAAfQAAAAAAAH0AAAAAAAB9AAAAAAAAfQAAAAAAAH0AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAH0AAAAAAAB9AAAAAAAAAAAAAAAAAH0AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB9AAAAAAAAfQAAAAAAAH0AAAAAAAB9AAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAH0AAAAAAAB9AAAAAAAAfQAAAAAAAH0AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==
           version: 7
         -1,2:
           ind: -1,2
@@ -7578,6 +7578,7 @@ entities:
     - type: SpreaderGrid
     - type: GridPathfinding
     - type: ImplicitRoof
+    - type: ExplosionAirtightGrid
   - uid: 5350
     components:
     - type: MetaData
@@ -11783,7 +11784,7 @@ entities:
       pos: 34.5,45.5
       parent: 30
     - type: Door
-      secondsUntilStateChange: -47753.46
+      secondsUntilStateChange: -48347.26
       state: Opening
     - type: DeviceLinkSource
       lastSignals:
@@ -17568,10 +17569,10 @@ entities:
       parent: 30
 - proto: Biogenerator
   entities:
-  - uid: 4699
+  - uid: 4689
     components:
     - type: Transform
-      pos: -44.5,69.5
+      pos: -44.5,70.5
       parent: 30
     - type: TechnologyDatabase
       supportedDisciplines:
@@ -18767,16 +18768,6 @@ entities:
     - type: Transform
       pos: -41.5,53.5
       parent: 30
-  - uid: 2219
-    components:
-    - type: Transform
-      pos: -49.5,70.5
-      parent: 30
-  - uid: 2220
-    components:
-    - type: Transform
-      pos: -45.5,70.5
-      parent: 30
   - uid: 2221
     components:
     - type: Transform
@@ -18847,11 +18838,6 @@ entities:
     - type: Transform
       pos: -47.5,61.5
       parent: 30
-  - uid: 2268
-    components:
-    - type: Transform
-      pos: -47.5,70.5
-      parent: 30
   - uid: 2270
     components:
     - type: Transform
@@ -54139,6 +54125,13 @@ entities:
     - type: Transform
       pos: -5.5,-7.5
       parent: 30
+- proto: ChemistryBottleEZNutrient
+  entities:
+  - uid: 2696
+    components:
+    - type: Transform
+      pos: -50.748863,68.50408
+      parent: 30
 - proto: ChemistryBottleMannitol
   entities:
   - uid: 23852
@@ -54146,6 +54139,13 @@ entities:
     - type: Transform
       pos: -21.209566,-52.691216
       parent: 30
+- proto: ChemistryBottleRobustHarvest
+  entities:
+  - uid: 4672
+    components:
+    - type: Transform
+      pos: -50.71969,68.78118
+      parent: 30
 - proto: ChemistryHotplate
   entities:
   - uid: 9180
@@ -55191,6 +55191,13 @@ entities:
     - type: Transform
       pos: 12.458031,22.694685
       parent: 30
+- proto: ClothingBeltPlant
+  entities:
+  - uid: 2219
+    components:
+    - type: Transform
+      pos: -50.384277,68.40203
+      parent: 30
 - proto: ClothingBeltPlantFilled
   entities:
   - uid: 3498
@@ -66034,13 +66041,6 @@ entities:
       parent: 30
     - type: FaxMachine
       name: Captain
-- proto: FigureSpawner
-  entities:
-  - uid: 20789
-    components:
-    - type: Transform
-      pos: -75.5,-63.5
-      parent: 30
 - proto: filingCabinet
   entities:
   - uid: 6899
@@ -96948,10 +96948,20 @@ entities:
     - type: Transform
       pos: -55.5,64.5
       parent: 30
-  - uid: 2259
+  - uid: 2322
     components:
     - type: Transform
-      pos: -47.5,70.5
+      pos: -49.5,71.5
+      parent: 30
+  - uid: 2325
+    components:
+    - type: Transform
+      pos: -47.5,71.5
+      parent: 30
+  - uid: 2327
+    components:
+    - type: Transform
+      pos: -45.5,71.5
       parent: 30
   - uid: 2345
     components:
@@ -96988,41 +96998,6 @@ entities:
     - type: Transform
       pos: -54.5,70.5
       parent: 30
-  - uid: 2390
-    components:
-    - type: Transform
-      pos: -44.5,72.5
-      parent: 30
-  - uid: 2391
-    components:
-    - type: Transform
-      pos: -45.5,72.5
-      parent: 30
-  - uid: 2392
-    components:
-    - type: Transform
-      pos: -46.5,72.5
-      parent: 30
-  - uid: 2393
-    components:
-    - type: Transform
-      pos: -47.5,72.5
-      parent: 30
-  - uid: 2394
-    components:
-    - type: Transform
-      pos: -48.5,72.5
-      parent: 30
-  - uid: 2395
-    components:
-    - type: Transform
-      pos: -49.5,72.5
-      parent: 30
-  - uid: 2398
-    components:
-    - type: Transform
-      pos: -52.5,72.5
-      parent: 30
   - uid: 2589
     components:
     - type: Transform
@@ -97043,11 +97018,6 @@ entities:
     - type: Transform
       pos: -50.5,55.5
       parent: 30
-  - uid: 2683
-    components:
-    - type: Transform
-      pos: -49.5,70.5
-      parent: 30
   - uid: 2690
     components:
     - type: Transform
@@ -97058,21 +97028,16 @@ entities:
     - type: Transform
       pos: -39.5,69.5
       parent: 30
-  - uid: 2696
-    components:
-    - type: Transform
-      pos: -51.5,72.5
-      parent: 30
-  - uid: 2697
-    components:
-    - type: Transform
-      pos: -43.5,72.5
-      parent: 30
   - uid: 2698
     components:
     - type: Transform
       pos: -38.5,68.5
       parent: 30
+  - uid: 2729
+    components:
+    - type: Transform
+      pos: -51.5,73.5
+      parent: 30
   - uid: 2933
     components:
     - type: Transform
@@ -97128,11 +97093,6 @@ entities:
     - type: Transform
       pos: -40.5,66.5
       parent: 30
-  - uid: 4690
-    components:
-    - type: Transform
-      pos: -45.5,70.5
-      parent: 30
   - uid: 4789
     components:
     - type: Transform
@@ -102473,6 +102433,31 @@ entities:
     - type: Transform
       pos: 7.5,-62.5
       parent: 30
+  - uid: 22537
+    components:
+    - type: Transform
+      pos: -48.5,73.5
+      parent: 30
+  - uid: 22540
+    components:
+    - type: Transform
+      pos: -50.5,73.5
+      parent: 30
+  - uid: 22541
+    components:
+    - type: Transform
+      pos: -45.5,73.5
+      parent: 30
+  - uid: 22542
+    components:
+    - type: Transform
+      pos: -46.5,73.5
+      parent: 30
+  - uid: 22543
+    components:
+    - type: Transform
+      pos: -44.5,73.5
+      parent: 30
   - uid: 22549
     components:
     - type: Transform
@@ -102957,6 +102942,16 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -65.5,63.5
       parent: 30
+  - uid: 23874
+    components:
+    - type: Transform
+      pos: -43.5,73.5
+      parent: 30
+  - uid: 23875
+    components:
+    - type: Transform
+      pos: -47.5,73.5
+      parent: 30
 - proto: GrilleBroken
   entities:
   - uid: 695
@@ -103021,23 +103016,11 @@ entities:
       rot: 3.141592653589793 rad
       pos: -54.5,69.5
       parent: 30
-  - uid: 2684
+  - uid: 4699
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: -50.5,72.5
-      parent: 30
-  - uid: 2687
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -50.5,72.5
-      parent: 30
-  - uid: 2691
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -42.5,72.5
+      pos: -49.5,73.5
       parent: 30
   - uid: 5799
     components:
@@ -103345,6 +103328,12 @@ entities:
     - type: Transform
       pos: 9.5,-45.5
       parent: 30
+  - uid: 22534
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -42.5,73.5
+      parent: 30
   - uid: 22781
     components:
     - type: Transform
@@ -103469,6 +103458,12 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -70.5,63.5
       parent: 30
+  - uid: 23878
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -49.5,73.5
+      parent: 30
 - proto: GrilleSpawner
   entities:
   - uid: 10007
@@ -104398,6 +104393,11 @@ entities:
       parent: 30
 - proto: HydroponicsToolClippers
   entities:
+  - uid: 2725
+    components:
+    - type: Transform
+      pos: -44.620857,68.69275
+      parent: 30
   - uid: 3496
     components:
     - type: Transform
@@ -104417,6 +104417,11 @@ entities:
       parent: 30
 - proto: HydroponicsToolMiniHoe
   entities:
+  - uid: 4690
+    components:
+    - type: Transform
+      pos: -44.48963,68.82401
+      parent: 30
   - uid: 14335
     components:
     - type: Transform
@@ -104436,6 +104441,11 @@ entities:
       parent: 30
 - proto: HydroponicsToolSpade
   entities:
+  - uid: 2268
+    components:
+    - type: Transform
+      pos: -44.47502,68.56152
+      parent: 30
   - uid: 16135
     components:
     - type: Transform
@@ -104463,45 +104473,50 @@ entities:
     - type: Transform
       pos: -21.5,12.5
       parent: 30
-  - uid: 2322
+  - uid: 2220
     components:
     - type: Transform
-      pos: -47.5,69.5
-      parent: 30
-  - uid: 2325
-    components:
-    - type: Transform
-      pos: -45.5,69.5
-      parent: 30
-  - uid: 2327
-    components:
-    - type: Transform
-      pos: -49.5,69.5
+      pos: -47.5,70.5
       parent: 30
   - uid: 2328
     components:
     - type: Transform
       pos: -47.5,68.5
       parent: 30
+  - uid: 2392
+    components:
+    - type: Transform
+      pos: -48.5,70.5
+      parent: 30
+  - uid: 2683
+    components:
+    - type: Transform
+      pos: -45.5,69.5
+      parent: 30
+  - uid: 2684
+    components:
+    - type: Transform
+      pos: -47.5,69.5
+      parent: 30
+  - uid: 2691
+    components:
+    - type: Transform
+      pos: -49.5,69.5
+      parent: 30
+  - uid: 2697
+    components:
+    - type: Transform
+      pos: -46.5,70.5
+      parent: 30
   - uid: 2702
     components:
     - type: Transform
-      pos: -48.5,69.5
+      pos: -45.5,70.5
       parent: 30
-  - uid: 2725
+  - uid: 2730
     components:
     - type: Transform
-      pos: -49.5,68.5
-      parent: 30
-  - uid: 4540
-    components:
-    - type: Transform
-      pos: -46.5,69.5
-      parent: 30
-  - uid: 4661
-    components:
-    - type: Transform
-      pos: -45.5,68.5
+      pos: -49.5,70.5
       parent: 30
   - uid: 5035
     components:
@@ -107915,6 +107930,13 @@ entities:
     - type: Transform
       pos: 17.5,-9.5
       parent: 30
+- proto: MechFigurineSpawner50
+  entities:
+  - uid: 20789
+    components:
+    - type: Transform
+      pos: -75.5,-63.5
+      parent: 30
 - proto: MedicalBed
   entities:
   - uid: 7422
@@ -109380,6 +109402,13 @@ entities:
     - type: Transform
       pos: -75.515656,-51.77146
       parent: 30
+- proto: PlantBGoneSpray
+  entities:
+  - uid: 4540
+    components:
+    - type: Transform
+      pos: -50.514687,68.76566
+      parent: 30
 - proto: PlaqueAtmos
   entities:
   - uid: 9084
@@ -109642,6 +109671,13 @@ entities:
     - type: Transform
       pos: 40.559143,-53.538166
       parent: 30
+- proto: PlushieSpawner50
+  entities:
+  - uid: 15146
+    components:
+    - type: Transform
+      pos: 13.5,6.5
+      parent: 30
 - proto: PlushieVox
   entities:
   - uid: 23851
@@ -111203,6 +111239,16 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -49.5,54.5
       parent: 30
+  - uid: 2259
+    components:
+    - type: Transform
+      pos: -48.5,70.5
+      parent: 30
+  - uid: 2267
+    components:
+    - type: Transform
+      pos: -46.5,70.5
+      parent: 30
   - uid: 2347
     components:
     - type: Transform
@@ -111233,11 +111279,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -43.5,64.5
       parent: 30
-  - uid: 2682
-    components:
-    - type: Transform
-      pos: -48.5,69.5
-      parent: 30
   - uid: 3203
     components:
     - type: Transform
@@ -111599,11 +111640,6 @@ entities:
       parent: 30
     - type: ApcPowerReceiver
       powerLoad: 0
-  - uid: 4689
-    components:
-    - type: Transform
-      pos: -46.5,69.5
-      parent: 30
   - uid: 4784
     components:
     - type: Transform
@@ -117140,15 +117176,10 @@ entities:
     - type: Transform
       pos: -49.5,47.5
       parent: 30
-  - uid: 2267
-    components:
-    - type: Transform
-      pos: -47.5,70.5
-      parent: 30
   - uid: 2269
     components:
     - type: Transform
-      pos: -45.5,70.5
+      pos: -45.5,71.5
       parent: 30
   - uid: 2314
     components:
@@ -117160,11 +117191,21 @@ entities:
     - type: Transform
       pos: -45.5,42.5
       parent: 30
+  - uid: 2394
+    components:
+    - type: Transform
+      pos: -47.5,71.5
+      parent: 30
   - uid: 2588
     components:
     - type: Transform
       pos: -26.5,57.5
       parent: 30
+  - uid: 2682
+    components:
+    - type: Transform
+      pos: -49.5,71.5
+      parent: 30
   - uid: 2724
     components:
     - type: Transform
@@ -117205,11 +117246,6 @@ entities:
     - type: Transform
       pos: -34.5,-24.5
       parent: 30
-  - uid: 4491
-    components:
-    - type: Transform
-      pos: -49.5,70.5
-      parent: 30
   - uid: 4695
     components:
     - type: Transform
@@ -120264,10 +120300,10 @@ entities:
       - CivilianServices
 - proto: SeedExtractor
   entities:
-  - uid: 4701
+  - uid: 4492
     components:
     - type: Transform
-      pos: -44.5,68.5
+      pos: -44.5,69.5
       parent: 30
   - uid: 16134
     components:
@@ -125292,7 +125328,7 @@ entities:
     - type: Transform
       pos: 19.53292,7.7526426
       parent: 30
-- proto: SpacemenFigureSpawner
+- proto: SpacemenFigurineSpawner90
   entities:
   - uid: 20790
     components:
@@ -129316,6 +129352,11 @@ entities:
     - type: Transform
       pos: -48.5,65.5
       parent: 30
+  - uid: 2685
+    components:
+    - type: Transform
+      pos: -44.5,68.5
+      parent: 30
   - uid: 2716
     components:
     - type: Transform
@@ -129341,6 +129382,11 @@ entities:
     - type: Transform
       pos: -39.5,18.5
       parent: 30
+  - uid: 4491
+    components:
+    - type: Transform
+      pos: -50.5,68.5
+      parent: 30
   - uid: 4574
     components:
     - type: Transform
@@ -132031,13 +132077,6 @@ entities:
     - type: Transform
       pos: -25.44764,39.398945
       parent: 30
-- proto: ToySpawner
-  entities:
-  - uid: 15146
-    components:
-    - type: Transform
-      pos: 13.5,6.5
-      parent: 30
 - proto: TrashBag
   entities:
   - uid: 16169
@@ -132968,16 +133007,16 @@ entities:
       parent: 30
 - proto: VendingMachineSeedsUnlocked
   entities:
-  - uid: 4672
-    components:
-    - type: Transform
-      pos: -50.5,68.5
-      parent: 30
   - uid: 15749
     components:
     - type: Transform
       pos: -77.5,-53.5
       parent: 30
+  - uid: 22536
+    components:
+    - type: Transform
+      pos: -50.5,69.5
+      parent: 30
 - proto: VendingMachineSovietSoda
   entities:
   - uid: 16926
@@ -134581,6 +134620,11 @@ entities:
     - type: Transform
       pos: -54.5,63.5
       parent: 30
+  - uid: 2343
+    components:
+    - type: Transform
+      pos: -46.5,71.5
+      parent: 30
   - uid: 2361
     components:
     - type: Transform
@@ -134621,6 +134665,26 @@ entities:
     - type: Transform
       pos: -54.5,65.5
       parent: 30
+  - uid: 2390
+    components:
+    - type: Transform
+      pos: -48.5,71.5
+      parent: 30
+  - uid: 2391
+    components:
+    - type: Transform
+      pos: -43.5,71.5
+      parent: 30
+  - uid: 2393
+    components:
+    - type: Transform
+      pos: -44.5,71.5
+      parent: 30
+  - uid: 2398
+    components:
+    - type: Transform
+      pos: -50.5,71.5
+      parent: 30
   - uid: 2405
     components:
     - type: Transform
@@ -134664,12 +134728,7 @@ entities:
   - uid: 2681
     components:
     - type: Transform
-      pos: -44.5,70.5
-      parent: 30
-  - uid: 2685
-    components:
-    - type: Transform
-      pos: -43.5,73.5
+      pos: -51.5,71.5
       parent: 30
   - uid: 2701
     components:
@@ -134681,16 +134740,6 @@ entities:
     - type: Transform
       pos: -52.5,60.5
       parent: 30
-  - uid: 2729
-    components:
-    - type: Transform
-      pos: -48.5,70.5
-      parent: 30
-  - uid: 2730
-    components:
-    - type: Transform
-      pos: -50.5,70.5
-      parent: 30
   - uid: 3153
     components:
     - type: Transform
@@ -134776,11 +134825,6 @@ entities:
     - type: Transform
       pos: 41.5,20.5
       parent: 30
-  - uid: 4492
-    components:
-    - type: Transform
-      pos: -46.5,70.5
-      parent: 30
   - uid: 4512
     components:
     - type: Transform
@@ -134801,6 +134845,11 @@ entities:
     - type: Transform
       pos: -44.5,51.5
       parent: 30
+  - uid: 4661
+    components:
+    - type: Transform
+      pos: -48.5,74.5
+      parent: 30
   - uid: 4674
     components:
     - type: Transform
@@ -134846,6 +134895,11 @@ entities:
     - type: Transform
       pos: -43.5,69.5
       parent: 30
+  - uid: 4701
+    components:
+    - type: Transform
+      pos: -44.5,74.5
+      parent: 30
   - uid: 4702
     components:
     - type: Transform
@@ -141912,45 +141966,10 @@ entities:
     - type: Transform
       pos: 6.5,-64.5
       parent: 30
-  - uid: 22534
-    components:
-    - type: Transform
-      pos: -51.5,73.5
-      parent: 30
   - uid: 22535
     components:
     - type: Transform
-      pos: -50.5,73.5
-      parent: 30
-  - uid: 22536
-    components:
-    - type: Transform
-      pos: -49.5,73.5
-      parent: 30
-  - uid: 22537
-    components:
-    - type: Transform
-      pos: -48.5,73.5
-      parent: 30
-  - uid: 22540
-    components:
-    - type: Transform
-      pos: -47.5,73.5
-      parent: 30
-  - uid: 22541
-    components:
-    - type: Transform
-      pos: -45.5,73.5
-      parent: 30
-  - uid: 22542
-    components:
-    - type: Transform
-      pos: -46.5,73.5
-      parent: 30
-  - uid: 22543
-    components:
-    - type: Transform
-      pos: -44.5,73.5
+      pos: -46.5,74.5
       parent: 30
   - uid: 22779
     components:
@@ -141977,6 +141996,31 @@ entities:
     - type: Transform
       pos: -44.5,53.5
       parent: 30
+  - uid: 23876
+    components:
+    - type: Transform
+      pos: -50.5,74.5
+      parent: 30
+  - uid: 23877
+    components:
+    - type: Transform
+      pos: -49.5,74.5
+      parent: 30
+  - uid: 23879
+    components:
+    - type: Transform
+      pos: -43.5,74.5
+      parent: 30
+  - uid: 23880
+    components:
+    - type: Transform
+      pos: -45.5,74.5
+      parent: 30
+  - uid: 23881
+    components:
+    - type: Transform
+      pos: -47.5,74.5
+      parent: 30
 - proto: WallSolid
   entities:
   - uid: 3
@@ -147862,10 +147906,10 @@ entities:
     - type: Transform
       pos: -30.5,29.5
       parent: 30
-  - uid: 2343
+  - uid: 2687
     components:
     - type: Transform
-      pos: -50.5,69.5
+      pos: -50.5,70.5
       parent: 30
   - uid: 9283
     components:
@@ -148112,6 +148156,13 @@ entities:
     - type: Physics
       canCollide: False
     - type: InsideEntityStorage
+- proto: WeedSpray
+  entities:
+  - uid: 2395
+    components:
+    - type: Transform
+      pos: -50.259445,68.70736
+      parent: 30
 - proto: Welder
   entities:
   - uid: 1633

From ff1cba2949978295a9b50d25dd024a054e23729b Mon Sep 17 00:00:00 2001
From: PJBot <pieterjan.briers+bot@gmail.com>
Date: Wed, 24 Dec 2025 00:44:26 +0000
Subject: [PATCH 056/134] Automatic changelog update

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

diff --git a/Resources/Changelog/Maps.yml b/Resources/Changelog/Maps.yml
index 68f28da092..52aad2badb 100644
--- a/Resources/Changelog/Maps.yml
+++ b/Resources/Changelog/Maps.yml
@@ -956,4 +956,11 @@
   id: 116
   time: '2025-12-20T08:32:14.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/41908
+- author: jessicamaybe
+  changes:
+  - message: Added botany equipment to the Marathon brig
+    type: Add
+  id: 117
+  time: '2025-12-24T00:43:15.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/42028
 Order: 2

From 92ee561f4b5a3a79f0f50613c6777898f5f51877 Mon Sep 17 00:00:00 2001
From: Pieter-Jan Briers <pieterjan.briers+git@gmail.com>
Date: Wed, 24 Dec 2025 02:16:20 +0100
Subject: [PATCH 057/134] Update RT to v270.0.0 (#42029)

Fix audio loading issues
---
 RobustToolbox | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/RobustToolbox b/RobustToolbox
index c7ba63ed8e..6d31d5ba24 160000
--- a/RobustToolbox
+++ b/RobustToolbox
@@ -1 +1 @@
-Subproject commit c7ba63ed8e9c8087b7a78bada55057ac7aa0812d
+Subproject commit 6d31d5ba2404c9f069c456f10bd717929b00a9d8

From 9511285508133839a11c5f6a14ab7cf61b558060 Mon Sep 17 00:00:00 2001
From: Pieter-Jan Briers <pieterjan.briers+git@gmail.com>
Date: Wed, 24 Dec 2025 02:56:31 +0100
Subject: [PATCH 058/134] Fix NanoTask and bounty print formatting (#42030)

Markup text was erroneously being appended via AddText().
---
 Content.Server/Cargo/Systems/CargoSystem.Bounty.cs          | 4 ++--
 .../CartridgeLoader/Cartridges/NanoTaskCartridgeSystem.cs   | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Content.Server/Cargo/Systems/CargoSystem.Bounty.cs b/Content.Server/Cargo/Systems/CargoSystem.Bounty.cs
index c2c2a8365c..72941a1665 100644
--- a/Content.Server/Cargo/Systems/CargoSystem.Bounty.cs
+++ b/Content.Server/Cargo/Systems/CargoSystem.Bounty.cs
@@ -119,9 +119,9 @@ public sealed partial class CargoSystem
         label.Id = bounty.Id;
         label.AssociatedStationId = stationId;
         var msg = new FormattedMessage();
-        msg.AddText(Loc.GetString("bounty-manifest-header", ("id", bounty.Id)));
+        msg.AddMarkupOrThrow(Loc.GetString("bounty-manifest-header", ("id", bounty.Id)));
         msg.PushNewline();
-        msg.AddText(Loc.GetString("bounty-manifest-list-start"));
+        msg.AddMarkupOrThrow(Loc.GetString("bounty-manifest-list-start"));
         msg.PushNewline();
         foreach (var entry in prototype.Entries)
         {
diff --git a/Content.Server/CartridgeLoader/Cartridges/NanoTaskCartridgeSystem.cs b/Content.Server/CartridgeLoader/Cartridges/NanoTaskCartridgeSystem.cs
index 66934c8a87..a544ba66e0 100644
--- a/Content.Server/CartridgeLoader/Cartridges/NanoTaskCartridgeSystem.cs
+++ b/Content.Server/CartridgeLoader/Cartridges/NanoTaskCartridgeSystem.cs
@@ -77,11 +77,11 @@ public sealed class NanoTaskCartridgeSystem : SharedNanoTaskCartridgeSystem
 
         printed.Task = item;
         var msg = new FormattedMessage();
-        msg.AddText(Loc.GetString("nano-task-printed-description", ("description", item.Description)));
+        msg.AddMarkupOrThrow(Loc.GetString("nano-task-printed-description", ("description", FormattedMessage.EscapeText(item.Description))));
         msg.PushNewline();
-        msg.AddText(Loc.GetString("nano-task-printed-requester", ("requester", item.TaskIsFor)));
+        msg.AddMarkupOrThrow(Loc.GetString("nano-task-printed-requester", ("requester", FormattedMessage.EscapeText(item.TaskIsFor))));
         msg.PushNewline();
-        msg.AddText(item.Priority switch {
+        msg.AddMarkupOrThrow(item.Priority switch {
             NanoTaskPriority.High => Loc.GetString("nano-task-printed-high-priority"),
             NanoTaskPriority.Medium => Loc.GetString("nano-task-printed-medium-priority"),
             NanoTaskPriority.Low => Loc.GetString("nano-task-printed-low-priority"),

From dd22d58f2d923bf6abf7347a4cfc27735270fb98 Mon Sep 17 00:00:00 2001
From: Stefano Pigozzi <me@steffo.eu>
Date: Wed, 24 Dec 2025 04:10:25 +0100
Subject: [PATCH 059/134] =?UTF-8?q?Change=20"pappa"=20(food)=20to=20"pap?=
 =?UTF-8?q?=C3=A0"=20(dad)=20in=20Italian=20accent=20(#42018)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/Resources/Locale/en-US/accent/italian.ftl b/Resources/Locale/en-US/accent/italian.ftl
index 7b7ff4c94b..4976b3338e 100644
--- a/Resources/Locale/en-US/accent/italian.ftl
+++ b/Resources/Locale/en-US/accent/italian.ftl
@@ -34,7 +34,7 @@ accent-italian-words-9 = could
 accent-italian-words-replace-9 = could-a
 
 accent-italian-words-10 = dad
-accent-italian-words-replace-10 = pappa
+accent-italian-words-replace-10 = papà
 
 accent-italian-words-11 = good
 accent-italian-words-replace-11 = molto bene

From 7ac84d1acb285fcb5d2e5732d1739672122c5fe1 Mon Sep 17 00:00:00 2001
From: Stefano Pigozzi <me@steffo.eu>
Date: Wed, 24 Dec 2025 06:15:12 +0100
Subject: [PATCH 060/134] Fix greytide terms in Italian accent (#42020)

* Use singular form for greytider in Italian accent

* Use "curva" for "greytide" instead of "curvisti" in Italian accent
---
 Resources/Locale/en-US/accent/italian.ftl | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Resources/Locale/en-US/accent/italian.ftl b/Resources/Locale/en-US/accent/italian.ftl
index 4976b3338e..4b8d9814b3 100644
--- a/Resources/Locale/en-US/accent/italian.ftl
+++ b/Resources/Locale/en-US/accent/italian.ftl
@@ -40,10 +40,10 @@ accent-italian-words-11 = good
 accent-italian-words-replace-11 = molto bene
 
 accent-italian-words-12 = greytide
-accent-italian-words-replace-12 = curvisti
+accent-italian-words-replace-12 = curva
 
 accent-italian-words-13 = greytider
-accent-italian-words-replace-13 = curvisti
+accent-italian-words-replace-13 = curvista
 
 accent-italian-words-14 = greytiders
 accent-italian-words-replace-14 = curvisti

From c6a4d3f7d8938ba037e9057d02ac1de6f7363435 Mon Sep 17 00:00:00 2001
From: B_Kirill <153602297+B-Kirill@users.noreply.github.com>
Date: Wed, 24 Dec 2025 16:17:16 +1000
Subject: [PATCH 061/134] Clarify checkbox formatting in PR template (#42035)

---
 .github/PULL_REQUEST_TEMPLATE.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index 53fad99b1a..caad947fdd 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -14,7 +14,7 @@
 Small fixes/refactors are exempt. Media may be used in SS14 progress reports with credit. -->
 
 ## Requirements
-<!-- Confirm the following by placing an X in the brackets [X]: -->
+<!-- Confirm the following by placing an X in the brackets without spaces inside (for example: [X] ): -->
 - [ ] I have read and am following the [Pull Request and Changelog Guidelines](https://docs.spacestation14.com/en/general-development/codebase-info/pull-request-guidelines.html).
 - [ ] I have added media to this PR or it does not require an in-game showcase.
 <!-- You should understand that not following the above may get your PR closed at maintainer’s discretion -->

From 9212f261eac13e8c6393b49bd1d67df2c4d95846 Mon Sep 17 00:00:00 2001
From: ScarKy0 <106310278+ScarKy0@users.noreply.github.com>
Date: Wed, 24 Dec 2025 07:34:10 +0100
Subject: [PATCH 062/134] [HOTFIX] Fix MMI mind transfer (#41941)

---
 .../Borgs/Components/MMILinkedComponent.cs    | 18 -----------
 .../Silicons/Borgs/SharedBorgSystem.MMI.cs    | 31 +++++--------------
 2 files changed, 7 insertions(+), 42 deletions(-)
 delete mode 100644 Content.Shared/Silicons/Borgs/Components/MMILinkedComponent.cs

diff --git a/Content.Shared/Silicons/Borgs/Components/MMILinkedComponent.cs b/Content.Shared/Silicons/Borgs/Components/MMILinkedComponent.cs
deleted file mode 100644
index cebbc9b746..0000000000
--- a/Content.Shared/Silicons/Borgs/Components/MMILinkedComponent.cs
+++ /dev/null
@@ -1,18 +0,0 @@
-using Robust.Shared.GameStates;
-
-namespace Content.Shared.Silicons.Borgs.Components;
-
-/// <summary>
-/// This is used for an entity that is linked to an MMI, usually a brain.
-/// Mostly for receiving events.
-/// </summary>
-[RegisterComponent, NetworkedComponent, Access(typeof(SharedBorgSystem))]
-[AutoGenerateComponentState]
-public sealed partial class MMILinkedComponent : Component
-{
-    /// <summary>
-    /// The MMI this entity is linked to.
-    /// </summary>
-    [DataField, AutoNetworkedField]
-    public EntityUid? LinkedMMI;
-}
diff --git a/Content.Shared/Silicons/Borgs/SharedBorgSystem.MMI.cs b/Content.Shared/Silicons/Borgs/SharedBorgSystem.MMI.cs
index efcd5a378c..3d33c6af4e 100644
--- a/Content.Shared/Silicons/Borgs/SharedBorgSystem.MMI.cs
+++ b/Content.Shared/Silicons/Borgs/SharedBorgSystem.MMI.cs
@@ -17,8 +17,7 @@ public abstract partial class SharedBorgSystem
         SubscribeLocalEvent<MMIComponent, MindAddedMessage>(OnMMIMindAdded);
         SubscribeLocalEvent<MMIComponent, MindRemovedMessage>(OnMMIMindRemoved);
 
-        SubscribeLocalEvent<MMILinkedComponent, MindAddedMessage>(OnMMILinkedMindAdded);
-        SubscribeLocalEvent<MMILinkedComponent, EntGotRemovedFromContainerMessage>(OnMMILinkedRemoved);
+        SubscribeLocalEvent<MMIComponent, EntRemovedFromContainerMessage>(OnMMILinkedRemoved);
     }
 
     private void OnMMIInit(Entity<MMIComponent> ent, ref ComponentInit args)
@@ -35,9 +34,6 @@ public abstract partial class SharedBorgSystem
             return;
 
         var brain = args.Entity;
-        var linked = EnsureComp<MMILinkedComponent>(brain);
-        linked.LinkedMMI = ent.Owner;
-        Dirty(brain, linked);
 
         if (_mind.TryGetMind(brain, out var mindId, out var mindComp))
         {
@@ -60,35 +56,22 @@ public abstract partial class SharedBorgSystem
         _appearance.SetData(ent.Owner, MMIVisuals.HasMind, false);
     }
 
-    private void OnMMILinkedMindAdded(Entity<MMILinkedComponent> ent, ref MindAddedMessage args)
-    {
-        if (ent.Comp.LinkedMMI == null || !_mind.TryGetMind(ent.Owner, out var mindId, out var mindComp))
-            return;
-
-        _mind.TransferTo(mindId, ent.Comp.LinkedMMI, true, mind: mindComp);
-    }
-
-    private void OnMMILinkedRemoved(Entity<MMILinkedComponent> ent, ref EntGotRemovedFromContainerMessage args)
+    private void OnMMILinkedRemoved(Entity<MMIComponent> ent, ref EntRemovedFromContainerMessage args)
     {
         if (_timing.ApplyingState)
             return; // The changes are already networked with the same game state
 
-        if (Terminating(ent.Owner))
+        if (args.Container.ID != ent.Comp.BrainSlotId)
             return;
 
-        if (ent.Comp.LinkedMMI is not { } linked)
-            return;
-
-        RemCompDeferred<MMILinkedComponent>(ent.Owner);
-
-        if (_mind.TryGetMind(linked, out var mindId, out var mindComp))
+        if (_mind.TryGetMind(ent, out var mindId, out var mindComp))
         {
+            _mind.TransferTo(mindId, args.Entity, true, mind: mindComp);
+
             if (_roles.MindHasRole<SiliconBrainRoleComponent>(mindId))
                 _roles.MindRemoveRole<SiliconBrainRoleComponent>(mindId);
-
-            _mind.TransferTo(mindId, ent.Owner, true, mind: mindComp);
         }
 
-        _appearance.SetData(linked, MMIVisuals.BrainPresent, false);
+        _appearance.SetData(ent, MMIVisuals.BrainPresent, false);
     }
 }

From 6f38eed9d9b056ce6b4bcba2f8693cf889cdd65b Mon Sep 17 00:00:00 2001
From: TemporalOroboros <TemporalOroboros@gmail.com>
Date: Tue, 23 Dec 2025 22:37:11 -0800
Subject: [PATCH 063/134] Splits temperature damage processing into its own
 component (#30515)

* Creates TemperatureDamageThresholdsComponent

* Obsolete TemperatureComponent fields

* Use TemperatureDamageThresholdsComponent
Moves all the uses of the relocated TemperatureComponent fields to use the TDTC versions

* Removes the obsolete TemperatureComponent fields

* Update YAML definitions

* Update doc comments

* Split TemperatureSystem
Creates TemperatureDamageSystem and moves the damage handling from TemperatureSystem

* Cull unused using statements

* Use component-based damage tick scheduling

* Fix temperature damage processing
Check was inverted resulting in things never starting to take temperature damage

* Poke tests

* Add TemperatureDamageThresholds to new prototypes

* Move TemperatureDamageThresholdsComponent to Shared
Parity with TemperatureComponent

* While I'm here
Fixes warning regarding obsolete ProtoId validator attribute

* Fix YAML errors

* Fix merge errors

* Rename TemperatureDamageThresholdsComponent -> TemperatureDamageComponent

* Use ContentHelpers.RoundToLevels for temperature alerts

* Fix YML

* A fuckton of cleanup

* working cleanup

* fix

* misc additions

---------

Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com>
---
 .../ContainerTemperatureComponent.cs          |  11 +
 ...nerTemperatureDamageThresholdsComponent.cs |  11 -
 .../Systems/TemperatureSystem.Damage.cs       | 279 ++++++++++++++++
 .../Temperature/Systems/TemperatureSystem.cs  | 310 +-----------------
 .../Zombies/ZombieSystem.Transform.cs         |   2 +-
 .../Components/TemperatureComponent.cs        |  52 +--
 .../Components/TemperatureDamageComponent.cs  |  94 ++++++
 .../Systems/SharedTemperatureSystem.cs        |   6 +-
 .../Prototypes/Entities/Mobs/NPCs/animals.yml |  16 +-
 .../Prototypes/Entities/Mobs/NPCs/carp.yml    |   1 +
 .../Prototypes/Entities/Mobs/NPCs/pets.yml    |   1 +
 .../Prototypes/Entities/Mobs/NPCs/scurret.yml |   5 +-
 .../Prototypes/Entities/Mobs/NPCs/space.yml   |   2 +
 .../Prototypes/Entities/Mobs/NPCs/xeno.yml    |   6 +-
 .../Entities/Mobs/Player/dragon.yml           |   1 +
 .../Prototypes/Entities/Mobs/Species/base.yml |   5 +-
 .../Prototypes/Entities/Mobs/Species/moth.yml |   7 +-
 .../Entities/Mobs/Species/reptilian.yml       |   5 +-
 .../Entities/Mobs/Species/vulpkanin.yml       |   3 +-
 Resources/Prototypes/Entities/Mobs/base.yml   |  10 +-
 .../Entities/Objects/Consumable/Food/egg.yml  |   8 +
 .../Entities/Objects/Consumable/Food/meat.yml |   1 +
 .../Entities/Objects/Misc/ice_crust.yml       |   1 +
 .../Entities/Objects/Misc/kudzu.yml           |   2 +
 .../Entities/Objects/Misc/spaceshroom.yml     |   1 +
 .../Structures/Machines/Medical/cryo_pod.yml  |   2 +-
 .../Entities/Structures/spider_web.yml        |   1 +
 27 files changed, 461 insertions(+), 382 deletions(-)
 create mode 100644 Content.Server/Temperature/Components/ContainerTemperatureComponent.cs
 delete mode 100644 Content.Server/Temperature/Components/ContainerTemperatureDamageThresholdsComponent.cs
 create mode 100644 Content.Server/Temperature/Systems/TemperatureSystem.Damage.cs
 create mode 100644 Content.Shared/Temperature/Components/TemperatureDamageComponent.cs

diff --git a/Content.Server/Temperature/Components/ContainerTemperatureComponent.cs b/Content.Server/Temperature/Components/ContainerTemperatureComponent.cs
new file mode 100644
index 0000000000..7c7b1e81e8
--- /dev/null
+++ b/Content.Server/Temperature/Components/ContainerTemperatureComponent.cs
@@ -0,0 +1,11 @@
+namespace Content.Server.Temperature.Components;
+
+[RegisterComponent]
+public sealed partial class ContainerTemperatureComponent : Component
+{
+    [DataField]
+    public float? HeatDamageThreshold;
+
+    [DataField]
+    public float? ColdDamageThreshold;
+}
diff --git a/Content.Server/Temperature/Components/ContainerTemperatureDamageThresholdsComponent.cs b/Content.Server/Temperature/Components/ContainerTemperatureDamageThresholdsComponent.cs
deleted file mode 100644
index 024b8a013b..0000000000
--- a/Content.Server/Temperature/Components/ContainerTemperatureDamageThresholdsComponent.cs
+++ /dev/null
@@ -1,11 +0,0 @@
-namespace Content.Server.Temperature.Components;
-
-[RegisterComponent]
-public sealed partial class ContainerTemperatureDamageThresholdsComponent: Component
-{
-    [DataField, ViewVariables(VVAccess.ReadWrite)]
-    public float? HeatDamageThreshold;
-
-    [DataField, ViewVariables(VVAccess.ReadWrite)]
-    public float? ColdDamageThreshold;
-}
diff --git a/Content.Server/Temperature/Systems/TemperatureSystem.Damage.cs b/Content.Server/Temperature/Systems/TemperatureSystem.Damage.cs
new file mode 100644
index 0000000000..d436977daf
--- /dev/null
+++ b/Content.Server/Temperature/Systems/TemperatureSystem.Damage.cs
@@ -0,0 +1,279 @@
+using Content.Server.Administration.Logs;
+using Content.Server.Body.Components;
+using Content.Server.Temperature.Components;
+using Content.Shared.Alert;
+using Content.Shared.Damage.Components;
+using Content.Shared.Damage.Systems;
+using Content.Shared.Database;
+using Content.Shared.Rounding;
+using Content.Shared.Temperature;
+using Content.Shared.Temperature.Components;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Timing;
+
+namespace Content.Server.Temperature.Systems;
+
+/// <summary>
+/// Handles entities taking damage from being too hot or too cold.
+/// Also handles alerts relevant to the same.
+/// </summary>
+public sealed partial class TemperatureSystem
+{
+    [Dependency] private readonly AlertsSystem _alerts = default!;
+    [Dependency] private readonly DamageableSystem _damageable = default!;
+    [Dependency] private readonly IAdminLogManager _adminLogger = default!;
+    [Dependency] private readonly IGameTiming _gameTiming = default!;
+
+    private EntityQuery<TemperatureDamageComponent> _tempDamageQuery;
+    private EntityQuery<ContainerTemperatureComponent> _containerTemperatureQuery;
+    private EntityQuery<ThermalRegulatorComponent> _thermalRegulatorQuery;
+
+    /// <summary>
+    ///     All the components that will have their damage updated at the end of the tick.
+    ///     This is done because both AtmosExposed and Flammable call ChangeHeat in the same tick, meaning
+    ///     that we need some mechanism to ensure it doesn't double-dip on damage for both calls.
+    /// </summary>
+    public HashSet<Entity<TemperatureDamageComponent>> ShouldUpdateDamage = new();
+
+    /// <summary>
+    /// Alert prototype for Temperature.
+    /// </summary>
+    public static readonly ProtoId<AlertCategoryPrototype> TemperatureAlertCategory = "Temperature";
+
+    /// <summary>
+    /// The maximum severity applicable to temperature alerts.
+    /// </summary>
+    public static readonly short MaxTemperatureAlertSeverity = 3;
+
+    /// <summary>
+    /// On a scale of 0. to 1. where 0. is the ideal temperature and 1. is a temperature damage threshold this is the point where the component starts raising temperature alerts.
+    /// </summary>
+    public static readonly float MinAlertTemperatureScale = 0.33f;
+
+    private void InitializeDamage()
+    {
+        SubscribeLocalEvent<AlertsComponent, OnTemperatureChangeEvent>(ServerAlert);
+
+        SubscribeLocalEvent<TemperatureDamageComponent, OnTemperatureChangeEvent>(EnqueueDamage);
+        SubscribeLocalEvent<TemperatureDamageComponent, EntityUnpausedEvent>(OnUnpaused);
+
+        // Allows overriding thresholds based on the parent's thresholds.
+        SubscribeLocalEvent<TemperatureDamageComponent, EntParentChangedMessage>(OnParentChange);
+        SubscribeLocalEvent<ContainerTemperatureComponent, ComponentStartup>(OnParentThresholdStartup);
+        SubscribeLocalEvent<ContainerTemperatureComponent, ComponentShutdown>(OnParentThresholdShutdown);
+
+        _tempDamageQuery = GetEntityQuery<TemperatureDamageComponent>();
+        _containerTemperatureQuery = GetEntityQuery<ContainerTemperatureComponent>();
+        _thermalRegulatorQuery = GetEntityQuery<ThermalRegulatorComponent>();
+    }
+
+    private void UpdateDamage()
+    {
+        foreach (var entity in ShouldUpdateDamage)
+        {
+            if (Deleted(entity) || Paused(entity))
+                continue;
+
+            var deltaTime = _gameTiming.CurTime - entity.Comp.LastUpdate;
+            if (entity.Comp.TakingDamage && deltaTime < entity.Comp.UpdateInterval)
+                continue;
+
+            ChangeDamage(entity, deltaTime);
+        }
+
+        ShouldUpdateDamage.Clear();
+    }
+
+    private void ChangeDamage(Entity<TemperatureDamageComponent> entity, TimeSpan deltaTime)
+    {
+        entity.Comp.LastUpdate = _gameTiming.CurTime;
+
+        if (!HasComp<DamageableComponent>(entity) || !TemperatureQuery.TryComp(entity, out var temperature))
+            return;
+
+        // See this link for where the scaling func comes from:
+        // https://www.desmos.com/calculator/0vknqtdvq9
+        // Based on a logistic curve, which caps out at MaxDamage
+        var heatK = 0.005;
+        var a = 1;
+        var y = entity.Comp.DamageCap;
+        var c = y * 2;
+
+        var heatDamageThreshold = entity.Comp.ParentHeatDamageThreshold ?? entity.Comp.HeatDamageThreshold;
+        var coldDamageThreshold = entity.Comp.ParentColdDamageThreshold ?? entity.Comp.ColdDamageThreshold;
+
+        if (temperature.CurrentTemperature >= heatDamageThreshold)
+        {
+            if (!entity.Comp.TakingDamage)
+            {
+                _adminLogger.Add(LogType.Temperature, $"{ToPrettyString(entity):entity} started taking high temperature damage");
+                entity.Comp.TakingDamage = true;
+            }
+
+            var diff = Math.Abs(temperature.CurrentTemperature - heatDamageThreshold);
+            var tempDamage = c / (1 + a * Math.Pow(Math.E, -heatK * diff)) - y;
+            _damageable.TryChangeDamage(entity.Owner, entity.Comp.HeatDamage * tempDamage * deltaTime.TotalSeconds, ignoreResistances: true, interruptsDoAfters: false);
+        }
+        else if (temperature.CurrentTemperature <= coldDamageThreshold)
+        {
+            if (!entity.Comp.TakingDamage)
+            {
+                _adminLogger.Add(LogType.Temperature, $"{ToPrettyString(entity):entity} started taking low temperature damage");
+                entity.Comp.TakingDamage = true;
+            }
+
+            var diff = Math.Abs(temperature.CurrentTemperature - coldDamageThreshold);
+            var tempDamage =
+                Math.Sqrt(diff * (Math.Pow(entity.Comp.DamageCap.Double(), 2) / coldDamageThreshold));
+            _damageable.TryChangeDamage(entity.Owner, entity.Comp.ColdDamage * tempDamage * deltaTime.TotalSeconds, ignoreResistances: true, interruptsDoAfters: false);
+        }
+        else if (entity.Comp.TakingDamage)
+        {
+            _adminLogger.Add(LogType.Temperature, $"{ToPrettyString(entity):entity} stopped taking temperature damage");
+            entity.Comp.TakingDamage = false;
+        }
+    }
+
+    private void ServerAlert(Entity<AlertsComponent> entity, ref OnTemperatureChangeEvent args)
+    {
+        ProtoId<AlertPrototype> type;
+        float threshold;
+        float idealTemp;
+
+        if (!_tempDamageQuery.TryComp(entity, out var thresholds))
+        {
+            _alerts.ClearAlertCategory(entity.Owner, TemperatureAlertCategory);
+            return;
+        }
+
+        if (_thermalRegulatorQuery.TryComp(entity, out var regulator) &&
+            regulator.NormalBodyTemperature > thresholds.ColdDamageThreshold &&
+            regulator.NormalBodyTemperature < thresholds.HeatDamageThreshold)
+        {
+            idealTemp = regulator.NormalBodyTemperature;
+        }
+        else
+        {
+            idealTemp = (thresholds.ColdDamageThreshold + thresholds.HeatDamageThreshold) / 2;
+        }
+
+        if (args.CurrentTemperature <= idealTemp)
+        {
+            type = thresholds.ColdAlert;
+            threshold = thresholds.ColdDamageThreshold;
+        }
+        else
+        {
+            type = thresholds.HotAlert;
+            threshold = thresholds.HeatDamageThreshold;
+        }
+
+        // Calculates a scale where 0.0 is the ideal temperature and 1.0 is where temperature damage begins
+        // The cold and hot scales will differ in their range if the ideal temperature is not exactly halfway between the thresholds
+        var tempScale = (args.CurrentTemperature - idealTemp) / (threshold - idealTemp);
+        var alertLevel = (short)ContentHelpers.RoundToLevels(tempScale - MinAlertTemperatureScale, 1.00f - MinAlertTemperatureScale, MaxTemperatureAlertSeverity + 1);
+
+        if (alertLevel > 0)
+            _alerts.ShowAlert(entity.AsNullable(), type, alertLevel);
+        else
+            _alerts.ClearAlertCategory(entity.AsNullable(), TemperatureAlertCategory);
+    }
+
+    private void EnqueueDamage(Entity<TemperatureDamageComponent> ent, ref OnTemperatureChangeEvent args)
+    {
+        if (ShouldUpdateDamage.Add(ent) && !ent.Comp.TakingDamage)
+            ent.Comp.LastUpdate = _gameTiming.CurTime;
+    }
+
+    private void OnUnpaused(Entity<TemperatureDamageComponent> ent, ref EntityUnpausedEvent args)
+    {
+        ent.Comp.LastUpdate += args.PausedTime;
+    }
+
+    private void OnParentChange(Entity<TemperatureDamageComponent> entity, ref EntParentChangedMessage args)
+    {
+        // We only need to update thresholds if the thresholds changed for the entity's ancestors.
+        var oldThresholds = args.OldParent != null
+            ? RecalculateParentThresholds(args.OldParent.Value)
+            : (null, null);
+        var xform = Transform(entity.Owner);
+        var newThresholds = RecalculateParentThresholds(xform.ParentUid);
+
+        if (oldThresholds != newThresholds)
+            RecursiveThresholdUpdate((entity, entity.Comp, xform));
+    }
+
+    private void OnParentThresholdStartup(Entity<ContainerTemperatureComponent> entity, ref ComponentStartup args)
+    {
+        RecursiveThresholdUpdate(entity.Owner);
+    }
+
+    private void OnParentThresholdShutdown(Entity<ContainerTemperatureComponent> entity, ref ComponentShutdown args)
+    {
+        RecursiveThresholdUpdate(entity.Owner);
+    }
+
+    /// <summary>
+    /// Recalculate and apply parent thresholds for the root entity and all its children.
+    /// </summary>
+    /// <param name="root">The root entity we're currently updating</param>
+    private void RecursiveThresholdUpdate(Entity<TemperatureDamageComponent?, TransformComponent?> root)
+    {
+        RecalculateAndApplyParentThresholds(root);
+
+        var xform = root.Comp2 ?? Transform(root);
+        var enumerator = xform.ChildEnumerator;
+        while (enumerator.MoveNext(out var child))
+        {
+            RecursiveThresholdUpdate(child);
+        }
+    }
+
+    /// <summary>
+    /// Recalculate parent thresholds and apply them on the uid temperature component.
+    /// </summary>
+    /// <param name="entity">The entity whose temperature damage thresholds we're updating</param>
+    private void RecalculateAndApplyParentThresholds(Entity<TemperatureDamageComponent?> entity)
+    {
+        if (!_tempDamageQuery.Resolve(entity, ref entity.Comp, logMissing: false))
+            return;
+
+        var newThresholds = RecalculateParentThresholds(Transform(entity).ParentUid);
+        entity.Comp.ParentHeatDamageThreshold = newThresholds.Item1;
+        entity.Comp.ParentColdDamageThreshold = newThresholds.Item2;
+    }
+
+    /// <summary>
+    /// Recalculate Parent Heat/Cold DamageThreshold by recursively checking each ancestor and fetching the
+    /// maximum HeatDamageThreshold and the minimum ColdDamageThreshold if any exists (aka the best value for each).
+    /// </summary>
+    /// <param name="initialParentUid">parent we start with</param>
+    private (float?, float?) RecalculateParentThresholds(EntityUid initialParentUid)
+    {
+        // Recursively check parents for the best threshold available
+        var parentUid = initialParentUid;
+        float? newHeatThreshold = null;
+        float? newColdThreshold = null;
+        while (parentUid.IsValid())
+        {
+            if (_containerTemperatureQuery.TryComp(parentUid, out var newThresholds))
+            {
+                if (newThresholds.HeatDamageThreshold != null)
+                {
+                    newHeatThreshold = Math.Max(newThresholds.HeatDamageThreshold.Value,
+                        newHeatThreshold ?? 0);
+                }
+
+                if (newThresholds.ColdDamageThreshold != null)
+                {
+                    newColdThreshold = Math.Min(newThresholds.ColdDamageThreshold.Value,
+                        newColdThreshold ?? float.MaxValue);
+                }
+            }
+
+            parentUid = Transform(parentUid).ParentUid;
+        }
+
+        return (newHeatThreshold, newColdThreshold);
+    }
+}
diff --git a/Content.Server/Temperature/Systems/TemperatureSystem.cs b/Content.Server/Temperature/Systems/TemperatureSystem.cs
index 928b6ae9b5..484912c780 100644
--- a/Content.Server/Temperature/Systems/TemperatureSystem.cs
+++ b/Content.Server/Temperature/Systems/TemperatureSystem.cs
@@ -1,64 +1,32 @@
-using System.Linq;
-using Content.Server.Administration.Logs;
 using Content.Server.Atmos.EntitySystems;
-using Content.Server.Body.Components;
 using Content.Server.Temperature.Components;
-using Content.Shared.Alert;
 using Content.Shared.Atmos;
-using Content.Shared.Damage.Components;
-using Content.Shared.Damage.Systems;
-using Content.Shared.Database;
 using Content.Shared.Inventory;
 using Content.Shared.Rejuvenate;
 using Content.Shared.Temperature;
-using Robust.Shared.Prototypes;
 using Content.Shared.Projectiles;
 using Content.Shared.Temperature.Components;
 using Content.Shared.Temperature.Systems;
 
 namespace Content.Server.Temperature.Systems;
 
-public sealed class TemperatureSystem : SharedTemperatureSystem
+public sealed partial class TemperatureSystem : SharedTemperatureSystem
 {
-    [Dependency] private readonly AlertsSystem _alerts = default!;
     [Dependency] private readonly AtmosphereSystem _atmosphere = default!;
-    [Dependency] private readonly DamageableSystem _damageable = default!;
-    [Dependency] private readonly IAdminLogManager _adminLogger = default!;
-    [Dependency] private readonly TemperatureSystem _temperature = default!;
-
-    /// <summary>
-    ///     All the components that will have their damage updated at the end of the tick.
-    ///     This is done because both AtmosExposed and Flammable call ChangeHeat in the same tick, meaning
-    ///     that we need some mechanism to ensure it doesn't double dip on damage for both calls.
-    /// </summary>
-    public HashSet<Entity<TemperatureComponent>> ShouldUpdateDamage = new();
-
-    public float UpdateInterval = 1.0f;
-
-    private float _accumulatedFrametime;
-
-    public static readonly ProtoId<AlertCategoryPrototype> TemperatureAlertCategory = "Temperature";
 
     public override void Initialize()
     {
         base.Initialize();
 
-        SubscribeLocalEvent<TemperatureComponent, OnTemperatureChangeEvent>(EnqueueDamage);
         SubscribeLocalEvent<TemperatureComponent, AtmosExposedUpdateEvent>(OnAtmosExposedUpdate);
         SubscribeLocalEvent<TemperatureComponent, RejuvenateEvent>(OnRejuvenate);
-        SubscribeLocalEvent<AlertsComponent, OnTemperatureChangeEvent>(ServerAlert);
         Subs.SubscribeWithRelay<TemperatureProtectionComponent, ModifyChangedTemperatureEvent>(OnTemperatureChangeAttempt, held: false);
 
         SubscribeLocalEvent<InternalTemperatureComponent, MapInitEvent>(OnInit);
 
         SubscribeLocalEvent<ChangeTemperatureOnCollideComponent, ProjectileHitEvent>(ChangeTemperatureOnCollide);
 
-        // Allows overriding thresholds based on the parent's thresholds.
-        SubscribeLocalEvent<TemperatureComponent, EntParentChangedMessage>(OnParentChange);
-        SubscribeLocalEvent<ContainerTemperatureDamageThresholdsComponent, ComponentStartup>(
-            OnParentThresholdStartup);
-        SubscribeLocalEvent<ContainerTemperatureDamageThresholdsComponent, ComponentShutdown>(
-            OnParentThresholdShutdown);
+        InitializeDamage();
     }
 
     public override void Update(float frameTime)
@@ -88,49 +56,23 @@ public sealed class TemperatureSystem : SharedTemperatureSystem
             ForceChangeTemperature(uid, temp.CurrentTemperature - degrees, temp);
         }
 
-        UpdateDamage(frameTime);
-    }
-
-    private void UpdateDamage(float frameTime)
-    {
-        _accumulatedFrametime += frameTime;
-
-        if (_accumulatedFrametime < UpdateInterval)
-            return;
-        _accumulatedFrametime -= UpdateInterval;
-
-        if (!ShouldUpdateDamage.Any())
-            return;
-
-        foreach (var comp in ShouldUpdateDamage)
-        {
-            MetaDataComponent? metaData = null;
-
-            var uid = comp.Owner;
-            if (Deleted(uid, metaData) || Paused(uid, metaData))
-                continue;
-
-            ChangeDamage(uid, comp);
-        }
-
-        ShouldUpdateDamage.Clear();
+        UpdateDamage();
     }
 
     public void ForceChangeTemperature(EntityUid uid, float temp, TemperatureComponent? temperature = null)
     {
-        if (!Resolve(uid, ref temperature))
+        if (!TemperatureQuery.Resolve(uid, ref temperature))
             return;
 
-        float lastTemp = temperature.CurrentTemperature;
-        float delta = temperature.CurrentTemperature - temp;
+        var lastTemp = temperature.CurrentTemperature;
+        var delta = temperature.CurrentTemperature - temp;
         temperature.CurrentTemperature = temp;
-        RaiseLocalEvent(uid, new OnTemperatureChangeEvent(temperature.CurrentTemperature, lastTemp, delta),
-            true);
+        RaiseLocalEvent(uid, new OnTemperatureChangeEvent(temperature.CurrentTemperature, lastTemp, delta), broadcast: true);
     }
 
     public override void ChangeHeat(EntityUid uid, float heatAmount, bool ignoreHeatResistance = false, TemperatureComponent? temperature = null)
     {
-        if (!Resolve(uid, ref temperature, false))
+        if (!TemperatureQuery.Resolve(uid, ref temperature, false))
             return;
 
         if (!ignoreHeatResistance)
@@ -144,11 +86,10 @@ public sealed class TemperatureSystem : SharedTemperatureSystem
         temperature.CurrentTemperature += heatAmount / GetHeatCapacity(uid, temperature);
         float delta = temperature.CurrentTemperature - lastTemp;
 
-        RaiseLocalEvent(uid, new OnTemperatureChangeEvent(temperature.CurrentTemperature, lastTemp, delta), true);
+        RaiseLocalEvent(uid, new OnTemperatureChangeEvent(temperature.CurrentTemperature, lastTemp, delta), broadcast: true);
     }
 
-    private void OnAtmosExposedUpdate(EntityUid uid, TemperatureComponent temperature,
-        ref AtmosExposedUpdateEvent args)
+    private void OnAtmosExposedUpdate(EntityUid uid, TemperatureComponent temperature, ref AtmosExposedUpdateEvent args)
     {
         var transform = args.Transform;
 
@@ -158,17 +99,18 @@ public sealed class TemperatureSystem : SharedTemperatureSystem
         var temperatureDelta = args.GasMixture.Temperature - temperature.CurrentTemperature;
         var airHeatCapacity = _atmosphere.GetHeatCapacity(args.GasMixture, false);
         var heatCapacity = GetHeatCapacity(uid, temperature);
+        // TODO ATMOS: This heat transfer formula is really really wrong, it needs to be pulled out. Pending on HeatContainers.
         var heat = temperatureDelta * (airHeatCapacity * heatCapacity /
                                        (airHeatCapacity + heatCapacity));
         ChangeHeat(uid, heat * temperature.AtmosTemperatureTransferEfficiency, temperature: temperature);
     }
 
-    private void OnInit(EntityUid uid, InternalTemperatureComponent comp, MapInitEvent args)
+    private void OnInit(Entity<InternalTemperatureComponent> entity, ref MapInitEvent args)
     {
-        if (!TryComp<TemperatureComponent>(uid, out var temp))
+        if (!TemperatureQuery.TryComp(entity, out var temp))
             return;
 
-        comp.Temperature = temp.CurrentTemperature;
+        entity.Comp.Temperature = temp.CurrentTemperature;
     }
 
     private void OnRejuvenate(EntityUid uid, TemperatureComponent comp, RejuvenateEvent args)
@@ -176,116 +118,6 @@ public sealed class TemperatureSystem : SharedTemperatureSystem
         ForceChangeTemperature(uid, Atmospherics.T20C, comp);
     }
 
-    private void ServerAlert(EntityUid uid, AlertsComponent status, OnTemperatureChangeEvent args)
-    {
-        ProtoId<AlertPrototype> type;
-        float threshold;
-        float idealTemp;
-
-        if (!TryComp<TemperatureComponent>(uid, out var temperature))
-        {
-            _alerts.ClearAlertCategory(uid, TemperatureAlertCategory);
-            return;
-        }
-
-        if (TryComp<ThermalRegulatorComponent>(uid, out var regulator) &&
-            regulator.NormalBodyTemperature > temperature.ColdDamageThreshold &&
-            regulator.NormalBodyTemperature < temperature.HeatDamageThreshold)
-        {
-            idealTemp = regulator.NormalBodyTemperature;
-        }
-        else
-        {
-            idealTemp = (temperature.ColdDamageThreshold + temperature.HeatDamageThreshold) / 2;
-        }
-
-        if (args.CurrentTemperature <= idealTemp)
-        {
-            type = temperature.ColdAlert;
-            threshold = temperature.ColdDamageThreshold;
-        }
-        else
-        {
-            type = temperature.HotAlert;
-            threshold = temperature.HeatDamageThreshold;
-        }
-
-        // Calculates a scale where 1.0 is the ideal temperature and 0.0 is where temperature damage begins
-        // The cold and hot scales will differ in their range if the ideal temperature is not exactly halfway between the thresholds
-        var tempScale = (args.CurrentTemperature - threshold) / (idealTemp - threshold);
-        switch (tempScale)
-        {
-            case <= 0f:
-                _alerts.ShowAlert(uid, type, 3);
-                break;
-
-            case <= 0.4f:
-                _alerts.ShowAlert(uid, type, 2);
-                break;
-
-            case <= 0.66f:
-                _alerts.ShowAlert(uid, type, 1);
-                break;
-
-            case > 0.66f:
-                _alerts.ClearAlertCategory(uid, TemperatureAlertCategory);
-                break;
-        }
-    }
-
-    private void EnqueueDamage(Entity<TemperatureComponent> temperature, ref OnTemperatureChangeEvent args)
-    {
-        ShouldUpdateDamage.Add(temperature);
-    }
-
-    private void ChangeDamage(EntityUid uid, TemperatureComponent temperature)
-    {
-        if (!HasComp<DamageableComponent>(uid))
-            return;
-
-        // See this link for where the scaling func comes from:
-        // https://www.desmos.com/calculator/0vknqtdvq9
-        // Based on a logistic curve, which caps out at MaxDamage
-        var heatK = 0.005;
-        var a = 1;
-        var y = temperature.DamageCap;
-        var c = y * 2;
-
-        var heatDamageThreshold = temperature.ParentHeatDamageThreshold ?? temperature.HeatDamageThreshold;
-        var coldDamageThreshold = temperature.ParentColdDamageThreshold ?? temperature.ColdDamageThreshold;
-
-        if (temperature.CurrentTemperature >= heatDamageThreshold)
-        {
-            if (!temperature.TakingDamage)
-            {
-                _adminLogger.Add(LogType.Temperature, $"{ToPrettyString(uid):entity} started taking high temperature damage");
-                temperature.TakingDamage = true;
-            }
-
-            var diff = Math.Abs(temperature.CurrentTemperature - heatDamageThreshold);
-            var tempDamage = c / (1 + a * Math.Pow(Math.E, -heatK * diff)) - y;
-            _damageable.TryChangeDamage(uid, temperature.HeatDamage * tempDamage, ignoreResistances: true, interruptsDoAfters: false);
-        }
-        else if (temperature.CurrentTemperature <= coldDamageThreshold)
-        {
-            if (!temperature.TakingDamage)
-            {
-                _adminLogger.Add(LogType.Temperature, $"{ToPrettyString(uid):entity} started taking low temperature damage");
-                temperature.TakingDamage = true;
-            }
-
-            var diff = Math.Abs(temperature.CurrentTemperature - coldDamageThreshold);
-            var tempDamage =
-                Math.Sqrt(diff * (Math.Pow(temperature.DamageCap.Double(), 2) / coldDamageThreshold));
-            _damageable.TryChangeDamage(uid, temperature.ColdDamage * tempDamage, ignoreResistances: true, interruptsDoAfters: false);
-        }
-        else if (temperature.TakingDamage)
-        {
-            _adminLogger.Add(LogType.Temperature, $"{ToPrettyString(uid):entity} stopped taking temperature damage");
-            temperature.TakingDamage = false;
-        }
-    }
-
     private void OnTemperatureChangeAttempt(EntityUid uid, TemperatureProtectionComponent component, ModifyChangedTemperatureEvent args)
     {
         var coefficient = args.TemperatureDelta < 0
@@ -300,118 +132,6 @@ public sealed class TemperatureSystem : SharedTemperatureSystem
 
     private void ChangeTemperatureOnCollide(Entity<ChangeTemperatureOnCollideComponent> ent, ref ProjectileHitEvent args)
     {
-        _temperature.ChangeHeat(args.Target, ent.Comp.Heat, ent.Comp.IgnoreHeatResistance);// adjust the temperature
-    }
-
-    private void OnParentChange(EntityUid uid, TemperatureComponent component,
-        ref EntParentChangedMessage args)
-    {
-        var temperatureQuery = GetEntityQuery<TemperatureComponent>();
-        var transformQuery = GetEntityQuery<TransformComponent>();
-        var thresholdsQuery = GetEntityQuery<ContainerTemperatureDamageThresholdsComponent>();
-        // We only need to update thresholds if the thresholds changed for the entity's ancestors.
-        var oldThresholds = args.OldParent != null
-            ? RecalculateParentThresholds(args.OldParent.Value, transformQuery, thresholdsQuery)
-            : (null, null);
-        var newThresholds = RecalculateParentThresholds(transformQuery.GetComponent(uid).ParentUid, transformQuery, thresholdsQuery);
-
-        if (oldThresholds != newThresholds)
-        {
-            RecursiveThresholdUpdate(uid, temperatureQuery, transformQuery, thresholdsQuery);
-        }
-    }
-
-    private void OnParentThresholdStartup(EntityUid uid, ContainerTemperatureDamageThresholdsComponent component,
-        ComponentStartup args)
-    {
-        RecursiveThresholdUpdate(uid, GetEntityQuery<TemperatureComponent>(), GetEntityQuery<TransformComponent>(),
-            GetEntityQuery<ContainerTemperatureDamageThresholdsComponent>());
-    }
-
-    private void OnParentThresholdShutdown(EntityUid uid, ContainerTemperatureDamageThresholdsComponent component,
-        ComponentShutdown args)
-    {
-        RecursiveThresholdUpdate(uid, GetEntityQuery<TemperatureComponent>(), GetEntityQuery<TransformComponent>(),
-            GetEntityQuery<ContainerTemperatureDamageThresholdsComponent>());
-    }
-
-    /// <summary>
-    /// Recalculate and apply parent thresholds for the root entity and all its descendant.
-    /// </summary>
-    /// <param name="root"></param>
-    /// <param name="temperatureQuery"></param>
-    /// <param name="transformQuery"></param>
-    /// <param name="tempThresholdsQuery"></param>
-    private void RecursiveThresholdUpdate(EntityUid root, EntityQuery<TemperatureComponent> temperatureQuery,
-        EntityQuery<TransformComponent> transformQuery,
-        EntityQuery<ContainerTemperatureDamageThresholdsComponent> tempThresholdsQuery)
-    {
-        RecalculateAndApplyParentThresholds(root, temperatureQuery, transformQuery, tempThresholdsQuery);
-
-        var enumerator = Transform(root).ChildEnumerator;
-        while (enumerator.MoveNext(out var child))
-        {
-            RecursiveThresholdUpdate(child, temperatureQuery, transformQuery, tempThresholdsQuery);
-        }
-    }
-
-    /// <summary>
-    /// Recalculate parent thresholds and apply them on the uid temperature component.
-    /// </summary>
-    /// <param name="uid"></param>
-    /// <param name="temperatureQuery"></param>
-    /// <param name="transformQuery"></param>
-    /// <param name="tempThresholdsQuery"></param>
-    private void RecalculateAndApplyParentThresholds(EntityUid uid,
-        EntityQuery<TemperatureComponent> temperatureQuery, EntityQuery<TransformComponent> transformQuery,
-        EntityQuery<ContainerTemperatureDamageThresholdsComponent> tempThresholdsQuery)
-    {
-        if (!temperatureQuery.TryGetComponent(uid, out var temperature))
-        {
-            return;
-        }
-
-        var newThresholds = RecalculateParentThresholds(transformQuery.GetComponent(uid).ParentUid, transformQuery, tempThresholdsQuery);
-        temperature.ParentHeatDamageThreshold = newThresholds.Item1;
-        temperature.ParentColdDamageThreshold = newThresholds.Item2;
-    }
-
-    /// <summary>
-    /// Recalculate Parent Heat/Cold DamageThreshold by recursively checking each ancestor and fetching the
-    /// maximum HeatDamageThreshold and the minimum ColdDamageThreshold if any exists (aka the best value for each).
-    /// </summary>
-    /// <param name="initialParentUid"></param>
-    /// <param name="transformQuery"></param>
-    /// <param name="tempThresholdsQuery"></param>
-    private (float?, float?) RecalculateParentThresholds(
-        EntityUid initialParentUid,
-        EntityQuery<TransformComponent> transformQuery,
-        EntityQuery<ContainerTemperatureDamageThresholdsComponent> tempThresholdsQuery)
-    {
-        // Recursively check parents for the best threshold available
-        var parentUid = initialParentUid;
-        float? newHeatThreshold = null;
-        float? newColdThreshold = null;
-        while (parentUid.IsValid())
-        {
-            if (tempThresholdsQuery.TryGetComponent(parentUid, out var newThresholds))
-            {
-                if (newThresholds.HeatDamageThreshold != null)
-                {
-                    newHeatThreshold = Math.Max(newThresholds.HeatDamageThreshold.Value,
-                        newHeatThreshold ?? 0);
-                }
-
-                if (newThresholds.ColdDamageThreshold != null)
-                {
-                    newColdThreshold = Math.Min(newThresholds.ColdDamageThreshold.Value,
-                        newColdThreshold ?? float.MaxValue);
-                }
-            }
-
-            parentUid = transformQuery.GetComponent(parentUid).ParentUid;
-        }
-
-        return (newHeatThreshold, newColdThreshold);
+        ChangeHeat(args.Target, ent.Comp.Heat, ent.Comp.IgnoreHeatResistance);// adjust the temperature
     }
 }
diff --git a/Content.Server/Zombies/ZombieSystem.Transform.cs b/Content.Server/Zombies/ZombieSystem.Transform.cs
index b4aee77cef..f39487bb24 100644
--- a/Content.Server/Zombies/ZombieSystem.Transform.cs
+++ b/Content.Server/Zombies/ZombieSystem.Transform.cs
@@ -242,7 +242,7 @@ public sealed partial class ZombieSystem
         _mind.MakeSentient(target);
 
         //Make the zombie not die in the cold. Good for space zombies
-        if (TryComp<TemperatureComponent>(target, out var tempComp))
+        if (TryComp<TemperatureDamageComponent>(target, out var tempComp))
             tempComp.ColdDamage.ClampMax(0);
 
         //Heals the zombie from all the damage it took while human
diff --git a/Content.Shared/Temperature/Components/TemperatureComponent.cs b/Content.Shared/Temperature/Components/TemperatureComponent.cs
index b73d1f77d1..fd79c4b4b2 100644
--- a/Content.Shared/Temperature/Components/TemperatureComponent.cs
+++ b/Content.Shared/Temperature/Components/TemperatureComponent.cs
@@ -1,15 +1,10 @@
-using Content.Shared.Alert;
 using Content.Shared.Atmos;
-using Content.Shared.Damage;
-using Content.Shared.FixedPoint;
-using Robust.Shared.Prototypes;
 
 namespace Content.Shared.Temperature.Components;
 
 /// <summary>
 /// Handles changing temperature,
-/// informing others of the current temperature,
-/// and taking fire damage from high temperature.
+/// informing others of the current temperature.
 /// </summary>
 [RegisterComponent]
 public sealed partial class TemperatureComponent : Component
@@ -20,24 +15,6 @@ public sealed partial class TemperatureComponent : Component
     [DataField, ViewVariables(VVAccess.ReadWrite)]
     public float CurrentTemperature = Atmospherics.T20C;
 
-    [DataField, ViewVariables(VVAccess.ReadWrite)]
-    public float HeatDamageThreshold = 360f;
-
-    [DataField, ViewVariables(VVAccess.ReadWrite)]
-    public float ColdDamageThreshold = 260f;
-
-    /// <summary>
-    /// Overrides HeatDamageThreshold if the entity's within a parent with the TemperatureDamageThresholdsComponent component.
-    /// </summary>
-    [DataField, ViewVariables(VVAccess.ReadWrite)]
-    public float? ParentHeatDamageThreshold;
-
-    /// <summary>
-    /// Overrides ColdDamageThreshold if the entity's within a parent with the TemperatureDamageThresholdsComponent component.
-    /// </summary>
-    [DataField, ViewVariables(VVAccess.ReadWrite)]
-    public float? ParentColdDamageThreshold;
-
     /// <summary>
     /// Heat capacity per kg of mass.
     /// </summary>
@@ -49,31 +26,4 @@ public sealed partial class TemperatureComponent : Component
     /// </summary>
     [DataField, ViewVariables(VVAccess.ReadWrite)]
     public float AtmosTemperatureTransferEfficiency = 0.1f;
-
-    [DataField, ViewVariables(VVAccess.ReadWrite)]
-    public DamageSpecifier ColdDamage = new();
-
-    [DataField, ViewVariables(VVAccess.ReadWrite)]
-    public DamageSpecifier HeatDamage = new();
-
-    /// <summary>
-    /// Temperature won't do more than this amount of damage per second.
-    /// </summary>
-    /// <remarks>
-    /// Okay it genuinely reaches this basically immediately for a plasma fire.
-    /// </remarks>
-    [DataField, ViewVariables(VVAccess.ReadWrite)]
-    public FixedPoint2 DamageCap = FixedPoint2.New(8);
-
-    /// <summary>
-    /// Used to keep track of when damage starts/stops. Useful for logs.
-    /// </summary>
-    [DataField]
-    public bool TakingDamage;
-
-    [DataField]
-    public ProtoId<AlertPrototype> HotAlert = "Hot";
-
-    [DataField]
-    public ProtoId<AlertPrototype> ColdAlert = "Cold";
 }
diff --git a/Content.Shared/Temperature/Components/TemperatureDamageComponent.cs b/Content.Shared/Temperature/Components/TemperatureDamageComponent.cs
new file mode 100644
index 0000000000..a9543e3046
--- /dev/null
+++ b/Content.Shared/Temperature/Components/TemperatureDamageComponent.cs
@@ -0,0 +1,94 @@
+using Content.Shared.Alert;
+using Content.Shared.Damage;
+using Content.Shared.FixedPoint;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom;
+
+namespace Content.Shared.Temperature.Components;
+
+/// <summary>
+/// Handles taking damage from being excessively hot/cold.
+/// Also handles alerts about being too hot or too cold.
+/// </summary>
+[RegisterComponent]
+public sealed partial class TemperatureDamageComponent : Component
+{
+    /// <summary>
+    /// The temperature above which the entity will start taking damage from being too hot.
+    /// </summary>
+    [DataField, ViewVariables(VVAccess.ReadWrite)]
+    public float HeatDamageThreshold = 360f;
+
+    /// <summary>
+    /// The temperature below which the entity will start taking damage from being too cold.
+    /// </summary>
+    [DataField, ViewVariables(VVAccess.ReadWrite)]
+    public float ColdDamageThreshold = 260f;
+
+    /// <summary>
+    /// Overrides HeatDamageThreshold if the entity's within a parent with the ContainerTemperatureDamageThresholdsComponent component.
+    /// </summary>
+    [DataField, ViewVariables(VVAccess.ReadWrite)]
+    public float? ParentHeatDamageThreshold;
+
+    /// <summary>
+    /// Overrides ColdDamageThreshold if the entity's within a parent with the ContainerTemperatureDamageThresholdsComponent component.
+    /// </summary>
+    [DataField, ViewVariables(VVAccess.ReadWrite)]
+    public float? ParentColdDamageThreshold;
+
+    /// <summary>
+    /// The base damage that this entity will take if it's too cold.
+    /// Will be scaled according to how cold it is.
+    /// The scaling maxes out at <see cref="DamageCap"/> times this damage per second.
+    /// </summary>
+    [DataField, ViewVariables(VVAccess.ReadWrite)]
+    public DamageSpecifier ColdDamage = new();
+
+    /// <summary>
+    /// The base damage that this entity will take per second if it's too hot.
+    /// Will be scaled according to how hot it is.
+    /// The scaling maxes out at <see cref="DamageCap"/> times this damage per second.
+    /// </summary>
+    [DataField, ViewVariables(VVAccess.ReadWrite)]
+    public DamageSpecifier HeatDamage = new();
+
+    /// <summary>
+    /// Temperature won't do more than this multiple of the base overheating/overcooling damage per seond.
+    /// </summary>
+    /// <remarks>
+    /// Okay it genuinely reaches this basically immediately for a plasma fire.
+    /// </remarks>
+    [DataField, ViewVariables(VVAccess.ReadWrite)]
+    public FixedPoint2 DamageCap = FixedPoint2.New(8);
+
+    /// <summary>
+    /// Used to keep track of when damage starts/stops. Useful for logs.
+    /// </summary>
+    [DataField]
+    public bool TakingDamage;
+
+    /// <summary>
+    /// The id of the alert thrown when the entity is too hot.
+    /// </summary>
+    [DataField]
+    public ProtoId<AlertPrototype> HotAlert = "Hot";
+
+    /// <summary>
+    /// The id of the alert thrown when the entity is too cold.
+    /// </summary>
+    [DataField]
+    public ProtoId<AlertPrototype> ColdAlert = "Cold";
+
+    /// <summary>
+    /// The last time this entity processed temperature damage.
+    /// </summary>
+    [DataField(customTypeSerializer: typeof(TimeOffsetSerializer))]
+    public TimeSpan LastUpdate;
+
+    /// <summary>
+    /// The time interval between temperature damage ticks for this entity.
+    /// </summary>
+    [DataField]
+    public TimeSpan UpdateInterval = TimeSpan.FromSeconds(1.0);
+}
diff --git a/Content.Shared/Temperature/Systems/SharedTemperatureSystem.cs b/Content.Shared/Temperature/Systems/SharedTemperatureSystem.cs
index 9561c6dfe1..216349d6f5 100644
--- a/Content.Shared/Temperature/Systems/SharedTemperatureSystem.cs
+++ b/Content.Shared/Temperature/Systems/SharedTemperatureSystem.cs
@@ -16,6 +16,8 @@ public abstract class SharedTemperatureSystem : EntitySystem
     [Dependency] private readonly IGameTiming _timing = default!;
     [Dependency] private readonly MovementSpeedModifierSystem _movementSpeedModifier = default!;
 
+    protected EntityQuery<TemperatureComponent> TemperatureQuery;
+
     /// <summary>
     /// Band-aid for unpredicted atmos. Delays the application for a short period so that laggy clients can get the replicated temperature.
     /// </summary>
@@ -27,6 +29,8 @@ public abstract class SharedTemperatureSystem : EntitySystem
 
         SubscribeLocalEvent<TemperatureSpeedComponent, OnTemperatureChangeEvent>(OnTemperatureChanged);
         SubscribeLocalEvent<TemperatureSpeedComponent, RefreshMovementSpeedModifiersEvent>(OnRefreshMovementSpeedModifiers);
+
+        TemperatureQuery = GetEntityQuery<TemperatureComponent>();
     }
 
     private void OnTemperatureChanged(Entity<TemperatureSpeedComponent> ent, ref OnTemperatureChangeEvent args)
@@ -87,7 +91,7 @@ public abstract class SharedTemperatureSystem : EntitySystem
 
     public float GetHeatCapacity(EntityUid uid, TemperatureComponent? comp = null, PhysicsComponent? physics = null)
     {
-        if (!Resolve(uid, ref comp) || !Resolve(uid, ref physics, false) || physics.FixturesMass <= 0)
+        if (!TemperatureQuery.Resolve(uid, ref comp) || !Resolve(uid, ref physics, false) || physics.FixturesMass <= 0)
         {
             return Atmospherics.MinimumHeatCapacity;
         }
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
index 3685f891b6..39c319f068 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
@@ -1610,10 +1610,11 @@
         Slash: 5
         Piercing: 4
   - type: Temperature
-    heatDamageThreshold: 360
-    coldDamageThreshold: 285
     currentTemperature: 310.15
     specificHeat: 42
+  - type: TemperatureDamage
+    heatDamageThreshold: 360
+    coldDamageThreshold: 285
   - type: Sprite
     drawdepth: Mobs
     layers:
@@ -2368,10 +2369,11 @@
     factions:
     - Passive
   - type: Temperature
-    heatDamageThreshold: 335
-    coldDamageThreshold: 230
     currentTemperature: 310.15
     specificHeat: 46
+  - type: TemperatureDamage
+    heatDamageThreshold: 335
+    coldDamageThreshold: 230
     coldDamage:
       types:
         Cold : 0.05 #per second, scales with temperature & other constants
@@ -3055,13 +3057,14 @@
     damageContainer: BiologicalMetaphysical
     damageModifierSet: Infernal
   - type: Temperature
+    currentTemperature: 310.15
+    specificHeat: 42
+  - type: TemperatureDamage
     heatDamageThreshold: 4000 #They come from hell, so..
     coldDamageThreshold: 260
-    currentTemperature: 310.15
     coldDamage:
       types:
         Cold : 1 #per second, scales with temperature & other constants
-    specificHeat: 42
     heatDamage:
       types:
         Heat : 1 #per second, scales with temperature & other constants
@@ -3256,6 +3259,7 @@
       Dead:
         Base: spacecat_dead
   - type: Temperature
+  - type: TemperatureDamage
     heatDamageThreshold: 423
     coldDamageThreshold: 0
   - type: Tag
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/carp.yml b/Resources/Prototypes/Entities/Mobs/NPCs/carp.yml
index 1547e36339..1eb22649e7 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/carp.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/carp.yml
@@ -185,6 +185,7 @@
       damage:
        types: {}
     - type: Temperature
+    - type: TemperatureDamage
       heatDamageThreshold: 1200
 - type: entity
   id: MobCarpDungeon
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml b/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml
index ccb5c3aebb..b6e53b794d 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml
@@ -833,6 +833,7 @@
         Bloodloss:
           -0.8
   - type: Temperature
+  - type: TemperatureDamage
     heatDamageThreshold: 800
     coldDamageThreshold: 0
   - type: MeleeWeapon
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/scurret.yml b/Resources/Prototypes/Entities/Mobs/NPCs/scurret.yml
index 8f84e1496a..883103adcc 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/scurret.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/scurret.yml
@@ -36,10 +36,11 @@
       60: Critical
       125: Dead
   - type: Temperature
-    heatDamageThreshold: 360
-    coldDamageThreshold: 285
     currentTemperature: 310.15
     specificHeat: 42
+  - type: TemperatureDamage
+    heatDamageThreshold: 360
+    coldDamageThreshold: 285
   # Good eatin', you monster.
   - type: Butcherable
     butcheringType: Spike
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/space.yml b/Resources/Prototypes/Entities/Mobs/NPCs/space.yml
index 7a51d257ef..e57e0d3d97 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/space.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/space.yml
@@ -45,6 +45,7 @@
         Quantity: 300
   - type: CombatMode
   - type: Temperature
+  - type: TemperatureDamage
     heatDamageThreshold: 500
     coldDamageThreshold: 0
   - type: MeleeWeapon
@@ -512,6 +513,7 @@
     sprite: Mobs/Effects/onfire.rsi
     normalState: Mouse_burning
   - type: Temperature
+  - type: TemperatureDamage
     heatDamageThreshold: 500
     coldDamageThreshold: 0
   - type: Reactive
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/xeno.yml b/Resources/Prototypes/Entities/Mobs/NPCs/xeno.yml
index 58e0088828..33653ed207 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/xeno.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/xeno.yml
@@ -107,9 +107,10 @@
   - type: TypingIndicator
     proto: alien
   - type: Temperature
+    currentTemperature: 310.15
+  - type: TemperatureDamage
     heatDamageThreshold: 360
     coldDamageThreshold: -150
-    currentTemperature: 310.15
   - type: Tag
     tags:
       - CannotSuicide
@@ -524,9 +525,10 @@
   - type: TypingIndicator
     proto: alien
   - type: Temperature
+    currentTemperature: 310.15
+  - type: TemperatureDamage
     heatDamageThreshold: 360
     coldDamageThreshold: -150
-    currentTemperature: 310.15
   - type: NoSlip
   - type: Perishable #Ummmm the acid kills a lot of the bacteria or something
     molsPerSecondPerUnitMass: 0.0005
diff --git a/Resources/Prototypes/Entities/Mobs/Player/dragon.yml b/Resources/Prototypes/Entities/Mobs/Player/dragon.yml
index 07bff11974..5aa7f05f0e 100644
--- a/Resources/Prototypes/Entities/Mobs/Player/dragon.yml
+++ b/Resources/Prototypes/Entities/Mobs/Player/dragon.yml
@@ -109,6 +109,7 @@
     - RadiationProtection
     - Adrenaline
   - type: Temperature
+  - type: TemperatureDamage
     heatDamageThreshold: 2400
   - type: Metabolizer
     solutionOnBody: false
diff --git a/Resources/Prototypes/Entities/Mobs/Species/base.yml b/Resources/Prototypes/Entities/Mobs/Species/base.yml
index a0ace57c47..4df9ddcaac 100644
--- a/Resources/Prototypes/Entities/Mobs/Species/base.yml
+++ b/Resources/Prototypes/Entities/Mobs/Species/base.yml
@@ -239,10 +239,11 @@
   - type: Blindable
   # Other
   - type: Temperature
-    heatDamageThreshold: 325
-    coldDamageThreshold: 260
     currentTemperature: 310.15
     specificHeat: 42
+  - type: TemperatureDamage
+    heatDamageThreshold: 325
+    coldDamageThreshold: 260
     coldDamage:
       types:
         Cold: 0.1 #per second, scales with temperature & other constants
diff --git a/Resources/Prototypes/Entities/Mobs/Species/moth.yml b/Resources/Prototypes/Entities/Mobs/Species/moth.yml
index 83031d61d9..6d7ba02f5f 100644
--- a/Resources/Prototypes/Entities/Mobs/Species/moth.yml
+++ b/Resources/Prototypes/Entities/Mobs/Species/moth.yml
@@ -58,11 +58,12 @@
     damage:
       types:
         Heat: 2.5 # moths burn more easily
-  - type: Temperature # Moths hate the heat and thrive in the cold.
-    heatDamageThreshold: 320
-    coldDamageThreshold: 230
+  - type: Temperature
     currentTemperature: 310.15
     specificHeat: 46
+  - type: TemperatureDamage # Moths hate the heat and thrive in the cold.
+    heatDamageThreshold: 320
+    coldDamageThreshold: 230
     coldDamage:
       types:
         Cold : 0.05 #per second, scales with temperature & other constants
diff --git a/Resources/Prototypes/Entities/Mobs/Species/reptilian.yml b/Resources/Prototypes/Entities/Mobs/Species/reptilian.yml
index 67d0cfba80..55bb32e3a3 100644
--- a/Resources/Prototypes/Entities/Mobs/Species/reptilian.yml
+++ b/Resources/Prototypes/Entities/Mobs/Species/reptilian.yml
@@ -54,10 +54,11 @@
       types:
         Slash: 5
   - type: Temperature
-    heatDamageThreshold: 400
-    coldDamageThreshold: 285
     currentTemperature: 310.15
     specificHeat: 42
+  - type: TemperatureDamage
+    heatDamageThreshold: 400
+    coldDamageThreshold: 285
     coldDamage:
       types:
         Cold : 0.1 #per second, scales with temperature & other constants
diff --git a/Resources/Prototypes/Entities/Mobs/Species/vulpkanin.yml b/Resources/Prototypes/Entities/Mobs/Species/vulpkanin.yml
index a80d20627f..535d3ba327 100644
--- a/Resources/Prototypes/Entities/Mobs/Species/vulpkanin.yml
+++ b/Resources/Prototypes/Entities/Mobs/Species/vulpkanin.yml
@@ -34,9 +34,10 @@
         Piercing: 2
         Slash: 3
   - type: Temperature # Same as moth temperatures until below is solved.
+    specificHeat: 44
+  - type: TemperatureDamage
     heatDamageThreshold: 320 # TODO: 315 when there is a way to make the temperature alert not blink to the side of the screen and disappear when you "sweat" at 39C.
     coldDamageThreshold: 230 # TODO: 220 when the above is solved.
-    specificHeat: 44
     coldDamage:
       types:
         Cold: 0.05 # Per second, scales with temperature & other constants
diff --git a/Resources/Prototypes/Entities/Mobs/base.yml b/Resources/Prototypes/Entities/Mobs/base.yml
index a21ca14c5d..26f9215247 100644
--- a/Resources/Prototypes/Entities/Mobs/base.yml
+++ b/Resources/Prototypes/Entities/Mobs/base.yml
@@ -169,13 +169,14 @@
   components:
   - type: AtmosExposed
   - type: Temperature
+    currentTemperature: 310.15
+    specificHeat: 42
+  - type: TemperatureDamage
     heatDamageThreshold: 325
     coldDamageThreshold: 0
-    currentTemperature: 310.15
     coldDamage: #per second, scales with temperature & other constants
       types:
         Cold : 0.1
-    specificHeat: 42
     heatDamage: #per second, scales with temperature & other constants
       types:
         Heat : 1.5
@@ -204,10 +205,11 @@
     normalBodyTemperature: 310.15
     thermalRegulationTemperatureThreshold: 2
   - type: Temperature
-    heatDamageThreshold: 325
-    coldDamageThreshold: 260
     currentTemperature: 310.15
     specificHeat: 42
+  - type: TemperatureDamage
+    heatDamageThreshold: 325
+    coldDamageThreshold: 260
     coldDamage:
       types:
         Cold: 1 #per second, scales with temperature & other constants
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/egg.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/egg.yml
index 25e40d12dc..e19859f16e 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/egg.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/egg.yml
@@ -61,6 +61,13 @@
   # all below are for egg cooking/exploding
   - type: AtmosExposed
   - type: Temperature
+  - type: TemperatureDamage
+  - type: InternalTemperature
+    # ~1mm shell and ~1cm of albumen
+    thickness: 0.011
+    area: 0.04
+    # conductivity of egg shell based on a paper from Romanoff and Romanoff (1949)
+    conductivity: 0.456
 
 # Splat
 - type: entity
@@ -128,3 +135,4 @@
   - type: Temperature
     # preserve temperature from the boiling step
     currentTemperature: 344
+  - type: TemperatureDamage
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/meat.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/meat.yml
index adc3b373d4..41c8f65885 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/meat.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/meat.yml
@@ -42,6 +42,7 @@
   - type: AtmosExposed
   - type: Temperature
     currentTemperature: 290
+  - type: TemperatureDamage
   # required for cooking to work
   - type: InternalTemperature
     thickness: 0.02
diff --git a/Resources/Prototypes/Entities/Objects/Misc/ice_crust.yml b/Resources/Prototypes/Entities/Objects/Misc/ice_crust.yml
index ccca7d1af1..514443f9a1 100644
--- a/Resources/Prototypes/Entities/Objects/Misc/ice_crust.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/ice_crust.yml
@@ -45,6 +45,7 @@
         - !type:DoActsBehavior
           acts: [ "Destruction" ]
     - type: Temperature
+    - type: TemperatureDamage
       heatDamage:
         types:
           Heat: 5
diff --git a/Resources/Prototypes/Entities/Objects/Misc/kudzu.yml b/Resources/Prototypes/Entities/Objects/Misc/kudzu.yml
index 157a9616ab..1f1b9a9c6a 100644
--- a/Resources/Prototypes/Entities/Objects/Misc/kudzu.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/kudzu.yml
@@ -56,6 +56,7 @@
         - !type:DoActsBehavior
           acts: [ "Destruction" ]
     - type: Temperature
+    - type: TemperatureDamage
       heatDamage:
         types:
           Heat: 5
@@ -226,6 +227,7 @@
           Cold: -1.0
           Blunt: -0.5 # Needs to be balanced (approx 3x) with vacuum damage to stall but not kill Kudzu
     - type: Temperature
+    - type: TemperatureDamage
       heatDamage:
         types:
           Heat: 10
diff --git a/Resources/Prototypes/Entities/Objects/Misc/spaceshroom.yml b/Resources/Prototypes/Entities/Objects/Misc/spaceshroom.yml
index e73d13e2cb..6e96dbbadc 100644
--- a/Resources/Prototypes/Entities/Objects/Misc/spaceshroom.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/spaceshroom.yml
@@ -89,6 +89,7 @@
   - type: AtmosExposed
   - type: Temperature
     currentTemperature: 290
+  - type: TemperatureDamage
   - type: InternalTemperature
     thickness: 0.02
     area: 0.02
diff --git a/Resources/Prototypes/Entities/Structures/Machines/Medical/cryo_pod.yml b/Resources/Prototypes/Entities/Structures/Machines/Medical/cryo_pod.yml
index d147417f9e..4d50a8b6ed 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/Medical/cryo_pod.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/Medical/cryo_pod.yml
@@ -111,7 +111,7 @@
   - type: CryoPodAir
   - type: Climbable # so that ejected bodies don't get stuck
     vaultable: false
-  - type: ContainerTemperatureDamageThresholds
+  - type: ContainerTemperature
     coldDamageThreshold: 10
   - type: GuideHelp
     guides:
diff --git a/Resources/Prototypes/Entities/Structures/spider_web.yml b/Resources/Prototypes/Entities/Structures/spider_web.yml
index 73e5f5f032..b09e022a3b 100644
--- a/Resources/Prototypes/Entities/Structures/spider_web.yml
+++ b/Resources/Prototypes/Entities/Structures/spider_web.yml
@@ -24,6 +24,7 @@
   - type: Damageable
     damageModifierSet: Wood
   - type: Temperature
+  - type: TemperatureDamage
     heatDamage:
       types:
         Heat: 5

From cdc0c35f3f49bccce2207da57cb001e39a30a3ce Mon Sep 17 00:00:00 2001
From: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com>
Date: Wed, 24 Dec 2025 00:15:10 -0800
Subject: [PATCH 064/134] AddMolsToMixture atmos helper (#42033)

---
 .../EntitySystems/AtmosphereSystem.Gases.cs   | 21 ++++++
 .../Server/Atmos/AddMolsToMixtureTest.cs      | 75 +++++++++++++++++++
 2 files changed, 96 insertions(+)
 create mode 100644 Content.Tests/Server/Atmos/AddMolsToMixtureTest.cs

diff --git a/Content.Server/Atmos/EntitySystems/AtmosphereSystem.Gases.cs b/Content.Server/Atmos/EntitySystems/AtmosphereSystem.Gases.cs
index 0c6a3a7daa..95d56c9ca6 100644
--- a/Content.Server/Atmos/EntitySystems/AtmosphereSystem.Gases.cs
+++ b/Content.Server/Atmos/EntitySystems/AtmosphereSystem.Gases.cs
@@ -3,6 +3,7 @@ using System.Runtime.CompilerServices;
 using Content.Server.Atmos.Reactions;
 using Content.Shared.Atmos;
 using Content.Shared.Atmos.Reactions;
+using JetBrains.Annotations;
 using Robust.Shared.Prototypes;
 using DependencyAttribute = Robust.Shared.IoC.DependencyAttribute;
 
@@ -477,6 +478,26 @@ namespace Content.Server.Atmos.EntitySystems
             return reaction;
         }
 
+        /// <summary>
+        /// Adds an array of moles to a <see cref="GasMixture"/>.
+        /// Guards against negative moles by clamping to zero.
+        /// </summary>
+        /// <param name="mixture">The <see cref="GasMixture"/> to add moles to.</param>
+        /// <param name="molsToAdd">The <see cref="ReadOnlySpan{T}"/> of moles to add.</param>
+        /// <exception cref="ArgumentOutOfRangeException">Thrown when the length of the <see cref="ReadOnlySpan{T}"/>
+        /// is not the same as the length of the <see cref="GasMixture"/> gas array.</exception>
+        [PublicAPI]
+        public static void AddMolsToMixture(GasMixture mixture, ReadOnlySpan<float> molsToAdd)
+        {
+            // Span length should be as long as the length of the gas array.
+            // Technically this is a redundant check because NumericsHelpers will do the same thing,
+            // but eh.
+            ArgumentOutOfRangeException.ThrowIfNotEqual(mixture.Moles.Length, molsToAdd.Length, nameof(mixture.Moles.Length));
+
+            NumericsHelpers.Add(mixture.Moles, molsToAdd);
+            NumericsHelpers.Max(mixture.Moles, 0f);
+        }
+
         public enum GasCompareResult
         {
             NoExchange = -2,
diff --git a/Content.Tests/Server/Atmos/AddMolsToMixtureTest.cs b/Content.Tests/Server/Atmos/AddMolsToMixtureTest.cs
new file mode 100644
index 0000000000..07b45bfe11
--- /dev/null
+++ b/Content.Tests/Server/Atmos/AddMolsToMixtureTest.cs
@@ -0,0 +1,75 @@
+using System;
+using Content.Server.Atmos.EntitySystems;
+using Content.Shared.Atmos;
+using NUnit.Framework;
+
+namespace Content.Tests.Server.Atmos;
+
+[TestFixture, TestOf(typeof(AtmosphereSystem))]
+[Parallelizable(ParallelScope.All)]
+public sealed class AddMolsToMixtureTest
+{
+    /// <summary>
+    /// Assert that an exception is thrown if the length of the array passed in
+    /// does not match the number of gases.
+    /// </summary>
+    [Test]
+    [TestCase(-1)]
+    [TestCase(1)]
+    public void AddMolsToMixture_Throws_OnLengthMismatch(int num)
+    {
+        var mixture = new GasMixture();
+        var wrongLength = new float[Atmospherics.AdjustedNumberOfGases + num];
+
+        var ex = Assert.Throws<ArgumentOutOfRangeException>(() =>
+            AtmosphereSystem.AddMolsToMixture(mixture, wrongLength));
+
+        Assert.That(ex!.ParamName, Is.EqualTo("Length"));
+    }
+
+    /// <summary>
+    /// Assert that the added mols are correctly added.
+    /// </summary>
+    [Test]
+    public void AddMolsToMixture_Adds_CheckElementwise()
+    {
+        var mixture = new GasMixture();
+        mixture.SetMoles(Gas.Oxygen, 1f);
+        mixture.SetMoles(Gas.Nitrogen, 2f);
+
+        var add = new float[Atmospherics.AdjustedNumberOfGases];
+        add[(int)Gas.Oxygen] = 3f;
+        add[(int)Gas.Nitrogen] = 4f;
+
+        AtmosphereSystem.AddMolsToMixture(mixture, add);
+
+        using (Assert.EnterMultipleScope())
+        {
+            Assert.That(mixture.GetMoles(Gas.Oxygen), Is.EqualTo(4f));
+            Assert.That(mixture.GetMoles(Gas.Nitrogen), Is.EqualTo(6f));
+        }
+    }
+
+    /// <summary>
+    /// Assert that the added mols are correctly clamped at zero.
+    /// </summary>
+    [Test]
+    public void AddMolsToMixture_EnsureClamp()
+    {
+        var mixture = new GasMixture();
+        mixture.SetMoles(Gas.Oxygen, 1f);
+        mixture.SetMoles(Gas.Nitrogen, 2f);
+
+        var add = new float[Atmospherics.AdjustedNumberOfGases];
+        add[(int)Gas.Oxygen] = -2f; // would go to -1 without clamping
+        add[(int)Gas.Nitrogen] = -1f; // should become 1
+
+        AtmosphereSystem.AddMolsToMixture(mixture, add);
+
+        using (Assert.EnterMultipleScope())
+        {
+            Assert.That(mixture.GetMoles(Gas.Oxygen), Is.Zero);
+            Assert.That(mixture.GetMoles(Gas.Nitrogen), Is.EqualTo(1f));
+        }
+    }
+}

From 0444987d5037d0390b929ab1013a14a50b1ff807 Mon Sep 17 00:00:00 2001
From: TVK-04 <114073746+TVK-04@users.noreply.github.com>
Date: Wed, 24 Dec 2025 18:19:08 +0100
Subject: [PATCH 065/134] Fixed Voice Mask and Ripley APU interaction (#42023)

Would show player's real identity instead of assumed identity

Co-authored-by: TVK-04 <>
---
 Content.Server/Mech/Systems/MechSystem.cs | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/Content.Server/Mech/Systems/MechSystem.cs b/Content.Server/Mech/Systems/MechSystem.cs
index 61aa1aa1cc..f4b7ee48a8 100644
--- a/Content.Server/Mech/Systems/MechSystem.cs
+++ b/Content.Server/Mech/Systems/MechSystem.cs
@@ -1,4 +1,3 @@
-using System.Linq;
 using Content.Server.Atmos.EntitySystems;
 using Content.Server.Body.Systems;
 using Content.Server.Mech.Components;
@@ -6,6 +5,7 @@ using Content.Shared.ActionBlocker;
 using Content.Shared.Damage.Systems;
 using Content.Shared.DoAfter;
 using Content.Shared.FixedPoint;
+using Content.Shared.IdentityManagement;
 using Content.Shared.Interaction;
 using Content.Shared.Mech;
 using Content.Shared.Mech.Components;
@@ -25,6 +25,7 @@ using Robust.Server.GameObjects;
 using Robust.Shared.Containers;
 using Robust.Shared.Player;
 using Robust.Shared.Prototypes;
+using System.Linq;
 
 namespace Content.Server.Mech.Systems;
 
@@ -219,7 +220,7 @@ public sealed partial class MechSystem : SharedMechSystem
                     {
                         BreakOnMove = true,
                     };
-                    _popup.PopupEntity(Loc.GetString("mech-eject-pilot-alert", ("item", uid), ("user", args.User)), uid, PopupType.Large);
+                    _popup.PopupEntity(Loc.GetString("mech-eject-pilot-alert", ("item", uid), ("user", Identity.Entity(args.User, EntityManager))), uid, PopupType.Large);
 
                     _doAfter.TryStartDoAfter(doAfterEventArgs);
                 }
@@ -235,7 +236,7 @@ public sealed partial class MechSystem : SharedMechSystem
 
         if (_whitelistSystem.IsWhitelistFail(component.PilotWhitelist, args.User))
         {
-            _popup.PopupEntity(Loc.GetString("mech-no-enter", ("item", uid)), args.User);
+            _popup.PopupEntity(Loc.GetString("mech-no-enter", ("item", uid)), Identity.Entity(args.User, EntityManager));
             return;
         }
 

From 92413255062af8a3555ddf1cce3d566da089b1a4 Mon Sep 17 00:00:00 2001
From: EchoOfNothing <52498373+EchoOfNothing@users.noreply.github.com>
Date: Wed, 24 Dec 2025 22:17:51 +0200
Subject: [PATCH 066/134] Update dotnet sdk from 9 to 10 for nix devl shell.
 (#42041)

Update dotnet sdk from 9 to 10 in shell.nix
---
 shell.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/shell.nix b/shell.nix
index 43f7349f1e..14c2acb798 100644
--- a/shell.nix
+++ b/shell.nix
@@ -12,7 +12,7 @@
 
 let
   dependencies = with pkgs; [
-    dotnetCorePackages.sdk_9_0
+    dotnet-sdk_10
     icu
     glfw
     libGL

From 2d77e48b4c3d92d371eedc41cc0295a8e017ec09 Mon Sep 17 00:00:00 2001
From: Sir Warock <67167466+SirWarock@users.noreply.github.com>
Date: Thu, 25 Dec 2025 20:44:06 +0100
Subject: [PATCH 067/134] Add jet injectors (#40076)

* Added Jet Injectors

* Small fixes

* YML Linter fix

* Requested Adjustments

* Better Sprites for the Jet Injector

* Actually forgor to give credit

* Fix merge conflicts and refactor

* Undo Oversight

* Introduction of Advanced Jet Injectors

* minor oversight

* Adhere to requests

* Remove Loadout, add Lockers

* harder better faster stronger

* vend shortage

* Sound effect

* will this work or do I just gotta choose one at random???

* alright fine I'll do it this way

* quiet the hissing, raise the pitch

* Merge new sprites

---------

Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
---
 Resources/Audio/Items/attributions.yml        |   5 ++
 Resources/Audio/Items/jet_injector.ogg        | Bin 0 -> 20742 bytes
 .../components/injector-component.ftl         |   2 +
 .../Catalog/Fills/Lockers/medical.yml         |   2 +
 .../VendingMachines/Inventories/medical.yml   |   3 +-
 .../Prototypes/Chemistry/injector_modes.yml   |  41 +++++++++++-
 .../Objects/Specific/Medical/hypospray.yml    |  62 ++++++++++++++++++
 .../Recipes/Lathes/Packs/medical.yml          |   2 +
 .../Prototypes/Recipes/Lathes/medical.yml     |  24 +++++++
 .../Prototypes/Research/civilianservices.yml  |   1 +
 .../advanced_jetinjector.rsi/inhand-left.png  | Bin 0 -> 381 bytes
 .../advanced_jetinjector.rsi/inhand-right.png | Bin 0 -> 384 bytes
 .../jetinjector_base.png                      | Bin 0 -> 253 bytes
 .../jetinjector_filled1.png                   | Bin 0 -> 480 bytes
 .../jetinjector_filled2.png                   | Bin 0 -> 110 bytes
 .../jetinjector_filled3.png                   | Bin 0 -> 114 bytes
 .../jetinjector_filled4.png                   | Bin 0 -> 115 bytes
 .../advanced_jetinjector.rsi/meta.json        |  34 ++++++++++
 .../Medical/jetinjector.rsi/inhand-left.png   | Bin 0 -> 381 bytes
 .../Medical/jetinjector.rsi/inhand-right.png  | Bin 0 -> 388 bytes
 .../jetinjector.rsi/jetinjector_base.png      | Bin 0 -> 270 bytes
 .../jetinjector.rsi/jetinjector_filled1.png   | Bin 0 -> 480 bytes
 .../jetinjector.rsi/jetinjector_filled2.png   | Bin 0 -> 127 bytes
 .../jetinjector.rsi/jetinjector_filled3.png   | Bin 0 -> 115 bytes
 .../Medical/jetinjector.rsi/meta.json         |  31 +++++++++
 25 files changed, 203 insertions(+), 4 deletions(-)
 create mode 100644 Resources/Audio/Items/jet_injector.ogg
 create mode 100644 Resources/Textures/Objects/Specific/Medical/advanced_jetinjector.rsi/inhand-left.png
 create mode 100644 Resources/Textures/Objects/Specific/Medical/advanced_jetinjector.rsi/inhand-right.png
 create mode 100644 Resources/Textures/Objects/Specific/Medical/advanced_jetinjector.rsi/jetinjector_base.png
 create mode 100644 Resources/Textures/Objects/Specific/Medical/advanced_jetinjector.rsi/jetinjector_filled1.png
 create mode 100644 Resources/Textures/Objects/Specific/Medical/advanced_jetinjector.rsi/jetinjector_filled2.png
 create mode 100644 Resources/Textures/Objects/Specific/Medical/advanced_jetinjector.rsi/jetinjector_filled3.png
 create mode 100644 Resources/Textures/Objects/Specific/Medical/advanced_jetinjector.rsi/jetinjector_filled4.png
 create mode 100644 Resources/Textures/Objects/Specific/Medical/advanced_jetinjector.rsi/meta.json
 create mode 100644 Resources/Textures/Objects/Specific/Medical/jetinjector.rsi/inhand-left.png
 create mode 100644 Resources/Textures/Objects/Specific/Medical/jetinjector.rsi/inhand-right.png
 create mode 100644 Resources/Textures/Objects/Specific/Medical/jetinjector.rsi/jetinjector_base.png
 create mode 100644 Resources/Textures/Objects/Specific/Medical/jetinjector.rsi/jetinjector_filled1.png
 create mode 100644 Resources/Textures/Objects/Specific/Medical/jetinjector.rsi/jetinjector_filled2.png
 create mode 100644 Resources/Textures/Objects/Specific/Medical/jetinjector.rsi/jetinjector_filled3.png
 create mode 100644 Resources/Textures/Objects/Specific/Medical/jetinjector.rsi/meta.json

diff --git a/Resources/Audio/Items/attributions.yml b/Resources/Audio/Items/attributions.yml
index 5a5927c878..bed043b3ca 100644
--- a/Resources/Audio/Items/attributions.yml
+++ b/Resources/Audio/Items/attributions.yml
@@ -174,3 +174,8 @@
   license: "CC0-1.0"
   copyright: "Created by romulofs, converted to OGG, and edited by TiniestShark (Github)"
   source: "https://freesound.org/s/127541/"
+
+- files: ["jet_injector.ogg"]
+  license: "CC-BY-3.0"
+  copyright: "Orginal audio by EminYILDIRIM -- https://freesound.org/s/548009/ -- License: Attribution 4.0, 2imitk -- https://freesound.org/s/279044/ -- License: Attribution 3.0 and brunoboselli -- https://freesound.org/s/457294/ -- License: Creative Commons 0, modified by Princess-Cheeseballs (GitHub)"
+  source: "https://github.com/space-wizards/space-station-14/pull/40076"
diff --git a/Resources/Audio/Items/jet_injector.ogg b/Resources/Audio/Items/jet_injector.ogg
new file mode 100644
index 0000000000000000000000000000000000000000..8ccb40d8ce67bd76d254bb169001abd403904679
GIT binary patch
literal 20742
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

literal 0
HcmV?d00001

diff --git a/Resources/Locale/en-US/chemistry/components/injector-component.ftl b/Resources/Locale/en-US/chemistry/components/injector-component.ftl
index 2958dda5ed..762816a9d2 100644
--- a/Resources/Locale/en-US/chemistry/components/injector-component.ftl
+++ b/Resources/Locale/en-US/chemistry/components/injector-component.ftl
@@ -45,6 +45,8 @@ injector-component-needle-injecting-user = You start injecting the needle.
 injector-component-needle-injecting-target = {CAPITALIZE(THE($user))} is trying to inject a needle into you!
 injector-component-needle-drawing-user = You start drawing the needle.
 injector-component-needle-drawing-target = {CAPITALIZE(THE($user))} is trying to use a needle to draw from you!
+injector-component-spray-injecting-user = You start preparing the spray nozzle.
+injector-component-spray-injecting-target = {CAPITALIZE(THE($user))} is trying to place a spray nozzle onto you!
 
 ## Target Popup Success messages
 injector-component-feel-prick-message = You feel a tiny prick!
diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/medical.yml b/Resources/Prototypes/Catalog/Fills/Lockers/medical.yml
index 7d9fe7fb59..67eeb837aa 100644
--- a/Resources/Prototypes/Catalog/Fills/Lockers/medical.yml
+++ b/Resources/Prototypes/Catalog/Fills/Lockers/medical.yml
@@ -64,6 +64,7 @@
       - id: UniformScrubsColorPurple
         weight: 0.05
     - id: ClothingMaskSterile
+    - id: JetInjector
 
 - type: entity
   parent: LockerMedical
@@ -132,6 +133,7 @@
     - id: HandheldGPSBasic
     - id: MedkitFilled
       prob: 0.3
+    - id: JetInjector
 
 - type: entity
   parent: LockerParamedic
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/medical.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/medical.yml
index fe8668ec30..639bc55f87 100644
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/medical.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/medical.yml
@@ -41,6 +41,7 @@
     ChemistryBottleEpinephrine: 3
     ChemistryBottleBicaridine: 1
     Syringe: 5
+    JetInjector: 2
     BoxBottle: 3
     PillCanisterTricordrazine: 3
     PillCanisterIron: 1
@@ -74,4 +75,4 @@
   contrabandInventory:
     PillCanisterRandom: 1
     PillSpaceDrugs: 3
-    FoodApple: 1
\ No newline at end of file
+    FoodApple: 1
diff --git a/Resources/Prototypes/Chemistry/injector_modes.yml b/Resources/Prototypes/Chemistry/injector_modes.yml
index fd96819df3..53a5ee4f73 100644
--- a/Resources/Prototypes/Chemistry/injector_modes.yml
+++ b/Resources/Prototypes/Chemistry/injector_modes.yml
@@ -100,20 +100,55 @@
   injectSound: /Audio/Items/hypospray.ogg
   injectPopupTarget: injector-component-feel-prick-message
   injectOnUse: true
-  mobTime: 0
   delayPerVolume: 0
   transferAmounts:
   - 5
 
 - type: injectorMode
-  parent: [ BaseHyposprayMode, BaseInjectMode ]
+  abstract: true
+  parent: BaseHyposprayMode
+  id: BaseInstantHyposprayMode
+  mobTime: 0
+
+- type: injectorMode
+  parent: [ BaseInstantHyposprayMode, BaseInjectMode ]
   id: HyposprayInjectMode
 
 - type: injectorMode
-  parent: [ BaseHyposprayMode, BaseDynamicMode ]
+  parent: [ BaseInstantHyposprayMode, BaseDynamicMode ]
   id: HyposprayDynamicMode
 
 - type: injectorMode
   parent: HyposprayDynamicMode
   id: HypopenDynamicMode
   containerDrawTime: 0.75
+
+- type: injectorMode
+  abstract: true
+  parent: BaseHyposprayMode
+  id: BaseJetInjectorMode
+  injectSound: /Audio/Items/jet_injector.ogg
+  popupUserAttempt: injector-component-spray-injecting-user
+  popupTargetAttempt: injector-component-spray-injecting-target
+
+- type: injectorMode
+  parent: [ BaseJetInjectorMode, BaseInjectMode ]
+  id: JetInjectorInjectMode
+
+- type: injectorMode
+  parent: [ BaseJetInjectorMode, BaseDynamicMode ]
+  id: JetInjectorDynamicMode
+
+- type: injectorMode
+  abstract: true
+  parent: BaseJetInjectorMode
+  id: BaseAdvancedJetInjectorMode
+  mobTime: 2.5
+
+- type: injectorMode
+  parent: [ BaseAdvancedJetInjectorMode, BaseInjectMode ]
+  id: AdvancedJetInjectorInjectMode
+
+- type: injectorMode
+  parent: [ BaseAdvancedJetInjectorMode, BaseDynamicMode ]
+  id: AdvancedJetInjectorDynamicMode
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml b/Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml
index 3d0180f901..eb602ec985 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml
@@ -107,6 +107,68 @@
   - type: UseDelay
     delay: 0.5
 
+- type: entity
+  parent: BaseHypospray
+  id: JetInjector
+  name: jet injector
+  description: A sterile injector for convenient administration of drugs to patients.
+  components:
+  - type: Sprite
+    sprite: Objects/Specific/Medical/jetinjector.rsi
+    layers:
+    - state: jetinjector_base
+      map: [ "enum.SolutionContainerLayers.Base" ]
+    - state: jetinjector_filled1
+      map: [ "enum.SolutionContainerLayers.Fill" ]
+      visible: false
+  - type: Item
+    sprite: Objects/Specific/Medical/jetinjector.rsi
+  - type: UseDelay
+    delay: 2.0
+  - type: SolutionContainerManager
+    solutions:
+      hypospray:
+        maxVol: 15
+  - type: SolutionContainerVisuals
+    maxFillLevels: 3
+    fillBaseName: jetinjector_filled
+    solutionName: hypospray
+  - type: Injector
+    solutionName: hypospray
+    currentTransferAmount: null # Inject everything on injection.
+    activeModeProtoId: JetInjectorDynamicMode
+    allowedModes:
+    - JetInjectorDynamicMode
+    - JetInjectorInjectMode
+
+- type: entity
+  parent: JetInjector
+  id: AdvancedJetInjector
+  name: advanced jet injector
+  description: A pristine, fashionable, high quality injector. Allows for a faster injection, with a slightly larger capacity.
+  components:
+  - type: Sprite
+    sprite: Objects/Specific/Medical/advanced_jetinjector.rsi
+    layers:
+    - state: jetinjector_base
+      map: [ "enum.SolutionContainerLayers.Base" ]
+    - state: jetinjector_filled1
+      map: [ "enum.SolutionContainerLayers.Fill" ]
+      visible: false
+  - type: Item
+    sprite: Objects/Specific/Medical/advanced_jetinjector.rsi
+  - type: SolutionContainerManager
+    solutions:
+      hypospray:
+        maxVol: 20
+  - type: SolutionContainerVisuals
+    maxFillLevels: 4
+  - type: Injector
+    activeModeProtoId: AdvancedJetInjectorDynamicMode
+    allowedModes:
+    - AdvancedJetInjectorDynamicMode
+    - AdvancedJetInjectorInjectMode
+
 - type: entity
   parent: SyndiHypo
   id: AdminHypo
diff --git a/Resources/Prototypes/Recipes/Lathes/Packs/medical.yml b/Resources/Prototypes/Recipes/Lathes/Packs/medical.yml
index 0bb3c49fe9..0b97e46e7a 100644
--- a/Resources/Prototypes/Recipes/Lathes/Packs/medical.yml
+++ b/Resources/Prototypes/Recipes/Lathes/Packs/medical.yml
@@ -47,6 +47,7 @@
   - WhiteCane
   - OffsetCane
   - OffsetCaneWood
+  - JetInjector
 
 - type: latheRecipePack
   id: RollerBedsStatic
@@ -98,6 +99,7 @@
   - SyringeBluespace
   - LauncherSyringe
   - MiniSyringe
+  - AdvancedJetInjector
 
 - type: latheRecipePack
   id: MedicalBoards
diff --git a/Resources/Prototypes/Recipes/Lathes/medical.yml b/Resources/Prototypes/Recipes/Lathes/medical.yml
index bd3ee3773d..b8b39ae175 100644
--- a/Resources/Prototypes/Recipes/Lathes/medical.yml
+++ b/Resources/Prototypes/Recipes/Lathes/medical.yml
@@ -252,3 +252,27 @@
     Glass: 100
     Plastic: 100
 
+- type: latheRecipe
+  id: JetInjector
+  result: JetInjector
+  categories:
+  - Tools
+  completetime: 5
+  materials:
+    Steel: 500
+    Glass: 500
+    Plastic: 250
+    Silver: 250
+
+- type: latheRecipe
+  id: AdvancedJetInjector
+  result: AdvancedJetInjector
+  categories:
+  - Tools
+  completetime: 5
+  materials:
+    Steel: 500
+    Glass: 500
+    Plastic: 250
+    Silver: 400
+    Gold: 50 # A bit of gold for the gold ornaments on it!
diff --git a/Resources/Prototypes/Research/civilianservices.yml b/Resources/Prototypes/Research/civilianservices.yml
index 50bfcc0f57..01407a8ae3 100644
--- a/Resources/Prototypes/Research/civilianservices.yml
+++ b/Resources/Prototypes/Research/civilianservices.yml
@@ -131,6 +131,7 @@
   cost: 5000
   recipeUnlocks:
   - BorgModuleAdvancedChemical
+  - AdvancedJetInjector
 
 - type: technology
   id: AdvancedCleaning
diff --git a/Resources/Textures/Objects/Specific/Medical/advanced_jetinjector.rsi/inhand-left.png b/Resources/Textures/Objects/Specific/Medical/advanced_jetinjector.rsi/inhand-left.png
new file mode 100644
index 0000000000000000000000000000000000000000..5eb91bfbf4c1c1765f27d61f41b4449bb0abc75a
GIT binary patch
literal 381
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`u%tWsIx;Y9
z?C1WI$O`032l#}z-n@BJTU-0Ufddi}5*s#b@b>mT)vEmAP90GG44-Kskm4)}@(cbC
z1q{Ld6+$4v0*}aI1_r)EAj~ML;ne^XlqhkHC<)F_D=AMbN@WO0%*-p%^K%VRFx4~E
zv&_l6Wd~HV$<xI#B*OjeR7bAE20SclE&RUx7Z(p?nzYCJ^%N(~S+m2Fl!|UHlfP87
z!Hd%?VakK$tc4EOZ@83vp1f`4j^*tfzveaVUH+hnBgCzOuZ%%-53k69_e*E%O;~XF
zuHpxChJ%HRm_wf06t%E+edC#-d{9VLqcN~aNJ90;yoMtQ2CQyc<;U-QE-2J0cYjx@
zk>J`@CC)A8(DY}biw!^Li@*L!=amm?JDtBT*fMXw>W3*0^jY}7anzkyUnG?abUlNo
LtDnm{r-UW|nEj1Q

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Specific/Medical/advanced_jetinjector.rsi/inhand-right.png b/Resources/Textures/Objects/Specific/Medical/advanced_jetinjector.rsi/inhand-right.png
new file mode 100644
index 0000000000000000000000000000000000000000..9630d22a3d07c36552ccb3a79e3d843b55319c84
GIT binary patch
literal 384
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|SkfJR9T^xl
z_H+M9WCij$3p^r=85sBuf-vKbiP>*~f)XXJ5hcO-X(i=}MX3w{iJ5sNdVa1U3Z{C7
zdX_nPx9oswK6<)1hE&A8y}6h7kbywkL*d|<%+5=TE7YyNeU!-&=sYy{c20rGlFlEU
z%!=t>?3OAYw@;7#+zHeP1b283Cw$&0x7Yf3qMgEb&#hsCf}Mu@{xpVP-j}^LU;p9C
zIh$9$+I7-8IP|pT`uo*hC#%-}Q#qEQxpdw62hRTHH-8n$n;qOK&@?6JNVR=HsP<A1
zj>La2iw)hR*Q@WI)32xhu*mLKg{^7m{+ZVg`|o+r53!cv!rrSVvzv9VM@-?d{WSGQ
zCFAzMzsEloD^CynyWZ*YwFAP@w{}b2kK4VHGf&E1f6MJ#_MP+hD%Sx6^ZygJR)fad
TSu3vOg3R)C^>bP0l+XkK!||Dy

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Specific/Medical/advanced_jetinjector.rsi/jetinjector_base.png b/Resources/Textures/Objects/Specific/Medical/advanced_jetinjector.rsi/jetinjector_base.png
new file mode 100644
index 0000000000000000000000000000000000000000..43ca3c4f5046903856cc0e86b9f43e4dab1ea669
GIT binary patch
literal 253
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|v;urWTn`*L
zaQyi34I4ISYin0kRY^!lczb)FYE{0m+RfV9T1iPsSXj8hSp}%P((GI(km4%|@(cct
z3>aJw+&KZ1N%wSd46*3FdeNG%!GVJ%psaoV>O22;UCS~O3G;UUWaKa*%j+Ank`bHl
zj8A<v-&RDPYGCwpbXAcJY%n%>u*&a1i@b<Pjphr{eR~*hHk^3Ea8YH!ZN}&M41A}~
lbTyrLHanb!{r)YcJ0`M*re<O;e}Gmpc)I$ztaD0e0swiVU{e49

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Specific/Medical/advanced_jetinjector.rsi/jetinjector_filled1.png b/Resources/Textures/Objects/Specific/Medical/advanced_jetinjector.rsi/jetinjector_filled1.png
new file mode 100644
index 0000000000000000000000000000000000000000..9da2b06d2f3ed2357c7fc9110b34561f7615712f
GIT binary patch
literal 480
zcmV<60U!Q}P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800009a7bBm000XT
z000XT0n*)m`~Uy}l1W5CR9HvtRl7<9K@`1f0;UL>1qnp_fy8QmA<foG(ALf$u<#Sa
zAF$L`B=`p@6$IJJgjEQ{C`by0JR~v5y62h|-6q*HrF&r*2IkH=_nbR3B59-w{C5Q`
zRshFw{-k=IM;%2G0C=%jRKS&dUi!nK^m;vc`&gCBgKr`?tw8pV`*TSx&D{~(u(5X{
zlkxZmJR$)?lUHAXF&2&Nq8qUf;E3g1PAmScz*D!Y>+Z{Yk|Tw(00@x{u%Ov$Dd=6Z
znFt)46I&1=py@uRQyGj#G<agR@q{1<q*N;DV1rhmQZ6f|T`1^?)=7y_1OT=^s~YoW
zr6QKawG%}ERqi$#avOpkg);(nFhLVIuT}+5&S5y41Wf>-AYt3KUO(0XiadJ2bzPMm
z13kcokpckSsnuxzjUJ*|#lc0r&K9qE#tImrn<Pj6;|%r@LN4`spy>dLf8epx(Hp>g
zL`D{@h5vuM-IndMYZD>)9(eG5$!0Qg|2&Yb(<}NaQWiwM#~&Zo1|td6<WvDu1-<}n
WuznAQJT-R!0000<MNUMnLSTYdXU9PR

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Specific/Medical/advanced_jetinjector.rsi/jetinjector_filled2.png b/Resources/Textures/Objects/Specific/Medical/advanced_jetinjector.rsi/jetinjector_filled2.png
new file mode 100644
index 0000000000000000000000000000000000000000..052593467571f5d7b14ced6099901ceeed53e1d5
GIT binary patch
literal 110
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}8lEnWArY-_
z&pGlkFmN0(XsSQo&hcZy7N%*Tj0_(lC*?@jZvIrk(7@=~&BCZA$z1}}!{F)a=d#Wz
Gp$P!B1|AXs

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Specific/Medical/advanced_jetinjector.rsi/jetinjector_filled3.png b/Resources/Textures/Objects/Specific/Medical/advanced_jetinjector.rsi/jetinjector_filled3.png
new file mode 100644
index 0000000000000000000000000000000000000000..c2ae1388ab962a0b930ff1a59bde81462dd6a523
GIT binary patch
literal 114
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}I-V|$ArY-_
zFCFA$VBk1nQ22lDc~us{Nu0kjL>WFrPKq%v$bQ^-&$Cj7;Q&L40sG&XsqCwO`WQT2
L{an^LB{Ts5YP%t!

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Specific/Medical/advanced_jetinjector.rsi/jetinjector_filled4.png b/Resources/Textures/Objects/Specific/Medical/advanced_jetinjector.rsi/jetinjector_filled4.png
new file mode 100644
index 0000000000000000000000000000000000000000..52531e9920b777b9a5e6641a156e95b89d796b65
GIT binary patch
literal 115
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}x}GkMArY-_
zFCXM(FyLX@xZ?MFpSBD;k8cbw?9MPaY*zVsx58ZWC}YWICI&s7*{e7hH@Zk>0yQ#t
My85}Sb4q9e0JZlbKL7v#

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Specific/Medical/advanced_jetinjector.rsi/meta.json b/Resources/Textures/Objects/Specific/Medical/advanced_jetinjector.rsi/meta.json
new file mode 100644
index 0000000000..faf83686a6
--- /dev/null
+++ b/Resources/Textures/Objects/Specific/Medical/advanced_jetinjector.rsi/meta.json
@@ -0,0 +1,34 @@
+{
+	"version": 1,
+	"license": "CC-BY-SA-3.0",
+	"copyright": "Sprites made by @Sir_Warock on Discord, remastered by @Phantasai on Github",
+	"size": {
+		"x": 32,
+		"y": 32
+	},
+	"states": [
+		{
+			"name": "jetinjector_base"
+		},
+        {
+			"name": "jetinjector_filled1"
+		},
+		{
+			"name": "jetinjector_filled2"
+		},
+		{
+			"name": "jetinjector_filled3"
+		},
+        {
+            "name": "jetinjector_filled4"
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        }
+    ]
+}
diff --git a/Resources/Textures/Objects/Specific/Medical/jetinjector.rsi/inhand-left.png b/Resources/Textures/Objects/Specific/Medical/jetinjector.rsi/inhand-left.png
new file mode 100644
index 0000000000000000000000000000000000000000..25e34bb739ab9dd1673e47e238bed416951c0803
GIT binary patch
literal 381
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`u%tWsIx;Y9
z?C1WI$O`032l#}z-n@B}&oJh|fdkA^o*Oo7Pz<j=)vEmAP90GGdQ>RL49=1uzu^B+
zz!2<TAp{aE@Q5sCVBk9h!i=ICUJXD&i4xa{lHmNblJdl&REB`W%)AmkKi3ciQ$0gH
z%bdJhc0e_oJY5_^BHZ6jb>up1z{9fE!tcv}aq&Q=Nqf9sPjS+mH9I^>sp#f1`AbC`
zyg0oQraV~ATIg{7hD*uk$=g=$Sl-U@YhKgd<qw)TLfk6&${0lV@QNIGzjU_VgawE1
zDt<6$I9RxdIpnELQ44F=H=Y^F2ZdBM8UvezBvgOQYdDf%!0M(|e*Dhof<mow_ji>V
z39emL;@n~mO@Ai3*zj|{`0Jl^UiqN5)A{>?E%WxPewgw=pN0P$N8O3_MN+vy*E4v!
L`njxgN@xNA`OA)n

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Specific/Medical/jetinjector.rsi/inhand-right.png b/Resources/Textures/Objects/Specific/Medical/jetinjector.rsi/inhand-right.png
new file mode 100644
index 0000000000000000000000000000000000000000..c4f7f7fdf8fb38c0284345d4468d721db6c2d7ff
GIT binary patch
literal 388
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`u%tWsIx;Y9
z?C1WI$O`032l#}z-n@D9z<~pNhA|s9Y+#o1R1B~FaHsB6t1?i2W09E-km4)}@(cbC
z1q{Ld6+$4v0*}aI1_r)^Ak4U9V)k30phSslL`iUdT1k0gQ7S_~VrE{6o}X)of~lUN
zo@GwnEjyr^ot`d^ArbCxr=1pSQQ&YmyXD7!{dtdP_P85(U0%dmKDje)3a{Fa$tvo5
zS`=7%1@?G6`2I!qetwj~<_{e_-5z_zq~wFH*;%n%EoW$m>2Li1iAiM6Im0h|G*(n@
z<7s`S6n^4%pS}GJ^C*L;=AD0&?l!yb@#Jv2z~RUtr5M06y|YhH;PQ=as@J$3bdGPU
zb**PSQB&4!8pjayppCOfMLlW;SH$gW7Y?}`xcyD%3(MxWb3f(?z87dR=df#)s=KpE
T^XFxtCm1|k{an^LB{Ts5X*`te

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Specific/Medical/jetinjector.rsi/jetinjector_base.png b/Resources/Textures/Objects/Specific/Medical/jetinjector.rsi/jetinjector_base.png
new file mode 100644
index 0000000000000000000000000000000000000000..c8fdcc3a1e68e770464990e5a2847694301b0d5d
GIT binary patch
literal 270
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|%mREuTn`*L
zaQyi34I4J_8OHck^fOC&Du!2|YE{0m+RfYBTU%S3VQUyev$TYSM1!*mP=Rug3Q+6z
z3zvTbDWQ@ezu^C<fZ_lDLe-QaplpVxi(`mI@70SNxegd`umnsFUU)I-|Nm_3?XATx
zM9d!+YI&Ke{$>=EY*zEBbhoR%qLX@nVfg~1=01%Bk^(zc2^&0QXJw7&s%q8GcQ8><
zws0`xd{K7br*uQJ(dI=8i+?_wdh+1*Z4Bls?JW-OF1qy)XeWcGtDnm{r-UW|e|c!F

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Specific/Medical/jetinjector.rsi/jetinjector_filled1.png b/Resources/Textures/Objects/Specific/Medical/jetinjector.rsi/jetinjector_filled1.png
new file mode 100644
index 0000000000000000000000000000000000000000..9da2b06d2f3ed2357c7fc9110b34561f7615712f
GIT binary patch
literal 480
zcmV<60U!Q}P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800009a7bBm000XT
z000XT0n*)m`~Uy}l1W5CR9HvtRl7<9K@`1f0;UL>1qnp_fy8QmA<foG(ALf$u<#Sa
zAF$L`B=`p@6$IJJgjEQ{C`by0JR~v5y62h|-6q*HrF&r*2IkH=_nbR3B59-w{C5Q`
zRshFw{-k=IM;%2G0C=%jRKS&dUi!nK^m;vc`&gCBgKr`?tw8pV`*TSx&D{~(u(5X{
zlkxZmJR$)?lUHAXF&2&Nq8qUf;E3g1PAmScz*D!Y>+Z{Yk|Tw(00@x{u%Ov$Dd=6Z
znFt)46I&1=py@uRQyGj#G<agR@q{1<q*N;DV1rhmQZ6f|T`1^?)=7y_1OT=^s~YoW
zr6QKawG%}ERqi$#avOpkg);(nFhLVIuT}+5&S5y41Wf>-AYt3KUO(0XiadJ2bzPMm
z13kcokpckSsnuxzjUJ*|#lc0r&K9qE#tImrn<Pj6;|%r@LN4`spy>dLf8epx(Hp>g
zL`D{@h5vuM-IndMYZD>)9(eG5$!0Qg|2&Yb(<}NaQWiwM#~&Zo1|td6<WvDu1-<}n
WuznAQJT-R!0000<MNUMnLSTYdXU9PR

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Specific/Medical/jetinjector.rsi/jetinjector_filled2.png b/Resources/Textures/Objects/Specific/Medical/jetinjector.rsi/jetinjector_filled2.png
new file mode 100644
index 0000000000000000000000000000000000000000..29b40170299c1616df016b0c41ac11baf882e7f7
GIT binary patch
literal 127
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}mYyz-ArY-_
zFE(;A81OJTzRXw{ofcv3!X@-0`T)Bs1H*=yx$ewXyYya$r83vq6fEO?*|4#Kf#CsT
Xc^hX^re#GS&=3YsS3j3^P6<r_-RUG5

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Specific/Medical/jetinjector.rsi/jetinjector_filled3.png b/Resources/Textures/Objects/Specific/Medical/jetinjector.rsi/jetinjector_filled3.png
new file mode 100644
index 0000000000000000000000000000000000000000..52531e9920b777b9a5e6641a156e95b89d796b65
GIT binary patch
literal 115
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}x}GkMArY-_
zFCXM(FyLX@xZ?MFpSBD;k8cbw?9MPaY*zVsx58ZWC}YWICI&s7*{e7hH@Zk>0yQ#t
My85}Sb4q9e0JZlbKL7v#

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Specific/Medical/jetinjector.rsi/meta.json b/Resources/Textures/Objects/Specific/Medical/jetinjector.rsi/meta.json
new file mode 100644
index 0000000000..a881305a2f
--- /dev/null
+++ b/Resources/Textures/Objects/Specific/Medical/jetinjector.rsi/meta.json
@@ -0,0 +1,31 @@
+{
+	"version": 1,
+	"license": "CC-BY-SA-3.0",
+	"copyright": "Sprites made by @Sir_Warock on Discord, remastered by @Phantasai on Github",
+	"size": {
+		"x": 32,
+		"y": 32
+	},
+	"states": [
+		{
+			"name": "jetinjector_base"
+		},
+        {
+			"name": "jetinjector_filled1"
+		},
+		{
+			"name": "jetinjector_filled2"
+		},
+		{
+			"name": "jetinjector_filled3"
+		},
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        }
+    ]
+}

From 3ecc3cb295f134e95a708989cafd346588a3b905 Mon Sep 17 00:00:00 2001
From: PJBot <pieterjan.briers+bot@gmail.com>
Date: Thu, 25 Dec 2025 19:58:54 +0000
Subject: [PATCH 068/134] 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 74666f467b..9cfb17a4e3 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -1,11 +1,4 @@
 Entries:
-- author: ScarKy0, beck-thompson
-  changes:
-  - message: Various canines will now sometimes clumsily spill things they drink.
-    type: Add
-  id: 8831
-  time: '2025-08-06T13:00:32.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/38852
 - author: aada
   changes:
   - message: You can examine fuel tanks to see how much they're filled.
@@ -3933,3 +3926,16 @@
   id: 9330
   time: '2025-12-23T10:01:37.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/41960
+- author: SirWarock
+  changes:
+  - message: Added Jet Injectors, an hypodermic alternative to Syringes!
+    type: Add
+  - message: Jet Injectors now spawn in Medical Doctor Lockers, as well as being stocked
+      in the NanoMed Plus!
+    type: Add
+  - message: Added Advanced Jet Injectors, with a bigger storage and faster injection
+      times than the base one!
+    type: Add
+  id: 9331
+  time: '2025-12-25T19:57:41.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/40076

From 6129fbe98e4f10759b73ea29e602acdab1e3b037 Mon Sep 17 00:00:00 2001
From: lzk <124214523+lzk228@users.noreply.github.com>
Date: Thu, 25 Dec 2025 21:53:14 +0100
Subject: [PATCH 069/134] make comp-repairable-repair sane (#42048)

---
 .../Locale/en-US/repairable/repairable-component.ftl      | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/Resources/Locale/en-US/repairable/repairable-component.ftl b/Resources/Locale/en-US/repairable/repairable-component.ftl
index 8e2e0e2ee1..3167b415cd 100644
--- a/Resources/Locale/en-US/repairable/repairable-component.ftl
+++ b/Resources/Locale/en-US/repairable/repairable-component.ftl
@@ -1,10 +1,4 @@
 ### Interaction Messages
 
 # Shown when repairing something
-comp-repairable-repair = You finish repairing {PROPER($target) ->
-  [true] {""}
-  *[false] the{" "}
-}{$target} with {PROPER($tool) ->
-  [true] {""}
-  *[false] the{" "}
-}{$tool}
+comp-repairable-repair = You finish repairing {THE($target)} with {THE($tool)}

From 8fab0ccb585d58d2105c024c44380dbb6f40059d Mon Sep 17 00:00:00 2001
From: Errant <35878406+Errant-4@users.noreply.github.com>
Date: Thu, 25 Dec 2025 22:02:05 +0100
Subject: [PATCH 070/134] Remove reverted shuttle event change from the
 changelog (#42065)

revert changelog
---
 Resources/Changelog/Changelog.yml | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index 9cfb17a4e3..a87d2e5857 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -3627,13 +3627,6 @@
   id: 9294
   time: '2025-12-15T01:50:21.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/41823
-- author: PJB3005
-  changes:
-  - message: Removed friendly & freelancer "unknown shuttle" events.
-    type: Remove
-  id: 9295
-  time: '2025-12-15T03:42:56.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/41860
 - author: Meara1179
   changes:
   - message: Added crowbar to the Medical Borg's Rescue module.

From 2f0d3476129ece976f3de1d68b172b87049440e1 Mon Sep 17 00:00:00 2001
From: TheFlyingSentry <170261226+TheFlyingSentry@users.noreply.github.com>
Date: Thu, 25 Dec 2025 18:21:40 -0500
Subject: [PATCH 071/134] Fixed Xeno air alarms warning/danger sprites not
 showing (#41590)

Fixed Xeno air alarms (someone didn't copy paste correctly :3)
---
 .../WallmountMachines/air_alarm.yml           |   4 +++-
 .../air_monitors_xeno.rsi/alarm1.png          | Bin 17694 -> 17732 bytes
 .../air_monitors_xeno.rsi/alarm2.png          | Bin 17732 -> 17694 bytes
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/WallmountMachines/air_alarm.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/WallmountMachines/air_alarm.yml
index 609f6e21ea..8958d6e8d0 100644
--- a/Resources/Prototypes/Entities/Structures/Wallmounts/WallmountMachines/air_alarm.yml
+++ b/Resources/Prototypes/Entities/Structures/Wallmounts/WallmountMachines/air_alarm.yml
@@ -161,8 +161,10 @@
   - type: Sprite
     sprite: Structures/Wallmounts/air_monitors_xeno.rsi
     layers:
+    - state: alarmp
+      map: ["airAlarmBase"]  # TODO: fire alarm enum
     - state: alarm0
-      map: ["airAlarmBase"] # TODO: fire alarm enum
+      map: ["airAlarmState"]
     - state: alarmx
       map: ["enum.WiresVisualLayers.MaintenancePanel"]
 
diff --git a/Resources/Textures/Structures/Wallmounts/air_monitors_xeno.rsi/alarm1.png b/Resources/Textures/Structures/Wallmounts/air_monitors_xeno.rsi/alarm1.png
index 3284ec9f01a71008a5487f20af1ee4fe7f659e05..33852a99f025c472a59be95f6c831f35d51677fa 100644
GIT binary patch
delta 3102
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
ZCHJf73*ZJNL4qI<$jaQ-tj@$M{y(8)-Npa_

delta 3062
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

diff --git a/Resources/Textures/Structures/Wallmounts/air_monitors_xeno.rsi/alarm2.png b/Resources/Textures/Structures/Wallmounts/air_monitors_xeno.rsi/alarm2.png
index 33852a99f025c472a59be95f6c831f35d51677fa..3284ec9f01a71008a5487f20af1ee4fe7f659e05 100644
GIT binary patch
delta 3062
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

delta 3102
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
ZCHJf73*ZJNL4qI<$jaQ-tj@$M{y(8)-Npa_


From 2182c7be705915364e5c285e79ef781649f584dc Mon Sep 17 00:00:00 2001
From: PJBot <pieterjan.briers+bot@gmail.com>
Date: Thu, 25 Dec 2025 23:35:14 +0000
Subject: [PATCH 072/134] Automatic changelog update

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

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index a87d2e5857..f030930c95 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -3932,3 +3932,10 @@
   id: 9331
   time: '2025-12-25T19:57:41.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/40076
+- author: TheFlyingSentry
+  changes:
+  - message: Fixed Xeno air alarms not showing state changes.
+    type: Fix
+  id: 9332
+  time: '2025-12-25T23:34:06.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/41590

From 4ff7411fb786c1288db1d2feab080729d2551018 Mon Sep 17 00:00:00 2001
From: alexalexmax <149889301+alexalexmax@users.noreply.github.com>
Date: Thu, 25 Dec 2025 18:47:05 -0800
Subject: [PATCH 073/134] Voice mask effects are toggleable and hide your
 accent (#41965)

* apply negate accents system

* add toggle to voice mask ui

* roll negateaccents into voice mask system, delete negate accents comp&system, update yml entries

* convert button to ToggleButton and some cleanup

* retry for heisenfail

* accent toggle

* update names and add mask active check for accent hiding
---
 .../VoiceMask/VoiceMaskBoundUserInterface.cs  | 14 ++++-
 .../VoiceMask/VoiceMaskNameChangeWindow.xaml  |  2 +
 .../VoiceMaskNameChangeWindow.xaml.cs         |  9 ++-
 Content.Server/Chat/Systems/ChatSystem.cs     |  2 +-
 Content.Server/Speech/AccentSystem.cs         |  3 +
 .../VoiceMask/VoiceMaskComponent.cs           | 12 ++++
 Content.Server/VoiceMask/VoiceMaskSystem.cs   | 57 +++++++++++++++++--
 Content.Shared/Chat/SharedChatEvents.cs       |  3 +-
 .../SharedSubdermalImplantSystem.Relays.cs    |  1 +
 .../Inventory/InventorySystem.Relay.cs        |  1 +
 .../VoiceMask/SharedVoiceMaskSystem.cs        | 18 +++++-
 Resources/Locale/en-US/voice-mask.ftl         |  5 ++
 12 files changed, 118 insertions(+), 9 deletions(-)

diff --git a/Content.Client/VoiceMask/VoiceMaskBoundUserInterface.cs b/Content.Client/VoiceMask/VoiceMaskBoundUserInterface.cs
index e76ca1cf8f..b2b374cac5 100644
--- a/Content.Client/VoiceMask/VoiceMaskBoundUserInterface.cs
+++ b/Content.Client/VoiceMask/VoiceMaskBoundUserInterface.cs
@@ -26,6 +26,8 @@ public sealed class VoiceMaskBoundUserInterface : BoundUserInterface
 
         _window.OnNameChange += OnNameSelected;
         _window.OnVerbChange += verb => SendMessage(new VoiceMaskChangeVerbMessage(verb));
+        _window.OnToggle += OnToggle;
+        _window.OnAccentToggle += OnAccentToggle;
     }
 
     private void OnNameSelected(string name)
@@ -33,6 +35,16 @@ public sealed class VoiceMaskBoundUserInterface : BoundUserInterface
         SendMessage(new VoiceMaskChangeNameMessage(name));
     }
 
+    private void OnToggle()
+    {
+        SendMessage(new VoiceMaskToggleMessage());
+    }
+
+    private void OnAccentToggle()
+    {
+        SendMessage(new VoiceMaskAccentToggleMessage());
+    }
+
     protected override void UpdateState(BoundUserInterfaceState state)
     {
         if (state is not VoiceMaskBuiState cast || _window == null)
@@ -40,7 +52,7 @@ public sealed class VoiceMaskBoundUserInterface : BoundUserInterface
             return;
         }
 
-        _window.UpdateState(cast.Name, cast.Verb);
+        _window.UpdateState(cast.Name, cast.Verb, cast.Active, cast.AccentHide);
     }
 
     protected override void Dispose(bool disposing)
diff --git a/Content.Client/VoiceMask/VoiceMaskNameChangeWindow.xaml b/Content.Client/VoiceMask/VoiceMaskNameChangeWindow.xaml
index e23aca1239..18416757b9 100644
--- a/Content.Client/VoiceMask/VoiceMaskNameChangeWindow.xaml
+++ b/Content.Client/VoiceMask/VoiceMaskNameChangeWindow.xaml
@@ -12,5 +12,7 @@
             <Label Text="{Loc 'voice-mask-name-change-speech-style'}" />
             <OptionButton Name="SpeechVerbSelector" /> <!-- Populated in LoadVerbs -->
         </BoxContainer>
+        <Button Name="ToggleAccentButton" Text="{Loc 'voice-mask-name-change-accent-toggle'}" HorizontalExpand="True" ToggleMode="True" Margin="5"/>
+        <Button Name="ToggleButton" Text="{Loc 'voice-mask-name-change-toggle'}" HorizontalExpand="True" ToggleMode="True" Margin="5"/>
     </BoxContainer>
 </controls:FancyWindow>
diff --git a/Content.Client/VoiceMask/VoiceMaskNameChangeWindow.xaml.cs b/Content.Client/VoiceMask/VoiceMaskNameChangeWindow.xaml.cs
index 7ca4dd4b95..a5e7036283 100644
--- a/Content.Client/VoiceMask/VoiceMaskNameChangeWindow.xaml.cs
+++ b/Content.Client/VoiceMask/VoiceMaskNameChangeWindow.xaml.cs
@@ -12,6 +12,8 @@ public sealed partial class VoiceMaskNameChangeWindow : FancyWindow
 {
     public Action<string>? OnNameChange;
     public Action<string?>? OnVerbChange;
+    public Action? OnToggle;
+    public Action? OnAccentToggle;
 
     private List<(string, string)> _verbs = new();
 
@@ -31,6 +33,9 @@ public sealed partial class VoiceMaskNameChangeWindow : FancyWindow
             OnVerbChange?.Invoke((string?) args.Button.GetItemMetadata(args.Id));
             SpeechVerbSelector.SelectId(args.Id);
         };
+
+        ToggleButton.OnPressed += args => OnToggle?.Invoke();
+        ToggleAccentButton.OnPressed += args => OnAccentToggle?.Invoke();
     }
 
     public void ReloadVerbs(IPrototypeManager proto)
@@ -64,10 +69,12 @@ public sealed partial class VoiceMaskNameChangeWindow : FancyWindow
             SpeechVerbSelector.SelectId(id);
     }
 
-    public void UpdateState(string name, string? verb)
+    public void UpdateState(string name, string? verb, bool active, bool accentHide)
     {
         NameSelector.Text = name;
         _verb = verb;
+        ToggleButton.Pressed = active;
+        ToggleAccentButton.Pressed = accentHide;
 
         for (int id = 0; id < SpeechVerbSelector.ItemCount; id++)
         {
diff --git a/Content.Server/Chat/Systems/ChatSystem.cs b/Content.Server/Chat/Systems/ChatSystem.cs
index 581b678b84..9ea04ca3bc 100644
--- a/Content.Server/Chat/Systems/ChatSystem.cs
+++ b/Content.Server/Chat/Systems/ChatSystem.cs
@@ -736,7 +736,7 @@ public sealed partial class ChatSystem : SharedChatSystem
     public string TransformSpeech(EntityUid sender, string message)
     {
         var ev = new TransformSpeechEvent(sender, message);
-        RaiseLocalEvent(ev);
+        RaiseLocalEvent(sender, ev, true);
 
         return ev.Message;
     }
diff --git a/Content.Server/Speech/AccentSystem.cs b/Content.Server/Speech/AccentSystem.cs
index 275a4175c8..6f89a7d14d 100644
--- a/Content.Server/Speech/AccentSystem.cs
+++ b/Content.Server/Speech/AccentSystem.cs
@@ -15,6 +15,9 @@ public sealed class AccentSystem : EntitySystem
 
     private void AccentHandler(TransformSpeechEvent args)
     {
+        if (args.Cancelled)
+            return;
+
         var accentEvent = new AccentGetEvent(args.Sender, args.Message);
 
         RaiseLocalEvent(args.Sender, accentEvent, true);
diff --git a/Content.Server/VoiceMask/VoiceMaskComponent.cs b/Content.Server/VoiceMask/VoiceMaskComponent.cs
index f7e07f2bd1..042b78a859 100644
--- a/Content.Server/VoiceMask/VoiceMaskComponent.cs
+++ b/Content.Server/VoiceMask/VoiceMaskComponent.cs
@@ -43,5 +43,17 @@ public sealed partial class VoiceMaskComponent : Component
     /// </summary>
     [DataField]
     public EntityUid? ActionEntity;
+
+    /// <summary>
+    ///     If user's voice is getting changed when they speak.
+    /// </summary>
+    [DataField]
+    public bool Active = true;
+
+    /// <summary>
+    ///     If user's accent is getting hidden when they speak.
+    /// </summary>
+    [DataField]
+    public bool AccentHide = true;
 }
 
diff --git a/Content.Server/VoiceMask/VoiceMaskSystem.cs b/Content.Server/VoiceMask/VoiceMaskSystem.cs
index 170bddf082..a67bfb8b66 100644
--- a/Content.Server/VoiceMask/VoiceMaskSystem.cs
+++ b/Content.Server/VoiceMask/VoiceMaskSystem.cs
@@ -1,3 +1,4 @@
+using Content.Server.Speech;
 using Content.Shared.Actions;
 using Content.Shared.Administration.Logs;
 using Content.Shared.CCVar;
@@ -10,7 +11,6 @@ using Content.Shared.Implants;
 using Content.Shared.Inventory;
 using Content.Shared.Lock;
 using Content.Shared.Popups;
-using Content.Shared.Preferences;
 using Content.Shared.Speech;
 using Content.Shared.VoiceMask;
 using Robust.Shared.Configuration;
@@ -45,12 +45,41 @@ public sealed partial class VoiceMaskSystem : EntitySystem
         SubscribeLocalEvent<VoiceMaskComponent, LockToggledEvent>(OnLockToggled);
         SubscribeLocalEvent<VoiceMaskComponent, VoiceMaskChangeNameMessage>(OnChangeName);
         SubscribeLocalEvent<VoiceMaskComponent, VoiceMaskChangeVerbMessage>(OnChangeVerb);
+        SubscribeLocalEvent<VoiceMaskComponent, VoiceMaskToggleMessage>(OnToggle);
+        SubscribeLocalEvent<VoiceMaskComponent, VoiceMaskAccentToggleMessage>(OnAccentToggle);
         SubscribeLocalEvent<VoiceMaskComponent, ClothingGotEquippedEvent>(OnEquip);
         SubscribeLocalEvent<VoiceMaskSetNameEvent>(OpenUI);
+        SubscribeLocalEvent<VoiceMaskComponent, TransformSpeechEvent>(OnTransformSpeech, before: [typeof(AccentSystem)]);
+        SubscribeLocalEvent<VoiceMaskComponent, InventoryRelayedEvent<TransformSpeechEvent>>(OnTransformSpeechInventory, before: [typeof(AccentSystem)]);
+        SubscribeLocalEvent<VoiceMaskComponent, ImplantRelayEvent<TransformSpeechEvent>>(OnTransformSpeechImplant, before: [typeof(AccentSystem)]);
 
         Subs.CVar(_cfgManager, CCVars.MaxNameLength, value => _maxNameLength = value, true);
     }
 
+    /// <summary>
+    ///     Hides accent if the voice mask is on and the option to block accents is on
+    /// </summary>
+    private void TransformSpeech(Entity<VoiceMaskComponent> entity, TransformSpeechEvent args)
+    {
+        if (entity.Comp.AccentHide && entity.Comp.Active)
+            args.Cancel();
+    }
+
+    private void OnTransformSpeech(Entity<VoiceMaskComponent> entity, ref TransformSpeechEvent args)
+    {
+        TransformSpeech(entity, args);
+    }
+
+    private void OnTransformSpeechInventory(Entity<VoiceMaskComponent> entity, ref InventoryRelayedEvent<TransformSpeechEvent> args)
+    {
+        TransformSpeech(entity, args.Args);
+    }
+
+    private void OnTransformSpeechImplant(Entity<VoiceMaskComponent> entity, ref ImplantRelayEvent<TransformSpeechEvent> args)
+    {
+        TransformSpeech(entity, args.Event);
+    }
+
     private void OnTransformSpeakerNameInventory(Entity<VoiceMaskComponent> entity, ref InventoryRelayedEvent<TransformSpeakerNameEvent> args)
     {
         TransformVoice(entity, args.Args);
@@ -63,8 +92,10 @@ public sealed partial class VoiceMaskSystem : EntitySystem
 
     private void OnSeeIdentityAttemptEvent(Entity<VoiceMaskComponent> entity, ref ImplantRelayEvent<SeeIdentityAttemptEvent> args)
     {
-        if (entity.Comp.OverrideIdentity)
-            args.Event.NameOverride = GetCurrentVoiceName(entity);
+        if (!entity.Comp.OverrideIdentity || !entity.Comp.Active)
+            return;
+
+        args.Event.NameOverride = GetCurrentVoiceName(entity);
     }
 
     private void OnImplantImplantedEvent(Entity<VoiceMaskComponent> entity, ref ImplantImplantedEvent ev)
@@ -117,6 +148,21 @@ public sealed partial class VoiceMaskSystem : EntitySystem
 
         UpdateUI(entity);
     }
+
+    private void OnToggle(Entity<VoiceMaskComponent> entity, ref VoiceMaskToggleMessage args)
+    {
+        _popupSystem.PopupEntity(Loc.GetString("voice-mask-popup-toggle"), entity, args.Actor);
+        entity.Comp.Active = !entity.Comp.Active;
+
+        // Update identity because of possible name override
+        _identity.QueueIdentityUpdate(args.Actor);
+    }
+
+    private void OnAccentToggle(Entity<VoiceMaskComponent> entity, ref VoiceMaskAccentToggleMessage args)
+    {
+        _popupSystem.PopupEntity(Loc.GetString("voice-mask-popup-accent-toggle"), entity, args.Actor);
+        entity.Comp.AccentHide = !entity.Comp.AccentHide;
+    }
     #endregion
 
     #region UI
@@ -145,7 +191,7 @@ public sealed partial class VoiceMaskSystem : EntitySystem
     private void UpdateUI(Entity<VoiceMaskComponent> entity)
     {
         if (_uiSystem.HasUi(entity, VoiceMaskUIKey.Key))
-            _uiSystem.SetUiState(entity.Owner, VoiceMaskUIKey.Key, new VoiceMaskBuiState(GetCurrentVoiceName(entity), entity.Comp.VoiceMaskSpeechVerb));
+            _uiSystem.SetUiState(entity.Owner, VoiceMaskUIKey.Key, new VoiceMaskBuiState(GetCurrentVoiceName(entity), entity.Comp.VoiceMaskSpeechVerb, entity.Comp.Active, entity.Comp.AccentHide));
     }
     #endregion
 
@@ -157,6 +203,9 @@ public sealed partial class VoiceMaskSystem : EntitySystem
 
     private void TransformVoice(Entity<VoiceMaskComponent> entity, TransformSpeakerNameEvent args)
     {
+        if (!entity.Comp.Active)
+            return;
+
         args.VoiceName = GetCurrentVoiceName(entity);
         args.SpeechVerb = entity.Comp.VoiceMaskSpeechVerb ?? args.SpeechVerb;
     }
diff --git a/Content.Shared/Chat/SharedChatEvents.cs b/Content.Shared/Chat/SharedChatEvents.cs
index f9b706e57d..5701081b56 100644
--- a/Content.Shared/Chat/SharedChatEvents.cs
+++ b/Content.Shared/Chat/SharedChatEvents.cs
@@ -27,8 +27,9 @@ public sealed class TransformSpeakerNameEvent : EntityEventArgs, IInventoryRelay
 /// <summary>
 /// Raised broadcast in order to transform speech.transmit
 /// </summary>
-public sealed class TransformSpeechEvent : EntityEventArgs
+public sealed class TransformSpeechEvent : CancellableEntityEventArgs, IInventoryRelayEvent
 {
+    public SlotFlags TargetSlots { get; } = SlotFlags.WITHOUT_POCKET;
     public EntityUid Sender;
     public string Message;
 
diff --git a/Content.Shared/Implants/SharedSubdermalImplantSystem.Relays.cs b/Content.Shared/Implants/SharedSubdermalImplantSystem.Relays.cs
index 774be5d9b2..24b76e15c5 100644
--- a/Content.Shared/Implants/SharedSubdermalImplantSystem.Relays.cs
+++ b/Content.Shared/Implants/SharedSubdermalImplantSystem.Relays.cs
@@ -15,6 +15,7 @@ public abstract partial class SharedSubdermalImplantSystem
         SubscribeLocalEvent<ImplantedComponent, AfterInteractUsingEvent>(RelayToImplantEvent);
         SubscribeLocalEvent<ImplantedComponent, SuicideEvent>(RelayToImplantEvent);
         SubscribeLocalEvent<ImplantedComponent, TransformSpeakerNameEvent>(RelayToImplantEvent);
+        SubscribeLocalEvent<ImplantedComponent, TransformSpeechEvent>(RelayToImplantEvent);
         SubscribeLocalEvent<ImplantedComponent, SeeIdentityAttemptEvent>(RelayToImplantEvent);
     }
 
diff --git a/Content.Shared/Inventory/InventorySystem.Relay.cs b/Content.Shared/Inventory/InventorySystem.Relay.cs
index 242e8d0de9..280a99cd32 100644
--- a/Content.Shared/Inventory/InventorySystem.Relay.cs
+++ b/Content.Shared/Inventory/InventorySystem.Relay.cs
@@ -47,6 +47,7 @@ public partial class InventorySystem
         SubscribeLocalEvent<InventoryComponent, GetDefaultRadioChannelEvent>(RelayInventoryEvent);
         SubscribeLocalEvent<InventoryComponent, RefreshNameModifiersEvent>(RelayInventoryEvent);
         SubscribeLocalEvent<InventoryComponent, TransformSpeakerNameEvent>(RelayInventoryEvent);
+        SubscribeLocalEvent<InventoryComponent, TransformSpeechEvent>(RelayInventoryEvent);
         SubscribeLocalEvent<InventoryComponent, SelfBeforeInjectEvent>(RelayInventoryEvent);
         SubscribeLocalEvent<InventoryComponent, BeforeInjectTargetEvent>(RelayInventoryEvent);
         SubscribeLocalEvent<InventoryComponent, SelfBeforeGunShotEvent>(RelayInventoryEvent);
diff --git a/Content.Shared/VoiceMask/SharedVoiceMaskSystem.cs b/Content.Shared/VoiceMask/SharedVoiceMaskSystem.cs
index 2855891946..9d586a5af8 100644
--- a/Content.Shared/VoiceMask/SharedVoiceMaskSystem.cs
+++ b/Content.Shared/VoiceMask/SharedVoiceMaskSystem.cs
@@ -13,11 +13,15 @@ public sealed class VoiceMaskBuiState : BoundUserInterfaceState
 {
     public readonly string Name;
     public readonly string? Verb;
+    public readonly bool Active;
+    public readonly bool AccentHide;
 
-    public VoiceMaskBuiState(string name, string? verb)
+    public VoiceMaskBuiState(string name, string? verb, bool active, bool accentHide)
     {
         Name = name;
         Verb = verb;
+        Active = active;
+        AccentHide = accentHide;
     }
 }
 
@@ -45,3 +49,15 @@ public sealed class VoiceMaskChangeVerbMessage : BoundUserInterfaceMessage
         Verb = verb;
     }
 }
+
+/// <summary>
+///     Toggle the effects of the voice mask.
+/// </summary>
+[Serializable, NetSerializable]
+public sealed class VoiceMaskToggleMessage : BoundUserInterfaceMessage;
+
+/// <summary>
+///     Toggle the effects of accent negation.
+/// </summary>
+[Serializable, NetSerializable]
+public sealed class VoiceMaskAccentToggleMessage : BoundUserInterfaceMessage;
diff --git a/Resources/Locale/en-US/voice-mask.ftl b/Resources/Locale/en-US/voice-mask.ftl
index f3740cdafb..cd06e61eb2 100644
--- a/Resources/Locale/en-US/voice-mask.ftl
+++ b/Resources/Locale/en-US/voice-mask.ftl
@@ -5,6 +5,11 @@ voice-mask-name-change-info = Type in the name you want to mimic.
 voice-mask-name-change-speech-style = Speech style
 voice-mask-name-change-set = Set name
 voice-mask-name-change-set-description = Change the name others hear to something else.
+voice-mask-name-change-toggle = Toggle voice mask
+voice-mask-name-change-accent-toggle = Block accent
+
+voice-mask-popup-toggle = Toggled voice mask.
+voice-mask-popup-accent-toggle = Toggled accent.
 
 voice-mask-popup-success = Name set successfully.
 voice-mask-popup-failure = Name could not be set.

From caebc10c5d8282573ae099e1d3f914cf630a7c7a Mon Sep 17 00:00:00 2001
From: PJBot <pieterjan.briers+bot@gmail.com>
Date: Fri, 26 Dec 2025 03:01:32 +0000
Subject: [PATCH 074/134] Automatic changelog update

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

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index f030930c95..0eb0801bb7 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -1,11 +1,4 @@
 Entries:
-- author: aada
-  changes:
-  - message: You can examine fuel tanks to see how much they're filled.
-    type: Add
-  id: 8832
-  time: '2025-08-06T16:11:19.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/39362
 - author: Tao7891
   changes:
   - message: Craftable cardboard structures and equipment.
@@ -3939,3 +3932,14 @@
   id: 9332
   time: '2025-12-25T23:34:06.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/41590
+- author: alexalexmax
+  changes:
+  - message: Voice masks and voice mask implants can have their effects toggled from
+      within the voice mask menu.
+    type: Add
+  - message: Voice masks and voice mask implanters now hide any accents you have,
+      including innate accents and conditional ones.
+    type: Tweak
+  id: 9333
+  time: '2025-12-26T03:00:24.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/41965

From 8b33f4734f4e53166948bbe06d50290605423955 Mon Sep 17 00:00:00 2001
From: Princess Cheeseballs
 <66055347+Princess-Cheeseballs@users.noreply.github.com>
Date: Thu, 25 Dec 2025 23:41:27 -0800
Subject: [PATCH 075/134] Fix Kitchen Spike Paralysis by removing an unused
 subscription.  (#42078)

* remove

* ACK ACK ACK ACK

---------

Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
---
 Content.Shared/Kitchen/SharedKitchenSpikeSystem.cs   |  1 -
 Content.Shared/Movement/Events/UpdateCanMoveEvent.cs | 10 ++++++++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/Content.Shared/Kitchen/SharedKitchenSpikeSystem.cs b/Content.Shared/Kitchen/SharedKitchenSpikeSystem.cs
index 7e7dbd744e..938aefc601 100644
--- a/Content.Shared/Kitchen/SharedKitchenSpikeSystem.cs
+++ b/Content.Shared/Kitchen/SharedKitchenSpikeSystem.cs
@@ -70,7 +70,6 @@ public sealed class SharedKitchenSpikeSystem : EntitySystem
 
         // Prevent the victim from doing anything while on the spike.
         SubscribeLocalEvent<KitchenSpikeHookedComponent, ChangeDirectionAttemptEvent>(OnAttempt);
-        SubscribeLocalEvent<KitchenSpikeHookedComponent, UpdateCanMoveEvent>(OnAttempt);
         SubscribeLocalEvent<KitchenSpikeHookedComponent, UseAttemptEvent>(OnAttempt);
         SubscribeLocalEvent<KitchenSpikeHookedComponent, ThrowAttemptEvent>(OnAttempt);
         SubscribeLocalEvent<KitchenSpikeHookedComponent, DropAttemptEvent>(OnAttempt);
diff --git a/Content.Shared/Movement/Events/UpdateCanMoveEvent.cs b/Content.Shared/Movement/Events/UpdateCanMoveEvent.cs
index d9772c1cf4..3efeaeaf4c 100644
--- a/Content.Shared/Movement/Events/UpdateCanMoveEvent.cs
+++ b/Content.Shared/Movement/Events/UpdateCanMoveEvent.cs
@@ -1,11 +1,17 @@
+using Content.Shared.ActionBlocker;
 using Content.Shared.Movement.Components;
 
 namespace Content.Shared.Movement.Events;
 
 /// <summary>
-///     Raised whenever <see cref="IMoverComponent.CanMove"/> needs to be updated. Cancel this event to prevent a
-///     mover from moving.
+///     Raised whenever <see cref="InputMoverComponent.CanMove"/> needs to be updated.
+///     Cancel this event to prevent a mover from moving.
 /// </summary>
+/// <remarks>
+///     This is not an attempt event and the result is cached.
+///     If you subscribe to this you must also call <see cref="ActionBlockerSystem.UpdateCanMove(EntityUid,InputMoverComponent?)"/>
+///     both when you want to prevent a mob from moving, and when you want to allow them to move again!
+/// </remarks>
 public sealed class UpdateCanMoveEvent : CancellableEntityEventArgs
 {
     public UpdateCanMoveEvent(EntityUid uid)

From 2aa29de1eeb8d38b649f809d902b728fd49221e5 Mon Sep 17 00:00:00 2001
From: GeneralGaws <122978178+GeneralGaws@users.noreply.github.com>
Date: Fri, 26 Dec 2025 19:28:02 +0300
Subject: [PATCH 076/134] Energy guns' fire mode text formating fix (#42103)

issue
---
 .../Weapons/Ranged/Systems/BatteryWeaponFireModesSystem.cs    | 4 ++--
 Resources/Locale/en-US/weapons/ranged/gun.ftl                 | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/Content.Shared/Weapons/Ranged/Systems/BatteryWeaponFireModesSystem.cs b/Content.Shared/Weapons/Ranged/Systems/BatteryWeaponFireModesSystem.cs
index 81f4ad3213..59b4345f97 100644
--- a/Content.Shared/Weapons/Ranged/Systems/BatteryWeaponFireModesSystem.cs
+++ b/Content.Shared/Weapons/Ranged/Systems/BatteryWeaponFireModesSystem.cs
@@ -38,7 +38,7 @@ public sealed class BatteryWeaponFireModesSystem : EntitySystem
         if (!_prototypeManager.TryIndex<EntityPrototype>(fireMode.Prototype, out var proto))
             return;
 
-        args.PushMarkup(Loc.GetString("gun-set-fire-mode", ("mode", proto.Name)));
+        args.PushMarkup(Loc.GetString("gun-set-fire-mode-examine", ("mode", proto.Name)));
     }
 
     private BatteryWeaponFireMode GetMode(BatteryWeaponFireModesComponent component)
@@ -124,7 +124,7 @@ public sealed class BatteryWeaponFireModesSystem : EntitySystem
                 _appearanceSystem.SetData(uid, BatteryWeaponFireModeVisuals.State, prototype.ID, appearance);
 
             if (user != null)
-                _popupSystem.PopupClient(Loc.GetString("gun-set-fire-mode", ("mode", prototype.Name)), uid, user.Value);
+                _popupSystem.PopupClient(Loc.GetString("gun-set-fire-mode-popup", ("mode", prototype.Name)), uid, user.Value);
         }
 
         if (TryComp(uid, out BatteryAmmoProviderComponent? batteryAmmoProviderComponent))
diff --git a/Resources/Locale/en-US/weapons/ranged/gun.ftl b/Resources/Locale/en-US/weapons/ranged/gun.ftl
index 08f1f6cb22..bc54aeb3f4 100644
--- a/Resources/Locale/en-US/weapons/ranged/gun.ftl
+++ b/Resources/Locale/en-US/weapons/ranged/gun.ftl
@@ -4,7 +4,8 @@ gun-fire-rate-examine = Fire rate is [color={$color}]{$fireRate}[/color] per sec
 gun-selector-verb = Change to {$mode}
 gun-selected-mode = Selected {$mode}
 gun-disabled = You can't use guns!
-gun-set-fire-mode = Set to [color=yellow]{$mode}[/color].
+gun-set-fire-mode-examine = Set to [color=yellow]{$mode}[/color].
+gun-set-fire-mode-popup = Changed to {$mode}
 gun-magazine-whitelist-fail = That won't fit into the gun!
 gun-magazine-fired-empty = No ammo left!
 

From abeeb910fb1c5639f6c6cc7134dff583f88708a4 Mon Sep 17 00:00:00 2001
From: Nox <nebulousnox38@gmail.com>
Date: Fri, 26 Dec 2025 16:33:43 -0500
Subject: [PATCH 077/134] ERT Overhaul 3/3: Loadouts (#38481)

* Initial commit: Added ERT web vest and sprites, added ERT magboots.

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* Added duffle bag and magboots

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* Half finished updating the web vest

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* Removed unused items

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* Added ERT chest rig, changed sprites of backpacks

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* Parented all ERT hardsuit stats to nukie hardsuits

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* fixed naming

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* Added equipment to be used by ERT.

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* Added flamethrower suffix

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* Added hydra filled with frag grenades

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* Made basic grenades centcomm restricted

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* Made energy swords central command contraband

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* Added ERT chest rig, changed sprites of backpacks

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* Parented all ERT hardsuit stats to nukie hardsuits

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* fixed naming

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* Added equipment to be used by ERT.

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* Added flamethrower suffix

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* Added hydra filled with frag grenades

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* Made basic grenades centcomm restricted

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* Made energy swords central command contraband

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* First implementation of humanoid.yml

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* Added leader, chaplain, and half implemented paladin

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* Bit more work on chaplain

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* Parented ERT backpacks to syndicate ones

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* Revert "Parented ERT backpacks to syndicate ones"

This reverts commit 615526512d90ea17c0e452ed24fdb351f54740bc.

:wq#

* Parented ERT backpacks to syndicate ones

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* changed size of ERT backpacks

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* Started adding engineer

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* Unparented ERT duffels from syndicate ones

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* Finished ERT security, Leader, and Chaplain. Issue remaining with the fills and shotgun ammo, rifleman half done.

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* Added all loadouts

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* Updated labels and containers

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* Added names, finished loadouts.

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* Tested loadouts, added chaplain job icon (finally), ready to go!

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* Added ERT survival box with double emergency tank

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* ERT now use double tanks by default

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* Misc fixes

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* Fixed belt

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* Fixed belt sprites

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* Fixed test fails

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* Minor spelling mistake:

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* Fixed all known issues with the PR, ready for review!

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* Fixed ERT medic backpack sprite

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* Fixed random metadata

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* Fixed test fail

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* Fixed test fail I hope?

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* defintely fixed test fails

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* removed flamethrower

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* Slight loadout fixes to bring everything up to date.

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* fix

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* Made C4 CC contra, reverted Incen to syni contra

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* reverted contraband

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* revert the rest of the contraband

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* revert contraband

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* Finished reverting contraband

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* Heisentest

* Replaced the melee ert security with a marksman

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* Added explosion resistance to backpacks

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* Added label component to spray bottles.

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* Added suffixes to the space cleaner bottles

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* Removed ERT duffel bag, made engi loadouts work without a duffel (still finishing medic loadouts)

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* Removed ERT duffel bag.

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* Finished updating loadouts to account for removed duffel bag.

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* Replaced armed engineer's C4 with explosive cord

* Replaced leader's XL8 with a standard Lecter

* Updated leader loadout

* Minor fix to ERT leader

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* fix formatting

* Fixed rifleman, armed engineer, and test fail

* Finished vanguard, chaplain.

* Fixed minor spelling mistake

* Gave ERT medics back their omnizine

* Added ERT security breacher, made ERT survival boxes 2x2.

* Finished implementing security shotgunner

* one small thing

---------

Signed-off-by: Nox38 <nebulousnox38@gmail.com>
Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
---
 .../random-metadata-formats.ftl               |  11 +-
 .../Catalog/Fills/Boxes/emergency.yml         |   8 +-
 .../Entities/Mobs/Player/humanoid.yml         | 277 ++++-----
 .../Objects/Specific/chemical-containers.yml  |   1 -
 .../Jobs/CentComm/emergencyresponseteam.yml   | 526 +++++++++++-------
 .../Textures/Markers/jobs.rsi/ertchaplain.png | Bin 0 -> 1077 bytes
 .../Markers/jobs.rsi/ertchaplaineva.png       | Bin 0 -> 1005 bytes
 Resources/Textures/Markers/jobs.rsi/meta.json | 408 +++++++-------
 8 files changed, 682 insertions(+), 549 deletions(-)
 create mode 100644 Resources/Textures/Markers/jobs.rsi/ertchaplain.png
 create mode 100644 Resources/Textures/Markers/jobs.rsi/ertchaplaineva.png

diff --git a/Resources/Locale/en-US/random-metadata/random-metadata-formats.ftl b/Resources/Locale/en-US/random-metadata/random-metadata-formats.ftl
index 3a621695f5..69bd357af3 100644
--- a/Resources/Locale/en-US/random-metadata/random-metadata-formats.ftl
+++ b/Resources/Locale/en-US/random-metadata/random-metadata-formats.ftl
@@ -15,8 +15,17 @@ name-format-nukie-generic = {$part0} {$part1}
 name-format-nukie-agent = Corpsman {$part0}
 name-format-nukie-commander = Commander {$part0}
 name-format-nukie-operator = Operator {$part0}
-# "<title> <name>"
+
 name-format-ert = {$part0} {$part1}
+name-format-ert-leader = Sergeant {$part0}
+name-format-ert-specialist = Specialist {$part0}
+name-format-ert-pointman = Pointman {$part0}
+name-format-ert-officer = Officer {$part0}
+name-format-ert-rifle = Rifleman {$part0}
+name-format-ert-grenade = Grenadier {$part0}
+name-format-ert-vanguard = Vanguard {$part0}
+name-format-ert-doctor = Doctor {$part0}
+name-format-ert-corpsman = Corpsman {$part0}
 
 # "<appearance> <type>"
 name-format-book = {$part0} {$part1}
diff --git a/Resources/Prototypes/Catalog/Fills/Boxes/emergency.yml b/Resources/Prototypes/Catalog/Fills/Boxes/emergency.yml
index f68deb7750..a5765eadea 100644
--- a/Resources/Prototypes/Catalog/Fills/Boxes/emergency.yml
+++ b/Resources/Prototypes/Catalog/Fills/Boxes/emergency.yml
@@ -320,19 +320,16 @@
 
 
 - type: entity
-  parent: BoxCardboard
+  parent: BoxCardboardSmall # Cannot fit 3x3 boxes into already-filled ERT backpacks.
   id: BoxSurvivalMilitaryDouble
   suffix: Military O2
   description: It's a box with basic internals inside. This one is labelled to contain an double extended-capacity tank.
   components:
   - type: StorageFill
     contents:
-    - id: ClothingMaskBreath
     - id: DoubleEmergencyOxygenTankFilled
     - id: EmergencyMedipen
     - id: Flare
-    - id: FoodSnackNutribrick
-    - id: DrinkWaterBottleFull
   - type: Sprite
     layers:
     - state: internals
@@ -345,12 +342,9 @@
   components:
   - type: StorageFill
     contents:
-    - id: ClothingMaskBreath
     - id: DoubleEmergencyNitrogenTankFilled
     - id: EmergencyMedipen
     - id: Flare
-    - id: FoodSnackNutribrick
-    - id: DrinkWaterBottleFull
   - type: Sprite
     layers:
     - state: internals
diff --git a/Resources/Prototypes/Entities/Mobs/Player/humanoid.yml b/Resources/Prototypes/Entities/Mobs/Player/humanoid.yml
index f8cbae86a4..51a9b7a02c 100644
--- a/Resources/Prototypes/Entities/Mobs/Player/humanoid.yml
+++ b/Resources/Prototypes/Entities/Mobs/Player/humanoid.yml
@@ -78,11 +78,6 @@
     - type: Sprite
       sprite: Markers/jobs.rsi
       state: ertleader
-    - type: RandomMetadata
-      nameSegments:
-      - NamesMilitaryFirstLeader
-      - NamesMilitaryLast
-      nameFormat: name-format-ert
     - type: RandomHumanoidSpawner
       settings: ERTLeader
 
@@ -99,18 +94,17 @@
       job: ERTLeader
     - type: Loadout
       prototypes: [ ERTLeaderGear ]
-      roleLoadout: [ RoleSurvivalExtended ]
+      roleLoadout: [ RoleSurvivalMilitaryDouble ]
     - type: RandomMetadata
       nameSegments:
-      - NamesMilitaryFirstLeader
       - NamesMilitaryLast
-      nameFormat: name-format-ert
+      nameFormat: name-format-ert-leader
 
 - type: entity
   id: RandomHumanoidSpawnerERTLeaderEVA
   parent: RandomHumanoidSpawnerERTLeader
   name: ERT leader
-  suffix: ERTRole, Armored EVA
+  suffix: ERTRole, EVA
   components:
     - type: Sprite
       sprite: Markers/jobs.rsi
@@ -122,39 +116,25 @@
   id: ERTLeaderEVA
   parent: ERTLeader
   components:
-    - type: GhostRole
-      name: ghost-role-information-ert-leader-name
-      description: ghost-role-information-ert-leader-description
-      rules: ghost-role-information-nonantagonist-rules
-      raffle:
-        settings: short
-      job: ERTLeader
     - type: Loadout
       prototypes: [ ERTLeaderGearEVA ]
-      roleLoadout: [ RoleSurvivalEVA ]
+      roleLoadout: [ RoleSurvivalMilitaryDouble ]
 
 - type: entity
-  id: RandomHumanoidSpawnerERTLeaderEVALecter
+  id: RandomHumanoidSpawnerERTLeaderArmed
   parent: RandomHumanoidSpawnerERTLeaderEVA
-  suffix: ERTRole, Lecter, EVA
+  suffix: ERTRole, Armed, EVA
   components:
     - type: RandomHumanoidSpawner
-      settings: ERTLeaderEVALecter
+      settings: ERTLeaderArmed
 
 - type: randomHumanoidSettings
-  id: ERTLeaderEVALecter
+  id: ERTLeaderArmed
   parent: ERTLeaderEVA
   components:
-    - type: GhostRole
-      name: ghost-role-information-ert-leader-name
-      description: ghost-role-information-ert-leader-description
-      rules: ghost-role-information-nonantagonist-rules
-      raffle:
-        settings: short
-      job: ERTLeader
     - type: Loadout
-      prototypes: [ ERTLeaderGearEVALecter ]
-      roleLoadout: [ RoleSurvivalEVA ]
+      prototypes: [ ERTLeaderGearArmed ]
+      roleLoadout: [ RoleSurvivalMilitaryDouble ]
 
 ## ERT Chaplain
 
@@ -166,12 +146,7 @@
   components:
     - type: Sprite
       sprite: Markers/jobs.rsi
-      state: chaplain #needs an ERT variant once a good suit it made.
-    - type: RandomMetadata
-      nameSegments:
-      - NamesMilitaryFirst
-      - NamesMilitaryLast
-      nameFormat: name-format-ert
+      state: ertchaplain
     - type: RandomHumanoidSpawner
       settings: ERTChaplain
 
@@ -189,22 +164,21 @@
       job: ERTChaplain
     - type: RandomMetadata
       nameSegments:
-      - NamesMilitaryFirst
       - NamesMilitaryLast
-      nameFormat: name-format-ert
+      nameFormat: name-format-ert-specialist
     - type: Loadout
       prototypes: [ ERTChaplainGear ]
-      roleLoadout: [ RoleSurvivalExtended ]
+      roleLoadout: [ RoleSurvivalMilitaryDouble ]
 
 - type: entity
   id: RandomHumanoidSpawnerERTChaplainEVA
   parent: RandomHumanoidSpawnerERTChaplain
   name: ERT chaplain
-  suffix: ERTRole, Enviro EVA
+  suffix: ERTRole, EVA
   components:
     - type: Sprite
       sprite: Markers/jobs.rsi
-      state: chaplain #needs an ERT variant once a good suit it made.
+      state: ertchaplaineva
     - type: RandomHumanoidSpawner
       settings: ERTChaplainEVA
 
@@ -212,17 +186,9 @@
   id: ERTChaplainEVA
   parent: ERTChaplain
   components:
-    - type: GhostRole
-      name: ghost-role-information-ert-chaplain-name
-      description: ghost-role-information-ert-chaplain-description
-      rules: ghost-role-information-nonantagonist-rules
-      raffle:
-        settings: short
-      job: ERTChaplain
     - type: Loadout
       prototypes: [ ERTChaplainGearEVA ]
-      roleLoadout: [ RoleSurvivalEVA ]
-    - type: BibleUser
+      roleLoadout: [ RoleSurvivalMilitaryDouble ]
 
 ## ERT Janitor
 
@@ -235,11 +201,6 @@
     - type: Sprite
       sprite: Markers/jobs.rsi
       state: ertjanitor
-    - type: RandomMetadata
-      nameSegments:
-      - NamesMilitaryFirst
-      - NamesMilitaryLast
-      nameFormat: name-format-ert
     - type: RandomHumanoidSpawner
       settings: ERTJanitor
 
@@ -256,18 +217,16 @@
       job: ERTJanitor
     - type: RandomMetadata
       nameSegments:
-      - NamesMilitaryFirst
       - NamesMilitaryLast
-      nameFormat: name-format-ert
+      nameFormat: name-format-ert-specialist
     - type: Loadout
       prototypes: [ ERTJanitorGear ]
-      roleLoadout: [ RoleSurvivalExtended ]
+      roleLoadout: [ RoleSurvivalMilitaryDouble ]
 
 - type: entity
   id: RandomHumanoidSpawnerERTJanitorEVA
   parent: RandomHumanoidSpawnerERTJanitor
-  name: ERT janitor
-  suffix: ERTRole, Enviro EVA
+  suffix: ERTRole, EVA
   components:
     - type: Sprite
       sprite: Markers/jobs.rsi
@@ -279,16 +238,9 @@
   id: ERTJanitorEVA
   parent: ERTJanitor
   components:
-    - type: GhostRole
-      name: ghost-role-information-ert-janitor-name
-      description: ghost-role-information-ert-janitor-description
-      rules: ghost-role-information-nonantagonist-rules
-      raffle:
-        settings: short
-      job: ERTJanitor
     - type: Loadout
       prototypes: [ ERTJanitorGearEVA ]
-      roleLoadout: [ RoleSurvivalEVA ]
+      roleLoadout: [ RoleSurvivalMilitaryDouble ]
 
 ## ERT Engineer
 
@@ -301,11 +253,6 @@
     - type: Sprite
       sprite: Markers/jobs.rsi
       state: ertengineer
-    - type: RandomMetadata
-      nameSegments:
-      - NamesMilitaryFirst
-      - NamesMilitaryLast
-      nameFormat: name-format-ert
     - type: RandomHumanoidSpawner
       settings: ERTEngineer
 
@@ -322,18 +269,16 @@
       job: ERTEngineer
     - type: RandomMetadata
       nameSegments:
-      - NamesMilitaryFirst
       - NamesMilitaryLast
-      nameFormat: name-format-ert
+      nameFormat: name-format-ert-specialist
     - type: Loadout
       prototypes: [ ERTEngineerGear ]
-      roleLoadout: [ RoleSurvivalExtended ]
+      roleLoadout: [ RoleSurvivalMilitaryDouble ]
 
 - type: entity
   id: RandomHumanoidSpawnerERTEngineerEVA
   parent: RandomHumanoidSpawnerERTEngineer
-  name: ERT engineer
-  suffix: ERTRole, Enviro EVA
+  suffix: ERTRole, EVA
   components:
     - type: Sprite
       sprite: Markers/jobs.rsi
@@ -345,16 +290,29 @@
   id: ERTEngineerEVA
   parent: ERTEngineer
   components:
-    - type: GhostRole
-      name: ghost-role-information-ert-engineer-name
-      description: ghost-role-information-ert-engineer-description
-      rules: ghost-role-information-nonantagonist-rules
-      raffle:
-        settings: short
-      job: ERTEngineer
     - type: Loadout
       prototypes: [ ERTEngineerGearEVA ]
-      roleLoadout: [ RoleSurvivalEVA ]
+      roleLoadout: [ RoleSurvivalMilitaryDouble ]
+
+- type: entity
+  parent: RandomHumanoidSpawnerERTEngineerEVA
+  id: RandomHumanoidSpawnerERTEngineerArmed
+  suffix: ERTRole, Armed, EVA
+  components:
+  - type: RandomHumanoidSpawner
+    settings: ERTEngineerArmed
+
+- type: randomHumanoidSettings
+  id: ERTEngineerArmed
+  parent: ERTEngineer
+  components:
+  - type: RandomMetadata
+    nameSegments:
+    - NamesMilitaryLast
+    nameFormat: name-format-ert-pointman
+  - type: Loadout
+    prototypes: [ ERTEngineerGearArmed ]
+    roleLoadout: [ RoleSurvivalMilitaryDouble ]
 
 ## ERT Security
 
@@ -367,11 +325,6 @@
     - type: Sprite
       sprite: Markers/jobs.rsi
       state: ertsecurity
-    - type: RandomMetadata
-      nameSegments:
-      - NamesMilitaryFirst
-      - NamesMilitaryLast
-      nameFormat: name-format-ert
     - type: RandomHumanoidSpawner
       settings: ERTSecurity
 
@@ -388,18 +341,17 @@
       job: ERTSecurity
     - type: RandomMetadata
       nameSegments:
-      - NamesMilitaryFirst
       - NamesMilitaryLast
-      nameFormat: name-format-ert
+      nameFormat: name-format-ert-officer
     - type: Loadout
       prototypes: [ ERTSecurityGear ]
-      roleLoadout: [ RoleSurvivalExtended ]
+      roleLoadout: [ RoleSurvivalMilitaryDouble ]
 
 - type: entity
   id: RandomHumanoidSpawnerERTSecurityEVA
   parent: RandomHumanoidSpawnerERTSecurity
   name: ERT security
-  suffix: ERTRole, Armored EVA
+  suffix: ERTRole, EVA
   components:
     - type: Sprite
       sprite: Markers/jobs.rsi
@@ -420,30 +372,91 @@
       job: ERTSecurity
     - type: Loadout
       prototypes: [ ERTSecurityGearEVA ]
-      roleLoadout: [ RoleSurvivalEVA ]
+      roleLoadout: [ RoleSurvivalMilitaryDouble ]
 
 - type: entity
-  id: RandomHumanoidSpawnerERTSecurityEVALecter
+  id: RandomHumanoidSpawnerERTSecurityArmedRifle
   parent: RandomHumanoidSpawnerERTSecurityEVA
-  suffix: ERTRole, Lecter, EVA
+  name: ERT security rifleman
+  suffix: ERTRole, Armed, EVA
   components:
-    - type: RandomHumanoidSpawner
-      settings: ERTSecurityEVALecter
+  - type: RandomHumanoidSpawner
+    settings: ERTSecurityArmedRifle
 
 - type: randomHumanoidSettings
-  id: ERTSecurityEVALecter
+  id: ERTSecurityArmedRifle
   parent: ERTSecurityEVA
   components:
-    - type: GhostRole
-      name: ghost-role-information-ert-security-name
-      description: ghost-role-information-ert-security-description
-      rules: ghost-role-information-nonantagonist-rules
-      raffle:
-        settings: short
-      job: ERTSecurity
-    - type: Loadout
-      prototypes: [ ERTSecurityGearEVALecter ]
-      roleLoadout: [ RoleSurvivalEVA ]
+  - type: RandomMetadata
+    nameSegments:
+    - NamesMilitaryLast
+    nameFormat: name-format-ert-rifle
+  - type: Loadout
+    prototypes: [ ERTSecurityGearArmedRifle ]
+    roleLoadout: [ RoleSurvivalMilitaryDouble ]
+
+- type: entity
+  parent: RandomHumanoidSpawnerERTSecurityEVA
+  id: RandomHumanoidSpawnerERTSecurityArmedGrenade
+  name: ERT security grenadier
+  suffix: ERTRole, Armed, EVA
+  components:
+  - type: RandomHumanoidSpawner
+    settings: ERTSecurityArmedGrenade
+
+- type: randomHumanoidSettings
+  parent: ERTSecurityEVA
+  id: ERTSecurityArmedGrenade
+  components:
+  - type: RandomMetadata
+    nameSegments:
+    - NamesMilitaryLast
+    nameFormat: name-format-ert-grenade
+  - type: Loadout
+    prototypes: [ ERTSecurityGearArmedGrenade ]
+    roleLoadout: [ RoleSurvivalMilitaryDouble ]
+
+- type: entity
+  parent: RandomHumanoidSpawnerERTSecurityEVA
+  id: RandomHumanoidSpawnerERTSecurityArmedVanguard
+  name: ERT security vanguard
+  suffix: ERTRole, Armed, EVA
+  components:
+  - type: RandomHumanoidSpawner
+    settings: ERTSecurityArmedVanguard
+
+- type: randomHumanoidSettings
+  parent: ERTSecurityEVA
+  id: ERTSecurityArmedVanguard
+  components:
+  - type: RandomMetadata
+    nameSegments:
+    - NamesMilitaryLast
+    nameFormat: name-format-ert-vanguard
+  - type: Loadout
+    prototypes: [ ERTSecurityGearArmedVanguard ]
+    roleLoadout: [ RoleSurvivalMilitaryDouble ]
+
+- type: entity
+  parent: RandomHumanoidSpawnerERTSecurityEVA
+  id: RandomHumanoidSpawnerERTSecurityArmedShotgun
+  name: ERT security breacher
+  suffix: ERTRole, Armed, EVA
+  components:
+  - type: RandomHumanoidSpawner
+    settings: ERTSecurityArmedShotgun
+
+- type: randomHumanoidSettings
+  parent: ERTSecurityEVA
+  id: ERTSecurityArmedShotgun
+  components:
+  - type: RandomMetadata
+    nameSegments:
+    - NamesMilitaryLast
+    nameFormat: name-format-ert-pointman
+  - type: Loadout
+    prototypes: [ ERTSecurityGearArmedShotgun ]
+    roleLoadout: [ RoleSurvivalMilitaryDouble ]
 
 ## ERT Medic
 
@@ -456,11 +469,6 @@
     - type: Sprite
       sprite: Markers/jobs.rsi
       state: ertmedical
-    - type: RandomMetadata
-      nameSegments:
-      - NamesMilitaryFirst
-      - NamesMilitaryLast
-      nameFormat: name-format-ert
     - type: RandomHumanoidSpawner
       settings: ERTMedical
 
@@ -477,18 +485,16 @@
       job: ERTMedical
     - type: RandomMetadata
       nameSegments:
-      - NamesMilitaryFirst
       - NamesMilitaryLast
-      nameFormat: name-format-ert
+      nameFormat: name-format-ert-doctor
     - type: Loadout
       prototypes: [ ERTMedicalGear ]
-      roleLoadout: [ RoleSurvivalExtended ]
+      roleLoadout: [ RoleSurvivalMilitaryDouble ]
 
 - type: entity
   id: RandomHumanoidSpawnerERTMedicalEVA
   parent: RandomHumanoidSpawnerERTMedical
-  name: ERT medic
-  suffix: ERTRole, Armored EVA
+  suffix: ERTRole, EVA
   components:
     - type: Sprite
       sprite: Markers/jobs.rsi
@@ -500,16 +506,29 @@
   id: ERTMedicalEVA
   parent: ERTMedical
   components:
-    - type: GhostRole
-      name: ghost-role-information-ert-medical-name
-      description: ghost-role-information-ert-medical-description
-      rules: ghost-role-information-nonantagonist-rules
-      raffle:
-        settings: short
-      job: ERTMedical
     - type: Loadout
       prototypes: [ ERTMedicalGearEVA ]
-      roleLoadout: [ RoleSurvivalEVA ]
+      roleLoadout: [ RoleSurvivalMilitaryDouble ]
+
+- type: entity
+  parent: RandomHumanoidSpawnerERTMedicalEVA
+  id: RandomHumanoidSpawnerERTMedicalArmed
+  suffix: ERTRole, Armed, EVA
+  components:
+  - type: RandomHumanoidSpawner
+    settings: ERTMedicalArmed
+
+- type: randomHumanoidSettings
+  parent: ERTMedicalEVA
+  id: ERTMedicalArmed
+  components:
+  - type: RandomMetadata
+    nameSegments:
+    - NamesMilitaryLast
+    nameFormat: name-format-ert-corpsman
+  - type: Loadout
+    prototypes: [ ERTMedicalGearArmed ]
+    roleLoadout: [ RoleSurvivalMilitaryDouble ]
 
 ## CBURN
 
diff --git a/Resources/Prototypes/Entities/Objects/Specific/chemical-containers.yml b/Resources/Prototypes/Entities/Objects/Specific/chemical-containers.yml
index 7dc4e4b024..43ad53495f 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/chemical-containers.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/chemical-containers.yml
@@ -91,7 +91,6 @@
 - type: entity
   parent: Jug
   id: JugPunctTranex
-  categories: [ HideSpawnMenu ]
   suffix: punct & tranex
   components:
   - type: Label
diff --git a/Resources/Prototypes/Roles/Jobs/CentComm/emergencyresponseteam.yml b/Resources/Prototypes/Roles/Jobs/CentComm/emergencyresponseteam.yml
index c78463b1e1..e0aa56d79e 100644
--- a/Resources/Prototypes/Roles/Jobs/CentComm/emergencyresponseteam.yml
+++ b/Resources/Prototypes/Roles/Jobs/CentComm/emergencyresponseteam.yml
@@ -18,78 +18,76 @@
     implants: [ MindShieldImplant, DeathRattleImplantCentcomm ]
 
 - type: startingGear
+  parent: ERTLeaderGearEVA
   id: ERTLeaderGear
   equipment:
-    jumpsuit: ClothingUniformJumpsuitERTLeader
-    back: ClothingBackpackERTLeader
-    shoes: ClothingShoesBootsCombatFilled
+    shoes: ClothingShoesBootsJackFilled
     head: ClothingHeadHelmetERTLeader
-    eyes: ClothingEyesGlassesSecurity
-    gloves: ClothingHandsGlovesCombat
-    outerClothing: ClothingOuterArmorBasicSlim
-    id: ERTLeaderPDA
-    ears: ClothingHeadsetAltCentCom
-    belt: ClothingBeltSecurityFilled
-    pocket1: WeaponPistolN1984
+    outerClothing: ClothingOuterArmorBasic
     pocket2: FlashlightSeclite
-  storage:
-    back:
-    - WeaponDisabler
-    - MedicatedSuture
-    - RegenerativeMesh
-    - BoxZiptie
-    - CrowbarRed
-    - MagazineMagnum
 
 - type: startingGear
   id: ERTLeaderGearEVA
   equipment:
     jumpsuit: ClothingUniformJumpsuitERTLeader
     back: ClothingBackpackERTLeader
-    shoes: ClothingShoesBootsMagAdv
+    shoes: ClothingShoesBootsMagERT
     mask: ClothingMaskGasERT
-    eyes: ClothingEyesGlassesSecurity
+    eyes: ClothingEyesHudMedSec
+    neck: Whistle
     gloves: ClothingHandsGlovesCombat
     outerClothing: ClothingOuterHardsuitERTLeader
     id: ERTLeaderPDA
     ears: ClothingHeadsetAltCentCom
-    belt: ClothingBeltSecurityFilled
-    pocket1: WeaponPistolN1984
-    pocket2: FlashlightSeclite
+    belt: ClothingBeltMilitaryWebbingERT
+    pocket2: CombatKnife
+    suitstorage: WeaponDisablerSMG
   storage:
     back:
-    - WeaponDisabler
-    - MedicatedSuture
-    - RegenerativeMesh
-    - BoxZiptie
+    - Binoculars
+    - HoloprojectorField
+    - PhoneInstrument
+    - PinpointerNuclear
+    - PowerCellHigh
+    - PowerCellHigh
+    - MedkitCombatFilled # End of first line
+    - MedkitCombatFilled
+    - TelescopicShield
+    belt:
+    - Stunbaton
+    - Handcuffs
+    - Handcuffs
     - CrowbarRed
+    - WeaponPistolN1984
     - MagazineMagnum
+    - EmergencyMedipen
 
 - type: startingGear
-  id: ERTLeaderGearEVALecter
+  parent: ERTLeaderGearEVA
+  id: ERTLeaderGearArmed
   equipment:
-    jumpsuit: ClothingUniformJumpsuitERTLeader
-    back: ClothingBackpackERTLeader
-    shoes: ClothingShoesBootsMagAdv
-    mask: ClothingMaskGasERT
-    eyes: ClothingEyesGlassesSecurity
-    gloves: ClothingHandsGlovesCombat
-    outerClothing: ClothingOuterHardsuitERTLeader
-    id: ERTLeaderPDA
-    ears: ClothingHeadsetAltCentCom
-    belt: ClothingBeltSecurityFilled
-    pocket1: MagazineRifle
-    pocket2: MagazineRifle
-  inhand:
-  - WeaponRifleLecterXL8
+    pocket2: WeaponDisabler
+    suitstorage: WeaponRifleLecterXL8
   storage:
     back:
-    - WeaponDisabler
-    - MedicatedSuture
-    - RegenerativeMesh
-    - BoxZiptie
+    - HoloprojectorField
+    - PhoneInstrument
+    - PinpointerNuclear
+    - MagazineRifle
+    - MagazineRifle
+    - MagazineRifleIncendiary
+    - MagazineRifleUranium
+    - MedkitCombatFilled # End of first line
+    - GrenadeShrapnel
+    - EmpGrenade
+    belt:
+    - Truncheon
+    - Handcuffs
+    - Handcuffs
     - CrowbarRed
+    - WeaponPistolN1984
     - MagazineMagnum
+    - EmergencyMedipen
 
 - type: chameleonOutfit
   id: ERTLeaderChameleonOutfit
@@ -122,66 +120,49 @@
     implants: [ MindShieldImplant, DeathRattleImplantCentcomm ]
 
 - type: startingGear
+  parent: ERTChaplainGearEVA
   id: ERTChaplainGear
   equipment:
-    jumpsuit: ClothingUniformJumpsuitERTChaplain
-    back: ClothingBackpackERTChaplain
-    shoes: ClothingShoesLeather
+    shoes: ClothingShoesBootsJackFilled
     head: ClothingHeadHatFez
-    eyes: ClothingEyesGlasses
     neck: ClothingNeckStoleChaplain
-    gloves: ClothingHandsGlovesCombat
-    outerClothing: ClothingOuterArmorBasicSlim
-    id: ERTChaplainPDA
-    ears: ClothingHeadsetAltCentCom
-    belt: ClothingBeltStorageWaistbag
-    pocket1: Flare
-    pocket2: DrinkWaterBottleFull
-  storage:
-    back:
-    - BoxCandle
-    - BoxBodyBag
-    - DrinkWaterMelonJuiceJug
-    - Lantern
-    - Lantern
-    - Bible
-    - CrowbarRed
-    - FoodBakedBunHotX
-    - FoodBakedBunHotX
-    - FoodBakedBunHotX
-    - FoodBakedBunHotX
-    - Lighter
+    outerClothing: ClothingOuterArmorBasic
+    pocket2: FlashlightSeclite
 
 - type: startingGear
   id: ERTChaplainGearEVA
   equipment:
     jumpsuit: ClothingUniformJumpsuitERTChaplain
     back: ClothingBackpackERTChaplain
-    shoes: ClothingShoesBootsMagAdv
+    shoes: ClothingShoesBootsMagERT
     mask: ClothingMaskGasERT
-    eyes: ClothingEyesGlasses
-    neck: ClothingNeckStoleChaplain
+    eyes: ClothingEyesHudMedical
     gloves: ClothingHandsGlovesCombat
     outerClothing: ClothingOuterHardsuitERTChaplain
     id: ERTChaplainPDA
     ears: ClothingHeadsetAltCentCom
-    belt: ClothingBeltStorageWaistbag
-    pocket1: Flare
-    pocket2: DrinkWaterBottleFull
+    belt: ClothingBeltMilitaryWebbingERT
+    pocket2: CombatKnife
   storage:
     back:
     - BoxCandle
-    - BoxBodyBag
-    - DrinkWaterMelonJuiceJug
-    - Lantern
-    - Lantern
+    - BodyBagFolded
+    - BodyBagFolded
+    - JugWater
+    - JugBlood # End of first row
+    - FoodBakedBunHotX
+    - FoodBakedBunHotX
+    - FoodBakedBunHotX
+    - FoodBakedBunHotX
+    belt:
     - Bible
+    - Lantern
+    - Lantern
+    - Lantern
     - CrowbarRed
-    - FoodBakedBunHotX
-    - FoodBakedBunHotX
-    - FoodBakedBunHotX
-    - FoodBakedBunHotX
-    - Lighter
+    - WeaponPistolMk58
+    - MagazinePistol
+    - FlippoEngravedLighter
 
 - type: chameleonOutfit
   id: ERTChaplainChameleonOutfit
@@ -213,60 +194,71 @@
     implants: [ MindShieldImplant, DeathRattleImplantCentcomm ]
 
 - type: startingGear
+  parent: ERTEngineerGearEVA
   id: ERTEngineerGear
   equipment:
-    jumpsuit: ClothingUniformJumpsuitERTEngineer
-    back: ClothingBackpackERTEngineer
-    shoes: ClothingShoesBootsWork
+    shoes: ClothingShoesBootsJackFilled
     head: ClothingHeadHelmetERTEngineer
-    eyes: ClothingEyesGlassesMeson
-    gloves: ClothingHandsGlovesCombat
-    outerClothing: ClothingOuterArmorBasicSlim
-    id: ERTEngineerPDA
-    ears: ClothingHeadsetAltCentCom
-    belt: ClothingBeltChiefEngineerFilled
-    pocket1: Flare
-    pocket2: GasAnalyzer
-  storage:
-    back:
-    - trayScanner
-    - RCD
-    - RCDAmmo
-    - RCDAmmo
-    - CableMVStack
-    - CableHVStack
-    - CableApcStack
-    - SheetPlasteel
-    - SheetSteel
-    - SheetGlass
+    outerClothing: ClothingOuterArmorBasic
+    pocket2: FlashlightSeclite
 
 - type: startingGear
   id: ERTEngineerGearEVA
   equipment:
     jumpsuit: ClothingUniformJumpsuitERTEngineer
     back: ClothingBackpackERTEngineer
-    shoes: ClothingShoesBootsMagAdv
+    shoes: ClothingShoesBootsMagERT
     mask: ClothingMaskGasERT
-    eyes: ClothingEyesGlassesMeson
+    eyes: ClothingEyesHudDiagnostic
     gloves: ClothingHandsGlovesCombat
     outerClothing: ClothingOuterHardsuitERTEngineer
     id: ERTEngineerPDA
     ears: ClothingHeadsetAltCentCom
-    belt: ClothingBeltChiefEngineerFilled
-    pocket1: Flare
-    pocket2: GasAnalyzer
+    belt: ClothingBeltMilitaryWebbingERT
+    pocket2: CombatKnife
   storage:
     back:
-    - trayScanner
     - RCD
+    - GasAnalyzer
+    - trayScanner
+    - HolofanProjector
+    - PartRodMetal
+    - SheetPlasteel # End of first line
+    - MiningDrillDiamond
     - RCDAmmo
     - RCDAmmo
-    - CableMVStack
-    - CableHVStack
-    - CableApcStack
-    - SheetPlasteel
-    - SheetSteel
-    - SheetGlass
+    - RCDAmmo
+    - RCDAmmo
+    - MetalFoamGrenade
+    - AirGrenade
+    belt:
+    - JawsOfLife
+    - PowerDrill
+    - WelderIndustrialAdvanced
+    - Multitool
+    - WeaponPistolMk58
+    - MagazinePistol
+    - EmergencyMedipen
+
+- type: startingGear
+  parent: ERTEngineerGearEVA
+  id: ERTEngineerGearArmed
+  equipment:
+    suitstorage: WeaponShotgunEnforcer
+  storage:
+    back:
+    - RCD
+    - GasAnalyzer
+    - HolofanProjector
+    - MiningDrillDiamond
+    - BoxLethalshot
+    - BoxShotgunSlug # End of first line
+    - RCDAmmo
+    - RCDAmmo
+    - RCDAmmo
+    - RCDAmmo
+    - CableDetStack
+    - BoxDetonator
 
 - type: chameleonOutfit
   id: ERTEngineerChameleonOutfit
@@ -296,78 +288,164 @@
     implants: [ MindShieldImplant, DeathRattleImplantCentcomm ]
 
 - type: startingGear
+  parent: ERTSecurityGearEVA
   id: ERTSecurityGear
   equipment:
-    jumpsuit: ClothingUniformJumpsuitERTSecurity
-    back: ClothingBackpackERTSecurity
-    shoes: ClothingShoesBootsCombatFilled
+    shoes: ClothingShoesBootsJackFilled
     head: ClothingHeadHelmetERTSecurity
-    eyes: ClothingEyesGlassesSecurity
-    gloves: ClothingHandsGlovesCombat
-    outerClothing: ClothingOuterArmorBasicSlim
-    id: ERTSecurityPDA
-    ears: ClothingHeadsetAltCentCom
-    belt: ClothingBeltSecurityFilled
-    pocket1: WeaponPistolMk58
+    outerClothing: ClothingOuterArmorBasic
     pocket2: FlashlightSeclite
-  storage:
-    back:
-    - WeaponDisabler
-    - MedicatedSuture
-    - RegenerativeMesh
-    - BoxZiptie
-    - CrowbarRed
-    - MagazinePistol
 
 - type: startingGear
   id: ERTSecurityGearEVA
   equipment:
     jumpsuit: ClothingUniformJumpsuitERTSecurity
     back: ClothingBackpackERTSecurity
-    shoes: ClothingShoesBootsMag
+    shoes: ClothingShoesBootsMagERT
     mask: ClothingMaskGasERT
-    eyes: ClothingEyesGlassesSecurity
+    eyes: ClothingEyesHudSecurity
     gloves: ClothingHandsGlovesCombat
+    neck: SecurityWhistle
     outerClothing: ClothingOuterHardsuitERTSecurity
     id: ERTSecurityPDA
     ears: ClothingHeadsetAltCentCom
-    belt: ClothingBeltSecurityFilled
-    pocket1: WeaponPistolMk58
-    pocket2: FlashlightSeclite
+    belt: ClothingBeltMilitaryWebbingERT
+    pocket2: CombatKnife
+    suitstorage: WeaponDisablerSMG
   storage:
     back:
-    - WeaponDisabler
-    - MedicatedSuture
-    - RegenerativeMesh
     - BoxZiptie
+    - Flash
+    - GrenadeFlashBang
+    - TearGasGrenade
+    - GrenadeStinger
+    - MedkitCombatFilled # End of first line
+    - TelescopicShield
+    - HoloprojectorSecurity
+    - PowerCellHigh
+    belt:
+    - Stunbaton
+    - Handcuffs
+    - Handcuffs
     - CrowbarRed
+    - WeaponPistolMk58
     - MagazinePistol
+    - EmergencyMedipen
 
 - type: startingGear
-  id: ERTSecurityGearEVALecter
+  id: ERTSecurityGearArmedRifle
   equipment:
     jumpsuit: ClothingUniformJumpsuitERTSecurity
-    back: ClothingBackpackERTSecurity
-    shoes: ClothingShoesBootsMag
+    shoes: ClothingShoesBootsMagERT
     mask: ClothingMaskGasERT
-    eyes: ClothingEyesGlassesSecurity
+    eyes: ClothingEyesHudSecurity
     gloves: ClothingHandsGlovesCombat
     outerClothing: ClothingOuterHardsuitERTSecurity
     id: ERTSecurityPDA
     ears: ClothingHeadsetAltCentCom
-    belt: ClothingBeltSecurityFilled
-    pocket1: MagazineRifle
-    pocket2: MagazineRifle
+    belt: ClothingBeltMilitaryWebbingERT
+    pocket2: CombatKnife
+    suitstorage: WeaponRifleLecter
   inhand:
-    - WeaponRifleLecter
+    - WeaponLaserCannon
+    - PortableRecharger
+  storage:
+    belt:
+    - CrowbarRed
+    - Zipties
+    - MedkitCombatFilled
+    - MagazineRifle
+    - MagazineRifle
+    - MagazineRifleIncendiary
+    - MagazineRifleUranium
+    - Zipties
+
+- type: startingGear
+  parent: ERTSecurityGearEVA
+  id: ERTSecurityGearArmedGrenade
+  equipment:
+    pocket2: WeaponDisabler
+    suitstorage: WeaponLauncherHydraLethal
   storage:
     back:
-    - WeaponDisabler
-    - MedicatedSuture
-    - RegenerativeMesh
-    - BoxZiptie
-    - CrowbarRed
+    - GrenadeBlast
+    - GrenadeBlast
+    - GrenadeBlast
+    - GrenadeBlast
+    - GrenadeBlast
+    - GrenadeBlast
     - MagazinePistol
+    - MedkitCombatFilled # End of first line
+    - GrenadeEMP
+    - GrenadeEMP
+    - GrenadeEMP
+    - GrenadeFlash
+    - GrenadeFlash
+    - GrenadeFlash
+    - MagazinePistol
+    belt:
+    - Truncheon
+    - Handcuffs
+    - Handcuffs
+    - CrowbarRed
+    - WeaponPistolMk58
+    - MagazinePistol
+    - EmergencyMedipen
+
+- type: startingGear
+  parent: ERTSecurityGearEVA
+  id: ERTSecurityGearArmedVanguard
+  equipment:
+    pocket2: WeaponDisabler
+    suitstorage: WeaponSubMachineGunWt550
+  storage:
+    back:
+    - ExGrenade
+    - SmokeGrenade
+    - EmpGrenade
+    - HoloprojectorSecurity
+    - TelescopicShield
+    - TelescopicShield
+    - TelescopicShield
+    - MedkitCombatFilled # End of first line
+    - MagazinePistolSubMachineGunTopMounted
+    - MagazinePistolSubMachineGunTopMounted
+    - MagazinePistolSubMachineGunTopMounted
+    - MagazinePistolSubMachineGunTopMounted
+    belt:
+    - Truncheon
+    - Handcuffs
+    - Handcuffs
+    - CrowbarRed
+    - WeaponPistolMk58
+    - MagazinePistol
+    - EmergencyMedipen
+
+- type: startingGear
+  parent: ERTSecurityGearEVA
+  id: ERTSecurityGearArmedShotgun
+  equipment:
+    pocket2: WeaponDisabler
+    suitstorage: WeaponShotgunEnforcer
+  storage:
+    back:
+    - SmokeGrenade
+    - BoxLethalshot
+    - BoxShotgunSlug
+    - BoxShotgunIncendiary
+    - MedkitCombatFilled # End of first line
+    - SmokeGrenade
+    - ExGrenade
+    - CableDetStack
+    - BoxDetonator
+    belt:
+    - Truncheon
+    - Handcuffs
+    - Handcuffs
+    - CrowbarRed
+    - WeaponPistolMk58
+    - MagazinePistol
+    - EmergencyMedipen
 
 - type: chameleonOutfit
   id: ERTSecurityChameleonOutfit
@@ -397,52 +475,77 @@
     implants: [ MindShieldImplant, DeathRattleImplantCentcomm ]
 
 - type: startingGear
+  parent: ERTMedicalGearEVA
   id: ERTMedicalGear
   equipment:
-    jumpsuit: ClothingUniformJumpsuitERTMedic
-    back: ClothingBackpackERTMedical
-    shoes: ClothingShoesBootsCombatFilled
+    shoes: ClothingShoesBootsJackFilled
     head: ClothingHeadHelmetERTMedic
-    eyes: ClothingEyesHudMedical
-    gloves: ClothingHandsGlovesNitrile
-    outerClothing: ClothingOuterArmorBasicSlim
-    id: ERTMedicPDA
-    ears: ClothingHeadsetAltCentCom
-    belt: ClothingBeltMedicalFilled
-    pocket1: Flare
-  storage:
-    back:
-    - Hypospray
-    - MedkitCombatFilled
-    - MedkitCombatFilled
-    - CrowbarRed
-    - ChemistryBottleOmnizine
-    - ChemistryBottleEpinephrine
-    - ChemistryBottleEpinephrine
+    outerClothing: ClothingOuterArmorBasic
+    pocket2: FlashlightSeclite
 
 - type: startingGear
   id: ERTMedicalGearEVA
   equipment:
     jumpsuit: ClothingUniformJumpsuitERTMedic
     back: ClothingBackpackERTMedical
-    shoes: ClothingShoesBootsMag
+    shoes: ClothingShoesBootsMagERT
     mask: ClothingMaskGasERT
     eyes: ClothingEyesHudMedical
-    gloves: ClothingHandsGlovesNitrile
+    gloves: ClothingHandsGlovesCombat
     outerClothing: ClothingOuterHardsuitERTMedical
     id: ERTMedicPDA
     ears: ClothingHeadsetAltCentCom
-    belt: ClothingBeltMedicalFilled
-    pocket1: Flare
+    belt: ClothingBeltMilitaryWebbingERT
+    pocket2: CombatKnife
   storage:
     back:
     - Hypospray
-    - MedkitCombatFilled
+    - BeakerSmallBruiz
+    - BeakerSmallLace
+    - JugPunctTranex
+    - JugPyraDerma
+    - JugDexPlusSaline # End of first line
+    - JugTrico
+    - BeakerSmallArith
+    - BeakerSmallDiph
+    - BeakerSmallSigy
+    - ClothingEyesGlassesChemical
+    - ChemistryBottleOmnizine
+    belt:
+    - DefibrillatorCompact
     - MedkitCombatFilled
     - CrowbarRed
+    - WeaponPistolMk58
+    - MagazinePistol
+    - EmergencyMedipen
+
+- type: startingGear
+  parent: ERTMedicalGearEVA
+  id: ERTMedicalGearArmed
+  equipment:
+    suitstorage: WeaponRifleLecter
+    pocket2: WeaponDisabler
+  storage:
+    back:
+    - Hypospray
+    - JugPunctTranex
+    - JugPyraDerma
+    - JugDexPlusSaline
+    - JugTrico # End of first line
+    - BeakerSmallArith
+    - DefibrillatorCompact
+    - MedkitCombatFilled
+    - ClothingEyesGlassesChemical
     - ChemistryBottleOmnizine
-    - ChemistryBottleEpinephrine
-    - ChemistryBottleEpinephrine
+    belt:
+    - Truncheon
+    - Zipties
+    - CrowbarRed
+    - MagazineRifle
+    - MagazineRifle
+    - MagazineRifleIncendiary
+    - MagazineRifleUranium # End of first line
+    - Zipties
 
 - type: chameleonOutfit
   id: ERTMedicalChameleonOutfit
@@ -472,48 +575,51 @@
     implants: [ MindShieldImplant, DeathRattleImplantCentcomm ]
 
 - type: startingGear
+  parent: ERTJanitorGearEVA
   id: ERTJanitorGear
   equipment:
-    jumpsuit: ClothingUniformJumpsuitERTJanitor
-    back: ClothingBackpackERTJanitor
     shoes: ClothingShoesGaloshes
     head: ClothingHeadHelmetERTJanitor
-    gloves: ClothingHandsGlovesColorPurple
-    outerClothing: ClothingOuterArmorBasicSlim
-    id: ERTJanitorPDA
-    ears: ClothingHeadsetAltCentCom
-    belt: ClothingBeltJanitorFilled
-    pocket1: Flare
-  storage:
-    back:
-    - LightReplacer
-    - BoxLightMixed
-    - BoxLightMixed
-    - Soap
-    - CrowbarRed
-    - AdvMopItem
+    outerClothing: ClothingOuterArmorBasic
+    pocket2: FlashlightSeclite
 
 - type: startingGear
   id: ERTJanitorGearEVA
   equipment:
     jumpsuit: ClothingUniformJumpsuitERTJanitor
     back: ClothingBackpackERTJanitor
-    shoes: ClothingShoesBootsMag
+    shoes: ClothingShoesBootsMagERT
     mask: ClothingMaskGasERT
-    gloves: ClothingHandsGlovesColorPurple
+    eyes: ClothingEyesGlassesChemical
+    gloves: ClothingHandsGlovesCombat
     outerClothing: ClothingOuterHardsuitERTJanitor
     id: ERTJanitorPDA
     ears: ClothingHeadsetAltCentCom
-    belt: ClothingBeltJanitorFilled
-    pocket1: Flare
+    belt: ClothingBeltMilitaryWebbingERT
+    pocket2: CombatKnife
+    suitstorage: WeaponLauncherHydra
   storage:
     back:
+    - TrashBag
+    - SoapNT
+    - Plunger
+    - Screwdriver
+    - AdvMopItem # End of first line
+    - GrenadeCleanade
+    - GrenadeCleanade
+    - GrenadeCleanade
+    - GrenadeCleanade
+    - GrenadeCleanade
+    - GrenadeCleanade
+    belt:
+    - MegaSprayBottleSpaceCleaner
+    - Holoprojector
     - LightReplacer
-    - BoxLightMixed
-    - BoxLightMixed
-    - Soap
+    - WireBrush
     - CrowbarRed
-    - AdvMopItem
+    - WeaponPistolMk58
+    - MagazinePistol
+    - EmergencyMedipen
 
 - type: chameleonOutfit
   id: ERTJanitorChameleonOutfit
diff --git a/Resources/Textures/Markers/jobs.rsi/ertchaplain.png b/Resources/Textures/Markers/jobs.rsi/ertchaplain.png
new file mode 100644
index 0000000000000000000000000000000000000000..74f47a35a216fff00a55b74d628b2a113d18363e
GIT binary patch
literal 1077
zcmV-51j_q~P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800009a7bBm000ie
z000ie0hKEb8vp<U=Sf6CRCt`dS6@t9RT%%>0k^c!HI$V$3S3rNq9KF0RpZNmhuM)V
z(dZKY#Kb5r#Asyk!MGPdW^`;X%eI&8VGOrq@d0O=Wz#UtX!oYXgi3>AHwP`<0LQ;l
zpas32@4!V$7QFYC`b(N~&Ue0Zzu)=Y?>px<SC(byg~#KO`}_L^WPn^fi`u0pIO{_j
z`W+)NT|{&dAXJ--C^v{0O{Nf9Sk(I%?F4AYN^pYGl0EsxTj=cU)TD%N1-1*i2$1BD
zlRb3#GMEI}Bk+6oX}ROhb>0^w56(xzc<*i$@^jDN!tL)7>beT8(5ygeHUZI6fMn1Q
z@$VU|Oh3ehN0ay?@FVVfzlH~_G@-sUH4$*X{gFT_Nc;BTuel|}?v9|zW=GES80!6g
zRD=(sr@1G)N!aTD77x39=skBFyLL*bZ~g=Zg8|Z0W_)$2NAp>ri9k#1OZ?Dr>=xnu
zu#MX&IE|J0v!D60qd-+vmE8E+(<n3>`FLn(V12G~&+`z3fBlAshqpHeN=iy(x7*G8
zbax0W8ja)eILv1AdT@fxX5;=76BDXP{3ih=_~PPf-8&=`#z$BC^YinZ0Kr~vM0|FU
z`;os|5~>uKnVCUOP7d!kRSGyWn?7%{tl57CSWs9j7O2IR1ZWoyhXYenQ*gOlIJ(z_
zqGB6sC-LgdDEFZqbGvob9=zj1I2;D8Q=`I`1YSs`aQu`9?{?lpEEdCw+ZLRBMP@r)
zfYE5=%1}$=PY;02FK|C1d-0ePZLeR;Oo3aX2>+2@Sglrgy<YqoAI1k?{>Cdo$q8x`
z?3KLV{VN}nUmy@b{gE(IqL>+hJc9|2G70wLBL2{CI;y$-3${}wC#WTjKYy{9k6&&N
zpiFW?EG)u<$Vg@c2o&6EDMW<zKfaR0z`y{0>N<q|KZKE=pN~W$fm4SiJlk{wwY9Z;
z4fzwcg#ck{b{>zW=fJXy*Z$QvuVIqq$Gz{~fwS=vYNi{3<(oYD$dCNhVoL&Jk^91v
zWflDRbyrp(7z}dBPqLGTj^Nz~yI?S~l51(<{?TZZDrS8Rt<Q*n@{opx2ALAEw6qj;
zb#)jV9AroF5R%CxcI=2l+>~r;0;?vl89tv6DJH+eZbyXeczJo5+eH-_ubV($U!PD@
zQzMha1qB7%7Fm;<DWm_71vDtY-halyG9s`Ud3kyNKY^8%6_m3?{3R4hv(eAxbf(#}
zLV!R)_EcA=1=~E%3W1I9KQcC!Hn(w1ew3WsN`M}!d=b&rJU%|2Hcz*ros}h>6<SHC
vB0!}_*Q^5i;GjET<9KOlY28ODRW<krSa+Z$B4_%100000NkvXXu0mjfb4>wK

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Markers/jobs.rsi/ertchaplaineva.png b/Resources/Textures/Markers/jobs.rsi/ertchaplaineva.png
new file mode 100644
index 0000000000000000000000000000000000000000..3195d44dd2de26107421f498698b6d65be354036
GIT binary patch
literal 1005
zcmV<J0}}j+P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800009a7bBm000ie
z000ie0hKEb8vp<UpGibPRCt`VS6@g|Q5gRQ%P6JDa0@NS)M0@`K`U#C)o?w=40=dG
z!WalrZcti12!;CKCL$8PNMH>lX0Itx!zM+Dio%KuwqQ;|(J&S<S>EpN*tuOb^xn<=
ze7N^~=ey_kJKvvkoL&?~(u&zvH^scl4vGfdlyS;Mv;JnvyV9?t1fWlpTnUVsJpmD#
z1SogT!Qb;Nj}sE1IRX@qQ-<mGx}d;AMw|>Z3y2Ec^1IQHwPBoc0oQK5B>hs1OlfIb
z=7iN%iXYxfli~i<3HZ4$iw@EpBZG+Yj0}1ojk0l~(42zjQ&V)KxR{XxcnZtQ%zpjy
z87iexah%3g7osKs>Aw~!7!0y^?3_mc;C3zKngvXTzw3H?d&LJ{FTJR%lkFHsA`zNj
zO(U()B*0`ci7P8B)YsRyo_9t5o4ieQNcu~e0FbArr?Yp5!$E!0t~oFUd3JU-^AiMN
zcWc1s^I=gcDJh}h;bE$+t);TF=jHi=f&v;C7$CddPVj?&b#=8W5jzUNjtm9^wY0R5
zUazOw@S;4Ib0mu*-`2;l$6_(~(_ep8kx&(ZKp?;t1{&&Xw#+XqEHFC+ZuU<~0N*`F
zT)GF|j*hXN1I<Tssben0!j4E>toWA}e5a-!wiVFc-cC|3H`tWq(`#$82yW*<6r@_9
zouDcOp-_mbs;X#YWJJz6NI5yT0q}!=Zf>rcrFRwp634qYj2!qRgy^Jc>*BBj@N>Cb
z?7On=&g2CEXuG1KBAS_*q1O9OYHjndkXyZjGCAx3{NQgPb=Xz_S}$M9v(ac|hYSQL
zVXZj5<s0|`(_g|gBz?cRhBOI41xpKvoSa7iEyue7`RA>P`JSF0U1MXTIA2~$g3p)y
zIUrTCuClUH%*@PW<NRohew;Wa=NwP8+yQCF91uY&q3JS0B%EV@R^b+lh1CLbkCsE_
zdpsV}3RMF9e!tFaHj8ezn~{SI<WddjsLdntwsSh2sSyCIn(gxY#KZ(EP@I6sKMpM3
z_k}gB;^$|ryPE<mYC2a%Hk*wV-~WJO#C+kMr<z2lj=<7@i#<P#jZ#-v*M>Qao0NWe
zHnq#D7x3G9k7)2N3;kx`Hsp5Z7n<5#0SM>o(T}3_k-(1F!0{YL%7Hete2uVsLGqJ|
z^Xl%_0IpRWGEbx*L7mdQKo>62(EdI0Jjiih@Kdj$en$1bWvWxak6{!VDaZkc8M3L*
byApo@{_?-91kgry00000NkvXXu0mjf8>ib>

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Markers/jobs.rsi/meta.json b/Resources/Textures/Markers/jobs.rsi/meta.json
index bca3be1df8..ce53eab3eb 100644
--- a/Resources/Textures/Markers/jobs.rsi/meta.json
+++ b/Resources/Textures/Markers/jobs.rsi/meta.json
@@ -1,206 +1,212 @@
 {
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from https://github.com/vgstation-coders/vgstation13/blob/e71d6c4fba5a51f99b81c295dcaec4fc2f58fb19/icons/mob/screen1.dmi | cburn and cluwne made by brainfood1183 (github). brigmed made by PuroSlavKing (Github)",
-  "size": {
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Taken from https://github.com/vgstation-coders/vgstation13/blob/e71d6c4fba5a51f99b81c295dcaec4fc2f58fb19/icons/mob/screen1.dmi | cburn and cluwne made by brainfood1183 (github). brigmed made by PuroSlavKing (Github)",
+    "size": {
     "x": 32,
     "y": 32
-  },
-  "states": [
-    {
-      "name": "green"
     },
-    {
-      "name": "ai"
-    },
-    {
-      "name": "atmospherics"
-    },
-    {
-      "name": "bartender"
-    },
-    {
-      "name": "botanist"
-    },
-    {
-      "name": "boxer"
-    },
-    {
-      "name": "brigmedic"
-    },
-    {
-      "name": "captain"
-    },
-    {
-      "name": "cargo_tech"
-    },
-    {
-      "name": "cburn"
-    },
-    {
-      "name": "centcom"
-    },
-    {
-      "name": "chaplain"
-    },
-    {
-      "name": "chemist"
-    },
-    {
-      "name": "ce"
-    },
-    {
-      "name": "cmo"
-    },
-    {
-      "name": "clown"
-    },
-    {
-      "name": "cluwne"
-    },
-    {
-      "name": "chef"
-    },
-    {
-      "name": "curator"
-    },
-    {
-      "name": "cyborg"
-    },
-    {
-      "name": "detective"
-    },
-    {
-      "name": "doctor"
-    },
-    {
-      "name": "ertengineer"
-    },
-    {
-      "name": "ertengineereva"
-    },
-    {
-      "name": "ertjanitor"
-    },
-    {
-      "name": "ertjanitoreva"
-    },
-    {
-      "name": "ertleader"
-    },
-    {
-      "name": "ertleadereva"
-    },
-    {
-      "name": "ertmedical"
-    },
-    {
-      "name": "ertmedicaleva"
-    },
-    {
-      "name": "ertsecurity"
-    },
-    {
-      "name": "ertsecurityeva"
-    },
-    {
-      "name": "engineer"
-    },
-    {
-      "name": "geneticist"
-    },
-    {
-      "name": "hop"
-    },
-    {
-      "name": "hos"
-    },
-    {
-      "name": "janitor"
-    },
-    {
-      "name": "lawyer"
-    },
-    {
-      "name": "librarian"
-    },
-    {
-      "name": "medicalintern"
-    },
-    {
-      "name": "mime"
-    },
-    {
-      "name": "miner"
-    },
-    {
-      "name": "musician"
-    },
-    {
-      "name": "reporter"
-    },
-    {
-      "name": "paramedic"
-    },
-    {
-      "name": "passenger"
-    },
-    {
-      "name": "prisoner"
-    },
-    {
-      "name": "psychologist"
-    },
-    {
-      "name": "qm"
-    },
-    {
-      "name": "rd"
-    },
-    {
-      "name": "researchassistant"
-    },
-    {
-      "name": "roboticist"
-    },
-    {
-      "name": "salvagespecialist"
-    },
-    {
-      "name": "scientist"
-    },
-    {
-      "name": "security_cadet" 
-    },
-    {
-      "name": "security_officer"
-    },
-    {
-      "name": "serviceworker"
-    },
-    {
-      "name": "seniorengineer"
-    },
-    {
-      "name": "seniorresearcher"
-    },
-    {
-      "name": "seniorphysician"
-    },
-    {
-      "name": "seniorofficer"
-    },
-    {
-      "name": "technicalassistant"
-    },
-    {
-      "name": "virologist"
-    },
-    {
-      "name": "warden"
-    },
-    {
-      "name": "zookeeper"
-    }
-  ]
+        "states": [
+        {
+            "name": "green"
+        },
+        {
+            "name": "ai"
+        },
+        {
+            "name": "atmospherics"
+        },
+        {
+            "name": "bartender"
+        },
+        {
+            "name": "botanist"
+        },
+        {
+            "name": "boxer"
+        },
+        {
+            "name": "brigmedic"
+        },
+        {
+            "name": "captain"
+        },
+        {
+            "name": "cargo_tech"
+        },
+        {
+            "name": "cburn"
+        },
+        {
+            "name": "centcom"
+        },
+        {
+            "name": "chaplain"
+        },
+        {
+            "name": "chemist"
+        },
+        {
+            "name": "ce"
+        },
+        {
+            "name": "cmo"
+        },
+        {
+            "name": "clown"
+        },
+        {
+            "name": "cluwne"
+        },
+        {
+            "name": "chef"
+        },
+        {
+            "name": "curator"
+        },
+        {
+            "name": "cyborg"
+        },
+        {
+            "name": "detective"
+        },
+        {
+            "name": "doctor"
+        },
+        {
+            "name": "ertchaplain"
+        },
+        {
+            "name": "ertchaplaineva"
+        },
+        {
+            "name": "ertengineer"
+        },
+        {
+            "name": "ertengineereva"
+        },
+        {
+            "name": "ertjanitor"
+        },
+        {
+            "name": "ertjanitoreva"
+        },
+        {
+            "name": "ertleader"
+        },
+        {
+            "name": "ertleadereva"
+        },
+        {
+            "name": "ertmedical"
+        },
+        {
+            "name": "ertmedicaleva"
+        },
+        {
+            "name": "ertsecurity"
+        },
+        {
+            "name": "ertsecurityeva"
+        },
+        {
+            "name": "engineer"
+        },
+        {
+            "name": "geneticist"
+        },
+        {
+            "name": "hop"
+        },
+        {
+            "name": "hos"
+        },
+        {
+            "name": "janitor"
+        },
+        {
+            "name": "lawyer"
+        },
+        {
+            "name": "librarian"
+        },
+        {
+            "name": "medicalintern"
+        },
+        {
+            "name": "mime"
+        },
+        {
+            "name": "miner"
+        },
+        {
+            "name": "musician"
+        },
+        {
+            "name": "reporter"
+        },
+        {
+            "name": "paramedic"
+        },
+        {
+            "name": "passenger"
+        },
+        {
+            "name": "prisoner"
+        },
+        {
+            "name": "psychologist"
+        },
+        {
+            "name": "qm"
+        },
+        {
+            "name": "rd"
+        },
+        {
+            "name": "researchassistant"
+        },
+        {
+            "name": "roboticist"
+        },
+        {
+            "name": "salvagespecialist"
+        },
+        {
+            "name": "scientist"
+        },
+        {
+            "name": "security_cadet"
+        },
+        {
+            "name": "security_officer"
+        },
+        {
+            "name": "serviceworker"
+        },
+        {
+            "name": "seniorengineer"
+        },
+        {
+            "name": "seniorresearcher"
+        },
+        {
+            "name": "seniorphysician"
+        },
+        {
+            "name": "seniorofficer"
+        },
+        {
+            "name": "technicalassistant"
+        },
+        {
+            "name": "virologist"
+        },
+        {
+            "name": "warden"
+        },
+        {
+            "name": "zookeeper"
+        }
+    ]
 }

From 339b28740accb0a79d9e84bcf53de1f8c8af1e4d Mon Sep 17 00:00:00 2001
From: PJBot <pieterjan.briers+bot@gmail.com>
Date: Fri, 26 Dec 2025 21:48:41 +0000
Subject: [PATCH 078/134] 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 0eb0801bb7..e6a37c2b36 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -1,11 +1,4 @@
 Entries:
-- author: Tao7891
-  changes:
-  - message: Craftable cardboard structures and equipment.
-    type: Add
-  id: 8833
-  time: '2025-08-06T16:58:07.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/37363
 - author: slarticodefast
   changes:
   - message: Fixed inventory sprites flickering when hovering over the slot with an
@@ -3943,3 +3936,12 @@
   id: 9333
   time: '2025-12-26T03:00:24.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/41965
+- author: Nox38
+  changes:
+  - message: Overhauled ERT starting equipment.
+    type: Tweak
+  - message: Added several new loadouts for ERT!
+    type: Add
+  id: 9334
+  time: '2025-12-26T21:47:30.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/38481

From 8313a4e3105d69a496261cddcffcc6894a053bbe Mon Sep 17 00:00:00 2001
From: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com>
Date: Fri, 26 Dec 2025 18:05:10 -0800
Subject: [PATCH 079/134] Atmospherics/Temperature HeatContainers (#39997)

* Initial HeatContainer logic

* comment fixes

* Comment changes + ChangeHeatCapacity

* highly intelligent specimen

* n-body full heat exchange methods

* extract to partials

* highly intelligent specimen

* fixes + ChangeHeatCapacityKeepTemperature

* Divide and merge methods

* even divide

* different merge signature

* forgot one little thing

* address review

* missing docs

* addr review

* oops

* review

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
---
 .../HeatContainer/HeatContainer.cs            |  66 ++++++
 .../HeatContainerHelpers.Conduct.cs           | 155 +++++++++++++
 .../HeatContainerHelpers.Divide.cs            |  55 +++++
 .../HeatContainerHelpers.Exchange.cs          | 214 ++++++++++++++++++
 .../HeatContainerHelpers.Merge.cs             |  66 ++++++
 .../HeatContainer/HeatContainerHelpers.cs     |  52 +++++
 6 files changed, 608 insertions(+)
 create mode 100644 Content.Shared/Temperature/HeatContainer/HeatContainer.cs
 create mode 100644 Content.Shared/Temperature/HeatContainer/HeatContainerHelpers.Conduct.cs
 create mode 100644 Content.Shared/Temperature/HeatContainer/HeatContainerHelpers.Divide.cs
 create mode 100644 Content.Shared/Temperature/HeatContainer/HeatContainerHelpers.Exchange.cs
 create mode 100644 Content.Shared/Temperature/HeatContainer/HeatContainerHelpers.Merge.cs
 create mode 100644 Content.Shared/Temperature/HeatContainer/HeatContainerHelpers.cs

diff --git a/Content.Shared/Temperature/HeatContainer/HeatContainer.cs b/Content.Shared/Temperature/HeatContainer/HeatContainer.cs
new file mode 100644
index 0000000000..c88d11b15a
--- /dev/null
+++ b/Content.Shared/Temperature/HeatContainer/HeatContainer.cs
@@ -0,0 +1,66 @@
+using Content.Shared.Atmos;
+using Content.Shared.Atmos.EntitySystems;
+using Robust.Shared.Serialization;
+
+namespace Content.Shared.Temperature.HeatContainer;
+
+/// <summary>
+/// A general-purpose container for heat energy.
+/// Any object that contains, stores, or transfers heat should use a <see cref="HeatContainer"/>
+/// instead of implementing its own system.
+/// This allows for consistent heat transfer mechanics across different objects and systems.
+/// </summary>
+[Serializable, NetSerializable, DataDefinition]
+[Access(typeof(HeatContainerHelpers), typeof(SharedAtmosphereSystem))]
+public partial struct HeatContainer : IRobustCloneable<HeatContainer>
+{
+    /// <summary>
+    /// The heat capacity of this container in Joules per Kelvin.
+    /// This determines how much energy is required to change the temperature of the container.
+    /// Higher values mean the container can absorb or release more heat energy
+    /// without a significant change in temperature.
+    /// </summary>
+    [DataField]
+    public float HeatCapacity = 4000f; // about 1kg of water
+
+    /// <summary>
+    /// The current temperature of the container in Kelvin.
+    /// </summary>
+    [DataField]
+    public float Temperature = Atmospherics.T20C; // room temperature
+
+    /// <summary>
+    /// The current temperature of the container in Celsius.
+    /// Ideal if you just need to read the temperature for UI.
+    /// Do not perform computations in Celsius/set this value, use Kelvin instead.
+    /// </summary>
+    [ViewVariables]
+    public float TemperatureC => TemperatureHelpers.KelvinToCelsius(Temperature);
+
+    /// <summary>
+    /// The current thermal energy of the container in Joules.
+    /// </summary>
+    [ViewVariables]
+    public float InternalEnergy => Temperature * HeatCapacity;
+
+    public HeatContainer(float heatCapacity, float temperature)
+    {
+        HeatCapacity = heatCapacity;
+        Temperature = temperature;
+    }
+
+    /// <summary>
+    /// Copy constructor for implementing ICloneable.
+    /// </summary>
+    /// <param name="c">The HeatContainer to copy.</param>
+    private HeatContainer(HeatContainer c)
+    {
+        HeatCapacity = c.HeatCapacity;
+        Temperature = c.Temperature;
+    }
+
+    public HeatContainer Clone()
+    {
+        return new HeatContainer(this);
+    }
+}
diff --git a/Content.Shared/Temperature/HeatContainer/HeatContainerHelpers.Conduct.cs b/Content.Shared/Temperature/HeatContainer/HeatContainerHelpers.Conduct.cs
new file mode 100644
index 0000000000..deb705b8e2
--- /dev/null
+++ b/Content.Shared/Temperature/HeatContainer/HeatContainerHelpers.Conduct.cs
@@ -0,0 +1,155 @@
+using JetBrains.Annotations;
+
+namespace Content.Shared.Temperature.HeatContainer;
+
+public static partial class HeatContainerHelpers
+{
+    /// <summary>
+    /// Conducts heat between a <see cref="HeatContainer"/> and some body with a different temperature,
+    /// given some constant thermal conductance g and a small time delta.
+    /// </summary>
+    /// <param name="c">The <see cref="HeatContainer"/> to conduct heat to.</param>
+    /// <param name="temp">The temperature of the second object that we are conducting heat with, in kelvin.</param>
+    /// <param name="deltaTime">
+    /// The amount of time that the heat is allowed to conduct, in seconds.
+    /// This value should be small such that deltaTime &lt;&lt; C / g where C is the heat capacity of the container.
+    /// If you need to simulate a larger time step split it into several smaller ones.
+    /// </param>
+    /// <param name="g">The thermal conductance in watt per kelvin. This describes how well heat flows between the bodies.</param>
+    /// <returns>The amount of heat in joules that was added to the heat container.</returns>
+    /// <example>A positive value indicates heat transfer from a hot body to a cold heat container c.</example>
+    /// <remarks>
+    /// This performs a single step using the Euler method for solving the Fourier heat equation
+    /// \frac{dQ}{dt} = g \Delta T.
+    /// If we need more precision in the future consider using a higher order integration scheme.
+    /// If we need support for larger time steps in the future consider adding a method to split the time delta into several
+    /// integration steps with adaptive step size.
+    /// </remarks>
+    [PublicAPI]
+    public static float ConductHeat(this HeatContainer c, float temp, float deltaTime, float g)
+    {
+        var dQ = c.ConductHeatQuery(temp, deltaTime, g);
+        c.AddHeat(dQ);
+        return dQ;
+    }
+
+    /// <summary>
+    /// Conducts heat between two <see cref="HeatContainer"/>s,
+    /// given some constant thermal conductance g and a small time delta.
+    /// </summary>
+    /// <param name="cA">The first <see cref="HeatContainer"/> to conduct heat to.</param>
+    /// <param name="cB">The second <see cref="HeatContainer"/> to conduct heat to.</param>
+    /// <param name="deltaTime">
+    /// The amount of time that the heat is allowed to conduct, in seconds.
+    /// This value should be small such that deltaTime &lt;&lt; C / g where C is the heat capacity of the containers.
+    /// If you need to simulate a larger time step split it into several smaller ones.
+    /// </param>
+    /// <param name="g">The thermal conductance in watt per kelvin. This describes how well heat flows between the bodies.</param>
+    /// <returns>The amount of heat in joules that is exchanged between the bodies.</returns>
+    /// <example>A positive value indicates heat transfer from a hot cB to a cold cA.</example>
+    /// <remarks>
+    /// This performs a single step using the Euler method for solving the Fourier heat equation
+    /// \frac{dQ}{dt} = g \Delta T.
+    /// If we need more precision in the future consider using a higher order integration scheme.
+    /// If we need support for larger time steps in the future consider adding a method to split the time delta into several
+    /// integration steps with adaptive step size.
+    /// </remarks>
+    [PublicAPI]
+    public static float ConductHeat(this HeatContainer cA, HeatContainer cB, float deltaTime, float g)
+    {
+        var dQ = ConductHeatQuery(cA, cB.Temperature, deltaTime, g);
+        cA.AddHeat(dQ);
+        cB.AddHeat(-dQ);
+        return dQ;
+    }
+
+    /// <summary>
+    /// Calculates the amount of heat that would be conducted between a <see cref="HeatContainer"/> and some body with a different temperature,
+    /// given some constant thermal conductance g and a small time delta.
+    /// </summary>
+    /// <param name="c">The <see cref="HeatContainer"/> to conduct heat to.</param>
+    /// <param name="temp">The temperature of the second object that we are conducting heat with, in kelvin.</param>
+    /// <param name="deltaTime">
+    /// The amount of time that the heat is allowed to conduct, in seconds.
+    /// This value should be small such that deltaTime &lt;&lt; C / g where C is the heat capacity of the container.
+    /// If you need to simulate a larger time step split it into several smaller ones.
+    /// </param>
+    /// <param name="g">The thermal conductance in watt per kelvin. This describes how well heat flows between the bodies.</param>
+    /// <returns>The amount of heat in joules that would be exchanged between the bodies.</returns>
+    /// <example>A positive value indicates heat transfer from a hot body to a cold heat container c.</example>
+    /// <remarks>
+    /// This performs a single step using the Euler method for solving the Fourier heat equation
+    /// \frac{dQ}{dt} = g \Delta T.
+    /// If we need more precision in the future consider using a higher order integration scheme.
+    /// If we need support for larger time steps in the future consider adding a method to split the time delta into several
+    /// integration steps with adaptive step size.
+    /// </remarks>
+    [PublicAPI]
+    public static float ConductHeatQuery(this HeatContainer c, float temp, float deltaTime, float g)
+    {
+        var dQ = g * (temp - c.Temperature) * deltaTime;
+        var dQMax = Math.Abs(ConductHeatToTempQuery(c, temp));
+
+        // Clamp the transferred heat amount in case we are overshooting the equilibrium temperature because our time step was too large.
+        return Math.Clamp(dQ, -dQMax, dQMax);
+    }
+
+    /// <summary>
+    /// Calculates the amount of heat that would be conducted between two <see cref="HeatContainer"/>s,
+    /// given some conductivity constant k and a time delta. Does not modify the containers.
+    /// </summary>
+    /// <param name="c1">The first <see cref="HeatContainer"/> to conduct heat to.</param>
+    /// <param name="c2">The second <see cref="HeatContainer"/> to conduct heat to.</param>
+    /// <param name="deltaTime">
+    /// The amount of time that the heat is allowed to conduct, in seconds.
+    /// This value should be small such that deltaTime &lt;&lt; C / g where C is the heat capacity of the container.
+    /// If you need to simulate a larger time step split it into several smaller ones.
+    /// </param>
+    /// <param name="g">The thermal conductance in watt per kelvin. This describes how well heat flows between the bodies.</param>
+    /// <returns>The amount of heat in joules that would be exchanged between the bodies.</returns>
+    /// <example>A positive value indicates heat transfer from a hot c2 to a cold c1.</example>
+    /// <remarks>
+    /// This performs a single step using the Euler method for solving the Fourier heat equation
+    /// \frac{dQ}{dt} = g \Delta T.
+    /// If we need more precision in the future consider using a higher order integration scheme.
+    /// If we need support for larger time steps in the future consider adding a method to split the time delta into several
+    /// integration steps with adaptive step size.
+    /// </remarks>
+    [PublicAPI]
+    public static float ConductHeatQuery(this HeatContainer c1, HeatContainer c2, float deltaTime, float g)
+    {
+        return ConductHeatQuery(c1, c2.Temperature, deltaTime, g);
+    }
+
+    /// <summary>
+    /// Changes the temperature of a <see cref="HeatContainer"/> to a target temperature by
+    /// adding or removing the necessary amount of heat.
+    /// </summary>
+    /// <param name="c">The <see cref="HeatContainer"/> to change the temperature of.</param>
+    /// <param name="targetTemp">The desired temperature to reach.</param>
+    /// <returns>The amount of heat in joules that was transferred to or from the <see cref="HeatContainer"/>
+    /// to reach the target temperature.</returns>
+    /// <example>A positive value indicates heat must be added to the container to reach the target temperature.</example>
+    [PublicAPI]
+    public static float ConductHeatToTemp(this HeatContainer c, float targetTemp)
+    {
+        var dQ = ConductHeatToTempQuery(c, targetTemp);
+        c.Temperature = targetTemp;
+        return dQ;
+    }
+
+    /// <summary>
+    /// Determines the amount of heat that must be transferred to or from a <see cref="HeatContainer"/>
+    /// to reach a target temperature. Does not modify the heat container.
+    /// </summary>
+    /// <param name="c">The <see cref="HeatContainer"/> to query.</param>
+    /// <param name="targetTemp">The desired temperature to reach.</param>
+    /// <returns>The amount of heat in joules that must be transferred to or from the <see cref="HeatContainer"/>
+    /// to reach the target temperature.</returns>
+    /// <example>A positive value indicates heat must be added to the container to reach the target temperature.</example>
+    [PublicAPI]
+    public static float ConductHeatToTempQuery(this HeatContainer c, float targetTemp)
+    {
+        return (targetTemp - c.Temperature) * c.HeatCapacity;
+    }
+}
diff --git a/Content.Shared/Temperature/HeatContainer/HeatContainerHelpers.Divide.cs b/Content.Shared/Temperature/HeatContainer/HeatContainerHelpers.Divide.cs
new file mode 100644
index 0000000000..f1e7206683
--- /dev/null
+++ b/Content.Shared/Temperature/HeatContainer/HeatContainerHelpers.Divide.cs
@@ -0,0 +1,55 @@
+using JetBrains.Annotations;
+
+namespace Content.Shared.Temperature.HeatContainer;
+
+public static partial class HeatContainerHelpers
+{
+    /// <summary>
+    /// Splits a <see cref="HeatContainer"/> into two.
+    /// </summary>
+    /// <param name="c">The <see cref="HeatContainer"/> to split. This will be modified to contain the remaining heat capacity.</param>
+    /// <param name="fraction">The fraction of the heat capacity to move to the new container. Clamped between 0 and 1.</param>
+    /// <returns>A new <see cref="HeatContainer"/> containing the specified fraction of the original container's heat capacity and the same temperature.</returns>
+    [PublicAPI]
+    public static HeatContainer Split(this ref HeatContainer c, float fraction = 0.5f)
+    {
+        fraction = Math.Clamp(fraction, 0f, 1f);
+        var newHeatCapacity = c.HeatCapacity * fraction;
+
+        var newContainer = new HeatContainer
+        {
+            HeatCapacity = newHeatCapacity,
+            Temperature = c.Temperature,
+        };
+
+        c.HeatCapacity -= newHeatCapacity;
+
+        return newContainer;
+    }
+
+    /// <summary>
+    /// Divides a source <see cref="HeatContainer"/> into a specified number of equal parts.
+    /// </summary>
+    /// <param name="c">The input <see cref="HeatContainer"/> to split.</param>
+    /// <param name="num">The number of <see cref="HeatContainer"/>s
+    /// to split the source <see cref="HeatContainer"/> into.</param>
+    /// <exception cref="ArgumentException">Thrown when attempting to divide the source container by zero.</exception>
+    /// <returns>An array of <see cref="HeatContainer"/>s equally split from the source <see cref="HeatContainer"/>.</returns>
+    [PublicAPI]
+    public static HeatContainer[] Divide(this HeatContainer c, uint num)
+    {
+        if (num == 0)
+            throw new ArgumentException("Cannot divide by zero.", nameof(num));
+
+        var fraction = 1f / num;
+        var cFrac = c.Split(fraction);
+        var containers = new HeatContainer[num];
+
+        for (var i = 0; i < num; i++)
+        {
+            containers[i] = cFrac;
+        }
+
+        return containers;
+    }
+}
diff --git a/Content.Shared/Temperature/HeatContainer/HeatContainerHelpers.Exchange.cs b/Content.Shared/Temperature/HeatContainer/HeatContainerHelpers.Exchange.cs
new file mode 100644
index 0000000000..6b7eb125dc
--- /dev/null
+++ b/Content.Shared/Temperature/HeatContainer/HeatContainerHelpers.Exchange.cs
@@ -0,0 +1,214 @@
+using JetBrains.Annotations;
+
+namespace Content.Shared.Temperature.HeatContainer;
+
+public static partial class HeatContainerHelpers
+{
+    #region 2-Body Exchange
+
+    /// <summary>
+    /// Determines the amount of heat energy that must be transferred between two heat containers
+    /// to bring them into thermal equilibrium.
+    /// Does not modify the containers.
+    /// </summary>
+    /// <param name="cA">The first <see cref="HeatContainer"/> to exchange heat.</param>
+    /// <param name="cB">The second <see cref="HeatContainer"/> to exchange heat with.</param>
+    /// <returns>The amount of heat in joules that is needed
+    /// to bring the containers to thermal equilibrium.</returns>
+    /// <example>A positive value indicates heat transfer from a hot cA to a cold cB.</example>
+    [PublicAPI]
+    public static float EquilibriumHeatQuery(this HeatContainer cA, HeatContainer cB)
+    {
+        /*
+        The solution is derived from the following facts:
+        1. Let Q be the amount of heat energy transferred from cA to cB.
+        2. T_A > T_B, so heat will flow from cA to cB.
+        3. The energy lost by T_A is equal to Q = C_A * (T_A_initial - T_A_final)
+        4. The energy gained by T_B is equal to Q = C_B * (T_B_final - T_B_initial)
+        5. Energy is conserved. So T_A_final and T_B_final can be expressed as:
+        T_A_final = T_A_initial - Q / C_A
+        T_B_final = T_B_initial + Q / C_B
+        6. At thermal equilibrium, T_A_final = T_B_final.
+        7. Solve for Q.
+        */
+        return (cA.Temperature - cB.Temperature) *
+               (cA.HeatCapacity * cB.HeatCapacity / (cA.HeatCapacity + cB.HeatCapacity));
+    }
+
+    /// <summary>
+    /// Determines the resulting temperature if two heat containers are brought into thermal equilibrium.
+    /// Does not modify the containers.
+    /// </summary>
+    /// <param name="cA">The first <see cref="HeatContainer"/> to exchange heat.</param>
+    /// <param name="cB">The second <see cref="HeatContainer"/> to exchange heat with.</param>
+    /// <returns>The resulting equilibrium temperature both containers will be at.</returns>
+    [PublicAPI]
+    public static float EquilibriumTemperatureQuery(this HeatContainer cA, HeatContainer cB)
+    {
+        // Insert the above solution for Q into T_A_final = T_A_initial - Q / C_A and rearrange the result.
+        return (cA.HeatCapacity * cA.Temperature - cB.HeatCapacity * cB.Temperature) / (cA.HeatCapacity + cB.HeatCapacity);
+    }
+
+    /// <summary>
+    /// Brings two <see cref="HeatContainer"/>s into thermal equilibrium by exchanging heat.
+    /// </summary>
+    /// <param name="cA">The first <see cref="HeatContainer"/> to exchange heat.</param>
+    /// <param name="cB">The second <see cref="HeatContainer"/> to exchange heat with.</param>
+    [PublicAPI]
+    public static void Equilibrate(this HeatContainer cA, HeatContainer cB)
+    {
+        var tFinal = EquilibriumTemperatureQuery(cA, cB);
+        cA.Temperature = tFinal;
+        cB.Temperature = tFinal;
+    }
+
+    /// <summary>
+    /// Brings two <see cref="HeatContainer"/>s into thermal equilibrium by exchanging heat.
+    /// </summary>
+    /// <param name="cA">The first <see cref="HeatContainer"/> to exchange heat.</param>
+    /// <param name="cB">The second <see cref="HeatContainer"/> to exchange heat with.</param>
+    /// <param name="dQ">The amount of heat in joules that was transferred from container A to B.</param>
+    [PublicAPI]
+    public static void Equilibrate(this HeatContainer cA, HeatContainer cB, out float dQ)
+    {
+        var tInitialA = cA.Temperature;
+        var tFinal = EquilibriumTemperatureQuery(cA, cB);
+        cA.Temperature = tFinal;
+        cB.Temperature = tFinal;
+        dQ = (tInitialA - tFinal) / cA.HeatCapacity;
+    }
+
+    #endregion
+
+    #region N-Body Exchange
+
+    /// <summary>
+    /// Brings an array of <see cref="HeatContainer"/>s into thermal equilibrium by exchanging heat.
+    /// </summary>
+    /// <param name="cN">The array of <see cref="HeatContainer"/>s to bring into thermal equilibrium.</param>
+    [PublicAPI]
+    public static void Equilibrate(this HeatContainer[] cN)
+    {
+        var tF = cN.EquilibriumTemperatureQuery();
+        for (var i = 0; i < cN.Length; i++)
+        {
+            cN[i].Temperature = tF;
+        }
+    }
+
+    /// <summary>
+    /// Brings a <see cref="HeatContainer"/> into thermal equilibrium
+    /// with an array of other <see cref="HeatContainer"/>s by exchanging heat.
+    /// </summary>
+    /// <param name="cA">The first <see cref="HeatContainer"/> to bring into thermal equilibrium.</param>
+    /// <param name="cN">The array of <see cref="HeatContainer"/>s to bring into thermal equilibrium.</param>
+    [PublicAPI]
+    public static void Equilibrate(this HeatContainer cA, HeatContainer[] cN)
+    {
+        var tF = cA.EquilibriumTemperatureQuery(cN);
+
+        cA.Temperature = tF;
+        for (var i = 0; i < cN.Length; i++)
+        {
+            cN[i].Temperature = tF;
+        }
+    }
+
+    /// <summary>
+    /// Determines the final temperature of an array of <see cref="HeatContainer"/>s
+    /// when they are brought into thermal equilibrium. Does not modify the containers.
+    /// </summary>
+    /// <param name="cN">The array of <see cref="HeatContainer"/>s to bring into thermal equilibrium.</param>
+    /// <returns>The temperature of all <see cref="HeatContainer"/>s involved after reaching thermal equilibrium.</returns>
+    [PublicAPI]
+    public static float EquilibriumTemperatureQuery(this HeatContainer[] cN)
+    {
+        /*
+        The solution is derived via the following:
+
+        1. In thermal equilibrium all bodies have the same temperature T_f.
+
+        2. Heat exchange for each body is defined by the equation \Delta Q_n = C_n \Delta T_n = C_n (T_f - T_n)
+        where C_n is the heat capacity and \Delta T_n the change in temperature of the n-th body.
+
+        3. Heat energy must be conserved, so the sum of all heat changes must equal zero.
+        Therefore, \sum_{n=1}^{N} Q_n = 0.
+
+        4. Substitute and expand.
+        \sum_{n=1}^{N} C_n (T_f - T_n) = 0.
+
+        5. Unroll and expand.
+        C_1(T_f - T_1) + C_2(T_f - T_2) + ... + C_n(T_f - T_n) = 0
+        C_1 T_f - C_1 T_1 + C_2 T_f - C_2 T_2 + ... + C_n T_f - C_n T_n = 0
+
+        6. Group like terms.
+        T_f(C_1 + C_2 + ... + C_n) - (C_1 T_1 + C_2 T_2 + ... + C_n T_n) = 0
+
+        7. Solve.
+        T_f(C_1 + C_2 + ... + C_n) = (C_1 T_1 + C_2 T_2 + ... + C_n T_n)
+        T_f = \frac{C_1 T_1 + C_2 T_2 + ... + C_n T_n}{C_1 + C_2 + ... + C_n}
+
+        8. Summation.
+        T_f = \frac{\sum(C_n T_n)}{\sum(C_n)}
+        */
+
+        var numerator = 0f;
+        var denominator = 0f;
+
+        foreach (var c in cN)
+        {
+            numerator += c.HeatCapacity * c.Temperature;
+            denominator += c.HeatCapacity;
+        }
+
+        return numerator / denominator;
+    }
+
+    /// <summary>
+    /// Determines the final temperature of an array of <see cref="HeatContainer"/>s
+    /// when they are brought into thermal equilibrium. Does not modify the containers.
+    /// </summary>
+    /// <param name="cN">The array of <see cref="HeatContainer"/>s to bring into thermal equilibrium.</param>
+    /// <param name="dQ">The amount of heat in joules that was added to each container
+    /// to reach thermal equilibrium.</param>
+    /// <returns>The temperature of all <see cref="HeatContainer"/>s involved after reaching thermal equilibrium.</returns>
+    [PublicAPI]
+    public static float EquilibriumTemperatureQuery(this HeatContainer[] cN, out float[] dQ)
+    {
+        /*
+        For finding the total heat exchanged during the equalization between a group of bodies
+        take the difference of the internal energy before and after the exchange.
+
+        dQ = C * (T_f - T_i) for each container
+        */
+
+        var tF = cN.EquilibriumTemperatureQuery();
+        dQ = new float[cN.Length];
+
+        for (var i = 0; i < cN.Length; i++)
+        {
+            dQ[i] = cN[i].HeatCapacity * (tF - cN[i].Temperature);
+        }
+
+        return tF;
+    }
+
+    /// <summary>
+    /// Determines the final temperature of a <see cref="HeatContainer"/> when it is brought into thermal equilibrium
+    /// with an array of other <see cref="HeatContainer"/>s. Does not modify the containers.
+    /// </summary>
+    /// <param name="cA">The first <see cref="HeatContainer"/> to bring into thermal equilibrium.</param>
+    /// <param name="cN">The array of <see cref="HeatContainer"/>s to bring into thermal equilibrium.</param>
+    /// <returns>The temperature of all <see cref="HeatContainer"/>s involved after reaching thermal equilibrium.</returns>
+    [PublicAPI]
+    public static float EquilibriumTemperatureQuery(this HeatContainer cA, HeatContainer[] cN)
+    {
+        var cAll = new HeatContainer[cN.Length + 1];
+        cAll[0] = cA;
+        cN.CopyTo(cAll, 1);
+
+        return cAll.EquilibriumTemperatureQuery();
+    }
+
+    #endregion
+}
diff --git a/Content.Shared/Temperature/HeatContainer/HeatContainerHelpers.Merge.cs b/Content.Shared/Temperature/HeatContainer/HeatContainerHelpers.Merge.cs
new file mode 100644
index 0000000000..d9f2cdd3e7
--- /dev/null
+++ b/Content.Shared/Temperature/HeatContainer/HeatContainerHelpers.Merge.cs
@@ -0,0 +1,66 @@
+using JetBrains.Annotations;
+
+namespace Content.Shared.Temperature.HeatContainer;
+
+public static partial class HeatContainerHelpers
+{
+    /// <summary>
+    /// Merges two heat containers into one, conserving total internal energy.
+    /// </summary>
+    /// <param name="cA">The first <see cref="HeatContainer"/> to merge. This will be modified to contain the merged result.</param>
+    /// <param name="cB">The second <see cref="HeatContainer"/> to merge.</param>
+    [PublicAPI]
+    public static void Merge(this ref HeatContainer cA, HeatContainer cB)
+    {
+        var merged = new HeatContainer
+        {
+            HeatCapacity = cA.HeatCapacity + cB.HeatCapacity,
+            Temperature = (cA.InternalEnergy + cB.InternalEnergy) / (cA.HeatCapacity + cB.HeatCapacity)
+        };
+
+        cA = merged;
+    }
+
+
+    /// <summary>
+    /// Merges an array of <see cref="HeatContainer"/>s into a single heat container, conserving total internal energy.
+    /// </summary>
+    /// <param name="cA">The first <see cref="HeatContainer"/> to merge.
+    /// This will be modified to contain the merged result.</param>
+    /// <param name="cN">The array of <see cref="HeatContainer"/>s to merge.</param>
+    [PublicAPI]
+    public static void Merge(this ref HeatContainer cA, HeatContainer[] cN)
+    {
+        var cAcN = new HeatContainer[cN.Length + 1];
+        cAcN[0] = cA;
+        cN.CopyTo(cAcN, 1);
+
+        cA = cAcN.Merge();
+    }
+
+    /// <summary>
+    /// Merges an array of <see cref="HeatContainer"/>s into a single heat container, conserving total internal energy.
+    /// </summary>
+    /// <param name="cN">The array of <see cref="HeatContainer"/>s to merge.</param>
+    /// <returns>A new <see cref="HeatContainer"/> representing the merged result.</returns>
+    [PublicAPI]
+    public static HeatContainer Merge(this HeatContainer[] cN)
+    {
+        var totalHeatCapacity = 0f;
+        var totalEnergy = 0f;
+
+        foreach (var c in cN)
+        {
+            totalHeatCapacity += c.HeatCapacity;
+            totalEnergy += c.InternalEnergy;
+        }
+
+        var result = new HeatContainer
+        {
+            HeatCapacity = totalHeatCapacity,
+            Temperature = totalEnergy / totalHeatCapacity,
+        };
+
+        return result;
+    }
+}
diff --git a/Content.Shared/Temperature/HeatContainer/HeatContainerHelpers.cs b/Content.Shared/Temperature/HeatContainer/HeatContainerHelpers.cs
new file mode 100644
index 0000000000..39078a810e
--- /dev/null
+++ b/Content.Shared/Temperature/HeatContainer/HeatContainerHelpers.cs
@@ -0,0 +1,52 @@
+using JetBrains.Annotations;
+
+namespace Content.Shared.Temperature.HeatContainer;
+
+/// <summary>
+/// Class containing helper methods for working with <see cref="HeatContainer"/>s.
+/// Use these classes instead of implementing your own heat transfer logic.
+/// </summary>
+public static partial class HeatContainerHelpers
+{
+    /// <summary>
+    /// Adds or removes heat energy from the container.
+    /// Positive values add heat, negative values remove heat.
+    /// The temperature can never become lower than 0K even if more heat is removed.
+    /// </summary>
+    /// <param name="c">The <see cref="HeatContainer"/> to add or remove energy.</param>
+    /// <param name="dQ">The energy in joules to add or remove.</param>
+    [PublicAPI]
+    public static void AddHeat(this HeatContainer c, float dQ)
+    {
+        c.Temperature = c.AddHeatQuery(dQ);
+    }
+
+    /// <summary>
+    /// Calculates the resulting temperature of the container after adding or removing heat energy.
+    /// Positive values add heat, negative values remove heat. This method doesn't change the container's state.
+    /// The temperature can never become lower than 0K even if more heat is removed.
+    /// </summary>
+    /// <param name="c">The <see cref="HeatContainer"/> to query.</param>
+    /// <param name="dQ">The energy in joules to add or remove.</param>
+    /// <returns>The resulting temperature in kelvin after the heat change.</returns>
+    [PublicAPI]
+    public static float AddHeatQuery(this HeatContainer c, float dQ)
+    {
+        // Don't allow the temperature to go below the absolute minimum.
+        return Math.Max(0f, c.Temperature + dQ / c.HeatCapacity);
+    }
+
+    /// <summary>
+    /// Sets the heat capacity of a <see cref="HeatContainer"/> without altering its thermal energy.
+    /// Adjusts the temperature accordingly to maintain the same internal energy.
+    /// </summary>
+    /// <param name="c">The <see cref="HeatContainer"/> to modify.</param>
+    /// <param name="newHeatCapacity">The new heat capacity to set.</param>
+    [PublicAPI]
+    public static void SetHeatCapacity(this HeatContainer c, float newHeatCapacity)
+    {
+        var currentEnergy = c.InternalEnergy;
+        c.HeatCapacity = newHeatCapacity;
+        c.Temperature = currentEnergy / c.HeatCapacity;
+    }
+}

From 589b187499bf98c795dd8d06691f96d8b96d87db Mon Sep 17 00:00:00 2001
From: SonarZeBat <sonarzebat153@gmail.com>
Date: Sat, 27 Dec 2025 22:00:29 +0800
Subject: [PATCH 080/134] Lowered Xenoborgs MinPlayers From 40 To 30 (#42111)

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

diff --git a/Resources/Prototypes/GameRules/subgamemodes.yml b/Resources/Prototypes/GameRules/subgamemodes.yml
index 008f500c5e..ea4bd65f18 100644
--- a/Resources/Prototypes/GameRules/subgamemodes.yml
+++ b/Resources/Prototypes/GameRules/subgamemodes.yml
@@ -78,7 +78,7 @@
   - type: XenoborgsRule
   - type: RuleGrids
   - type: GameRule
-    minPlayers: 40
+    minPlayers: 30
   - type: LoadMapRule
     gridPath: /Maps/Shuttles/mothership.yml
   - type: AntagMultipleRoleSpawner

From 1b3047644afdbe61b2112d730904820d3604c1ab Mon Sep 17 00:00:00 2001
From: PJBot <pieterjan.briers+bot@gmail.com>
Date: Sat, 27 Dec 2025 14:15:16 +0000
Subject: [PATCH 081/134] 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 e6a37c2b36..130bf4dd1e 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -1,12 +1,4 @@
 Entries:
-- author: slarticodefast
-  changes:
-  - message: Fixed inventory sprites flickering when hovering over the slot with an
-      item.
-    type: Fix
-  id: 8834
-  time: '2025-08-06T20:14:29.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/39379
 - author: Thinbug0
   changes:
   - message: New onion mutation, Bloonions! floating balloon-like onions.
@@ -3945,3 +3937,10 @@
   id: 9334
   time: '2025-12-26T21:47:30.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/38481
+- author: SonarZeBat
+  changes:
+  - message: Xenoborgs gamemode minimum players changed from 40 to 30.
+    type: Tweak
+  id: 9335
+  time: '2025-12-27T14:14:07.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/42111

From cd8d5a6a9c629fb75f5e45dc347e04ce64b79db3 Mon Sep 17 00:00:00 2001
From: B_Kirill <153602297+B-Kirill@users.noreply.github.com>
Date: Sun, 28 Dec 2025 00:14:42 +1000
Subject: [PATCH 082/134] Cleanup warnings: CS0414, CS0618 (#42068)

Cleanup
---
 .../Construction/UI/ConstructionMenuPresenter.cs       |  6 +++++-
 Content.Client/Launcher/LauncherConnecting.cs          |  8 ++++++--
 Content.Server/Chat/Managers/ChatManager.cs            |  7 ++++++-
 Content.Server/GameTicking/Commands/JoinGameCommand.cs | 10 ++++++++--
 Content.Server/Traits/TraitSystem.cs                   |  2 --
 Content.Shared/Fluids/SpraySafetySystem.cs             |  2 --
 6 files changed, 25 insertions(+), 10 deletions(-)

diff --git a/Content.Client/Construction/UI/ConstructionMenuPresenter.cs b/Content.Client/Construction/UI/ConstructionMenuPresenter.cs
index d5fee2bdda..6041b405c9 100644
--- a/Content.Client/Construction/UI/ConstructionMenuPresenter.cs
+++ b/Content.Client/Construction/UI/ConstructionMenuPresenter.cs
@@ -30,7 +30,10 @@ namespace Content.Client.Construction.UI
         [Dependency] private readonly IUserInterfaceManager _uiManager = default!;
         [Dependency] private readonly IPlayerManager _playerManager = default!;
         [Dependency] private readonly IClientPreferencesManager _preferencesManager = default!;
+        [Dependency] private readonly ILogManager _logManager = default!;
+
         private readonly SpriteSystem _spriteSystem;
+        private readonly ISawmill _sawmill;
 
         private readonly IConstructionMenuView _constructionView;
         private readonly EntityWhitelistSystem _whitelistSystem;
@@ -90,6 +93,7 @@ namespace Content.Client.Construction.UI
             _constructionView = new ConstructionMenu();
             _whitelistSystem = _entManager.System<EntityWhitelistSystem>();
             _spriteSystem = _entManager.System<SpriteSystem>();
+            _sawmill = _logManager.GetSawmill("construction.ui");
 
             // 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))
@@ -284,7 +288,7 @@ namespace Content.Client.Construction.UI
 
                 if (!_constructionSystem!.TryGetRecipePrototype(recipe.ID, out var targetProtoId))
                 {
-                    Logger.Error("Cannot find the target prototype in the recipe cache with the id \"{0}\" of {1}.",
+                    _sawmill.Error("Cannot find the target prototype in the recipe cache with the id \"{0}\" of {1}.",
                         recipe.ID,
                         nameof(ConstructionPrototype));
                     continue;
diff --git a/Content.Client/Launcher/LauncherConnecting.cs b/Content.Client/Launcher/LauncherConnecting.cs
index 33d31cc52d..9b9c472781 100644
--- a/Content.Client/Launcher/LauncherConnecting.cs
+++ b/Content.Client/Launcher/LauncherConnecting.cs
@@ -20,8 +20,10 @@ namespace Content.Client.Launcher
         [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
         [Dependency] private readonly IConfigurationManager _cfg = default!;
         [Dependency] private readonly IClipboardManager _clipboard = default!;
+        [Dependency] private readonly ILogManager _logManager = default!;
 
         private LauncherConnectingGui? _control;
+        private ISawmill _sawmill = default!;
 
         private Page _currentPage;
         private string? _connectFailReason;
@@ -61,6 +63,8 @@ namespace Content.Client.Launcher
         {
             _control = new LauncherConnectingGui(this, _random, _prototypeManager, _cfg, _clipboard);
 
+            _sawmill = _logManager.GetSawmill("launcher-ui");
+
             _userInterfaceManager.StateRoot.AddChild(_control);
 
             _clientNetManager.ConnectFailed += OnConnectFailed;
@@ -115,12 +119,12 @@ namespace Content.Client.Launcher
                 }
                 else
                 {
-                    Logger.InfoS("launcher-ui", $"Redial not possible, no Ss14Address");
+                    _sawmill.Info($"Redial not possible, no Ss14Address");
                 }
             }
             catch (Exception ex)
             {
-                Logger.ErrorS("launcher-ui", $"Redial exception: {ex}");
+                _sawmill.Error($"Redial exception: {ex}");
             }
             return false;
         }
diff --git a/Content.Server/Chat/Managers/ChatManager.cs b/Content.Server/Chat/Managers/ChatManager.cs
index f90e286d9e..0843f80998 100644
--- a/Content.Server/Chat/Managers/ChatManager.cs
+++ b/Content.Server/Chat/Managers/ChatManager.cs
@@ -45,6 +45,9 @@ internal sealed partial class ChatManager : IChatManager
     [Dependency] private readonly PlayerRateLimitManager _rateLimitManager = default!;
     [Dependency] private readonly ISharedPlayerManager _player = default!;
     [Dependency] private readonly DiscordChatLink _discordLink = default!;
+    [Dependency] private readonly ILogManager _logManager = default!;
+
+    private ISawmill _sawmill = default!;
 
     /// <summary>
     /// The maximum length a player-sent message can be sent
@@ -64,6 +67,8 @@ internal sealed partial class ChatManager : IChatManager
         _configurationManager.OnValueChanged(CCVars.OocEnabled, OnOocEnabledChanged, true);
         _configurationManager.OnValueChanged(CCVars.AdminOocEnabled, OnAdminOocEnabledChanged, true);
 
+        _sawmill = _logManager.GetSawmill("SERVER");
+
         RegisterRateLimits();
     }
 
@@ -111,7 +116,7 @@ internal sealed partial class ChatManager : IChatManager
     {
         var wrappedMessage = Loc.GetString("chat-manager-server-wrap-message", ("message", FormattedMessage.EscapeText(message)));
         ChatMessageToAll(ChatChannel.Server, message, wrappedMessage, EntityUid.Invalid, hideChat: false, recordReplay: true, colorOverride: colorOverride);
-        Logger.InfoS("SERVER", message);
+        _sawmill.Info(message);
 
         _adminLogger.Add(LogType.Chat, LogImpact.Low, $"Server announcement: {message}");
     }
diff --git a/Content.Server/GameTicking/Commands/JoinGameCommand.cs b/Content.Server/GameTicking/Commands/JoinGameCommand.cs
index a32a2f9495..3f5e294754 100644
--- a/Content.Server/GameTicking/Commands/JoinGameCommand.cs
+++ b/Content.Server/GameTicking/Commands/JoinGameCommand.cs
@@ -17,6 +17,9 @@ namespace Content.Server.GameTicking.Commands
         [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
         [Dependency] private readonly IAdminManager _adminManager = default!;
         [Dependency] private readonly IConfigurationManager _cfg = default!;
+        [Dependency] private readonly ILogManager _logManager = default!;
+
+        private readonly ISawmill _sawmill;
 
         public string Command => "joingame";
         public string Description => "";
@@ -25,7 +28,10 @@ namespace Content.Server.GameTicking.Commands
         public JoinGameCommand()
         {
             IoCManager.InjectDependencies(this);
+
+            _sawmill = _logManager.GetSawmill("security");
         }
+
         public void Execute(IConsoleShell shell, string argStr, string[] args)
         {
             if (args.Length != 2)
@@ -46,8 +52,8 @@ namespace Content.Server.GameTicking.Commands
 
             if (ticker.PlayerGameStatuses.TryGetValue(player.UserId, out var status) && status == PlayerGameStatus.JoinedGame)
             {
-                Logger.InfoS("security", $"{player.Name} ({player.UserId}) attempted to latejoin while in-game.");
-                shell.WriteError($"{player.Name} is not in the lobby.   This incident will be reported.");
+                _sawmill.Info($"{player.Name} ({player.UserId}) attempted to latejoin while in-game.");
+                shell.WriteError($"{player.Name} is not in the lobby. This incident will be reported.");
                 return;
             }
 
diff --git a/Content.Server/Traits/TraitSystem.cs b/Content.Server/Traits/TraitSystem.cs
index 010cb334da..0956bcb401 100644
--- a/Content.Server/Traits/TraitSystem.cs
+++ b/Content.Server/Traits/TraitSystem.cs
@@ -2,7 +2,6 @@ using Content.Shared.GameTicking;
 using Content.Shared.Hands.Components;
 using Content.Shared.Hands.EntitySystems;
 using Content.Shared.Roles;
-using Content.Shared.StatusEffectNew;
 using Content.Shared.Traits;
 using Content.Shared.Whitelist;
 using Robust.Shared.Prototypes;
@@ -14,7 +13,6 @@ public sealed class TraitSystem : EntitySystem
     [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
     [Dependency] private readonly SharedHandsSystem _sharedHandsSystem = default!;
     [Dependency] private readonly EntityWhitelistSystem _whitelistSystem = default!;
-    [Dependency] private readonly StatusEffectsSystem _statusEffects = default!;
 
     public override void Initialize()
     {
diff --git a/Content.Shared/Fluids/SpraySafetySystem.cs b/Content.Shared/Fluids/SpraySafetySystem.cs
index c206bbda08..fa5377f046 100644
--- a/Content.Shared/Fluids/SpraySafetySystem.cs
+++ b/Content.Shared/Fluids/SpraySafetySystem.cs
@@ -1,7 +1,6 @@
 using Content.Shared.Chemistry.EntitySystems;
 using Content.Shared.Fluids.Components;
 using Content.Shared.Item.ItemToggle;
-using Content.Shared.Popups;
 using Robust.Shared.Audio.Systems;
 
 namespace Content.Shared.Fluids;
@@ -10,7 +9,6 @@ public sealed class SpraySafetySystem : EntitySystem
 {
     [Dependency] private readonly ItemToggleSystem _toggle = default!;
     [Dependency] private readonly SharedAudioSystem _audio = default!;
-    [Dependency] private readonly SharedPopupSystem _popup = default!;
 
     public override void Initialize()
     {

From ee2f1da8c2cda4a52c4d3784cf46c6f2f79fcf91 Mon Sep 17 00:00:00 2001
From: EchoOfNothing <52498373+EchoOfNothing@users.noreply.github.com>
Date: Sat, 27 Dec 2025 16:18:45 +0200
Subject: [PATCH 083/134] Merge IFF controls into one control. Make syndicate
 IFF turned off by default.  (#42104)

* Merge IFF controls into one control.

* Implement logic to hide IFF of sydicate IFF console on map load. Add hideOnInit property to IFFConsoleComponent

* DataField

---------

Co-authored-by: ScarKy0 <106310278+ScarKy0@users.noreply.github.com>
---
 .../BUI/IFFConsoleBoundUserInterface.cs       |  9 -----
 .../Shuttles/UI/IFFConsoleWindow.xaml         |  6 ----
 .../Shuttles/UI/IFFConsoleWindow.xaml.cs      | 36 ++-----------------
 .../Components/IFFConsoleComponent.cs         |  3 ++
 .../Shuttles/Systems/ShuttleSystem.IFF.cs     | 36 ++++++++++++-------
 .../Shuttles/Events/IFFShowVesselMessage.cs   |  9 -----
 .../Machines/Computers/computers.yml          |  1 +
 7 files changed, 29 insertions(+), 71 deletions(-)
 delete mode 100644 Content.Shared/Shuttles/Events/IFFShowVesselMessage.cs

diff --git a/Content.Client/Shuttles/BUI/IFFConsoleBoundUserInterface.cs b/Content.Client/Shuttles/BUI/IFFConsoleBoundUserInterface.cs
index 8d84abed8a..704307f06b 100644
--- a/Content.Client/Shuttles/BUI/IFFConsoleBoundUserInterface.cs
+++ b/Content.Client/Shuttles/BUI/IFFConsoleBoundUserInterface.cs
@@ -23,7 +23,6 @@ public sealed class IFFConsoleBoundUserInterface : BoundUserInterface
 
         _window = this.CreateWindowCenteredLeft<IFFConsoleWindow>();
         _window.ShowIFF += SendIFFMessage;
-        _window.ShowVessel += SendVesselMessage;
     }
 
     protected override void UpdateState(BoundUserInterfaceState state)
@@ -44,14 +43,6 @@ public sealed class IFFConsoleBoundUserInterface : BoundUserInterface
         });
     }
 
-    private void SendVesselMessage(bool obj)
-    {
-        SendMessage(new IFFShowVesselMessage()
-        {
-            Show = obj,
-        });
-    }
-
     protected override void Dispose(bool disposing)
     {
         base.Dispose(disposing);
diff --git a/Content.Client/Shuttles/UI/IFFConsoleWindow.xaml b/Content.Client/Shuttles/UI/IFFConsoleWindow.xaml
index dab11a7b62..90684889a6 100644
--- a/Content.Client/Shuttles/UI/IFFConsoleWindow.xaml
+++ b/Content.Client/Shuttles/UI/IFFConsoleWindow.xaml
@@ -9,12 +9,6 @@
                 <Button Name="ShowIFFOnButton" Text="{Loc 'iff-console-on'}" StyleClasses="OpenRight" />
                 <Button Name="ShowIFFOffButton" Text="{Loc 'iff-console-off'}" StyleClasses="OpenLeft" />
             </BoxContainer>
-
-            <Label Name="ShowVesselLabel" Text="{Loc 'iff-console-show-vessel-label'}" HorizontalExpand="True" StyleClasses="highlight" />
-            <BoxContainer Orientation="Horizontal" MinWidth="120">
-                <Button Name="ShowVesselOnButton" Text="{Loc 'iff-console-on'}" StyleClasses="OpenRight" />
-                <Button Name="ShowVesselOffButton" Text="{Loc 'iff-console-off'}" StyleClasses="OpenLeft" />
-            </BoxContainer>
         </GridContainer>
     </BoxContainer>
 </controls:FancyWindow>
diff --git a/Content.Client/Shuttles/UI/IFFConsoleWindow.xaml.cs b/Content.Client/Shuttles/UI/IFFConsoleWindow.xaml.cs
index f14ef22c3c..d61486d2d8 100644
--- a/Content.Client/Shuttles/UI/IFFConsoleWindow.xaml.cs
+++ b/Content.Client/Shuttles/UI/IFFConsoleWindow.xaml.cs
@@ -13,9 +13,7 @@ public sealed partial class IFFConsoleWindow : FancyWindow,
     IComputerWindow<IFFConsoleBoundUserInterfaceState>
 {
     private readonly ButtonGroup _showIFFButtonGroup = new();
-    private readonly ButtonGroup _showVesselButtonGroup = new();
     public event Action<bool>? ShowIFF;
-    public event Action<bool>? ShowVessel;
 
     public IFFConsoleWindow()
     {
@@ -24,11 +22,6 @@ public sealed partial class IFFConsoleWindow : FancyWindow,
         ShowIFFOnButton.Group = _showIFFButtonGroup;
         ShowIFFOnButton.OnPressed += args => ShowIFFPressed(true);
         ShowIFFOffButton.OnPressed += args => ShowIFFPressed(false);
-
-        ShowVesselOffButton.Group = _showVesselButtonGroup;
-        ShowVesselOnButton.Group = _showVesselButtonGroup;
-        ShowVesselOnButton.OnPressed += args => ShowVesselPressed(true);
-        ShowVesselOffButton.OnPressed += args => ShowVesselPressed(false);
     }
 
     private void ShowIFFPressed(bool pressed)
@@ -36,19 +29,14 @@ public sealed partial class IFFConsoleWindow : FancyWindow,
         ShowIFF?.Invoke(pressed);
     }
 
-    private void ShowVesselPressed(bool pressed)
-    {
-        ShowVessel?.Invoke(pressed);
-    }
-
     public void UpdateState(IFFConsoleBoundUserInterfaceState state)
     {
-        if ((state.AllowedFlags & IFFFlags.HideLabel) != 0x0)
+        if ((state.AllowedFlags & IFFFlags.HideLabel) != 0x0 || (state.AllowedFlags & IFFFlags.Hide) != 0x0)
         {
             ShowIFFOffButton.Disabled = false;
             ShowIFFOnButton.Disabled = false;
 
-            if ((state.Flags & IFFFlags.HideLabel) != 0x0)
+            if ((state.Flags & IFFFlags.HideLabel) != 0x0 || (state.Flags & IFFFlags.Hide) != 0x0)
             {
                 ShowIFFOffButton.Pressed = true;
             }
@@ -62,25 +50,5 @@ public sealed partial class IFFConsoleWindow : FancyWindow,
             ShowIFFOffButton.Disabled = true;
             ShowIFFOnButton.Disabled = true;
         }
-
-        if ((state.AllowedFlags & IFFFlags.Hide) != 0x0)
-        {
-            ShowVesselOffButton.Disabled = false;
-            ShowVesselOnButton.Disabled = false;
-
-            if ((state.Flags & IFFFlags.Hide) != 0x0)
-            {
-                ShowVesselOffButton.Pressed = true;
-            }
-            else
-            {
-                ShowVesselOnButton.Pressed = true;
-            }
-        }
-        else
-        {
-            ShowVesselOffButton.Disabled = true;
-            ShowVesselOnButton.Disabled = true;
-        }
     }
 }
diff --git a/Content.Server/Shuttles/Components/IFFConsoleComponent.cs b/Content.Server/Shuttles/Components/IFFConsoleComponent.cs
index 562bec51c2..8db81dc1fd 100644
--- a/Content.Server/Shuttles/Components/IFFConsoleComponent.cs
+++ b/Content.Server/Shuttles/Components/IFFConsoleComponent.cs
@@ -11,4 +11,7 @@ public sealed partial class IFFConsoleComponent : Component
     /// </summary>
     [ViewVariables(VVAccess.ReadWrite), DataField("allowedFlags")]
     public IFFFlags AllowedFlags = IFFFlags.HideLabel;
+
+    [DataField]
+    public bool HideOnInit = false;
 }
diff --git a/Content.Server/Shuttles/Systems/ShuttleSystem.IFF.cs b/Content.Server/Shuttles/Systems/ShuttleSystem.IFF.cs
index 5e746fd495..e8d2e13e80 100644
--- a/Content.Server/Shuttles/Systems/ShuttleSystem.IFF.cs
+++ b/Content.Server/Shuttles/Systems/ShuttleSystem.IFF.cs
@@ -12,7 +12,7 @@ public sealed partial class ShuttleSystem
     {
         SubscribeLocalEvent<IFFConsoleComponent, AnchorStateChangedEvent>(OnIFFConsoleAnchor);
         SubscribeLocalEvent<IFFConsoleComponent, IFFShowIFFMessage>(OnIFFShow);
-        SubscribeLocalEvent<IFFConsoleComponent, IFFShowVesselMessage>(OnIFFShowVessel);
+        SubscribeLocalEvent<IFFConsoleComponent, MapInitEvent>(OnInitIFFConsole);
         SubscribeLocalEvent<GridSplitEvent>(OnGridSplit);
     }
 
@@ -37,38 +37,48 @@ public sealed partial class ShuttleSystem
 
     private void OnIFFShow(EntityUid uid, IFFConsoleComponent component, IFFShowIFFMessage args)
     {
-        if (!TryComp(uid, out TransformComponent? xform) || xform.GridUid == null ||
-            (component.AllowedFlags & IFFFlags.HideLabel) == 0x0)
+        if (!TryComp(uid, out TransformComponent? xform) || xform.GridUid == null)
         {
             return;
         }
 
+        // Merged toggle controls both HideLabel and Hide flags
         if (!args.Show)
         {
-            AddIFFFlag(xform.GridUid.Value, IFFFlags.HideLabel);
+            if ((component.AllowedFlags & IFFFlags.HideLabel) != 0x0)
+            {
+                AddIFFFlag(xform.GridUid.Value, IFFFlags.HideLabel);
+            }
+            if ((component.AllowedFlags & IFFFlags.Hide) != 0x0)
+            {
+                AddIFFFlag(xform.GridUid.Value, IFFFlags.Hide);
+            }
         }
         else
         {
-            RemoveIFFFlag(xform.GridUid.Value, IFFFlags.HideLabel);
+            if ((component.AllowedFlags & IFFFlags.HideLabel) != 0x0)
+            {
+                RemoveIFFFlag(xform.GridUid.Value, IFFFlags.HideLabel);
+            }
+            if ((component.AllowedFlags & IFFFlags.Hide) != 0x0)
+            {
+                RemoveIFFFlag(xform.GridUid.Value, IFFFlags.Hide);
+            }
         }
     }
 
-    private void OnIFFShowVessel(EntityUid uid, IFFConsoleComponent component, IFFShowVesselMessage args)
+    private void OnInitIFFConsole(EntityUid uid, IFFConsoleComponent component, MapInitEvent args)
     {
-        if (!TryComp(uid, out TransformComponent? xform) || xform.GridUid == null ||
-            (component.AllowedFlags & IFFFlags.Hide) == 0x0)
+        if (!TryComp(uid, out TransformComponent? xform) || xform.GridUid == null)
         {
             return;
         }
 
-        if (!args.Show)
+        if (component.HideOnInit)
         {
+            AddIFFFlag(xform.GridUid.Value, IFFFlags.HideLabel);
             AddIFFFlag(xform.GridUid.Value, IFFFlags.Hide);
         }
-        else
-        {
-            RemoveIFFFlag(xform.GridUid.Value, IFFFlags.Hide);
-        }
     }
 
     private void OnIFFConsoleAnchor(EntityUid uid, IFFConsoleComponent component, ref AnchorStateChangedEvent args)
diff --git a/Content.Shared/Shuttles/Events/IFFShowVesselMessage.cs b/Content.Shared/Shuttles/Events/IFFShowVesselMessage.cs
deleted file mode 100644
index 77ccaf2a60..0000000000
--- a/Content.Shared/Shuttles/Events/IFFShowVesselMessage.cs
+++ /dev/null
@@ -1,9 +0,0 @@
-using Robust.Shared.Serialization;
-
-namespace Content.Shared.Shuttles.Events;
-
-[Serializable, NetSerializable]
-public sealed class IFFShowVesselMessage : BoundUserInterfaceMessage
-{
-    public bool Show;
-}
diff --git a/Resources/Prototypes/Entities/Structures/Machines/Computers/computers.yml b/Resources/Prototypes/Entities/Structures/Machines/Computers/computers.yml
index 91db6d2fb0..0bc3e0487e 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/Computers/computers.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/Computers/computers.yml
@@ -283,6 +283,7 @@
     allowedFlags:
       - Hide
       - HideLabel
+    hideOnInit: true
   - type: ActivatableUI
     key: enum.IFFConsoleUiKey.Key
   - type: UserInterface

From e1da70ebf7b4db6ef80101eb57493a4e916938b4 Mon Sep 17 00:00:00 2001
From: PJBot <pieterjan.briers+bot@gmail.com>
Date: Sat, 27 Dec 2025 14:33:14 +0000
Subject: [PATCH 084/134] 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 130bf4dd1e..3ab2f540e9 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -1,11 +1,4 @@
 Entries:
-- author: Thinbug0
-  changes:
-  - message: New onion mutation, Bloonions! floating balloon-like onions.
-    type: Add
-  id: 8835
-  time: '2025-08-07T01:51:30.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/33375
 - author: Kittygyat
   changes:
   - message: Made baseball bats 1x4 instead of 2x2
@@ -3944,3 +3937,12 @@
   id: 9335
   time: '2025-12-27T14:14:07.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/42111
+- author: EchoOfNothing
+  changes:
+  - message: IFF controls are now merged into a single control.
+    type: Tweak
+  - message: Syndicate IFF console now has IFF turned off by default.
+    type: Tweak
+  id: 9336
+  time: '2025-12-27T14:32:07.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/42104

From cf2596118626491a799b16808a852b9b71ed558f Mon Sep 17 00:00:00 2001
From: Leah <leahcatdev@gmail.com>
Date: Sat, 27 Dec 2025 17:05:38 +0100
Subject: [PATCH 085/134] update communicator kit description for voice mask
 implanter (#42115)

update thief backpack description for voice mask implanter
---
 Resources/Locale/en-US/thief/backpack.ftl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Resources/Locale/en-US/thief/backpack.ftl b/Resources/Locale/en-US/thief/backpack.ftl
index 953542179c..c3e579110d 100644
--- a/Resources/Locale/en-US/thief/backpack.ftl
+++ b/Resources/Locale/en-US/thief/backpack.ftl
@@ -54,7 +54,7 @@ thief-backpack-category-communicator-description =
     Money is power, and secrets are money. Use your silver tongue
     and wealth to subvert the station.
     Includes: Master key for all station channels, a CyberSun pen,
-    voice chameleon mask, and 20k spesos inside a briefcase.
+    voice mask implanter, and 20k spesos inside a briefcase.
 
 thief-backpack-category-smuggler-name = Smuggler Kit
 thief-backpack-category-smuggler-description =

From 662d2ee964e934138ab945bde64fc390454e7db2 Mon Sep 17 00:00:00 2001
From: ScarKy0 <106310278+ScarKy0@users.noreply.github.com>
Date: Sat, 27 Dec 2025 18:09:33 +0100
Subject: [PATCH 086/134] ReagentGrinder Comp and API to shared (#41956)

* init

* API

* review

* return

* review

* I tend to be stupid
---
 .../EntitySystems/ReagentGrinderSystem.cs     |  8 +++
 .../Components/ReagentGrinderComponent.cs     | 52 --------------
 .../EntitySystems/ReagentGrinderSystem.cs     | 47 +++----------
 .../Components/ReagentGrinderComponent.cs     | 54 +++++++++++++++
 .../SharedReagentGrinderSystem.cs             | 68 +++++++++++++++++++
 .../Kitchen/SharedReagentGrinder.cs           |  1 +
 6 files changed, 140 insertions(+), 90 deletions(-)
 create mode 100644 Content.Client/Kitchen/EntitySystems/ReagentGrinderSystem.cs
 delete mode 100644 Content.Server/Kitchen/Components/ReagentGrinderComponent.cs
 create mode 100644 Content.Shared/Kitchen/Components/ReagentGrinderComponent.cs
 create mode 100644 Content.Shared/Kitchen/EntitySystems/SharedReagentGrinderSystem.cs

diff --git a/Content.Client/Kitchen/EntitySystems/ReagentGrinderSystem.cs b/Content.Client/Kitchen/EntitySystems/ReagentGrinderSystem.cs
new file mode 100644
index 0000000000..5eebd4a0fb
--- /dev/null
+++ b/Content.Client/Kitchen/EntitySystems/ReagentGrinderSystem.cs
@@ -0,0 +1,8 @@
+using Content.Shared.Kitchen.EntitySystems;
+using JetBrains.Annotations;
+
+namespace Content.Client.Kitchen.EntitySystems;
+
+[UsedImplicitly]
+public sealed class ReagentGrinderSystem : SharedReagentGrinderSystem;
+
diff --git a/Content.Server/Kitchen/Components/ReagentGrinderComponent.cs b/Content.Server/Kitchen/Components/ReagentGrinderComponent.cs
deleted file mode 100644
index 5bbbe2dc8d..0000000000
--- a/Content.Server/Kitchen/Components/ReagentGrinderComponent.cs
+++ /dev/null
@@ -1,52 +0,0 @@
-using Content.Shared.Kitchen;
-using Content.Server.Kitchen.EntitySystems;
-using Robust.Shared.Audio;
-
-namespace Content.Server.Kitchen.Components
-{
-    /// <summary>
-    /// The combo reagent grinder/juicer. The reason why grinding and juicing are seperate is simple,
-    /// think of grinding as a utility to break an object down into its reagents. Think of juicing as
-    /// converting something into its single juice form. E.g, grind an apple and get the nutriment and sugar
-    /// it contained, juice an apple and get "apple juice".
-    /// </summary>
-    [Access(typeof(ReagentGrinderSystem)), RegisterComponent]
-    public sealed partial class ReagentGrinderComponent : Component
-    {
-        [DataField]
-        public int StorageMaxEntities = 6;
-
-        [DataField]
-        public TimeSpan WorkTime = TimeSpan.FromSeconds(3.5); // Roughly matches the grind/juice sounds.
-
-        [DataField]
-        public float WorkTimeMultiplier = 1;
-
-        [DataField]
-        public SoundSpecifier ClickSound { get; set; } = new SoundPathSpecifier("/Audio/Machines/machine_switch.ogg");
-
-        [DataField]
-        public SoundSpecifier GrindSound { get; set; } = new SoundPathSpecifier("/Audio/Machines/blender.ogg");
-
-        [DataField]
-        public SoundSpecifier JuiceSound { get; set; } = new SoundPathSpecifier("/Audio/Machines/juicer.ogg");
-
-        [DataField]
-        public GrinderAutoMode AutoMode = GrinderAutoMode.Off;
-
-        public EntityUid? AudioStream;
-    }
-
-    [Access(typeof(ReagentGrinderSystem)), RegisterComponent]
-    public sealed partial class ActiveReagentGrinderComponent : Component
-    {
-        /// <summary>
-        /// Remaining time until the grinder finishes grinding/juicing.
-        /// </summary>
-        [ViewVariables]
-        public TimeSpan EndTime;
-
-        [ViewVariables]
-        public GrinderProgram Program;
-    }
-}
diff --git a/Content.Server/Kitchen/EntitySystems/ReagentGrinderSystem.cs b/Content.Server/Kitchen/EntitySystems/ReagentGrinderSystem.cs
index b850bc87fa..a709f4b8d9 100644
--- a/Content.Server/Kitchen/EntitySystems/ReagentGrinderSystem.cs
+++ b/Content.Server/Kitchen/EntitySystems/ReagentGrinderSystem.cs
@@ -1,5 +1,3 @@
-using Content.Server.Kitchen.Components;
-using Content.Server.Power.Components;
 using Content.Server.Power.EntitySystems;
 using Content.Server.Stack;
 using Content.Shared.Chemistry.EntitySystems;
@@ -20,15 +18,15 @@ using Robust.Shared.Audio.Systems;
 using Robust.Shared.Containers;
 using Robust.Shared.Timing;
 using System.Linq;
-using Content.Server.Construction.Completions;
 using Content.Server.Jittering;
 using Content.Shared.Jittering;
+using Content.Shared.Kitchen.EntitySystems;
 using Content.Shared.Power;
 
 namespace Content.Server.Kitchen.EntitySystems
 {
     [UsedImplicitly]
-    internal sealed class ReagentGrinderSystem : EntitySystem
+    internal sealed class ReagentGrinderSystem : SharedReagentGrinderSystem
     {
         [Dependency] private readonly IGameTiming _timing = default!;
         [Dependency] private readonly SharedSolutionContainerSystem _solutionContainersSystem = default!;
@@ -67,6 +65,8 @@ namespace Content.Server.Kitchen.EntitySystems
         {
             entity.Comp.AutoMode = (GrinderAutoMode) (((byte) entity.Comp.AutoMode + 1) % Enum.GetValues(typeof(GrinderAutoMode)).Length);
 
+            Dirty(entity);
+
             UpdateUiState(entity);
         }
 
@@ -90,12 +90,7 @@ namespace Content.Server.Kitchen.EntitySystems
 
                 foreach (var item in inputContainer.ContainedEntities.ToList())
                 {
-                    var solution = active.Program switch
-                    {
-                        GrinderProgram.Grind => GetGrindSolution(item),
-                        GrinderProgram.Juice => CompOrNull<ExtractableComponent>(item)?.JuiceSolution,
-                        _ => null,
-                    };
+                    var solution = GetGrinderSolution(item, active.Program);
 
                     if (solution is null)
                         continue;
@@ -218,8 +213,8 @@ namespace Content.Server.Kitchen.EntitySystems
                 && _solutionContainersSystem.TryGetFitsInDispenser(outputContainer.Value, out _, out containerSolution)
                 && inputContainer.ContainedEntities.Count > 0)
             {
-                canGrind = inputContainer.ContainedEntities.All(CanGrind);
-                canJuice = inputContainer.ContainedEntities.All(CanJuice);
+                canGrind = inputContainer.ContainedEntities.All(x => CanGrind(x));
+                canJuice = inputContainer.ContainedEntities.All(x => CanJuice(x));
             }
 
             var state = new ReagentGrinderInterfaceState(
@@ -293,10 +288,10 @@ namespace Content.Server.Kitchen.EntitySystems
             SoundSpecifier? sound;
             switch (program)
             {
-                case GrinderProgram.Grind when inputContainer.ContainedEntities.All(CanGrind):
+                case GrinderProgram.Grind when inputContainer.ContainedEntities.All(x => CanGrind(x)):
                     sound = reagentGrinder.GrindSound;
                     break;
-                case GrinderProgram.Juice when inputContainer.ContainedEntities.All(CanJuice):
+                case GrinderProgram.Juice when inputContainer.ContainedEntities.All(x => CanJuice(x)):
                     sound = reagentGrinder.JuiceSound;
                     break;
                 default:
@@ -317,29 +312,5 @@ namespace Content.Server.Kitchen.EntitySystems
         {
             _audioSystem.PlayPvs(reagentGrinder.Comp.ClickSound, reagentGrinder.Owner, AudioParams.Default.WithVolume(-2f));
         }
-
-        private Solution? GetGrindSolution(EntityUid uid)
-        {
-            if (TryComp<ExtractableComponent>(uid, out var extractable)
-                && extractable.GrindableSolution is not null
-                && _solutionContainersSystem.TryGetSolution(uid, extractable.GrindableSolution, out _, out var solution))
-            {
-                return solution;
-            }
-            else
-                return null;
-        }
-
-        private bool CanGrind(EntityUid uid)
-        {
-            var solutionName = CompOrNull<ExtractableComponent>(uid)?.GrindableSolution;
-
-            return solutionName is not null && _solutionContainersSystem.TryGetSolution(uid, solutionName, out _, out _);
-        }
-
-        private bool CanJuice(EntityUid uid)
-        {
-            return CompOrNull<ExtractableComponent>(uid)?.JuiceSolution is not null;
-        }
     }
 }
diff --git a/Content.Shared/Kitchen/Components/ReagentGrinderComponent.cs b/Content.Shared/Kitchen/Components/ReagentGrinderComponent.cs
new file mode 100644
index 0000000000..6b8eb6f4ac
--- /dev/null
+++ b/Content.Shared/Kitchen/Components/ReagentGrinderComponent.cs
@@ -0,0 +1,54 @@
+using Content.Shared.Kitchen.EntitySystems;
+using Robust.Shared.Audio;
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Kitchen.Components;
+
+/// <summary>
+/// The combo reagent grinder/juicer. The reason why grinding and juicing are seperate is simple,
+/// think of grinding as a utility to break an object down into its reagents. Think of juicing as
+/// converting something into its single juice form. E.g, grind an apple and get the nutriment and sugar
+/// it contained, juice an apple and get "apple juice".
+/// </summary>
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
+[Access(typeof(SharedReagentGrinderSystem))]
+public sealed partial class ReagentGrinderComponent : Component
+{
+    [DataField, AutoNetworkedField]
+    public int StorageMaxEntities = 6;
+
+    [DataField, AutoNetworkedField]
+    public TimeSpan WorkTime = TimeSpan.FromSeconds(3.5); // Roughly matches the grind/juice sounds.
+
+    [DataField, AutoNetworkedField]
+    public float WorkTimeMultiplier = 1;
+
+    [DataField]
+    public SoundSpecifier ClickSound { get; set; } = new SoundPathSpecifier("/Audio/Machines/machine_switch.ogg");
+
+    [DataField]
+    public SoundSpecifier GrindSound { get; set; } = new SoundPathSpecifier("/Audio/Machines/blender.ogg");
+
+    [DataField]
+    public SoundSpecifier JuiceSound { get; set; } = new SoundPathSpecifier("/Audio/Machines/juicer.ogg");
+
+    [DataField, AutoNetworkedField]
+    public GrinderAutoMode AutoMode = GrinderAutoMode.Off;
+
+    public EntityUid? AudioStream;
+}
+
+[RegisterComponent, NetworkedComponent]
+[Access(typeof(SharedReagentGrinderSystem))]
+public sealed partial class ActiveReagentGrinderComponent : Component
+{
+    /// <summary>
+    /// Remaining time until the grinder finishes grinding/juicing.
+    /// </summary>
+    [ViewVariables]
+    public TimeSpan EndTime;
+
+    [ViewVariables]
+    public GrinderProgram Program;
+}
+
diff --git a/Content.Shared/Kitchen/EntitySystems/SharedReagentGrinderSystem.cs b/Content.Shared/Kitchen/EntitySystems/SharedReagentGrinderSystem.cs
new file mode 100644
index 0000000000..b54fd1d49e
--- /dev/null
+++ b/Content.Shared/Kitchen/EntitySystems/SharedReagentGrinderSystem.cs
@@ -0,0 +1,68 @@
+using Content.Shared.Chemistry.EntitySystems;
+using Content.Shared.Chemistry.Components;
+using Content.Shared.Kitchen.Components;
+using JetBrains.Annotations;
+
+namespace Content.Shared.Kitchen.EntitySystems;
+
+[UsedImplicitly]
+public abstract class SharedReagentGrinderSystem : EntitySystem
+{
+    [Dependency] private readonly SharedSolutionContainerSystem _solutionContainersSystem = default!;
+
+    /// <summary>
+    /// Gets the solutions from an entity using the specified Grinder program.
+    /// </summary>
+    /// <param name="ent">The entity which we check for solutions.</param>
+    /// <param name="program">The grinder program.</param>
+    /// <returns>The solution received, or null if none.</returns>
+    public Solution? GetGrinderSolution(Entity<ExtractableComponent?> ent, GrinderProgram program)
+    {
+        if (!Resolve(ent, ref ent.Comp, false))
+            return null;
+
+        switch (program)
+        {
+            case GrinderProgram.Grind:
+                if (_solutionContainersSystem.TryGetSolution(ent.Owner, ent.Comp.GrindableSolution, out _, out var solution))
+                {
+                    return solution;
+                }
+                break;
+            case GrinderProgram.Juice:
+                return ent.Comp.JuiceSolution;
+        }
+
+        return null;
+    }
+
+    /// <summary>
+    /// Checks whether the entity can be ground using a ReagentGrinder.
+    /// </summary>
+    /// <param name="ent">The entity to check.</param>
+    /// <returns>True if it can be ground, otherwise false.</returns>
+    public bool CanGrind(Entity<ExtractableComponent?> ent)
+    {
+        if (!Resolve(ent, ref ent.Comp, false))
+            return false;
+
+        if (ent.Comp.GrindableSolution == null)
+            return false;
+
+        return _solutionContainersSystem.TryGetSolution(ent.Owner, ent.Comp.GrindableSolution, out _, out _);
+    }
+
+    /// <summary>
+    /// Checks whether the entity can be juiced using a ReagentGrinder.
+    /// </summary>
+    /// <param name="ent">The entity to check.</param>
+    /// <returns>True if it can be juiced, otherwise false.</returns>
+    public bool CanJuice(Entity<ExtractableComponent?> ent)
+    {
+        if (!Resolve(ent, ref ent.Comp, false))
+            return false;
+
+        return ent.Comp.JuiceSolution is not null;
+    }
+}
+
diff --git a/Content.Shared/Kitchen/SharedReagentGrinder.cs b/Content.Shared/Kitchen/SharedReagentGrinder.cs
index 579db239c8..83088555da 100644
--- a/Content.Shared/Kitchen/SharedReagentGrinder.cs
+++ b/Content.Shared/Kitchen/SharedReagentGrinder.cs
@@ -81,6 +81,7 @@ namespace Content.Shared.Kitchen
         Key
     }
 
+    [Serializable, NetSerializable]
     public enum GrinderAutoMode : byte
     {
         Off,

From 6506c7786f33fe70e2674935a8fcdf0307dc27ea Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Sun, 28 Dec 2025 01:45:02 +0100
Subject: [PATCH 087/134] Update Credits (#42127)

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 7238ecdf3c..dc0b0ac355 100644
--- a/Resources/Credits/GitHub.txt
+++ b/Resources/Credits/GitHub.txt
@@ -1 +1 @@
-0leshe, 0tito, 0x6273, 12rabbits, 1337dakota, 13spacemen, 154942, 2013HORSEMEATSCANDAL, 20kdc, 21Melkuu, 27alaing, 2DSiggy, 3nderall, 4310v343k, 4dplanner, 5tickman, 612git, 778b, 96flo, aaron, abadaba695, Ablankmann, abregado, Absolute-Potato, Absotively, achookh, Acruid, ActiveMammmoth, actually-reb, ada-please, adamsong, Adeinitas, adm2play, Admiral-Obvious-001, adrian, Adrian16199, Ady4ik, Aearo-Deepwater, Aerocrux, Aeshus, Aexolott, Aexxie, africalimedrop, afrokada, AftrLite, AgentSmithRadio, Agoichi, Ahion, aiden, aidenkrz, Aidenkrz, Aisu9, ajcm, AJCM-git, AjexRose, Alekshhh, alexalexmax, alexkar598, AlexMorgan3817, alexum418, alexumandxgabriel08x, Alice4267, Alithsko, Alkheemist, alliephante, ALMv1, Alpaccalypse, Alpha-Two, AlphaQwerty, Altoids1, amatwiedle, amylizzle, ancientpower, Andre19926, Andrew-Fall, AndrewEyeke, AndrewFenriz, AndreyCamper, anri, Anzarot121, ApolloVector, Appiah, april-gras, ar4ill, Arcane-Waffle, archee1, ArchPigeon, ArchRBX, areitpog, Arendian, areyouconfused, arimah, Arkanic, ArkiveDev, armoks, Arteben, ArthurMousatov, ArtisticRoomba, artur, Artxmisery, ArZarLordOfMango, as334, AshBats, AsikKEsel, AsnDen, asperger-sind, aspiringLich, astriloqua, Atakku, august-sun, AutoOtter, AverageNotDoingAnythingEnjoyer, avghdev, AwareFoxy, Awlod, azzyisnothere, AzzyIsNotHere, B-Kirill, B3CKDOOR, baa14453, BackeTako, BadaBoomie, Bakke, BananaFlambe, Baptr0b0t, BarryNorfolk, BasedUser, bebr3ght, beck-thompson, beesterman, bellwetherlogic, ben, benbryant0, benev0, benjamin-burges, BGare, bhespiritu, bibbly, BigfootBravo, BIGZi0348, bingojohnson, BismarckShuffle, Bixkitts, Blackern5000, Blazeror, blitzthesquishy, Blobadoodle, bloodrizer, Bloody2372, blueDev2, Boaz1111, BobdaBiscuit, BobTheSleder, boiled-water-tsar, Bokser815, bolantej, Booblesnoot42, Boolean-Buckeye, botanySupremist, brainfood1183, BramvanZijp, Brandon-Huu, breeplayx3, BriBrooo, BRINGit34, brndd, bryce0110, BubblegumBlue, buletsponge, buntobaggins, buunie099, bvelliquette, BWTCK, byondfuckery, c0rigin, c4llv07e, CaasGit, Caconym27, Calecute, Callmore, Camdot, cammusubi, capnsockless, CaptainMaru, captainsqrbeard, Carbonhell, Carolyn3114, Carou02, carteblanche4me, catdotjs, catlord, Catofquestionableethics, CatTheSystem, CawsForConcern, CDWimmer, Centronias, Chaboricks, chairbender, Chaoticaa, Charlese2, charlie, chartman, ChaseFlorom, chavonadelal, Cheackraze, CheddaCheez, cheesePizza2, CheesePlated, Chief-Engineer, chillyconmor, christhirtle, chromiumboy, Chronophylos, Chubbicous, Chubbygummibear, Ciac32, ciaran, citrea, civilCornball, claustro305, Clement-O, cloudyias, clyf, Clyybber, CMDR-Piboy314, cnv41, coco, cohanna, Cohnway, Cojoke-dot, ColdAutumnRain, Colin-Tel, collinlunn, ComicIronic, Compilatron144, CookieMasterT, coolboy911, CoolioDudio, coolmankid12345, Coolsurf6, cooperwallace, corentt, CormosLemming, CrafterKolyan, CraftyRenter, crazybrain23, Crazydave91920, creadth, CrigCrag, CroilBird, Crotalus, CrudeWax, cryals, CrzyPotato, cubixthree, cutemoongod, Cyberboss, d34d10cc, DadeKuma, Daemon, daerSeebaer, dahnte, dakamakat, DamianX, dan, dangerrevolution, daniel-cr, DanSAussieITS, Daracke, Darkenson, david, DawBla, Daxxi3, dch-GH, ddeegan, de0rix, Deahaka, dean, DEATHB4DEFEAT, Deatherd, deathride58, DebugOk, Decappi, Decortex, Deeeeja, deepdarkdepths, DeepwaterCreations, Deerstop, degradka, Delete69, deltanedas, DenisShvalov, DerbyX, derek, dersheppard, Deserty0, Detintinto, DevilishMilk, devinschubert14, dexlerxd, dffdff2423, DieselMohawk, DieselMohawkTheSequel, digitalic, Dimastra, DinnerCalzone, DinoWattz, Disp-Dev, DisposableCrewmember42, dissidentbullet, DjfjdfofdjfjD, doc-michael, docnite, Doctor-Cpu, DogZeroX, dolgovmi, dontbetank, Doomsdrayk, Doru991, DoubleRiceEddiedd, DoutorWhite, DR-DOCTOR-EVIL-EVIL, Dragonjspider, dragonryan06, drakewill-CRL, Drayff, dreamlyjack, DrEnzyme, dribblydrone, DrMelon, drongood12, DrSingh, DrSmugleaf, drteaspoon420, DTanxxx, DubiousDoggo, DuckManZach, Duddino, dukevanity, duskyjay, Dutch-VanDerLinde, dvir001, dylanstrategie, dylanwhittingham, Dynexust, Easypoller, echo, eclips_e, eden077, EEASAS, Efruit, efzapa, Ekkosangen, ElectroSR, elsie, elthundercloud, Elysium206, emberwinters, Emisse, emmafornash, EmoGarbage404, Endecc, EnrichedCaramel, Entvari, eoineoineoin, ephememory, eris, erohrs2, erorr404v1, Errant-4, ertanic, esguard, estacaoespacialpirata, eugene, ewokswagger, exincore, exp111, f0x-n3rd, F1restar4, FacePluslll, Fahasor, FairlySadPanda, farrellka-dev, FATFSAAM2, Feluk6174, ficcialfaint, Fiftyllama, Fildrance, fillervk, FinnishPaladin, firenamefn, Firewars763, FirinMaLazors, Fishfish458, fl-oz, Flareguy, flashgnash, FlipBrooke, FluffiestFloof, FluffMe, FluidRock, flymo5678, foboscheshir, FoLoKe, fooberticus, ForestNoises, forgotmyotheraccount, forkeyboards, forthbridge, Fortune117, foxhorn, freeman2651, freeze2222, frobnic8, Froffy025, Fromoriss, froozigiusz, FrostMando, FrostRibbon, Fruitsalad, Funce, FungiFellow, FunkySphere, FunTust, Futuristic-OK, GalacticChimp, gamer3107, Gamewar360, gansulalan, GaussiArson, Gaxeer, gbasood, gcoremans, Geekyhobo, genderGeometries, GeneralGaws, Genkail, Gentleman-Bird, geraeumig, Ghagliiarghii, Git-Nivrak, githubuser508, GitHubUser53123, gituhabu, GlassEclipse, GnarpGnarp, GNF54, godisdeadLOL, goet, GoldenCan, Goldminermac, Golinth, golubgik, GoodWheatley, Gorox221, GR1231, gradientvera, graevy, GraniteSidewalk, GreaseMonk, greenrock64, GreyMario, GrownSamoyedDog, GTRsound, gusxyz, Gyrandola, h3half, hamurlik, Hanzdegloker, HappyRoach, happyrobot33, Hardly3D, harikattar, Hayden, he1acdvv, Hebi, Helix-ctrl, helm4142, Henry, HerCoyote23, Hi-Im-Shot, HighTechPuddle, Hitlinemoss, hiucko, hivehum, Hmeister-fake, Hmeister-real, Hobbitmax, hobnob, HoidC, Holinka4ever, holyssss, HoofedEar, Hoolny, hord-brayden, hoshizora-sayo, Hreno, Hrosts, htmlsystem, Huaqas, hubismal, Hugal31, Hyenh, hyperb1, hyperDelegate, hyphenationc, i-justuser-i, iaada, iacore, IamVelcroboy, Ian321, icekot8, icesickleone, iczero, iglov, IgorAnt028, igorsaux, ike709, illersaver, Illiux, Ilushkins33, Ilya246, IlyaElDunaev, imatsoup, IMCB, impubbi, imrenq, imweax, indeano, Injazz, Insineer, insoPL, IntegerTempest, Interrobang01, Intoxicating-Innocence, IProduceWidgets, itsmethom, Itzbenz, iztokbajcar, Jackal298, Jackrost, JackRyd3r, jacksonzck, JackspajfMain, Jacktastic09, Jackw2As, jacob, jamessimo, janekvap-havok, Jark255, Jarmer123, Jaskanbe, JasperJRoth, jbox144, JCGWE30, JerryImMouse, jerryimmouse, Jessetriesagain, jessicamaybe, JesterX666, Jewelots, Jezithyr, jicksaw, JiimBob, JimGamemaster, jimmy12or, JIPDawg, jjtParadox, jkwookee, jmcb, JohnGinnane, johnku1, Jophire, Jopogrechkin, joshepvodka, JpegOfAFrog, jproads, JrInventor05, Jrpl, jukereise, juliangiebel, JustArt1m, JustCone14, justdie12, justin, justintether, JustinTrotter, JustinWinningham, justtne, K-Dynamic, k3yw, Kadeo64, Kaga-404, kaiserbirch, KaiShibaa, kalane15, kalanosh, KamTheSythe, Kanashi-Panda, katzenminer, kbailey-git, Keelin, Keer-Sar, KEEYNy, keikiru, Kelrak, kerisargit, keronshb, KIBORG04, KieueCaprie, Kimpes, kin98, KingFroozy, kira-er, kiri-yoshikage, Kirillcas, Kirus59, Kistras, Kit, Kit0vras, KittenColony, Kittygyat, klaypexx, kleinerstation13, Kmc2000, Ko4ergaPunk, kognise, kokoc9n, komunre, KonstantinAngelov, kontakt, korczoczek, kosticia, koteq, kotobdev, Kowlin, KrasnoshchekovPavel, Krosus777, Krunklehorn, Kryyto, Kupie, kxvvv, Kyoth25f, kyupolaris, kzhanik, LaCumbiaDelCoronavirus, lajolico, Lamrr, lanedon, LankLTE, laok233, lapatison, larryrussian, lawdog4817, Lazzi0706, leah, leander-0, leonardo-dabepis, leonidussaks, leonsfriedrich, LeoSantich, LetterN, lettern, Level10Cybermancer, LEVELcat, lever1209, LevitatingTree, Lgibb18, lgruthes, LightVillet, lilazero, liltenhead, linkbro1, linkuyx, Litraxx, little-meow-meow, LittleBuilderJane, LittleNorthStar, LittleNyanCat, lizelive, ljm862, lmsnoise, localcc, lokachop, lolman360, Lomcastar, Lordbrandon12, LordCarve, LordEclipse, lucas, LucasTheDrgn, luckyshotpictures, LudwigVonChesterfield, luegamer, luizwritescode, LukaSlade, Lukasz825700516, luminight, lunarcomets, Lusatia, Luxeator, lvvova1, Lyndomen, lyroth001, lzimann, lzk228, M1tht1c, M3739, M4rchy-S, M87S, mac6na6na, MACMAN2003, Macoron, magicalus, magmodius, magnuscrowe, maland1, malchanceux, MaloTV, manelnavola, ManelNavola, Mangohydra, marboww, Markek1, MarkerWicker, marlyn, matt, Matz05, max, MaxNox7, maylokana, MDuch369, meara1179, meganerobot, MehimoNemo, Mehnix, MeltedPixel, memeproof, MendaxxDev, Menshin, Mephisto72, MerrytheManokit, Mervill, metalgearsloth, MetalSage, MFMessage, mhamsterr, michaelcu, micheel665, mifia, MilenVolf, MilonPL, Minemoder5000, Minty642, minus1over12, Mirino97, mirrorcult, misandrie, MishaUnity, MissKay1994, MisterImp, MisterMecky, Mith-randalf, Mixelz, mjarduk, MjrLandWhale, mkanke-real, MLGTASTICa, mnva0, moderatelyaware, modern-nm, mokiros, momo, Moneyl, monotheonist, Moomoobeef, moony, Morb0, MossyGreySlope, mqole, mr-bo-jangles, Mr0maks, MrFippik, MrPersival, mrrobdemo, mtrs163, muburu, MureixloI, murolem, murphyneko, musicmanvr, MWKane, Myakot, Myctai, N3X15, nabegator, nails-n-tape, Nairodian, Naive817, NakataRin, namespace-Memory, Nannek, NazrinNya, neborsh, neutrino-laser, NickPowers43, nikitosych, nikthechampiongr, Nimfar11, ninruB, Nirnael, NIXC, nkokic, NkoKirkto, nmajask, noctyrnal, noelkathegod, noirogen, nok-ko, NonchalantNoob, NoobyLegion, Nopey, NoreUhh, not-gavnaed, notafet, notquitehadouken, notsodana, noudoit, noverd, Nox38, NuclearWinter, Nuggets219, nukashimika, nuke-haus, NULL882, nullarmo, nyeogmi, Nylux, Nyranu, Nyxilath, och-och, OctoRocket, OldDanceJacket, OliverOtter, onesch, OneZerooo0, OnsenCapy, OnyxTheBrave, opl-, Orange-Winds, OrangeMoronage9622, OrbitSystem07, Orsoniks, osjarw, Ostaf, othymer, OttoMaticode, Owai-Seek, packmore, paige404, paigemaeforrest, pali6, Palladinium, Pangogie, panzer-iv1, partyaddict, patrikturi, PaulRitter, pavlockblaine03, peccneck, Peptide90, peptron1, perryprog, PeterFuto, PetMudstone, pewter-wiz, PGrayCS, pgraycs, Pgriha, phantom-lily, pheenty, philingham, Phill101, Phooooooooooooooooooooooooooooooosphate, phunnyguy, PicklOH, PilgrimViis, Pill-U, pinkbat5, Piras314, Pireax, Pissachu, pissdemon, Pixel8-dev, PixeltheAertistContrib, PixelTheKermit, PJB3005, Plasmaguy, plinyvic, Plykiya, poeMota, pofitlo, pointer-to-null, Pok27, poklj, PolterTzi, PoorMansDreams, PopGamer45, portfiend, potato1234x, PotentiallyTom, PotRoastPiggy, Princess-Cheeseballs, ProfanedBane, PROG-MohamedDwidar, Prole0, ProPandaBear, PrPleGoo, ps3moira, Pspritechologist, Psychpsyo, psykana, psykzz, PuceTint, pumkin69, PuroSlavKing, PursuitInAshes, Putnam3145, py01, Pyrovi, qrtDaniil, qrwas, Quantum-cross, quasr-9, quatre, QueerNB, QuietlyWhisper, qwerltaz, Radezolid, RadioMull, Radosvik, Radrark, Rainbeon, Rainfey, Raitononai, Ramlik, RamZ, randy10122, Rane, Ranger6012, Rapidgame7, ravage123321, rbertoche, RedBookcase, Redfire1331, Redict, RedlineTriad, redmushie, RednoWCirabrab, redspyy, ReeZer2, RemberBM, RemieRichards, RemTim, rene-descartes2021, Renlou, retequizzle, rewafflution, rhailrake, rhsvenson, rich-dunne, RieBi, riggleprime, RIKELOLDABOSS, rinary1, Rinkashikachi, riolume, rlebell33, RobbyTheFish, robinthedragon, Rockdtben, Rohesie, rok-povsic, rokudara-sen, rolfero, RomanNovo, rosieposieeee, Roudenn, router, ruddygreat, rumaks, RumiTiger, Ruzihm, rwrv, S1rFl0, S1ss3l, Saakra, Sadie-silly, saga3152, saintmuntzer, Salex08, sam, samgithubaccount, Samuka-C, SaphireLattice, SapphicOverload, sarahon, sativaleanne, SaveliyM360, sBasalto, ScalyChimp, ScarKy0, ScholarNZL, schrodinger71, scrato, Scribbles0, scrivoy, scruq445, scuffedjays, ScumbagDog, SeamLesss, Segonist, semensponge, sephtasm, ser1-1y, Serkket, sewerpig, SG6732, sh18rw, Shaddap1, ShadeAware, ShadowCommander, shadowtheprotogen546, shaeone, shampunj, shariathotpatrol, SharkSnake98, shibechef, Siginanto, signalsender, SignalWalker, siigiil, silicon14wastaken, Silverfur-underscore, Simyon264, sirdragooon, Sirionaut, SirWarock, Sk1tch, SkaldetSkaeg, Skarletto, skeeka-dev, Skybailey-dev, skye, Skyedra, SlamBamActionman, slarticodefast, Slava0135, sleepyyapril, slimmslamm, Slyfox333, Smugman, SnappingOpossum, snebl, snicket, sniperchance, Snowni, snowsignal, SolidSyn, SolidusSnek, solstar2, SonicHDC, SoulFN, SoulSloth, Soundwavesghost, soupkilove, southbridge-fur, sowelipililimute, Soydium, SpaceLizard24, SpaceLizardSky, SpaceManiac, SpaceRox1244, SpaceyLady, Spangs04, spanky-spanky, Sparlight, spartak, SpartanKadence, spderman3333, SpeltIncorrectyl, Spessmann, SphiraI, SplinterGP, spoogemonster, sporekto, sporkyz, ssdaniel24, stalengd, stanberytrask, Stanislav4ix, StanTheCarpenter, starbuckss14, Stealthbomber16, Steffo99, stellar-novas, stewie523, stomf, Stop-Signs, stopbreaking, stopka-html, StrawberryMoses, Stray-Pyramid, strO0pwafel, Strol20, StStevens, Subversionary, sunbear-dev, SuperGDPWYL, superjj18, Supernorn, SurrealShibe, SweetAplle, SweptWasTaken, SyaoranFox, Sybil, SYNCHRONIC, Szunti, t, Tainakov, takemysoult, taonewt, tap, TaralGit, Taran, taurie, Tayrtahn, tday93, teamaki, TeenSarlacc, TekuNut, telavivgamers, telyonok, temm1ie, TemporalOroboros, tentekal, terezi4real, Terraspark4941, texcruize, Tezzaide, TGODiamond, TGRCdev, tgrkzus, thanosdegraf, ThatGuyUSA, ThatOneGoblin25, thatrandomcanadianguy, TheArturZh, TheBlueYowie, thecopbennet, TheCze, TheDarkElites, thedraccx, TheEmber, theexetron, TheFlyingSentry, TheGrimbeeper, TheIntoxicatedCat, thekilk, themias, theomund, TheProNoob678, TherapyGoth, ThereDrD0, TheSecondLord, TheShuEd, thetolbean, thevinter, TheWaffleJesus, thinbug0, ThunderBear2006, timothyteakettle, TimrodDX, timurjavid, tin-man-tim, TiniestShark, Titian3, tk-a369, tkdrg, tmtmtl30, ToastEnjoyer, Toby222, TokenStyle, Tollhouse, Toly65, tom-leys, tomasalves8, Tomeno, Tonydatguy, topy, tornado-technology, TornadoTechnology, tosatur, TotallyLemon, ToxicSonicFan04, Tr1bute, travis-g-reid, treytipton, trixxedbit, TrixxedHeart, tropicalhibi, truepaintgit, Truoizys, Tryded, TsjipTsjip, tuchila-adi-bogdan, Tunguso4ka, TurboTrackerss14, tyashley, Tyler-IN, TytosB, Tyzemol, UbaserB, Uberration, ubis1, UBlueberry, uhbg, UKNOWH, UltimateJester, Unbelievable-Salmon, underscorex5, UnicornOnLSD, Unisol, Unkn0wnGh0st333, unusualcrow, Uriende, UristMcDorf, user424242420, Utmanarn, Vaaankas, valentfingerov, valquaint, Varen, Vasilis, VasilisThePikachu, veliebm, Velken, VelonacepsCalyxEggs, veprolet, VerinSenpai, veritable-calamity, Veritius, Vermidia, vero5123, verslebas, vexerot, vgskye, viceemargo, VigersRay, violet754, Visne, vitopigno, vitusveit, vlad, vlados1408, VMSolidus, vmzd, VoidMeticulous, voidnull000, volotomite, volundr-, Voomra, Vordenburg, vorkathbruh, Vortebo, vulppine, wachte1, wafehling, walksanatora, Warentan, WarMechanic, Watermelon914, weaversam8, wertanchik, whateverusername0, whatston3, widgetbeck, Will-Oliver-Br, Willhelm53, WilliamECrew, willicassi, Winkarst-cpu, wirdal, wixoaGit, WlarusFromDaSpace, Wolfkey-SomeoneElseTookMyUsername, Worldwaker, wrexbe, wtcwr68, xeri7, xkreksx, xprospero, xRiriq, xsainteer, YanehCheck, yathxyz, Ygg01, YotaXP, youarereadingthis, YoungThugSS14, Yousifb26, youtissoum, yunii, yuriykiss, YuriyKiss, zach-hill, Zadeon, Zalycon, zamp, Zandario, Zap527, Zealith-Gamer, ZelteHonor, zero, ZeroDiamond, ZeWaka, zHonys, zionnBE, ZNixian, Zokkie, ZoldorfTheWizard, zonespace27, Zylofan, Zymem, zzylex
+0leshe, 0tito, 0x6273, 12rabbits, 1337dakota, 13spacemen, 154942, 2013HORSEMEATSCANDAL, 20kdc, 21Melkuu, 27alaing, 2DSiggy, 3nderall, 4310v343k, 4dplanner, 5tickman, 612git, 778b, 96flo, aaron, abadaba695, Ablankmann, abregado, Absolute-Potato, Absotively, achookh, Acruid, ActiveMammmoth, actually-reb, ada-please, adamsong, Adeinitas, adm2play, Admiral-Obvious-001, adrian, Adrian16199, Ady4ik, Aearo-Deepwater, Aerocrux, Aeshus, Aexolott, Aexxie, africalimedrop, afrokada, AftrLite, AgentSmithRadio, Agoichi, ahandleman, Ahion, aiden, Aidenkrz, aidenkrz, Aisu9, ajcm, AJCM-git, AjexRose, Alekshhh, alexalexmax, alexkar598, AlexMorgan3817, alexum418, alexumandxgabriel08x, Alice4267, Alithsko, Alkheemist, alliephante, ALMv1, Alpaccalypse, Alpha-Two, AlphaQwerty, Altoids1, amatwiedle, amylizzle, ancientpower, Andre19926, Andrew-Fall, AndrewEyeke, AndrewFenriz, AndreyCamper, anri, Anzarot121, ApolloVector, Appiah, april-gras, ar4ill, Arcane-Waffle, archee1, ArchPigeon, ArchRBX, areitpog, Arendian, areyouconfused, arimah, Arkanic, ArkiveDev, armoks, Arteben, ArthurMousatov, ArtisticRoomba, artur, Artxmisery, ArZarLordOfMango, as334, AshBats, AsikKEsel, AsnDen, asperger-sind, aspiringLich, astriloqua, Atakku, august-sun, AutoOtter, AverageNotDoingAnythingEnjoyer, avghdev, AwareFoxy, Awlod, azzyisnothere, AzzyIsNotHere, B-Kirill, B3CKDOOR, baa14453, BackeTako, BadaBoomie, Bakke, BananaFlambe, Baptr0b0t, BarryNorfolk, BasedUser, bebr3ght, beck-thompson, beesterman, bellwetherlogic, ben, benbryant0, benev0, benjamin-burges, BGare, bhespiritu, bibbly, BigfootBravo, BIGZi0348, bingojohnson, BismarckShuffle, Bixkitts, Blackern5000, Blazeror, blitzthesquishy, Blobadoodle, bloodrizer, Bloody2372, blueDev2, Boaz1111, BobdaBiscuit, BobTheSleder, boiled-water-tsar, Bokser815, bolantej, Booblesnoot42, Boolean-Buckeye, botanySupremist, brainfood1183, BramvanZijp, Brandon-Huu, breeplayx3, BriBrooo, BRINGit34, brndd, bryce0110, BubblegumBlue, buletsponge, buntobaggins, buunie099, bvelliquette, BWTCK, byondfuckery, c0rigin, c4llv07e, CaasGit, Caconym27, Calecute, Callmore, Camdot, cammusubi, capnsockless, CaptainMaru, captainsqrbeard, Carbonhell, Carolyn3114, Carou02, carteblanche4me, catdotjs, catlord, Catofquestionableethics, CatTheSystem, CawsForConcern, CDWimmer, Centronias, Chaboricks, chairbender, Chaoticaa, Charlese2, charlie, chartman, ChaseFlorom, chavonadelal, Cheackraze, CheddaCheez, cheesePizza2, CheesePlated, Chief-Engineer, chillyconmor, christhirtle, chromiumboy, Chronophylos, Chubbicous, Chubbygummibear, Ciac32, ciaran, citrea, civilCornball, claustro305, Clement-O, cloudyias, clyf, Clyybber, CMDR-Piboy314, cnv41, coco, cohanna, Cohnway, Cojoke-dot, ColdAutumnRain, Colin-Tel, collinlunn, ComicIronic, Compilatron144, CookieMasterT, coolboy911, CoolioDudio, coolmankid12345, Coolsurf6, cooperwallace, corentt, CormosLemming, CrafterKolyan, CraftyRenter, crazybrain23, Crazydave91920, creadth, CrigCrag, CroilBird, Crotalus, CrudeWax, cryals, CrzyPotato, cubixthree, cutemoongod, Cyberboss, d34d10cc, DadeKuma, Daemon, daerSeebaer, dahnte, dakamakat, DamianX, dan, dangerrevolution, daniel-cr, DanSAussieITS, Daracke, Darkenson, david, DawBla, Daxxi3, dch-GH, ddeegan, de0rix, Deahaka, dean, DEATHB4DEFEAT, Deatherd, deathride58, DebugOk, Decappi, Decortex, Deeeeja, deepdarkdepths, DeepwaterCreations, Deerstop, degradka, Delete69, deltanedas, DenisShvalov, DerbyX, derek, dersheppard, Deserty0, Detintinto, DevilishMilk, devinschubert14, dexlerxd, dffdff2423, DieselMohawk, DieselMohawkTheSequel, digitalic, Dimastra, DinnerCalzone, DinoWattz, Disp-Dev, DisposableCrewmember42, dissidentbullet, DjfjdfofdjfjD, doc-michael, docnite, Doctor-Cpu, DogZeroX, dolgovmi, dontbetank, Doomsdrayk, Doru991, DoubleRiceEddiedd, DoutorWhite, DR-DOCTOR-EVIL-EVIL, Dragonjspider, dragonryan06, drakewill-CRL, Drayff, dreamlyjack, DrEnzyme, dribblydrone, DrMelon, drongood12, DrSingh, DrSmugleaf, drteaspoon420, DTanxxx, DubiousDoggo, DuckManZach, Duddino, dukevanity, duskyjay, Dutch-VanDerLinde, dvir001, dylanstrategie, dylanwhittingham, Dynexust, Easypoller, echo, EchoOfNothing, eclips_e, eden077, EEASAS, Efruit, efzapa, Ekkosangen, ElectroSR, elsie, elthundercloud, Elysium206, emberwinters, Emisse, emmafornash, EmoGarbage404, Endecc, EnrichedCaramel, Entvari, eoineoineoin, ephememory, eris, erohrs2, erorr404v1, Errant-4, ertanic, esguard, estacaoespacialpirata, eugene, ewokswagger, exincore, exp111, f0x-n3rd, F1restar4, FacePluslll, Fahasor, FairlySadPanda, farrellka-dev, FATFSAAM2, Feluk6174, ficcialfaint, Fiftyllama, Fildrance, fillervk, FinnishPaladin, firenamefn, Firewars763, FirinMaLazors, Fishfish458, fl-oz, Flareguy, flashgnash, FlipBrooke, FluffiestFloof, FluffMe, FluidRock, flymo5678, foboscheshir, FoLoKe, fooberticus, ForestNoises, forgotmyotheraccount, forkeyboards, forthbridge, Fortune117, foxhorn, freeman2651, freeze2222, frobnic8, Froffy025, Fromoriss, froozigiusz, FrostMando, FrostRibbon, Fruitsalad, Funce, FungiFellow, FunkySphere, FunTust, Futuristic-OK, GalacticChimp, gamer3107, Gamewar360, gansulalan, GaussiArson, Gaxeer, gbasood, gcoremans, Geekyhobo, genderGeometries, GeneralGaws, Genkail, Gentleman-Bird, geraeumig, Ghagliiarghii, Git-Nivrak, githubuser508, GitHubUser53123, gituhabu, GlassEclipse, GnarpGnarp, GNF54, godisdeadLOL, goet, GoldenCan, Goldminermac, Golinth, golubgik, GoodWheatley, Gorox221, GR1231, gradientvera, graevy, GraniteSidewalk, GreaseMonk, greenrock64, GreyMario, GrownSamoyedDog, GTRsound, gusxyz, Gyrandola, h3half, hamurlik, Hanzdegloker, HappyRoach, happyrobot33, Hardly3D, harikattar, Hayden, he1acdvv, Hebi, Helix-ctrl, helm4142, Henry, HerCoyote23, Hi-Im-Shot, HighTechPuddle, Hitlinemoss, hiucko, hivehum, Hmeister-fake, Hmeister-real, Hobbitmax, hobnob, HoidC, Holinka4ever, holyssss, HoofedEar, Hoolny, hord-brayden, hoshizora-sayo, Hreno, Hrosts, htmlsystem, Huaqas, hubismal, Hugal31, Hyenh, hyperb1, hyperDelegate, hyphenationc, i-justuser-i, iaada, iacore, IamVelcroboy, Ian321, icekot8, icesickleone, iczero, iglov, IgorAnt028, igorsaux, ike709, illersaver, Illiux, Ilushkins33, Ilya246, IlyaElDunaev, imatsoup, IMCB, impubbi, imrenq, imweax, indeano, Injazz, Insineer, insoPL, IntegerTempest, Interrobang01, Intoxicating-Innocence, IProduceWidgets, itsmethom, Itzbenz, iztokbajcar, Jackal298, Jackrost, JackRyd3r, jacksonzck, JackspajfMain, Jacktastic09, Jackw2As, jacob, jamessimo, janekvap-havok, Jark255, Jarmer123, Jaskanbe, JasperJRoth, jbox144, JCGWE30, jerryimmouse, JerryImMouse, Jessetriesagain, jessicamaybe, JesterX666, Jewelots, Jezithyr, jicksaw, JiimBob, JimGamemaster, jimmy12or, JIPDawg, jjtParadox, jkwookee, jmcb, JohnGinnane, johnjjohn, johnku1, Jophire, Jopogrechkin, joshepvodka, JpegOfAFrog, jproads, JrInventor05, Jrpl, jukereise, juliangiebel, JustArt1m, JustCone14, justdie12, justin, justintether, JustinTrotter, JustinWinningham, justtne, K-Dynamic, k3yw, Kadeo64, Kaga-404, kaiserbirch, KaiShibaa, kalane15, kalanosh, KamTheSythe, Kanashi-Panda, katzenminer, kbailey-git, Keelin, Keer-Sar, KEEYNy, keikiru, Kelrak, kerisargit, keronshb, KIBORG04, KieueCaprie, Kimpes, kin98, KingFroozy, kira-er, kiri-yoshikage, Kirillcas, Kirus59, Kistras, Kit, Kit0vras, KittenColony, Kittygyat, klaypexx, kleinerstation13, Kmc2000, Ko4ergaPunk, kognise, kokoc9n, komunre, KonstantinAngelov, kontakt, korczoczek, kosticia, koteq, kotobdev, Kowlin, KrasnoshchekovPavel, Krosus777, Krunklehorn, Kryyto, Kupie, kxvvv, Kyoth25f, kyupolaris, kzhanik, LaCumbiaDelCoronavirus, lajolico, Lamrr, lanedon, LankLTE, laok233, lapatison, larryrussian, lawdog4817, Lazzi0706, leah, leander-0, leonardo-dabepis, leonidussaks, leonsfriedrich, LeoSantich, LetterN, lettern, Level10Cybermancer, LEVELcat, lever1209, LevitatingTree, Lgibb18, lgruthes, LightVillet, lilazero, liltenhead, linkbro1, linkuyx, Litraxx, little-meow-meow, LittleBuilderJane, LittleNorthStar, LittleNyanCat, lizelive, ljm862, lmsnoise, localcc, lokachop, lolman360, Lomcastar, Lordbrandon12, LordCarve, LordEclipse, lucas, LucasTheDrgn, luckyshotpictures, LudwigVonChesterfield, luegamer, luizwritescode, LukaSlade, Lukasz825700516, luminight, lunarcomets, Lusatia, Luxeator, lvvova1, Lyndomen, lyroth001, lzimann, lzk228, M1tht1c, M3739, M4rchy-S, M87S, mac6na6na, MACMAN2003, Macoron, magicalus, magmodius, magnuscrowe, maland1, malchanceux, MaloTV, ManelNavola, manelnavola, Mangohydra, marboww, Markek1, MarkerWicker, marlyn, matt, Matz05, max, MaxNox7, maylokana, MDuch369, meara1179, meganerobot, MehimoNemo, Mehnix, MeltedPixel, memeproof, MendaxxDev, Menshin, Mephisto72, MerrytheManokit, Mervill, metalgearsloth, MetalSage, MFMessage, mhamsterr, michaelcu, micheel665, mifia, MilenVolf, MilonPL, Minemoder5000, Minty642, minus1over12, Mirino97, mirrorcult, misandrie, MishaUnity, MissKay1994, MisterImp, MisterMecky, Mith-randalf, Mixelz, mjarduk, MjrLandWhale, mkanke-real, MLGTASTICa, mnva0, moderatelyaware, modern-nm, mokiros, momo, Moneyl, monotheonist, Moomoobeef, moony, Morb0, MossyGreySlope, mqole, mr-bo-jangles, Mr0maks, MrFippik, MrPersival, mrrobdemo, mtrs163, muburu, MureixloI, murolem, murphyneko, musicmanvr, MWKane, Myakot, Myctai, N3X15, nabegator, nails-n-tape, Nairodian, Naive817, NakataRin, namespace-Memory, Nannek, NazrinNya, neborsh, neutrino-laser, NickPowers43, nikitosych, nikthechampiongr, Nimfar11, ninruB, Nirnael, NIXC, nkokic, NkoKirkto, nmajask, noctyrnal, noelkathegod, noirogen, nok-ko, NonchalantNoob, NoobyLegion, Nopey, NoreUhh, not-gavnaed, notafet, notquitehadouken, notsodana, noudoit, noverd, Nox38, NuclearWinter, Nuggets219, nukashimika, nuke-haus, NULL882, nullarmo, nyeogmi, Nylux, Nyranu, Nyxilath, och-och, OctoRocket, OldDanceJacket, OliverOtter, onesch, OneZerooo0, OnsenCapy, OnyxTheBrave, opl-, Orange-Winds, OrangeMoronage9622, OrbitSystem07, Orsoniks, osjarw, Ostaf, othymer, OttoMaticode, Owai-Seek, packmore, paige404, paigemaeforrest, pali6, Palladinium, Pangogie, panzer-iv1, partyaddict, patrikturi, PaulRitter, pavlockblaine03, peccneck, Peptide90, peptron1, perryprog, PeterFuto, PetMudstone, pewter-wiz, PGrayCS, pgraycs, Pgriha, phantom-lily, pheenty, philingham, Phill101, Phooooooooooooooooooooooooooooooosphate, phunnyguy, PicklOH, PilgrimViis, Pill-U, pinkbat5, Piras314, Pireax, Pissachu, pissdemon, Pixel8-dev, PixeltheAertistContrib, PixelTheKermit, PJB3005, Plasmaguy, plinyvic, Plykiya, poeMota, pofitlo, pointer-to-null, Pok27, poklj, PolterTzi, PoorMansDreams, PopGamer45, portfiend, potato1234x, PotentiallyTom, PotRoastPiggy, Princess-Cheeseballs, ProfanedBane, PROG-MohamedDwidar, Prole0, ProPandaBear, PrPleGoo, ps3moira, Pspritechologist, Psychpsyo, psykana, psykzz, PuceTint, pumkin69, PuroSlavKing, PursuitInAshes, Putnam3145, py01, Pyrovi, qrtDaniil, qrwas, Quantum-cross, quasr-9, quatre, QueerNB, QuietlyWhisper, qwerltaz, Radezolid, RadioMull, Radosvik, Radrark, Rainbeon, Rainfey, Raitononai, Ramlik, RamZ, randy10122, Rane, Ranger6012, Rapidgame7, ravage123321, rbertoche, RedBookcase, Redfire1331, Redict, RedlineTriad, redmushie, RednoWCirabrab, redspyy, ReeZer2, RemberBM, RemieRichards, RemTim, rene-descartes2021, Renlou, retequizzle, rewafflution, rhailrake, rhsvenson, rich-dunne, RieBi, riggleprime, RIKELOLDABOSS, rinary1, Rinkashikachi, riolume, rlebell33, RobbyTheFish, robinthedragon, Rockdtben, Rohesie, rok-povsic, rokudara-sen, rolfero, RomanNovo, rosieposieeee, Roudenn, router, ruddygreat, rumaks, RumiTiger, Ruzihm, rwrv, S1rFl0, S1ss3l, Saakra, Sadie-silly, saga3152, saintmuntzer, Salex08, sam, samgithubaccount, Samuka-C, SaphireLattice, SapphicOverload, sarahon, sativaleanne, SaveliyM360, sBasalto, ScalyChimp, ScarKy0, ScholarNZL, schrodinger71, scrato, Scribbles0, scrivoy, scruq445, scuffedjays, ScumbagDog, SeamLesss, Segonist, semensponge, sephtasm, ser1-1y, Serkket, sewerpig, SG6732, sh18rw, Shaddap1, ShadeAware, ShadowCommander, shadowtheprotogen546, shaeone, shampunj, shariathotpatrol, SharkSnake98, shibechef, Siginanto, signalsender, SignalWalker, siigiil, silicon14wastaken, Silverfur-underscore, Simyon264, sirdragooon, Sirionaut, SirWarock, Sk1tch, SkaldetSkaeg, Skarletto, skeeka-dev, Skybailey-dev, skye, Skyedra, SlamBamActionman, slarticodefast, Slava0135, sleepyyapril, slimmslamm, Slyfox333, Smugman, SnappingOpossum, snebl, snicket, sniperchance, Snowni, snowsignal, SolidSyn, SolidusSnek, solstar2, SonarZeBat, SonicHDC, SoulFN, SoulSloth, Soundwavesghost, soupkilove, southbridge-fur, sowelipililimute, Soydium, SpaceLizard24, SpaceLizardSky, SpaceManiac, SpaceRox1244, SpaceyLady, Spangs04, spanky-spanky, Sparlight, spartak, SpartanKadence, spderman3333, SpeltIncorrectyl, Spessmann, SphiraI, SplinterGP, spoogemonster, sporekto, sporkyz, ssdaniel24, stalengd, stanberytrask, Stanislav4ix, StanTheCarpenter, starbuckss14, Stealthbomber16, Steffo99, stellar-novas, stewie523, stomf, Stop-Signs, stopbreaking, stopka-html, StrawberryMoses, Stray-Pyramid, strO0pwafel, Strol20, StStevens, Subversionary, sunbear-dev, SuperGDPWYL, superjj18, Supernorn, SurrealShibe, SweetAplle, SweptWasTaken, SyaoranFox, Sybil, SYNCHRONIC, Szunti, t, Tainakov, takemysoult, taonewt, tap, TaralGit, Taran, taurie, Tayrtahn, tday93, teamaki, TeenSarlacc, TekuNut, telavivgamers, telyonok, temm1ie, TemporalOroboros, tentekal, terezi4real, Terraspark4941, texcruize, Tezzaide, TGODiamond, TGRCdev, tgrkzus, thanosdegraf, ThatGuyUSA, ThatOneGoblin25, thatrandomcanadianguy, TheArturZh, TheBlueYowie, thecopbennet, TheCze, TheDarkElites, thedraccx, TheEmber, theexetron, TheFlyingSentry, TheGrimbeeper, TheIntoxicatedCat, thekilk, themias, theomund, TheProNoob678, TherapyGoth, ThereDrD0, TheSecondLord, TheShuEd, thetolbean, thevinter, TheWaffleJesus, thinbug0, ThunderBear2006, timothyteakettle, TimrodDX, timurjavid, tin-man-tim, TiniestShark, Titian3, tk-a369, tkdrg, tmtmtl30, ToastEnjoyer, Toby222, TokenStyle, Tollhouse, Toly65, tom-leys, tomasalves8, Tomeno, Tonydatguy, topy, tornado-technology, TornadoTechnology, tosatur, TotallyLemon, ToxicSonicFan04, Tr1bute, travis-g-reid, treytipton, trixxedbit, TrixxedHeart, tropicalhibi, truepaintgit, Truoizys, Tryded, TsjipTsjip, tuchila-adi-bogdan, Tunguso4ka, TurboTrackerss14, TVK-04, tyashley, Tyler-IN, TytosB, Tyzemol, UbaserB, Uberration, ubis1, UBlueberry, uhbg, UKNOWH, UltimateJester, Unbelievable-Salmon, underscorex5, UnicornOnLSD, Unisol, Unkn0wnGh0st333, unusualcrow, Uriende, UristMcDorf, user424242420, Utmanarn, Vaaankas, valentfingerov, valquaint, Varen, Vasilis, VasilisThePikachu, veliebm, Velken, VelonacepsCalyxEggs, veprolet, VerinSenpai, veritable-calamity, Veritius, Vermidia, vero5123, verslebas, vexerot, vgskye, viceemargo, VigersRay, violet754, Visne, vitopigno, vitusveit, vlad, vlados1408, VMSolidus, vmzd, VoidMeticulous, voidnull000, volotomite, volundr-, Voomra, Vordenburg, vorkathbruh, Vortebo, vulppine, wachte1, wafehling, walksanatora, Warentan, WarMechanic, Watermelon914, weaversam8, wertanchik, whateverusername0, whatston3, widgetbeck, Will-Oliver-Br, Willhelm53, WilliamECrew, willicassi, Winkarst-cpu, wirdal, wixoaGit, WlarusFromDaSpace, Wolfkey-SomeoneElseTookMyUsername, Worldwaker, wrexbe, wtcwr68, xeri7, xkreksx, xprospero, xRiriq, xsainteer, YanehCheck, yathxyz, Ygg01, YotaXP, youarereadingthis, YoungThugSS14, Yousifb26, youtissoum, yunii, YuriyKiss, yuriykiss, zach-hill, Zadeon, Zalycon, zamp, Zandario, Zap527, Zealith-Gamer, ZelteHonor, zero, ZeroDiamond, ZeWaka, zHonys, zionnBE, ZNixian, Zokkie, ZoldorfTheWizard, zonespace27, Zylofan, Zymem, zzylex

From 01e583f500fd9d35f9df5a7b2a2a037169eafd92 Mon Sep 17 00:00:00 2001
From: B_Kirill <153602297+B-Kirill@users.noreply.github.com>
Date: Sun, 28 Dec 2025 10:57:02 +1000
Subject: [PATCH 088/134] Fix broken vending machine UI behavior (#42110)

* Fix broken vending machine UI behavior

* begone

---------

Co-authored-by: beck-thompson <beck314159@hotmail.com>
---
 .../VendingMachines/VendingMachineSystem.cs   | 17 -----------------
 .../SharedVendingMachineSystem.cs             | 19 +++++++++++++++++++
 2 files changed, 19 insertions(+), 17 deletions(-)

diff --git a/Content.Server/VendingMachines/VendingMachineSystem.cs b/Content.Server/VendingMachines/VendingMachineSystem.cs
index 1fb695ae61..1c28378393 100644
--- a/Content.Server/VendingMachines/VendingMachineSystem.cs
+++ b/Content.Server/VendingMachines/VendingMachineSystem.cs
@@ -6,11 +6,9 @@ using Content.Server.Vocalization.Systems;
 using Content.Shared.Cargo;
 using Content.Shared.Damage;
 using Content.Shared.Damage.Systems;
-using Content.Shared.Destructible;
 using Content.Shared.Emp;
 using Content.Shared.Power;
 using Content.Shared.Throwing;
-using Content.Shared.UserInterface;
 using Content.Shared.VendingMachines;
 using Content.Shared.Wall;
 using Robust.Shared.Prototypes;
@@ -31,12 +29,10 @@ namespace Content.Server.VendingMachines
             base.Initialize();
 
             SubscribeLocalEvent<VendingMachineComponent, PowerChangedEvent>(OnPowerChanged);
-            SubscribeLocalEvent<VendingMachineComponent, BreakageEventArgs>(OnBreak);
             SubscribeLocalEvent<VendingMachineComponent, DamageChangedEvent>(OnDamageChanged);
             SubscribeLocalEvent<VendingMachineComponent, PriceCalculationEvent>(OnVendingPrice);
             SubscribeLocalEvent<VendingMachineComponent, TryVocalizeEvent>(OnTryVocalize);
 
-            SubscribeLocalEvent<VendingMachineComponent, ActivatableUIOpenAttemptEvent>(OnActivatableUIOpenAttempt);
             SubscribeLocalEvent<VendingMachineComponent, VendingMachineSelfDispenseEvent>(OnSelfDispense);
 
             SubscribeLocalEvent<VendingMachineRestockComponent, PriceCalculationEvent>(OnPriceCalculation);
@@ -70,24 +66,11 @@ namespace Content.Server.VendingMachines
             }
         }
 
-        private void OnActivatableUIOpenAttempt(EntityUid uid, VendingMachineComponent component, ActivatableUIOpenAttemptEvent args)
-        {
-            if (component.Broken)
-                args.Cancel();
-        }
-
         private void OnPowerChanged(EntityUid uid, VendingMachineComponent component, ref PowerChangedEvent args)
         {
             TryUpdateVisualState((uid, component));
         }
 
-        private void OnBreak(EntityUid uid, VendingMachineComponent vendComponent, BreakageEventArgs eventArgs)
-        {
-            vendComponent.Broken = true;
-            Dirty(uid, vendComponent);
-            TryUpdateVisualState((uid, vendComponent));
-        }
-
         private void OnDamageChanged(EntityUid uid, VendingMachineComponent component, DamageChangedEvent args)
         {
             if (!args.DamageIncreased && component.Broken)
diff --git a/Content.Shared/VendingMachines/SharedVendingMachineSystem.cs b/Content.Shared/VendingMachines/SharedVendingMachineSystem.cs
index 610f4d0efe..9dafb17e3c 100644
--- a/Content.Shared/VendingMachines/SharedVendingMachineSystem.cs
+++ b/Content.Shared/VendingMachines/SharedVendingMachineSystem.cs
@@ -3,6 +3,7 @@ using Content.Shared.Access.Components;
 using Content.Shared.Access.Systems;
 using Content.Shared.Advertise.Components;
 using Content.Shared.Advertise.Systems;
+using Content.Shared.Destructible;
 using Content.Shared.DoAfter;
 using Content.Shared.Emag.Components;
 using Content.Shared.Emag.Systems;
@@ -10,6 +11,7 @@ using Content.Shared.Emp;
 using Content.Shared.Interaction;
 using Content.Shared.Popups;
 using Content.Shared.Power.EntitySystems;
+using Content.Shared.UserInterface;
 using Robust.Shared.Audio;
 using Robust.Shared.Audio.Systems;
 using Robust.Shared.GameStates;
@@ -43,6 +45,8 @@ public abstract partial class SharedVendingMachineSystem : EntitySystem
         SubscribeLocalEvent<VendingMachineComponent, GotEmaggedEvent>(OnEmagged);
         SubscribeLocalEvent<VendingMachineComponent, EmpPulseEvent>(OnEmpPulse);
         SubscribeLocalEvent<VendingMachineComponent, RestockDoAfterEvent>(OnRestockDoAfter);
+        SubscribeLocalEvent<VendingMachineComponent, ActivatableUIOpenAttemptEvent>(OnActivatableUIOpenAttempt);
+        SubscribeLocalEvent<VendingMachineComponent, BreakageEventArgs>(OnBreak);
 
         SubscribeLocalEvent<VendingMachineRestockComponent, AfterInteractEvent>(OnAfterInteract);
 
@@ -425,4 +429,19 @@ public abstract partial class SharedVendingMachineSystem : EntitySystem
             }
         }
     }
+
+    private void OnActivatableUIOpenAttempt(EntityUid uid, VendingMachineComponent component, ActivatableUIOpenAttemptEvent args)
+    {
+        if (component.Broken)
+            args.Cancel();
+    }
+
+    private void OnBreak(EntityUid uid, VendingMachineComponent vendComponent, BreakageEventArgs eventArgs)
+    {
+        vendComponent.Broken = true;
+        Dirty(uid, vendComponent);
+        TryUpdateVisualState((uid, vendComponent));
+
+        UISystem.CloseUi(uid, VendingMachineUiKey.Key);
+    }
 }

From e8dab47f8971bb157cae56b1e9a46d87d65b1b90 Mon Sep 17 00:00:00 2001
From: PJBot <pieterjan.briers+bot@gmail.com>
Date: Sun, 28 Dec 2025 01:11:46 +0000
Subject: [PATCH 089/134] 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 3ab2f540e9..875a4e7b08 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -1,13 +1,4 @@
 Entries:
-- author: Kittygyat
-  changes:
-  - message: Made baseball bats 1x4 instead of 2x2
-    type: Tweak
-  - message: New baseball bat inventory icon sprites
-    type: Add
-  id: 8836
-  time: '2025-08-07T03:03:11.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/38392
 - author: lolman360
   changes:
   - message: Fixed certain items (like pickaxes) failing to insert into containers
@@ -3946,3 +3937,10 @@
   id: 9336
   time: '2025-12-27T14:32:07.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/42104
+- author: B_Kirill
+  changes:
+  - message: Broken vending machines now properly block and close their UI.
+    type: Fix
+  id: 9337
+  time: '2025-12-28T01:10:36.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/42110

From 45fa4114853435d851c8639bafeebd375bcc2390 Mon Sep 17 00:00:00 2001
From: SnappingOpossum <snappingopossum@outlook.com>
Date: Sun, 28 Dec 2025 17:23:46 +1100
Subject: [PATCH 090/134] Add crayon box to Big Bite meals (#42077)

Shuffle things, use table for big bite
---
 .../Consumable/Food/Containers/box.yml        | 36 ++++---------------
 1 file changed, 7 insertions(+), 29 deletions(-)

diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/box.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/box.yml
index 7523022278..58099b2848 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/box.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/box.yml
@@ -617,8 +617,6 @@
     containers:
       storagebase: !type:AllSelector
         children:
-        - !type:NestedSelector # First since it can spawn a 3x3
-          tableId: HappyHonkToySafeEntityTable
         - id: FoodBurgerCheese
         - !type:GroupSelector
           children:
@@ -626,6 +624,8 @@
           - id: DrinkLemonLimeCan
           - id: DrinkLemonLimeCranberryCan
           - id: DrinkIcedTeaCan
+        - !type:NestedSelector
+          tableId: HappyHonkToySafeEntityTable
 
 - type: entity
   id: FoodMealHappyHonkBigBite
@@ -638,33 +638,11 @@
       storagebase: !type:AllSelector
         children:
         - id: FoodBurgerBig
-        - id: FoodMealFriesCheesy
         - id: DrinkColaBottleFull
+        - !type:NestedSelector
+          tableId: HappyHonkToySafeEntityTable
+        - id: FoodMealFriesCheesy
         - id: FoodPieAppleSlice
-        - !type:GroupSelector # One item is too big, so the HappyHonkToySafeEntityTable can't  be used like the others.
-          children:
-          - id: ToyMouse
-          - id: ToyAi
-          - id: ToyNuke
-          - id: ToyFigurinePassenger
-          - id: ToyFigurineGriffin
-          - id: ToyIan
-          - id: ToyFigurineOwlman
-          - id: ToyFigurineSkeleton
-          - id: FoamBlade
-          - id: ClothingHeadHatBunny
-          - id: PersonalAI
-          #- id: CrayonBox
-          - id: ToySword
-          - id: RevolverCapGun
-          - id: ToyRubberDuck
-          - id: BikeHorn
-            weight: 0.5
-          - id: GoldenBikeHorn
-            weight: 0.1
-          - !type:NestedSelector
-            tableId: AllFigurineMechsTable
-            weight: 6
 
 - type: entity
   parent: BoxCardboard
@@ -691,7 +669,7 @@
       storagebase:
         id: MaterialCloth10
 
-- type: entityTable
+- type: entityTable # size: 2x2
   id: HappyHonkToySafeEntityTable
   table: !type:GroupSelector
     children:
@@ -718,7 +696,7 @@
       tableId: AllFigurineMechsTable
       weight: 6
 
-- type: entityTable
+- type: entityTable # size: 1x2
   id: HappyHonkToyUnsafeEntityTable
   table: !type:GroupSelector
     children:

From 129c56544e068682a2326638a96a45a6d4d871d2 Mon Sep 17 00:00:00 2001
From: PJBot <pieterjan.briers+bot@gmail.com>
Date: Sun, 28 Dec 2025 06:37:57 +0000
Subject: [PATCH 091/134] 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 875a4e7b08..69c4e08eff 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -1,12 +1,4 @@
 Entries:
-- author: lolman360
-  changes:
-  - message: Fixed certain items (like pickaxes) failing to insert into containers
-      that have enough space to store them, sometimes.
-    type: Fix
-  id: 8837
-  time: '2025-08-07T16:01:18.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/38896
 - author: chromiumboy
   changes:
   - message: The station AI will receive chat notifications when its sentry turrets
@@ -3944,3 +3936,10 @@
   id: 9337
   time: '2025-12-28T01:10:36.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/42110
+- author: SnappingOpossum
+  changes:
+  - message: Happy Honk Big Bite may now contain crayon boxes.
+    type: Add
+  id: 9338
+  time: '2025-12-28T06:36:49.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/42077

From 645c2494ec68b71c20627dc65d69b782b4d614c3 Mon Sep 17 00:00:00 2001
From: Ilya246 <57039557+Ilya246@users.noreply.github.com>
Date: Sun, 28 Dec 2025 11:16:07 +0400
Subject: [PATCH 092/134] optimise shuttle collision entity throwing (#40984)

* optimise

* reconstruct

* fix

* very mild change

---------

Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
---
 .../Shuttles/Systems/ShuttleSystem.Impact.cs  | 49 ++++++++++++++-----
 1 file changed, 36 insertions(+), 13 deletions(-)

diff --git a/Content.Server/Shuttles/Systems/ShuttleSystem.Impact.cs b/Content.Server/Shuttles/Systems/ShuttleSystem.Impact.cs
index 6126234451..d50eea53ee 100644
--- a/Content.Server/Shuttles/Systems/ShuttleSystem.Impact.cs
+++ b/Content.Server/Shuttles/Systems/ShuttleSystem.Impact.cs
@@ -231,35 +231,58 @@ public sealed partial class ShuttleSystem
         var knockdownTime = TimeSpan.FromSeconds(5);
 
         var minsq = _minThrowVelocity * _minThrowVelocity;
-        // iterate all entities on the grid
-        // TODO: only iterate non-static entities
-        var childEnumerator = xform.ChildEnumerator;
-        while (childEnumerator.MoveNext(out var uid))
-        {
-            // don't throw static bodies
-            if (!_physicsQuery.TryGetComponent(uid, out var physics) || (physics.BodyType & BodyType.Static) != 0)
-                continue;
 
+        // iterate all dynamic entities on the grid
+        if (!TryComp<BroadphaseComponent>(gridUid, out var lookup) || !_gridQuery.TryComp(gridUid, out var gridComp))
+            return;
+
+        var gridBox = gridComp.LocalAABB;
+        List<Entity<PhysicsComponent>> list = new();
+        HashSet<EntityUid> processed = new();
+        var state = (list, processed, _physicsQuery);
+        lookup.DynamicTree.QueryAabb(ref state, GridQueryCallback, gridBox, true);
+        lookup.SundriesTree.QueryAabb(ref state, GridQueryCallback, gridBox, true);
+
+        foreach (var ent in list)
+        {
             // don't throw if buckled
-            if (_buckle.IsBuckled(uid, _buckleQuery.CompOrNull(uid)))
+            if (_buckle.IsBuckled(ent, _buckleQuery.CompOrNull(ent)))
                 continue;
 
             // don't throw them if they have magboots
-            if (movedByPressureQuery.TryComp(uid, out var moved) && !moved.Enabled)
+            if (movedByPressureQuery.TryComp(ent, out var moved) && !moved.Enabled)
                 continue;
 
             if (direction.LengthSquared() > minsq)
             {
-                _stuns.TryCrawling(uid, knockdownTime);
-                _throwing.TryThrow(uid, direction, physics, Transform(uid), _projQuery, direction.Length(), playSound: false);
+                _stuns.TryCrawling(ent.Owner, knockdownTime);
+                _throwing.TryThrow(ent, direction, ent.Comp, Transform(ent), _projQuery, direction.Length(), playSound: false);
             }
             else
             {
-                _physics.ApplyLinearImpulse(uid, direction * physics.Mass, body: physics);
+                _physics.ApplyLinearImpulse(ent, direction * ent.Comp.Mass, body: ent.Comp);
             }
         }
     }
 
+    private static bool GridQueryCallback(
+        ref (List<Entity<PhysicsComponent>> List, HashSet<EntityUid> Processed, EntityQuery<PhysicsComponent> PhysicsQuery) state,
+        in EntityUid uid)
+    {
+        if (state.Processed.Add(uid) && state.PhysicsQuery.TryComp(uid, out var body))
+            state.List.Add((uid, body));
+
+        return true;
+    }
+
+    private static bool GridQueryCallback(
+        ref (List<Entity<PhysicsComponent>> List, HashSet<EntityUid> Processed, EntityQuery<PhysicsComponent> PhysicsQuery) state,
+        in FixtureProxy proxy)
+    {
+        var owner = proxy.Entity;
+        return GridQueryCallback(ref state, in owner);
+    }
+
     /// <summary>
     /// Structure to hold impact tile processing data for batch processing
     /// </summary>

From 4cf18a222b382b3731d3c287f51825675bb2f631 Mon Sep 17 00:00:00 2001
From: PJBot <pieterjan.briers+bot@gmail.com>
Date: Sun, 28 Dec 2025 07:31:15 +0000
Subject: [PATCH 093/134] 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 69c4e08eff..584392e798 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -1,12 +1,4 @@
 Entries:
-- author: chromiumboy
-  changes:
-  - message: The station AI will receive chat notifications when its sentry turrets
-      start firing upon hostile targets.
-    type: Add
-  id: 8838
-  time: '2025-08-08T18:56:01.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/35277
 - author: K-Dynamic
   changes:
   - message: Captain and Head of Personnel starts with administration glasses and
@@ -3943,3 +3935,10 @@
   id: 9338
   time: '2025-12-28T06:36:49.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/42077
+- author: Ilya246
+  changes:
+  - message: Large grid shuttle collisions should now be somewhat less laggy.
+    type: Fix
+  id: 9339
+  time: '2025-12-28T07:30:08.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/40984

From 0dcb2756c7195681b80f861b6555b32988fa64c2 Mon Sep 17 00:00:00 2001
From: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com>
Date: Sun, 28 Dec 2025 05:35:07 -0800
Subject: [PATCH 094/134] Add `AtmosTest` test assertion for a valid grid
 (#42139)

add test assertion for a valid grid
---
 .../Tests/Atmos/AtmosTest.cs                  | 33 +++++++++++++++----
 1 file changed, 27 insertions(+), 6 deletions(-)

diff --git a/Content.IntegrationTests/Tests/Atmos/AtmosTest.cs b/Content.IntegrationTests/Tests/Atmos/AtmosTest.cs
index d50c4a200b..d3bdc91cda 100644
--- a/Content.IntegrationTests/Tests/Atmos/AtmosTest.cs
+++ b/Content.IntegrationTests/Tests/Atmos/AtmosTest.cs
@@ -20,7 +20,7 @@ public abstract class AtmosTest : InteractionTest
     protected AtmosphereSystem SAtmos = default!;
     protected EntityLookupSystem LookupSystem = default!;
 
-    protected Entity<GridAtmosphereComponent> RelevantAtmos = default!;
+    protected Entity<GridAtmosphereComponent> RelevantAtmos;
 
     /// <summary>
     /// Used in <see cref="AtmosphereSystem.RunProcessingFull"/>. Resolved during test setup.
@@ -40,14 +40,35 @@ public abstract class AtmosTest : InteractionTest
         SAtmos = SEntMan.System<AtmosphereSystem>();
         LookupSystem = SEntMan.System<EntityLookupSystem>();
 
-        RelevantAtmos = (MapData.Grid, SEntMan.GetComponent<GridAtmosphereComponent>(MapData.Grid));
+        SEntMan.TryGetComponent<GridAtmosphereComponent>(MapData.Grid, out var gridAtmosComp);
+        SEntMan.TryGetComponent<GasTileOverlayComponent>(MapData.Grid, out var overlayComp);
+        SEntMan.TryGetComponent<MapGridComponent>(MapData.Grid, out var mapGridComp);
+        var xform = SEntMan.GetComponent<TransformComponent>(MapData.Grid);
+
+        using (Assert.EnterMultipleScope())
+        {
+            Assert.That(gridAtmosComp,
+                    Is.Not.Null,
+                    "Loaded map doesn't have a GridAtmosphereComponent on its grid. " +
+                    "Did you forget to override TestMapPath with a proper atmospherics testing map?");
+            Assert.That(overlayComp,
+                Is.Not.Null,
+                "Loaded map doesn't have a GasTileOverlayComponent on its grid. " +
+                "Did you forget to override TestMapPath with a proper atmospherics testing map?");
+            Assert.That(mapGridComp,
+                Is.Not.Null,
+                "Loaded map doesn't have a MapGridComponent on its grid. " +
+                "Did you forget to override TestMapPath with a proper atmospherics testing map?");
+        }
+
+        RelevantAtmos = (MapData.Grid, gridAtmosComp);
 
         ProcessEnt = new Entity<GridAtmosphereComponent, GasTileOverlayComponent, MapGridComponent, TransformComponent>(
             MapData.Grid.Owner,
-            SEntMan.GetComponent<GridAtmosphereComponent>(MapData.Grid.Owner),
-            SEntMan.GetComponent<GasTileOverlayComponent>(MapData.Grid.Owner),
-            SEntMan.GetComponent<MapGridComponent>(MapData.Grid.Owner),
-            SEntMan.GetComponent<TransformComponent>(MapData.Grid.Owner));
+            gridAtmosComp,
+            overlayComp,
+            mapGridComp,
+            xform);
     }
 
     /// <summary>

From 077dceeb2df026f5182a5b77447d7c3b795aa476 Mon Sep 17 00:00:00 2001
From: Princess Cheeseballs
 <66055347+Princess-Cheeseballs@users.noreply.github.com>
Date: Sun, 28 Dec 2025 15:22:04 -0800
Subject: [PATCH 095/134] Delete MetabolismMovespeedModifierSystem (#42134)

* delete metabolismmovespeedmodifiersystem

* Revert "delete metabolismmovespeedmodifiersystem"

This reverts commit 19572fa0858bfb9385f4717fc77c8956bdbc56c0.

* delete metabolismmovespeedmodifiersystem and component

---------

Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
---
 .../MovespeedModifierMetabolismComponent.cs   | 22 -------
 .../MetabolismMovespeedModifierSystem.cs      | 61 -------------------
 2 files changed, 83 deletions(-)
 delete mode 100644 Content.Shared/Chemistry/Components/MovespeedModifierMetabolismComponent.cs
 delete mode 100644 Content.Shared/Chemistry/MetabolismMovespeedModifierSystem.cs

diff --git a/Content.Shared/Chemistry/Components/MovespeedModifierMetabolismComponent.cs b/Content.Shared/Chemistry/Components/MovespeedModifierMetabolismComponent.cs
deleted file mode 100644
index 62127ab533..0000000000
--- a/Content.Shared/Chemistry/Components/MovespeedModifierMetabolismComponent.cs
+++ /dev/null
@@ -1,22 +0,0 @@
-using Robust.Shared.GameStates;
-
-namespace Content.Shared.Chemistry.Components
-{
-    //TODO: refactor movement modifier component because this is a pretty poor solution
-    [RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
-    public sealed partial class MovespeedModifierMetabolismComponent : Component
-    {
-        [AutoNetworkedField, ViewVariables]
-        public float WalkSpeedModifier { get; set; }
-
-        [AutoNetworkedField, ViewVariables]
-        public float SprintSpeedModifier { get; set; }
-
-        /// <summary>
-        /// When the current modifier is expected to end.
-        /// </summary>
-        [AutoNetworkedField, ViewVariables]
-        public TimeSpan ModifierTimer { get; set; } = TimeSpan.Zero;
-    }
-}
-
diff --git a/Content.Shared/Chemistry/MetabolismMovespeedModifierSystem.cs b/Content.Shared/Chemistry/MetabolismMovespeedModifierSystem.cs
deleted file mode 100644
index 68a55dd468..0000000000
--- a/Content.Shared/Chemistry/MetabolismMovespeedModifierSystem.cs
+++ /dev/null
@@ -1,61 +0,0 @@
-using Content.Shared.Chemistry.Components;
-using Content.Shared.Movement.Systems;
-using Robust.Shared.Timing;
-
-namespace Content.Shared.Chemistry
-{
-    // TODO CONVERT THIS TO A STATUS EFFECT!!!!!!!!!!!!!!!!!!!!!!!!
-    public sealed class MetabolismMovespeedModifierSystem : EntitySystem
-    {
-        [Dependency] private readonly IGameTiming _gameTiming = default!;
-        [Dependency] private readonly MovementSpeedModifierSystem _movespeed = default!;
-
-        private readonly List<Entity<MovespeedModifierMetabolismComponent>> _components = new();
-
-        public override void Initialize()
-        {
-            base.Initialize();
-
-            UpdatesOutsidePrediction = true;
-
-            SubscribeLocalEvent<MovespeedModifierMetabolismComponent, ComponentStartup>(AddComponent);
-            SubscribeLocalEvent<MovespeedModifierMetabolismComponent, RefreshMovementSpeedModifiersEvent>(OnRefreshMovespeed);
-        }
-
-        private void OnRefreshMovespeed(EntityUid uid, MovespeedModifierMetabolismComponent component, RefreshMovementSpeedModifiersEvent args)
-        {
-            args.ModifySpeed(component.WalkSpeedModifier, component.SprintSpeedModifier);
-        }
-
-        private void AddComponent(Entity<MovespeedModifierMetabolismComponent> metabolism, ref ComponentStartup args)
-        {
-            _components.Add(metabolism);
-        }
-
-        public override void Update(float frameTime)
-        {
-            base.Update(frameTime);
-
-            var currentTime = _gameTiming.CurTime;
-
-            for (var i = _components.Count - 1; i >= 0; i--)
-            {
-                var metabolism = _components[i];
-
-                if (metabolism.Comp.Deleted)
-                {
-                    _components.RemoveAt(i);
-                    continue;
-                }
-
-                if (metabolism.Comp.ModifierTimer > currentTime)
-                    continue;
-
-                _components.RemoveAt(i);
-                RemComp<MovespeedModifierMetabolismComponent>(metabolism);
-
-                _movespeed.RefreshMovementSpeedModifiers(metabolism);
-            }
-        }
-    }
-}

From 951f13fd699f06c08831ea4fca5c0f431fcdc9ec Mon Sep 17 00:00:00 2001
From: YoungThug <ramialanbagy@gmail.com>
Date: Sun, 28 Dec 2025 17:01:35 -0700
Subject: [PATCH 096/134] Add antag control for the space ninja (#42133)

* Add antag control for the space ninja

* Remove whitespace

---------

Co-authored-by: beck-thompson <beck314159@hotmail.com>
---
 .../Systems/AdminVerbSystem.Antags.cs            | 16 ++++++++++++++++
 Resources/Locale/en-US/administration/antag.ftl  |  2 ++
 2 files changed, 18 insertions(+)

diff --git a/Content.Server/Administration/Systems/AdminVerbSystem.Antags.cs b/Content.Server/Administration/Systems/AdminVerbSystem.Antags.cs
index 777d40e110..786a4294bf 100644
--- a/Content.Server/Administration/Systems/AdminVerbSystem.Antags.cs
+++ b/Content.Server/Administration/Systems/AdminVerbSystem.Antags.cs
@@ -31,6 +31,7 @@ public sealed partial class AdminVerbSystem
     private static readonly EntProtoId DefaultChangelingRule = "Changeling";
     private static readonly EntProtoId ParadoxCloneRuleId = "ParadoxCloneSpawn";
     private static readonly EntProtoId DefaultWizardRule = "Wizard";
+    private static readonly EntProtoId DefaultNinjaRule = "NinjaSpawn";
     private static readonly ProtoId<StartingGearPrototype> PirateGearId = "PirateGear";
 
     // All antag verbs have names so invokeverb works.
@@ -207,6 +208,21 @@ public sealed partial class AdminVerbSystem
         };
         args.Verbs.Add(wizard);
 
+        var ninjaName = Loc.GetString("admin-verb-text-make-space-ninja");
+        Verb ninja = new()
+        {
+            Text = ninjaName,
+            Category = VerbCategory.Antag,
+            Icon = new SpriteSpecifier.Rsi(new("/Textures/Objects/Weapons/Melee/energykatana.rsi"), "icon"),
+            Act = () =>
+            {
+                _antag.ForceMakeAntag<NinjaRoleComponent>(targetPlayer, DefaultNinjaRule);
+            },
+            Impact = LogImpact.High,
+            Message = string.Join(": ", ninjaName, Loc.GetString("admin-verb-make-space-ninja")),
+        };
+        args.Verbs.Add(ninja);
+
         if (HasComp<HumanoidAppearanceComponent>(args.Target)) // only humanoids can be cloned
             args.Verbs.Add(paradox);
     }
diff --git a/Resources/Locale/en-US/administration/antag.ftl b/Resources/Locale/en-US/administration/antag.ftl
index 5cb9b30133..a81dd048b8 100644
--- a/Resources/Locale/en-US/administration/antag.ftl
+++ b/Resources/Locale/en-US/administration/antag.ftl
@@ -8,6 +8,7 @@ admin-verb-make-head-rev = Make the target into a Head Revolutionary.
 admin-verb-make-thief = Make the target into a thief.
 admin-verb-make-paradox-clone = Create a Paradox Clone ghost role of the target.
 admin-verb-make-wizard = Make the target into a Wizard.
+admin-verb-make-space-ninja = Make the target into a Space Ninja.
 admin-verb-make-changeling = Make the target into a Changeling.
 
 
@@ -20,6 +21,7 @@ admin-verb-text-make-head-rev = Make Head Rev
 admin-verb-text-make-thief = Make Thief
 admin-verb-text-make-paradox-clone = Create Paradox Clone
 admin-verb-text-make-wizard = Make Wizard
+admin-verb-text-make-space-ninja = Make Ninja
 admin-verb-text-make-changeling = Make Changeling (WIP)
 
 admin-overlay-antag-classic = ANTAG

From 131108b018cd7155351bcabdec1f90383f7f423e Mon Sep 17 00:00:00 2001
From: EchoOfNothing <52498373+EchoOfNothing@users.noreply.github.com>
Date: Mon, 29 Dec 2025 05:52:44 +0200
Subject: [PATCH 097/134] Fix plasma station comms apc overloaded by default
 (#42144)

---
 Resources/Maps/plasma.yml | 100 +++++++++++++++++++++++++++++---------
 1 file changed, 76 insertions(+), 24 deletions(-)

diff --git a/Resources/Maps/plasma.yml b/Resources/Maps/plasma.yml
index 84cdc92d22..46a6b71104 100644
--- a/Resources/Maps/plasma.yml
+++ b/Resources/Maps/plasma.yml
@@ -1,11 +1,11 @@
 meta:
   format: 7
   category: Map
-  engineVersion: 268.0.0
+  engineVersion: 270.0.0
   forkId: ""
   forkVersion: ""
-  time: 11/24/2025 22:34:01
-  entityCount: 26479
+  time: 12/28/2025 21:35:23
+  entityCount: 26487
 maps:
 - 1
 grids:
@@ -10247,6 +10247,7 @@ entities:
       id: Plasma
     - type: ImplicitRoof
     - type: NavMap
+    - type: ExplosionAirtightGrid
 - proto: AccordionInstrument
   entities:
   - uid: 25884
@@ -14967,7 +14968,7 @@ entities:
       pos: -131.5,-45.5
       parent: 2
     - type: Door
-      secondsUntilStateChange: -64391.965
+      secondsUntilStateChange: -64586.55
       state: Opening
     - type: DeviceLinkSource
       lastSignals:
@@ -16463,11 +16464,14 @@ entities:
   - uid: 4410
     components:
     - type: MetaData
-      name: Telecommunications APC
+      name: Telecommunications East APC
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -84.5,-10.5
       parent: 2
+    - type: AccessReader
+      accessListsOriginal:
+      - - Engineering
     - type: Fixtures
       fixtures: {}
   - uid: 4419
@@ -16825,6 +16829,19 @@ entities:
       parent: 2
     - type: Fixtures
       fixtures: {}
+  - uid: 16798
+    components:
+    - type: MetaData
+      name: Telecommunications West APC
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -88.5,-9.5
+      parent: 2
+    - type: AccessReader
+      accessListsOriginal:
+      - - Engineering
+    - type: Fixtures
+      fixtures: {}
   - uid: 16994
     components:
     - type: MetaData
@@ -33235,6 +33252,11 @@ entities:
     - type: Transform
       pos: -15.5,-3.5
       parent: 2
+  - uid: 16856
+    components:
+    - type: Transform
+      pos: -88.5,-9.5
+      parent: 2
   - uid: 16947
     components:
     - type: Transform
@@ -53073,6 +53095,26 @@ entities:
     - type: Transform
       pos: -45.5,-44.5
       parent: 2
+  - uid: 16861
+    components:
+    - type: Transform
+      pos: -88.5,-9.5
+      parent: 2
+  - uid: 16868
+    components:
+    - type: Transform
+      pos: -88.5,-8.5
+      parent: 2
+  - uid: 16872
+    components:
+    - type: Transform
+      pos: -87.5,-8.5
+      parent: 2
+  - uid: 16907
+    components:
+    - type: Transform
+      pos: -86.5,-8.5
+      parent: 2
   - uid: 16960
     components:
     - type: Transform
@@ -53188,6 +53230,11 @@ entities:
     - type: Transform
       pos: -15.5,-63.5
       parent: 2
+  - uid: 17797
+    components:
+    - type: Transform
+      pos: -85.5,-8.5
+      parent: 2
   - uid: 17835
     components:
     - type: Transform
@@ -53228,6 +53275,11 @@ entities:
     - type: Transform
       pos: -85.5,-18.5
       parent: 2
+  - uid: 17990
+    components:
+    - type: Transform
+      pos: -84.5,-8.5
+      parent: 2
   - uid: 18106
     components:
     - type: Transform
@@ -131755,6 +131807,23 @@ entities:
     - type: Transform
       pos: -107.48633,-20.615337
       parent: 2
+- proto: PlushieSpawner50
+  entities:
+  - uid: 14357
+    components:
+    - type: Transform
+      pos: -21.5,11.5
+      parent: 2
+  - uid: 14359
+    components:
+    - type: Transform
+      pos: -20.5,11.5
+      parent: 2
+  - uid: 24648
+    components:
+    - type: Transform
+      pos: -19.5,11.5
+      parent: 2
 - proto: PortableFlasher
   entities:
   - uid: 2394
@@ -146294,7 +146363,7 @@ entities:
     - type: Transform
       pos: -107.5,-2.5
       parent: 2
-- proto: SpacemenFigureSpawner
+- proto: SpacemenFigurineSpawner90
   entities:
   - uid: 26079
     components:
@@ -153021,23 +153090,6 @@ entities:
     - type: Transform
       pos: -42.5,-1.5
       parent: 2
-- proto: ToySpawner
-  entities:
-  - uid: 14357
-    components:
-    - type: Transform
-      pos: -21.5,11.5
-      parent: 2
-  - uid: 14359
-    components:
-    - type: Transform
-      pos: -20.5,11.5
-      parent: 2
-  - uid: 24648
-    components:
-    - type: Transform
-      pos: -19.5,11.5
-      parent: 2
 - proto: TrainingBomb
   entities:
   - uid: 17799
@@ -171053,7 +171105,7 @@ entities:
       lastSignals:
         DoorStatus: True
     - type: Door
-      secondsUntilStateChange: -264498.72
+      secondsUntilStateChange: -264693.3
       state: Opening
     - type: Airlock
       autoClose: False

From be7653c131ed157f8fba9a8da485410cf6524ec5 Mon Sep 17 00:00:00 2001
From: PJBot <pieterjan.briers+bot@gmail.com>
Date: Mon, 29 Dec 2025 04:07:04 +0000
Subject: [PATCH 098/134] Automatic changelog update

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

diff --git a/Resources/Changelog/Maps.yml b/Resources/Changelog/Maps.yml
index 52aad2badb..c3def62c70 100644
--- a/Resources/Changelog/Maps.yml
+++ b/Resources/Changelog/Maps.yml
@@ -963,4 +963,12 @@
   id: 117
   time: '2025-12-24T00:43:15.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/42028
+- author: EchoOfNothing
+  changes:
+  - message: On Plasma, added a second APC to telecommunications, so the APC is no
+      longer overloaded at the start of the round.
+    type: Fix
+  id: 118
+  time: '2025-12-29T04:05:53.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/42144
 Order: 2

From ac3a91eac107637b962698527638e08716edaa17 Mon Sep 17 00:00:00 2001
From: EchoOfNothing <52498373+EchoOfNothing@users.noreply.github.com>
Date: Mon, 29 Dec 2025 10:53:18 +0200
Subject: [PATCH 099/134] Fix possible bug in my fix of IFF console. Add
 documentation to HideOnInit. (#42122)

* Refactor OnIFFShow and OnInitIFFConsole by extracting AddAllSupportedIFFFlags method. Fix possible addition of unallowed flags.

Fix posible addition of unallowed flags in OnInitIFFConsole by performing AllowedFlags check in the extracted function.

* Add documentation to HideOnInit

* Update IFFConsoleComponent.cs

---------

Co-authored-by: SlamBamActionman <83650252+SlamBamActionman@users.noreply.github.com>
---
 .../Components/IFFConsoleComponent.cs         |  3 ++
 .../Shuttles/Systems/ShuttleSystem.IFF.cs     | 44 +++++++++++--------
 2 files changed, 28 insertions(+), 19 deletions(-)

diff --git a/Content.Server/Shuttles/Components/IFFConsoleComponent.cs b/Content.Server/Shuttles/Components/IFFConsoleComponent.cs
index 8db81dc1fd..c2cf913c2c 100644
--- a/Content.Server/Shuttles/Components/IFFConsoleComponent.cs
+++ b/Content.Server/Shuttles/Components/IFFConsoleComponent.cs
@@ -12,6 +12,9 @@ public sealed partial class IFFConsoleComponent : Component
     [ViewVariables(VVAccess.ReadWrite), DataField("allowedFlags")]
     public IFFFlags AllowedFlags = IFFFlags.HideLabel;
 
+    /// <summary>
+    /// If true, automatically applies all supported IFF flags to the console's grid on MapInitEvent.
+    /// </summary>
     [DataField]
     public bool HideOnInit = false;
 }
diff --git a/Content.Server/Shuttles/Systems/ShuttleSystem.IFF.cs b/Content.Server/Shuttles/Systems/ShuttleSystem.IFF.cs
index e8d2e13e80..738fb765e1 100644
--- a/Content.Server/Shuttles/Systems/ShuttleSystem.IFF.cs
+++ b/Content.Server/Shuttles/Systems/ShuttleSystem.IFF.cs
@@ -42,28 +42,14 @@ public sealed partial class ShuttleSystem
             return;
         }
 
-        // Merged toggle controls both HideLabel and Hide flags
         if (!args.Show)
         {
-            if ((component.AllowedFlags & IFFFlags.HideLabel) != 0x0)
-            {
-                AddIFFFlag(xform.GridUid.Value, IFFFlags.HideLabel);
-            }
-            if ((component.AllowedFlags & IFFFlags.Hide) != 0x0)
-            {
-                AddIFFFlag(xform.GridUid.Value, IFFFlags.Hide);
-            }
+            AddAllSupportedIFFFlags(xform, component);
         }
         else
         {
-            if ((component.AllowedFlags & IFFFlags.HideLabel) != 0x0)
-            {
-                RemoveIFFFlag(xform.GridUid.Value, IFFFlags.HideLabel);
-            }
-            if ((component.AllowedFlags & IFFFlags.Hide) != 0x0)
-            {
-                RemoveIFFFlag(xform.GridUid.Value, IFFFlags.Hide);
-            }
+            RemoveIFFFlag(xform.GridUid.Value, IFFFlags.HideLabel);
+            RemoveIFFFlag(xform.GridUid.Value, IFFFlags.Hide);
         }
     }
 
@@ -76,8 +62,7 @@ public sealed partial class ShuttleSystem
 
         if (component.HideOnInit)
         {
-            AddIFFFlag(xform.GridUid.Value, IFFFlags.HideLabel);
-            AddIFFFlag(xform.GridUid.Value, IFFFlags.Hide);
+            AddAllSupportedIFFFlags(xform, component);
         }
     }
 
@@ -121,4 +106,25 @@ public sealed partial class ShuttleSystem
             });
         }
     }
+
+    // Made this method to avoid copy and pasting.
+    /// <summary>
+    /// Adds all IFF flags that are allowed by AllowedFlags to the grid.
+    /// </summary>
+    private void AddAllSupportedIFFFlags(TransformComponent xform, IFFConsoleComponent component)
+    {
+        if (xform.GridUid == null)
+        {
+            return;
+        }
+
+        if ((component.AllowedFlags & IFFFlags.HideLabel) != 0x0)
+        {
+            AddIFFFlag(xform.GridUid.Value, IFFFlags.HideLabel);
+        }
+        if ((component.AllowedFlags & IFFFlags.Hide) != 0x0)
+        {
+            AddIFFFlag(xform.GridUid.Value, IFFFlags.Hide);
+        }
+    }
 }

From 552938cda20dd4ec0f34a1d2e0c22d862b0eba9c Mon Sep 17 00:00:00 2001
From: PAFFhassoocks <asukalangleydanielle@gmail.com>
Date: Mon, 29 Dec 2025 13:29:13 +0300
Subject: [PATCH 100/134] puts Space ninja survival box contents into their bag
 (#42102)

* removes extended survival box, but adds most contents into the ninja's satchel

* major essential bugfix
---
 Resources/Prototypes/GameRules/events.yml       | 2 +-
 Resources/Prototypes/Loadouts/role_loadouts.yml | 5 +++++
 Resources/Prototypes/Roles/Antags/ninja.yml     | 4 ++++
 3 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/Resources/Prototypes/GameRules/events.yml b/Resources/Prototypes/GameRules/events.yml
index cbf3f7d9bf..f680004e87 100644
--- a/Resources/Prototypes/GameRules/events.yml
+++ b/Resources/Prototypes/GameRules/events.yml
@@ -244,7 +244,7 @@
       pickPlayer: false
       startingGear: SpaceNinjaGear
       roleLoadout:
-      - RoleSurvivalEVA
+      - RoleSurvivalSpaceNinja
       briefing:
         text: ninja-role-greeting
         color: Green
diff --git a/Resources/Prototypes/Loadouts/role_loadouts.yml b/Resources/Prototypes/Loadouts/role_loadouts.yml
index 2e70dea157..98bc279cbb 100644
--- a/Resources/Prototypes/Loadouts/role_loadouts.yml
+++ b/Resources/Prototypes/Loadouts/role_loadouts.yml
@@ -614,3 +614,8 @@
   groups:
   - GroupEVATank
   - SurvivalExtended
+
+- type: roleLoadout
+  id: RoleSurvivalSpaceNinja
+  groups:
+  - GroupEVATank
diff --git a/Resources/Prototypes/Roles/Antags/ninja.yml b/Resources/Prototypes/Roles/Antags/ninja.yml
index e8d9f1d021..27f4859cfb 100644
--- a/Resources/Prototypes/Roles/Antags/ninja.yml
+++ b/Resources/Prototypes/Roles/Antags/ninja.yml
@@ -33,6 +33,10 @@
     - Wirecutter
     - Welder
     - Multitool
+    - EmergencyMedipen
+    - Flare
+    - FoodSnackNutribrick
+    - DrinkWaterBottleFull
 
 - type: chameleonOutfit
   id: NinjaChameleonOutfit

From df7473a05805974bbf3d1a2df79ec6ff9dbb4bc3 Mon Sep 17 00:00:00 2001
From: PJBot <pieterjan.briers+bot@gmail.com>
Date: Mon, 29 Dec 2025 10:43:39 +0000
Subject: [PATCH 101/134] 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 584392e798..2c56b52f3f 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -1,12 +1,4 @@
 Entries:
-- author: K-Dynamic
-  changes:
-  - message: Captain and Head of Personnel starts with administration glasses and
-      hud respectively.
-    type: Add
-  id: 8839
-  time: '2025-08-08T19:00:41.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/35531
 - author: perryprog
   changes:
   - message: The emote radial menu now shows the correct icons for its subcategories.
@@ -3942,3 +3934,11 @@
   id: 9339
   time: '2025-12-28T07:30:08.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/40984
+- author: PAFFhassoocks
+  changes:
+  - message: Ninjas no longer spawn with a survival box, and instead have the items
+      directly in their bags, excluding the emergency tank.
+    type: Tweak
+  id: 9340
+  time: '2025-12-29T10:42:30.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/42102

From beb4d5f5844b65aa33b801441327e828af2db01a Mon Sep 17 00:00:00 2001
From: GeneralGaws <122978178+GeneralGaws@users.noreply.github.com>
Date: Mon, 29 Dec 2025 13:45:56 +0300
Subject: [PATCH 102/134] Remove syndicate bomb restock time (#42114)

* no restock time

* add timer
---
 .../Prototypes/Catalog/uplink_catalog.yml     | 24 +++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/Resources/Prototypes/Catalog/uplink_catalog.yml b/Resources/Prototypes/Catalog/uplink_catalog.yml
index 37e4b7a371..6b56eced0d 100644
--- a/Resources/Prototypes/Catalog/uplink_catalog.yml
+++ b/Resources/Prototypes/Catalog/uplink_catalog.yml
@@ -960,6 +960,30 @@
     Telecrystal: 4
   categories:
   - UplinkDeception
+  restockTime: 1800
+  conditions:
+  - !type:StoreWhitelistCondition
+    blacklist:
+      tags:
+      - NukeOpsUplink
+
+- type: listing
+  id: UplinkSyndicateBombFakeNukie
+  name: uplink-exploding-syndicate-bomb-fake-name
+  description: uplink-exploding-syndicate-bomb-fake-desc
+  productEntity: SyndicateBombFake
+  discountCategory: usualDiscounts
+  discountDownTo:
+    Telecrystal: 1
+  cost:
+    Telecrystal: 4
+  categories:
+  - UplinkDeception
+  conditions:
+  - !type:StoreWhitelistCondition
+    whitelist:
+      tags:
+      - NukeOpsUplink
 
 # Disruption
 

From c6c84ef17db9a40458ac46c5f89df53611237cf5 Mon Sep 17 00:00:00 2001
From: PJBot <pieterjan.briers+bot@gmail.com>
Date: Mon, 29 Dec 2025 11:00:25 +0000
Subject: [PATCH 103/134] 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 2c56b52f3f..b00859aa01 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -1,11 +1,4 @@
 Entries:
-- author: perryprog
-  changes:
-  - message: The emote radial menu now shows the correct icons for its subcategories.
-    type: Fix
-  id: 8840
-  time: '2025-08-08T19:27:46.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/39481
 - author: Flareguy
   changes:
   - message: Updated moth displacement maps to fix missing pixels, among other various
@@ -3942,3 +3935,11 @@
   id: 9340
   time: '2025-12-29T10:42:30.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/42102
+- author: GeneralGaws
+  changes:
+  - message: The Decoy Syndicate Bomb in the Traitor uplink now has a purchase timer,
+      same as the regular Syndicate Bomb.
+    type: Tweak
+  id: 9341
+  time: '2025-12-29T10:59:18.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/42114

From fb17257562a99a54f314aa266b0ad41efb4b97b2 Mon Sep 17 00:00:00 2001
From: 0-Anon <cec124@case.edu>
Date: Mon, 29 Dec 2025 17:36:01 -0500
Subject: [PATCH 104/134] Ammonia restores Rat King Bloodlevel (#42167)

* Ammonia restores Rat King Bloodlevel

Adds a saline effect to ammonia for creatures with the rat metabolizer type condition (aka, rat kings)

* error fix

code did not like amount under condition so fixing that, and restoring amount to 1 to be identical to how it was working in the video. amount 6 was comical levels of blood restoration
---
 Resources/Prototypes/Reagents/botany.yml | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/Resources/Prototypes/Reagents/botany.yml b/Resources/Prototypes/Reagents/botany.yml
index c2698b2b29..19133ba551 100644
--- a/Resources/Prototypes/Reagents/botany.yml
+++ b/Resources/Prototypes/Reagents/botany.yml
@@ -265,6 +265,14 @@
             Burn: -2.5
           types:
             Bloodloss: -5
+      - !type:ModifyBloodLevel
+        amount: 1
+        conditions:
+        - !type:MetabolizerTypeCondition
+          type: [ Rat ]
+        - !type:ReagentCondition
+          reagent: Ammonia
+          min: 1
       - !type:Oxygenate # ammonia displaces nitrogen in vox blood
         conditions:
         - !type:MetabolizerTypeCondition

From 56462d0cb19df5559603d2dda85639e9edef66bd Mon Sep 17 00:00:00 2001
From: PJBot <pieterjan.briers+bot@gmail.com>
Date: Mon, 29 Dec 2025 22:50:34 +0000
Subject: [PATCH 105/134] 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 b00859aa01..a706ffef99 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -1,12 +1,4 @@
 Entries:
-- author: Flareguy
-  changes:
-  - message: Updated moth displacement maps to fix missing pixels, among other various
-      issues.
-    type: Fix
-  id: 8841
-  time: '2025-08-09T21:52:06.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/39174
 - author: Princess-Cheeseballs
   changes:
   - message: Mobs such as borgs, dragons, etc can no longer crawl.
@@ -3943,3 +3935,10 @@
   id: 9341
   time: '2025-12-29T10:59:18.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/42114
+- author: 0-Anon
+  changes:
+  - message: Rat creatures will now restore bloodlevel when exposed to ammonia gas.
+    type: Tweak
+  id: 9342
+  time: '2025-12-29T22:49:25.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/42167

From d61ecd3d50d71d6e38e0642e94181a18215c59ac Mon Sep 17 00:00:00 2001
From: mikey <23003816+mikeysaurus@users.noreply.github.com>
Date: Tue, 30 Dec 2025 13:05:13 -0800
Subject: [PATCH 106/134] Align detective stamp with rest of stamps (lower by 2
 pixels) (#42177)

move detective stamp down 2 pixels
---
 .../Objects/Misc/stamps.rsi/stamp-detective.png | Bin 340 -> 314 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/Resources/Textures/Objects/Misc/stamps.rsi/stamp-detective.png b/Resources/Textures/Objects/Misc/stamps.rsi/stamp-detective.png
index 0ff33f9c69ea81ce7551fa6df6f4c9540e9fac1e..c2c545f6afaffca2f6cbbb81540da343fc26679f 100644
GIT binary patch
delta 191
zcmV;w06_oL0=fc_gMWm-%52ov^S6nfjrzKXPR+FVc+g?m1O^=d?RY`OM5}6&)N0lN
zSnR&8?xh)s4=Kqp10XqO#D}z01KRNdw&@9gZF<7-0sx~~$lEt<+cr@Y(bF;Ac7x4l
z!n)EzDTV90xiyVia3MRNi=+dFzd$L)9>pHu1yq>^eBZ~itT>x^7={IGJjwg(Q1dfv
tchB#8E^;rAM@2rCE2Cv32!imx`39*wO%(<8k{AF0002ovPDHLkV1kg$TQ>jz

delta 217
zcmV;~04D#s0@MPKgMa=ivr%8q-zIuC>gyspHPhnbL5FD*7<2%%;{_EHt*S{<t62wN
zvHQBZmu4V7q$I}-faI7FAJS3{XvYiKrY8Wl=?TXR0E}iKZ{M_S+eA@BPseoI4K|+%
z>q-ly6t3&$)--Cth3tGTk`5UD0;Lpt6nlUdP-PnMeILuRZc^f57#6VcB=4_7&Cjsi
zJ-_d{$h|xs75P}MjFyog2!imx`376{O%;<CxxWAa01jnXNoGw=04e|g00;m800000
T0Mb*F00000NkvXXu0mjf2pn6C


From 3cc79c223a243317446578982d2a4367773e5ce8 Mon Sep 17 00:00:00 2001
From: OnyxTheBrave <131422822+OnyxTheBrave@users.noreply.github.com>
Date: Tue, 30 Dec 2025 15:34:54 -0600
Subject: [PATCH 107/134] Chemmaster Pill Source (#40121)

* Buttons and basic internal data

* The buttons DO something

* it works?!!

* I hate predictions

* 5000 monkeys on typewritters

* who let the monkeys code?

* Localizations

* waiter, more commits please

* Not going insane (this is a lie)

* last one I SWEAR

* Some improvements ported from Moff

* clean it up a little

* one more cleanup

* The chemmaster is not a mime

* Fix my mistakes + address the other review

* Point to what chemmaster is broken, and why it's broken

* ChemMasterComponent changes

* Margin for packaging source

---------

Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
---
 .../UI/ChemMasterBoundUserInterface.cs        |   4 +
 .../Chemistry/UI/ChemMasterWindow.xaml        |   9 +-
 .../Chemistry/UI/ChemMasterWindow.xaml.cs     |  49 +++++++--
 .../Components/ChemMasterComponent.cs         |   6 ++
 .../EntitySystems/ChemMasterSystem.cs         | 102 ++++++++++++++----
 Content.Shared/Chemistry/SharedChemMaster.cs  |  17 ++-
 .../components/chem-master-component.ftl      |   7 ++
 7 files changed, 160 insertions(+), 34 deletions(-)

diff --git a/Content.Client/Chemistry/UI/ChemMasterBoundUserInterface.cs b/Content.Client/Chemistry/UI/ChemMasterBoundUserInterface.cs
index a669a8da4c..d0a9f5644c 100644
--- a/Content.Client/Chemistry/UI/ChemMasterBoundUserInterface.cs
+++ b/Content.Client/Chemistry/UI/ChemMasterBoundUserInterface.cs
@@ -48,6 +48,10 @@ namespace Content.Client.Chemistry.UI
                     (uint) _window.BottleDosage.Value, _window.LabelLine));
             _window.BufferSortButton.OnPressed += _ => SendMessage(
                     new ChemMasterSortingTypeCycleMessage());
+            _window.OutputBufferDraw.OnPressed += _ => SendMessage(
+                new ChemMasterOutputDrawSourceMessage(ChemMasterDrawSource.Internal));
+            _window.OutputBeakerDraw.OnPressed += _ => SendMessage(
+                new ChemMasterOutputDrawSourceMessage(ChemMasterDrawSource.External));
 
             for (uint i = 0; i < _window.PillTypeButtons.Length; i++)
             {
diff --git a/Content.Client/Chemistry/UI/ChemMasterWindow.xaml b/Content.Client/Chemistry/UI/ChemMasterWindow.xaml
index 5bc640ab44..cc2a199172 100644
--- a/Content.Client/Chemistry/UI/ChemMasterWindow.xaml
+++ b/Content.Client/Chemistry/UI/ChemMasterWindow.xaml
@@ -79,10 +79,13 @@
 
             <!-- Packaging -->
             <BoxContainer Orientation="Horizontal">
-                <Label Text="{Loc 'chem-master-window-packaging-text'}" />
+                <Label Text="{Loc 'chem-master-output-source'}" StyleClasses="LabelSecondaryColor" Margin="0 0 5 0"/>
+                <Button MinSize="80 0" Name="OutputBufferDraw" Access="Public" Text="{Loc 'chem-master-output-buffer-draw'}" ToggleMode="True" StyleClasses="OpenRight" />
+                <Button MinSize="80 0" Name="OutputBeakerDraw" Access="Public" Text="{Loc 'chem-master-output-beaker-draw'}" ToggleMode="True" StyleClasses="OpenLeft" />
                 <Control HorizontalExpand="True"/>
-                <Label Text="{Loc 'chem-master-window-buffer-label'}" />
-                <Label Name="BufferCurrentVolume" StyleClasses="LabelWeak" />
+                <!-- Output Draw Source -->
+                <Label Name="DrawSource"/>
+                <Label Name="BufferCurrentVolume" StyleClasses="LabelSecondaryColor" />
             </BoxContainer>
 
             <!-- Wrap the packaging info-->
diff --git a/Content.Client/Chemistry/UI/ChemMasterWindow.xaml.cs b/Content.Client/Chemistry/UI/ChemMasterWindow.xaml.cs
index d610f34b29..a8aab1d35f 100644
--- a/Content.Client/Chemistry/UI/ChemMasterWindow.xaml.cs
+++ b/Content.Client/Chemistry/UI/ChemMasterWindow.xaml.cs
@@ -150,7 +150,17 @@ namespace Content.Client.Chemistry.UI
             // Ensure the Panel Info is updated, including UI elements for Buffer Volume, Output Container and so on
             UpdatePanelInfo(castState);
 
-            BufferCurrentVolume.Text = $" {castState.BufferCurrentVolume?.Int() ?? 0}u";
+            switch (castState.DrawSource)
+            {
+                case ChemMasterDrawSource.Internal:
+                    SetBufferText(castState.BufferCurrentVolume, "chem-master-output-buffer-draw");
+                    break;
+                case ChemMasterDrawSource.External:
+                    SetBufferText(castState.InputContainerInfo?.CurrentVolume, "chem-master-output-beaker-draw");
+                    break;
+                default:
+                    throw new($"Chemmaster {castState.OutputContainerInfo} draw source is not set");
+            }
 
             InputEjectButton.Disabled = castState.InputContainerInfo is null;
             OutputEjectButton.Disabled = castState.OutputContainerInfo is null;
@@ -168,9 +178,14 @@ namespace Content.Client.Chemistry.UI
             var holdsReagents = output?.Reagents != null;
             var pillNumberMax = holdsReagents ? 0 : remainingCapacity;
             var bottleAmountMax = holdsReagents ? remainingCapacity : 0;
-            var bufferVolume = castState.BufferCurrentVolume?.Int() ?? 0;
+            var outputVolume = castState.DrawSource switch
+            {
+                ChemMasterDrawSource.Internal => castState.BufferCurrentVolume?.Int() ?? 0,
+                ChemMasterDrawSource.External => castState.InputContainerInfo?.CurrentVolume.Int() ?? 0,
+                _ => 0,
+            };
 
-            PillDosage.Value = (int)Math.Min(bufferVolume, castState.PillDosageLimit);
+            PillDosage.Value = (int)Math.Min(outputVolume, castState.PillDosageLimit);
 
             PillTypeButtons[castState.SelectedPillType].Pressed = true;
 
@@ -186,25 +201,35 @@ namespace Content.Client.Chemistry.UI
             // Avoid division by zero
             if (PillDosage.Value > 0)
             {
-                PillNumber.Value = Math.Min(bufferVolume / PillDosage.Value, pillNumberMax);
+                PillNumber.Value = Math.Min(outputVolume / PillDosage.Value, pillNumberMax);
             }
             else
             {
                 PillNumber.Value = 0;
             }
 
-            BottleDosage.Value = Math.Min(bottleAmountMax, bufferVolume);
+            BottleDosage.Value = Math.Min(bottleAmountMax, outputVolume);
         }
         /// <summary>
-        /// Generate a product label based on reagents in the buffer.
+        /// Generate a product label based on reagents in the buffer or beaker.
         /// </summary>
         /// <param name="state">State data sent by the server.</param>
         private string GenerateLabel(ChemMasterBoundUserInterfaceState state)
         {
-            if (state.BufferCurrentVolume == 0)
+            if (
+                state.BufferCurrentVolume == 0 && state.DrawSource == ChemMasterDrawSource.Internal ||
+                state.InputContainerInfo?.CurrentVolume == 0 && state.DrawSource == ChemMasterDrawSource.External ||
+                state.InputContainerInfo?.Reagents == null
+            )
                 return "";
 
-            var reagent = state.BufferReagents.OrderBy(r => r.Quantity).First().Reagent;
+            var reagent = (state.DrawSource switch
+                {
+                    ChemMasterDrawSource.Internal => state.BufferReagents,
+                    ChemMasterDrawSource.External => state.InputContainerInfo.Reagents ?? [],
+                    _ => throw new($"Chemmaster {state.OutputContainerInfo} draw source is not set"),
+                }).MinBy(r => r.Quantity)
+                .Reagent;
             _prototypeManager.TryIndex(reagent.Prototype, out ReagentPrototype? proto);
             return proto?.LocalizedName ?? "";
         }
@@ -233,6 +258,8 @@ namespace Content.Client.Chemistry.UI
                 _ => Loc.GetString("chem-master-window-sort-type-none")
             };
 
+            OutputBufferDraw.Pressed = state.DrawSource == ChemMasterDrawSource.Internal;
+            OutputBeakerDraw.Pressed = state.DrawSource == ChemMasterDrawSource.External;
 
             if (!state.BufferReagents.Any())
             {
@@ -414,6 +441,12 @@ namespace Content.Client.Chemistry.UI
             get => LabelLineEdit.Text;
             set => LabelLineEdit.Text = value;
         }
+
+        private void SetBufferText(FixedPoint2? volume, string text)
+        {
+            BufferCurrentVolume.Text = $" {volume ?? FixedPoint2.Zero}u";
+            DrawSource.Text = Loc.GetString(text);
+        }
     }
 
     public sealed class ReagentButton : Button
diff --git a/Content.Server/Chemistry/Components/ChemMasterComponent.cs b/Content.Server/Chemistry/Components/ChemMasterComponent.cs
index 0309d07ed9..398fddae0c 100644
--- a/Content.Server/Chemistry/Components/ChemMasterComponent.cs
+++ b/Content.Server/Chemistry/Components/ChemMasterComponent.cs
@@ -26,5 +26,11 @@ namespace Content.Server.Chemistry.Components
 
         [DataField("clickSound"), ViewVariables(VVAccess.ReadWrite)]
         public SoundSpecifier ClickSound = new SoundPathSpecifier("/Audio/Machines/machine_switch.ogg");
+
+        /// <summary>
+        /// Which source the chem master should draw from when making pills/bottles.
+        /// </summary>
+        [DataField]
+        public ChemMasterDrawSource DrawSource = ChemMasterDrawSource.Internal;
     }
 }
diff --git a/Content.Server/Chemistry/EntitySystems/ChemMasterSystem.cs b/Content.Server/Chemistry/EntitySystems/ChemMasterSystem.cs
index 64350cbda1..7252a59f60 100644
--- a/Content.Server/Chemistry/EntitySystems/ChemMasterSystem.cs
+++ b/Content.Server/Chemistry/EntitySystems/ChemMasterSystem.cs
@@ -57,6 +57,7 @@ namespace Content.Server.Chemistry.EntitySystems
             SubscribeLocalEvent<ChemMasterComponent, ChemMasterReagentAmountButtonMessage>(OnReagentButtonMessage);
             SubscribeLocalEvent<ChemMasterComponent, ChemMasterCreatePillsMessage>(OnCreatePillsMessage);
             SubscribeLocalEvent<ChemMasterComponent, ChemMasterOutputToBottleMessage>(OnOutputToBottleMessage);
+            SubscribeLocalEvent<ChemMasterComponent, ChemMasterOutputDrawSourceMessage>(OnSetDrawSourceMessage);
         }
 
         private void SubscribeUpdateUiState<T>(Entity<ChemMasterComponent> ent, ref T ev)
@@ -77,7 +78,7 @@ namespace Content.Server.Chemistry.EntitySystems
 
             var state = new ChemMasterBoundUserInterfaceState(
                 chemMaster.Mode, chemMaster.SortingType, BuildInputContainerInfo(inputContainer), BuildOutputContainerInfo(outputContainer),
-                bufferReagents, bufferCurrentVolume, chemMaster.PillType, chemMaster.PillDosageLimit, updateLabel);
+                bufferReagents, bufferCurrentVolume, chemMaster.PillType, chemMaster.PillDosageLimit, updateLabel, chemMaster.DrawSource);
 
             _userInterfaceSystem.SetUiState(owner, ChemMasterUiKey.Key, state);
         }
@@ -135,6 +136,17 @@ namespace Content.Server.Chemistry.EntitySystems
             ClickSound(chemMaster);
         }
 
+        private void OnSetDrawSourceMessage(Entity<ChemMasterComponent> chemMaster, ref ChemMasterOutputDrawSourceMessage message)
+        {
+            //Ensure draw source is valid, either from the internal buffer or the inserted beaker
+            if (!Enum.IsDefined(message.DrawSource))
+                return;
+
+            chemMaster.Comp.DrawSource = message.DrawSource;
+            UpdateUiState(chemMaster);
+            ClickSound(chemMaster);
+        }
+
         private void TransferReagents(Entity<ChemMasterComponent> chemMaster, ReagentId id, FixedPoint2 amount, bool fromBuffer)
         {
             var container = _itemSlotsSystem.GetItemOrNull(chemMaster, SharedChemMaster.InputSlotName);
@@ -208,9 +220,9 @@ namespace Content.Server.Chemistry.EntitySystems
                 return;
 
             var needed = message.Dosage * message.Number;
-            if (!WithdrawFromBuffer(chemMaster, needed, user, out var withdrawal))
-                return;
 
+            if (!WithdrawFromSource(chemMaster, needed, user, out var withdrawal))
+                return;
             _labelSystem.Label(container, message.Label);
 
             for (var i = 0; i < message.Number; i++)
@@ -219,7 +231,10 @@ namespace Content.Server.Chemistry.EntitySystems
                 _storageSystem.Insert(container, item, out _, user: user, storage);
                 _labelSystem.Label(item, message.Label);
 
-                _solutionContainerSystem.EnsureSolutionEntity(item, SharedChemMaster.PillSolutionName,out var itemSolution ,message.Dosage);
+                _solutionContainerSystem.EnsureSolutionEntity(item,
+                    SharedChemMaster.PillSolutionName,
+                    out var itemSolution,
+                    message.Dosage);
                 if (!itemSolution.HasValue)
                     return;
 
@@ -256,7 +271,7 @@ namespace Content.Server.Chemistry.EntitySystems
             if (message.Label.Length > SharedChemMaster.LabelMaxLength)
                 return;
 
-            if (!WithdrawFromBuffer(chemMaster, message.Dosage, user, out var withdrawal))
+            if (!WithdrawFromSource(chemMaster, message.Dosage, user, out var withdrawal))
                 return;
 
             _labelSystem.Label(container, message.Label);
@@ -270,34 +285,77 @@ namespace Content.Server.Chemistry.EntitySystems
             ClickSound(chemMaster);
         }
 
-        private bool WithdrawFromBuffer(
+        private bool WithdrawFromSource(
             Entity<ChemMasterComponent> chemMaster,
-            FixedPoint2 neededVolume, EntityUid? user,
+            FixedPoint2 neededVolume,
+            EntityUid? user,
             [NotNullWhen(returnValue: true)] out Solution? outputSolution)
         {
             outputSolution = null;
 
-            if (!_solutionContainerSystem.TryGetSolution(chemMaster.Owner, SharedChemMaster.BufferSolutionName, out _, out var solution))
-            {
-                return false;
-            }
+            Solution? solution;
+            Entity<SolutionComponent>? soln = null;
 
-            if (solution.Volume == 0)
+            switch (chemMaster.Comp.DrawSource)
             {
-                if (user.HasValue)
-                    _popupSystem.PopupCursor(Loc.GetString("chem-master-window-buffer-empty-text"), user.Value);
-                return false;
-            }
+                case ChemMasterDrawSource.Internal:
+                    if (!_solutionContainerSystem.TryGetSolution(chemMaster.Owner, SharedChemMaster.BufferSolutionName, out _, out solution))
+                        return false;
 
-            // ReSharper disable once InvertIf
-            if (neededVolume > solution.Volume)
-            {
-                if (user.HasValue)
-                    _popupSystem.PopupCursor(Loc.GetString("chem-master-window-buffer-low-text"), user.Value);
-                return false;
+                    if (solution.Volume == 0)
+                    {
+                        if (user is { } uid)
+                            _popupSystem.PopupCursor(Loc.GetString("chem-master-window-buffer-empty-text"), uid);
+
+                        return false;
+                    }
+                    if (neededVolume > solution.Volume)
+                    {
+                        if (user is { } uid)
+                            _popupSystem.PopupCursor(Loc.GetString("chem-master-window-buffer-low-text"), uid);
+
+                        return false;
+                    }
+
+                    break;
+
+                case ChemMasterDrawSource.External:
+                    if (_itemSlotsSystem.GetItemOrNull(chemMaster, SharedChemMaster.InputSlotName) is not {} container)
+                    {
+                        if (user.HasValue)
+                            _popupSystem.PopupCursor(Loc.GetString("chem-master-window-no-beaker-text"), user.Value);
+                        return false;
+                    }
+
+                    if (!_solutionContainerSystem.TryGetFitsInDispenser(container, out soln, out solution))
+                        return false;
+
+                    if (solution.Volume == 0)
+                    {
+                        if (user is { } uid)
+                            _popupSystem.PopupCursor(Loc.GetString("chem-master-window-beaker-empty-text"), uid);
+
+                        return false;
+                    }
+                    if (neededVolume > solution.Volume)
+                    {
+                        if (user is { } uid)
+                            _popupSystem.PopupCursor(Loc.GetString("chem-master-window-beaker-low-text"), uid);
+
+                        return false;
+                    }
+
+                    break;
+
+                default:
+                    return false;
             }
 
             outputSolution = solution.SplitSolution(neededVolume);
+
+            if (soln.HasValue)
+                _solutionContainerSystem.UpdateChemicals(soln.Value);
+
             return true;
         }
 
diff --git a/Content.Shared/Chemistry/SharedChemMaster.cs b/Content.Shared/Chemistry/SharedChemMaster.cs
index cabee465ea..8a71cc49f6 100644
--- a/Content.Shared/Chemistry/SharedChemMaster.cs
+++ b/Content.Shared/Chemistry/SharedChemMaster.cs
@@ -83,6 +83,12 @@ namespace Content.Shared.Chemistry
         }
     }
 
+    [Serializable, NetSerializable]
+    public sealed class ChemMasterOutputDrawSourceMessage(ChemMasterDrawSource drawSource) : BoundUserInterfaceMessage
+    {
+        public readonly ChemMasterDrawSource DrawSource = drawSource;
+    }
+
     public enum ChemMasterMode
     {
         Transfer,
@@ -115,6 +121,12 @@ namespace Content.Shared.Chemistry
         All,
     }
 
+    public enum ChemMasterDrawSource
+    {
+        Internal,
+        External,
+    }
+
     public static class ChemMasterReagentAmountToFixedPoint
     {
         public static FixedPoint2 GetFixedPoint(this ChemMasterReagentAmount amount)
@@ -184,10 +196,12 @@ namespace Content.Shared.Chemistry
 
         public readonly bool UpdateLabel;
 
+        public readonly ChemMasterDrawSource DrawSource;
+
         public ChemMasterBoundUserInterfaceState(
             ChemMasterMode mode, ChemMasterSortingType sortingType, ContainerInfo? inputContainerInfo, ContainerInfo? outputContainerInfo,
             IReadOnlyList<ReagentQuantity> bufferReagents, FixedPoint2 bufferCurrentVolume,
-            uint selectedPillType, uint pillDosageLimit, bool updateLabel)
+            uint selectedPillType, uint pillDosageLimit, bool updateLabel, ChemMasterDrawSource drawSource)
         {
             InputContainerInfo = inputContainerInfo;
             OutputContainerInfo = outputContainerInfo;
@@ -198,6 +212,7 @@ namespace Content.Shared.Chemistry
             SelectedPillType = selectedPillType;
             PillDosageLimit = pillDosageLimit;
             UpdateLabel = updateLabel;
+            DrawSource = drawSource;
         }
     }
 
diff --git a/Resources/Locale/en-US/chemistry/components/chem-master-component.ftl b/Resources/Locale/en-US/chemistry/components/chem-master-component.ftl
index c000811e77..0860e8347b 100644
--- a/Resources/Locale/en-US/chemistry/components/chem-master-component.ftl
+++ b/Resources/Locale/en-US/chemistry/components/chem-master-component.ftl
@@ -33,3 +33,10 @@ chem-master-window-sort-type-none = Sort by: Oldest First
 chem-master-window-sort-type-alphabetical = Sort by: Alphabetical
 chem-master-window-sort-type-quantity = Sort by: Quantity
 chem-master-window-sort-type-latest = Sort by: Recent First
+chem-master-output-buffer-draw = Buffer
+chem-master-output-beaker-draw = Beaker
+chem-master-window-no-beaker-text = No beaker loaded
+chem-master-window-beaker-empty-text = Beaker Empty
+chem-master-window-beaker-low-text = Not enough solution in beaker
+chem-master-output-source = Packaging source:
+chem-master-no-source = No Source

From a41101e8daaf10965770daa79f2458e350d8f2c8 Mon Sep 17 00:00:00 2001
From: PJBot <pieterjan.briers+bot@gmail.com>
Date: Tue, 30 Dec 2025 21:53:29 +0000
Subject: [PATCH 108/134] 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 a706ffef99..185b69b191 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -1,11 +1,4 @@
 Entries:
-- author: Princess-Cheeseballs
-  changes:
-  - message: Mobs such as borgs, dragons, etc can no longer crawl.
-    type: Tweak
-  id: 8842
-  time: '2025-08-10T17:49:29.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/39084
 - author: beck-thompson
   changes:
   - message: Various syndicate items can now be "locked" with your voice to hide their
@@ -3942,3 +3935,11 @@
   id: 9342
   time: '2025-12-29T22:49:25.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/42167
+- author: OnyxTheBrave
+  changes:
+  - message: The Chemmaster 4000 can now switch between making pills from the internal
+      buffer or from an inserted beaker.
+    type: Tweak
+  id: 9343
+  time: '2025-12-30T21:52:19.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/40121

From 0b1e8a4bbc091ca07a11b3586808635a47b06445 Mon Sep 17 00:00:00 2001
From: Princess Cheeseballs
 <66055347+Princess-Cheeseballs@users.noreply.github.com>
Date: Tue, 30 Dec 2025 13:41:57 -0800
Subject: [PATCH 109/134] Status Effects Toolshed (#41670)

* toolshed :)

* Yeah they call me the gamer

* Fix test fails

* refactor: extract method ZeroAsNull

---------

Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
Co-authored-by: pa.pecherskij <pa.pecherskij@interfax.ru>
---
 .../StatusEffects/StatusEffectCommand.cs      | 141 ++++++++++++++++++
 .../StatusEffectCompletionParser.cs           |  16 ++
 .../StatusEffectNew/StatusEffectsSystem.cs    |  26 ++++
 .../en-US/commands/toolshed-commands.ftl      |  12 +-
 4 files changed, 193 insertions(+), 2 deletions(-)
 create mode 100644 Content.Server/Toolshed/Commands/StatusEffects/StatusEffectCommand.cs
 create mode 100644 Content.Server/Toolshed/TypeParsers/StatusEffects/StatusEffectCompletionParser.cs

diff --git a/Content.Server/Toolshed/Commands/StatusEffects/StatusEffectCommand.cs b/Content.Server/Toolshed/Commands/StatusEffects/StatusEffectCommand.cs
new file mode 100644
index 0000000000..4182bac081
--- /dev/null
+++ b/Content.Server/Toolshed/Commands/StatusEffects/StatusEffectCommand.cs
@@ -0,0 +1,141 @@
+using Content.Server.Administration;
+using Content.Server.Toolshed.TypeParsers.StatusEffects;
+using Content.Shared.Administration;
+using Content.Shared.StatusEffectNew;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Toolshed;
+
+namespace Content.Server.Toolshed.Commands.StatusEffects;
+
+[ToolshedCommand, AdminCommand(AdminFlags.VarEdit)]
+public sealed class StatusEffectCommand : ToolshedCommand
+{
+    private StatusEffectsSystem? _statusEffectsSystem;
+
+    [CommandImplementation("add")]
+    public EntityUid? Add([PipedArgument] EntityUid input, [CommandArgument(typeof(StatusEffectCompletionParser))] EntProtoId status, float time, float delay = 0)
+    {
+        _statusEffectsSystem ??= GetSys<StatusEffectsSystem>();
+
+        _statusEffectsSystem.TryAddStatusEffectDuration(
+            input,
+            status,
+            TimeSpan.FromSeconds(time),
+            ZeroAsNull(delay));
+
+        return input;
+    }
+
+    [CommandImplementation("add")]
+    public IEnumerable<EntityUid> Add([PipedArgument] IEnumerable<EntityUid> input, [CommandArgument(typeof(StatusEffectCompletionParser))] EntProtoId status, float time, float delay = 0)
+    {
+        _statusEffectsSystem ??= GetSys<StatusEffectsSystem>();
+
+        foreach (var ent in input)
+        {
+            _statusEffectsSystem.TryAddStatusEffectDuration(
+                ent,
+                status,
+                TimeSpan.FromSeconds(time),
+                ZeroAsNull(delay));
+
+            yield return ent;
+        }
+    }
+
+    [CommandImplementation("update")]
+    public EntityUid? Update([PipedArgument] EntityUid input, [CommandArgument(typeof(StatusEffectCompletionParser))] EntProtoId status, float time, float delay = 0)
+    {
+        _statusEffectsSystem ??= GetSys<StatusEffectsSystem>();
+
+        _statusEffectsSystem.TryUpdateStatusEffectDuration(
+            input,
+            status,
+            ZeroAsNull(time),
+            ZeroAsNull(delay));
+
+        return input;
+    }
+
+    [CommandImplementation("update")]
+    public IEnumerable<EntityUid> Update([PipedArgument] IEnumerable<EntityUid> input, [CommandArgument(typeof(StatusEffectCompletionParser))] EntProtoId status, float time, float delay = 0)
+    {
+        _statusEffectsSystem ??= GetSys<StatusEffectsSystem>();
+
+        foreach (var ent in input)
+        {
+            _statusEffectsSystem.TryUpdateStatusEffectDuration(
+                ent,
+                status,
+                ZeroAsNull(time),
+                ZeroAsNull(delay));
+
+            yield return ent;
+        }
+    }
+
+    [CommandImplementation("set")]
+    public EntityUid? Set([PipedArgument] EntityUid input, [CommandArgument(typeof(StatusEffectCompletionParser))] EntProtoId status, float time = 0, float delay = 0)
+    {
+        _statusEffectsSystem ??= GetSys<StatusEffectsSystem>();
+
+        _statusEffectsSystem.TrySetStatusEffectDuration(
+            input,
+            status,
+            ZeroAsNull(time),
+            ZeroAsNull(delay));
+
+        return input;
+    }
+
+    [CommandImplementation("set")]
+    public IEnumerable<EntityUid> Set([PipedArgument] IEnumerable<EntityUid> input, [CommandArgument(typeof(StatusEffectCompletionParser))] EntProtoId status, float time = 0, float delay = 0)
+    {
+        _statusEffectsSystem ??= GetSys<StatusEffectsSystem>();
+
+        foreach (var ent in input)
+        {
+            _statusEffectsSystem.TrySetStatusEffectDuration(
+                ent,
+                status,
+                ZeroAsNull(time),
+                ZeroAsNull(delay));
+
+            yield return ent;
+        }
+    }
+
+    [CommandImplementation("remove")]
+    public EntityUid? Remove([PipedArgument] EntityUid input, [CommandArgument(typeof(StatusEffectCompletionParser))] EntProtoId status, float time = 0)
+    {
+        _statusEffectsSystem ??= GetSys<StatusEffectsSystem>();
+
+        _statusEffectsSystem.TryRemoveTime(
+            input,
+            status,
+            ZeroAsNull(time));
+
+        return input;
+    }
+
+    [CommandImplementation("remove")]
+    public IEnumerable<EntityUid> Remove([PipedArgument] IEnumerable<EntityUid> input, [CommandArgument(typeof(StatusEffectCompletionParser))] EntProtoId status, float time = 0)
+    {
+        _statusEffectsSystem ??= GetSys<StatusEffectsSystem>();
+
+        foreach (var ent in input)
+        {
+            _statusEffectsSystem.TryRemoveTime(
+                ent,
+                status,
+                ZeroAsNull(time));
+
+            yield return ent;
+        }
+    }
+
+    private static TimeSpan? ZeroAsNull(float delay)
+    {
+        return delay == 0 ? null : TimeSpan.FromSeconds(delay);
+    }
+}
diff --git a/Content.Server/Toolshed/TypeParsers/StatusEffects/StatusEffectCompletionParser.cs b/Content.Server/Toolshed/TypeParsers/StatusEffects/StatusEffectCompletionParser.cs
new file mode 100644
index 0000000000..7faa7825d8
--- /dev/null
+++ b/Content.Server/Toolshed/TypeParsers/StatusEffects/StatusEffectCompletionParser.cs
@@ -0,0 +1,16 @@
+using Content.Shared.StatusEffectNew;
+using Robust.Shared.Console;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Toolshed;
+using Robust.Shared.Toolshed.Syntax;
+using Robust.Shared.Toolshed.TypeParsers;
+
+namespace Content.Server.Toolshed.TypeParsers.StatusEffects;
+
+public sealed class StatusEffectCompletionParser : CustomCompletionParser<EntProtoId>
+{
+    public override CompletionResult? TryAutocomplete(ParserContext ctx, CommandArgument? arg)
+    {
+        return CompletionResult.FromHintOptions(StatusEffectsSystem.StatusEffectPrototypes, GetArgHint(arg));
+    }
+}
diff --git a/Content.Shared/StatusEffectNew/StatusEffectsSystem.cs b/Content.Shared/StatusEffectNew/StatusEffectsSystem.cs
index 82915b002a..1c650e5e4c 100644
--- a/Content.Shared/StatusEffectNew/StatusEffectsSystem.cs
+++ b/Content.Shared/StatusEffectNew/StatusEffectsSystem.cs
@@ -14,6 +14,7 @@ namespace Content.Shared.StatusEffectNew;
 /// </summary>
 public sealed partial class StatusEffectsSystem : EntitySystem
 {
+    [Dependency] private readonly IComponentFactory _factory = default!;
     [Dependency] private readonly IGameTiming _timing = default!;
     [Dependency] private readonly SharedContainerSystem _container = default!;
     [Dependency] private readonly EntityWhitelistSystem _whitelist = default!;
@@ -22,6 +23,8 @@ public sealed partial class StatusEffectsSystem : EntitySystem
     private EntityQuery<StatusEffectContainerComponent> _containerQuery;
     private EntityQuery<StatusEffectComponent> _effectQuery;
 
+    public static HashSet<string> StatusEffectPrototypes = [];
+
     public override void Initialize()
     {
         base.Initialize();
@@ -35,8 +38,12 @@ public sealed partial class StatusEffectsSystem : EntitySystem
 
         SubscribeLocalEvent<RejuvenateRemovedStatusEffectComponent, StatusEffectRelayedEvent<RejuvenateEvent>>(OnRejuvenate);
 
+        SubscribeLocalEvent<PrototypesReloadedEventArgs>(OnPrototypesReloaded);
+
         _containerQuery = GetEntityQuery<StatusEffectContainerComponent>();
         _effectQuery = GetEntityQuery<StatusEffectComponent>();
+
+        ReloadStatusEffectsCache();
     }
 
     public override void Update(float frameTime)
@@ -61,6 +68,25 @@ public sealed partial class StatusEffectsSystem : EntitySystem
         }
     }
 
+    private void OnPrototypesReloaded(PrototypesReloadedEventArgs args)
+    {
+        if (!args.WasModified<EntityPrototype>())
+            return;
+
+        ReloadStatusEffectsCache();
+    }
+
+    private void ReloadStatusEffectsCache()
+    {
+        StatusEffectPrototypes.Clear();
+
+        foreach (var ent in _proto.EnumeratePrototypes<EntityPrototype>())
+        {
+            if (ent.TryGetComponent<StatusEffectComponent>(out _, _factory))
+                StatusEffectPrototypes.Add(ent.ID);
+        }
+    }
+
     private void OnStatusContainerInit(Entity<StatusEffectContainerComponent> ent, ref ComponentInit args)
     {
         ent.Comp.ActiveStatusEffects =
diff --git a/Resources/Locale/en-US/commands/toolshed-commands.ftl b/Resources/Locale/en-US/commands/toolshed-commands.ftl
index 85eae1ef3d..bfd2f780b1 100644
--- a/Resources/Locale/en-US/commands/toolshed-commands.ftl
+++ b/Resources/Locale/en-US/commands/toolshed-commands.ftl
@@ -6,9 +6,9 @@ command-description-acmd-perms =
     Returns the admin permissions of the given command, if any.
 command-description-acmd-caninvoke =
     Check if the given player can invoke the given command.
-command-description-bank-accounts = 
+command-description-bank-accounts =
     Returns all accounts on a station.
-command-description-bank-account = 
+command-description-bank-account =
     Returns a given bank account from a station.
 command-description-bank-adjust =
     Adjusts the money for the given bank account.
@@ -166,3 +166,11 @@ command-description-dynamicrule-executenow =
     Executes the piped dynamic rule as if it had reached its regular update time.
 command-description-dynamicrule-rules =
     Gets a list of all the rules spawned by the piped dynamic rule.
+command-description-statuseffect-add =
+    Adds time in seconds to a given status effect's duration, or creates one with a duration equal to time.
+command-description-statuseffect-update =
+    Sets the duration of a status effect to the higher of the inputted time or existing time. If time is 0, duration will be infinite.
+command-description-statuseffect-set =
+    Sets the duration of a status effect to the inputted time in seconds. If time is 0, duration will be infinite.
+command-description-statuseffect-remove =
+    Removes a time from a given status effect by prototype. If time isn't set, removes the status effect. 

From 41234b7eb1500130a305e6e6a1cf095929b22112 Mon Sep 17 00:00:00 2001
From: Jessica M <jessica@jessicamaybe.com>
Date: Tue, 30 Dec 2025 15:13:59 -0800
Subject: [PATCH 110/134] Move borg module remove button to the left side
 (#42119)

Move module remove button to the left side

Co-authored-by: Jessica M <jessica@maybe.sh>
---
 Content.Client/Silicons/Borgs/BorgModuleControl.xaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Content.Client/Silicons/Borgs/BorgModuleControl.xaml b/Content.Client/Silicons/Borgs/BorgModuleControl.xaml
index 2f6e25f983..1be7cea8d9 100644
--- a/Content.Client/Silicons/Borgs/BorgModuleControl.xaml
+++ b/Content.Client/Silicons/Borgs/BorgModuleControl.xaml
@@ -3,10 +3,10 @@
                 StyleClasses="PanelLight"
                 Margin="5 5 5 0">
     <BoxContainer Orientation="Horizontal" HorizontalExpand="True" Margin="5 5 0 5">
+        <TextureButton Name="RemoveButton" VerticalAlignment="Top" HorizontalAlignment="Left" Scale="0.5 0.5"/>
         <SpriteView Name="ModuleView" Margin="0 0 5 0"/>
         <BoxContainer RectClipContent="True" HorizontalExpand="True">
             <Label Name="ModuleName" HorizontalExpand="True" HorizontalAlignment="Center"/>
         </BoxContainer>
-        <TextureButton Name="RemoveButton" VerticalAlignment="Top" HorizontalAlignment="Right" Scale="0.5 0.5"/>
     </BoxContainer>
 </PanelContainer>

From cdf64617962339a37326dfe4bf690b1bfd852b2d Mon Sep 17 00:00:00 2001
From: PJBot <pieterjan.briers+bot@gmail.com>
Date: Tue, 30 Dec 2025 23:27:35 +0000
Subject: [PATCH 111/134] Automatic changelog update

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

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index 185b69b191..4d8caf677a 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -1,17 +1,4 @@
 Entries:
-- author: beck-thompson
-  changes:
-  - message: Various syndicate items can now be "locked" with your voice to hide their
-      true identity. The items are, all chameleon clothing, voice masks, no slips,
-      agent IDs, cane swords, and e daggers.
-    type: Add
-  - message: e dagger now has a slightly longer activation cool down (1s -> 1.5s).
-    type: Tweak
-  - message: Voice triggered items now properly display the trigger text when examined.
-    type: Fix
-  id: 8843
-  time: '2025-08-10T18:10:13.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/39310
 - author: jessicamaybe
   changes:
   - message: 'Added a rare Hamlet variant: Fragile Hamlet'
@@ -3943,3 +3930,10 @@
   id: 9343
   time: '2025-12-30T21:52:19.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/40121
+- author: jessicamaybe
+  changes:
+  - message: Moved borg module remove button to the left side
+    type: Tweak
+  id: 9344
+  time: '2025-12-30T23:26:26.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/42119

From dc9d4accfd3f8b98712a8fafea3a9f5ebd484d64 Mon Sep 17 00:00:00 2001
From: Crotalus <Crotalus@users.noreply.github.com>
Date: Wed, 31 Dec 2025 00:49:32 +0100
Subject: [PATCH 112/134] Fix warnings (#42175)

* Fix warnings

* Update Content.Server/Medical/DefibrillatorSystem.cs

* Update Content.Server/Medical/DefibrillatorSystem.cs

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
---
 Content.Shared/Chat/Prototypes/ChatNotificationPrototype.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Content.Shared/Chat/Prototypes/ChatNotificationPrototype.cs b/Content.Shared/Chat/Prototypes/ChatNotificationPrototype.cs
index 58315161a5..43a79e133e 100644
--- a/Content.Shared/Chat/Prototypes/ChatNotificationPrototype.cs
+++ b/Content.Shared/Chat/Prototypes/ChatNotificationPrototype.cs
@@ -6,7 +6,7 @@ namespace Content.Shared.Chat.Prototypes;
 /// <summary>
 /// A predefined notification used to warn a player of specific events.
 /// </summary>
-[Prototype("chatNotification")]
+[Prototype]
 public sealed partial class ChatNotificationPrototype : IPrototype
 {
     [ViewVariables]

From 360e43b9e7687654c4917f1e72fa62aded30d78e Mon Sep 17 00:00:00 2001
From: FotY <55259600+TheFotY@users.noreply.github.com>
Date: Wed, 31 Dec 2025 01:10:59 +0100
Subject: [PATCH 113/134] (Fix) Make paper extinguishable with fire
 extinguisher (#42142)

Make paper extinguishable with fire extinguisher
---
 Resources/Prototypes/Entities/Objects/Misc/paper.yml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/Resources/Prototypes/Entities/Objects/Misc/paper.yml b/Resources/Prototypes/Entities/Objects/Misc/paper.yml
index 890642ad0d..d435042485 100644
--- a/Resources/Prototypes/Entities/Objects/Misc/paper.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/paper.yml
@@ -8,9 +8,15 @@
     - Document
     - Paper
   - type: Appearance
+  - type: Reactive
+    groups:
+      Flammable: [ Touch ]
+      Extinguish: [ Touch ]
+  - type: ExtinguishableSetCollisionWake
   - type: Flammable
     fireSpread: true
     alwaysCombustible: true
+    canExtinguish: true
     damage:
       types:
         Heat: 1

From 8514405ca9d751c38c05f52c0912da3d6d722cef Mon Sep 17 00:00:00 2001
From: PJBot <pieterjan.briers+bot@gmail.com>
Date: Wed, 31 Dec 2025 00:24:27 +0000
Subject: [PATCH 114/134] 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 4d8caf677a..bba8b2d915 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -1,11 +1,4 @@
 Entries:
-- author: jessicamaybe
-  changes:
-  - message: 'Added a rare Hamlet variant: Fragile Hamlet'
-    type: Add
-  id: 8844
-  time: '2025-08-10T22:20:26.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/39531
 - author: perryprog
   changes:
   - message: "Diona\_nymphs that reform inside of a locker will no longer be invisible."
@@ -3937,3 +3930,10 @@
   id: 9344
   time: '2025-12-30T23:26:26.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/42119
+- author: TheFotY
+  changes:
+  - message: Paper can now be extinguished (e.g. fire extinguisher)
+    type: Fix
+  id: 9345
+  time: '2025-12-31T00:23:19.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/42142

From 97a75f49c6b059024729d969ed7116551153389e Mon Sep 17 00:00:00 2001
From: Princess Cheeseballs
 <66055347+Princess-Cheeseballs@users.noreply.github.com>
Date: Tue, 30 Dec 2025 16:42:49 -0800
Subject: [PATCH 115/134] Damageable Cleanup + Bugfix (#42076)

* Does not build do not PR

* using blah blah blah rider hates me

---------

Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
---
 .../Tests/Damageable/DamageableTest.cs        | 20 +++++++++----------
 .../Damage/Systems/DamageableSystem.API.cs    |  3 +--
 .../DamageableSystem.BenchmarkHelpers.cs      |  2 +-
 3 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/Content.IntegrationTests/Tests/Damageable/DamageableTest.cs b/Content.IntegrationTests/Tests/Damageable/DamageableTest.cs
index 72e8901631..20b0877548 100644
--- a/Content.IntegrationTests/Tests/Damageable/DamageableTest.cs
+++ b/Content.IntegrationTests/Tests/Damageable/DamageableTest.cs
@@ -164,7 +164,7 @@ namespace Content.IntegrationTests.Tests.Damageable
                 var damageToDeal = FixedPoint2.New(types.Count * 5);
                 DamageSpecifier damage = new(group3, damageToDeal);
 
-                sDamageableSystem.TryChangeDamage(uid, damage, true);
+                sDamageableSystem.ChangeDamage(uid, damage, true);
 
                 Assert.Multiple(() =>
                 {
@@ -178,7 +178,7 @@ namespace Content.IntegrationTests.Tests.Damageable
                 });
 
                 // Heal
-                sDamageableSystem.TryChangeDamage(uid, -damage);
+                sDamageableSystem.ChangeDamage(uid, -damage);
 
                 Assert.Multiple(() =>
                 {
@@ -197,7 +197,7 @@ namespace Content.IntegrationTests.Tests.Damageable
                 Assert.That(types, Has.Count.EqualTo(3));
 
                 damage = new DamageSpecifier(group3, 14);
-                sDamageableSystem.TryChangeDamage(uid, damage, true);
+                sDamageableSystem.ChangeDamage(uid, damage, true);
 
                 Assert.Multiple(() =>
                 {
@@ -209,7 +209,7 @@ namespace Content.IntegrationTests.Tests.Damageable
                 });
 
                 // Heal
-                sDamageableSystem.TryChangeDamage(uid, -damage);
+                sDamageableSystem.ChangeDamage(uid, -damage);
 
                 Assert.Multiple(() =>
                 {
@@ -225,7 +225,7 @@ namespace Content.IntegrationTests.Tests.Damageable
                     Assert.That(sDamageableComponent.TotalDamage, Is.EqualTo(FixedPoint2.Zero));
                 });
                 damage = new DamageSpecifier(group1, FixedPoint2.New(10)) + new DamageSpecifier(type2b, FixedPoint2.New(10));
-                sDamageableSystem.TryChangeDamage(uid, damage, true);
+                sDamageableSystem.ChangeDamage(uid, damage, true);
 
                 Assert.Multiple(() =>
                 {
@@ -245,9 +245,9 @@ namespace Content.IntegrationTests.Tests.Damageable
                 Assert.That(sDamageableComponent.TotalDamage, Is.EqualTo(FixedPoint2.Zero));
 
                 // Test 'wasted' healing
-                sDamageableSystem.TryChangeDamage(uid, new DamageSpecifier(type3a, 5));
-                sDamageableSystem.TryChangeDamage(uid, new DamageSpecifier(type3b, 7));
-                sDamageableSystem.TryChangeDamage(uid, new DamageSpecifier(group3, -11));
+                sDamageableSystem.ChangeDamage(uid, new DamageSpecifier(type3a, 5));
+                sDamageableSystem.ChangeDamage(uid, new DamageSpecifier(type3b, 7));
+                sDamageableSystem.ChangeDamage(uid, new DamageSpecifier(group3, -11));
 
                 Assert.Multiple(() =>
                 {
@@ -257,11 +257,11 @@ namespace Content.IntegrationTests.Tests.Damageable
                 });
 
                 // Test Over-Healing
-                sDamageableSystem.TryChangeDamage(uid, new DamageSpecifier(group3, FixedPoint2.New(-100)));
+                sDamageableSystem.ChangeDamage(uid, new DamageSpecifier(group3, FixedPoint2.New(-100)));
                 Assert.That(sDamageableComponent.TotalDamage, Is.EqualTo(FixedPoint2.Zero));
 
                 // Test that if no health change occurred, returns false
-                sDamageableSystem.TryChangeDamage(uid, new DamageSpecifier(group3, -100));
+                sDamageableSystem.ChangeDamage(uid, new DamageSpecifier(group3, -100));
                 Assert.That(sDamageableComponent.TotalDamage, Is.EqualTo(FixedPoint2.Zero));
             });
             await pair.CleanReturnAsync();
diff --git a/Content.Shared/Damage/Systems/DamageableSystem.API.cs b/Content.Shared/Damage/Systems/DamageableSystem.API.cs
index e1c44f55be..e08e742b41 100644
--- a/Content.Shared/Damage/Systems/DamageableSystem.API.cs
+++ b/Content.Shared/Damage/Systems/DamageableSystem.API.cs
@@ -1,5 +1,4 @@
 using System.Linq;
-using System.Net.Sockets;
 using Content.Shared.Damage.Components;
 using Content.Shared.Damage.Prototypes;
 using Content.Shared.FixedPoint;
@@ -103,7 +102,7 @@ public sealed partial class DamageableSystem
         //! Empty just checks if the DamageSpecifier is _literally_ empty, as in, is internal dictionary of damage types is empty.
         // If you deal 0.0 of some damage type, Empty will be false!
         newDamage = ChangeDamage(ent, damage, ignoreResistances, interruptsDoAfters, origin, ignoreGlobalModifiers);
-        return !damage.Empty;
+        return !newDamage.Empty;
     }
 
     /// <summary>
diff --git a/Content.Shared/Damage/Systems/DamageableSystem.BenchmarkHelpers.cs b/Content.Shared/Damage/Systems/DamageableSystem.BenchmarkHelpers.cs
index 5ca7fe1992..0175b5fb5e 100644
--- a/Content.Shared/Damage/Systems/DamageableSystem.BenchmarkHelpers.cs
+++ b/Content.Shared/Damage/Systems/DamageableSystem.BenchmarkHelpers.cs
@@ -11,7 +11,7 @@ public sealed partial class DamageableSystem
     {
         foreach (var (uid, damageable) in damageables)
         {
-            TryChangeDamage((uid, damageable), damage);
+            ChangeDamage((uid, damageable), damage);
         }
     }
 }

From 2c5b67fc3f0f063e6039741b067876b03b9c28b5 Mon Sep 17 00:00:00 2001
From: YoungThug <ramialanbagy@gmail.com>
Date: Tue, 30 Dec 2025 18:23:59 -0700
Subject: [PATCH 116/134] Ninjas now get a custom bag! (#42112)

* Ninjas now recieve a custom satchel

* Original Size

* Requested Changes + Making bag silent

* Add code comment
---
 .../Entities/Clothing/Back/satchel.yml        |  12 ++++++++
 Resources/Prototypes/Roles/Antags/ninja.yml   |   2 +-
 .../Satchels/ninja.rsi/equipped-BACKPACK.png  | Bin 0 -> 711 bytes
 .../Clothing/Back/Satchels/ninja.rsi/icon.png | Bin 0 -> 684 bytes
 .../Back/Satchels/ninja.rsi/inhand-left.png   | Bin 0 -> 735 bytes
 .../Back/Satchels/ninja.rsi/inhand-right.png  | Bin 0 -> 696 bytes
 .../Back/Satchels/ninja.rsi/meta.json         |  26 ++++++++++++++++++
 7 files changed, 39 insertions(+), 1 deletion(-)
 create mode 100644 Resources/Textures/Clothing/Back/Satchels/ninja.rsi/equipped-BACKPACK.png
 create mode 100644 Resources/Textures/Clothing/Back/Satchels/ninja.rsi/icon.png
 create mode 100644 Resources/Textures/Clothing/Back/Satchels/ninja.rsi/inhand-left.png
 create mode 100644 Resources/Textures/Clothing/Back/Satchels/ninja.rsi/inhand-right.png
 create mode 100644 Resources/Textures/Clothing/Back/Satchels/ninja.rsi/meta.json

diff --git a/Resources/Prototypes/Entities/Clothing/Back/satchel.yml b/Resources/Prototypes/Entities/Clothing/Back/satchel.yml
index f12a837be0..c0c53c9f70 100644
--- a/Resources/Prototypes/Entities/Clothing/Back/satchel.yml
+++ b/Resources/Prototypes/Entities/Clothing/Back/satchel.yml
@@ -168,6 +168,18 @@
     - type: Sprite
       sprite: Clothing/Back/Satchels/salvage.rsi
 
+- type: entity
+  parent: [ClothingBackpackSatchel, BaseHighlyIllegalContraband]
+  id: ClothingBackpackSatchelNinja
+  name: spider clan satchel
+  description: A robust satchel for stashing your loot.
+  components:
+  - type: Sprite
+    sprite: Clothing/Back/Satchels/ninja.rsi
+  - type: Storage # Backpack sounds are null due to silent ninja tech
+    storageOpenSound: null
+    storageInsertSound: null
+
 - type: entity
   parent: ClothingBackpackSatchel
   id: ClothingBackpackSatchelHolding
diff --git a/Resources/Prototypes/Roles/Antags/ninja.yml b/Resources/Prototypes/Roles/Antags/ninja.yml
index 27f4859cfb..b43dbf72c1 100644
--- a/Resources/Prototypes/Roles/Antags/ninja.yml
+++ b/Resources/Prototypes/Roles/Antags/ninja.yml
@@ -11,7 +11,7 @@
   id: SpaceNinjaGear
   equipment:
     jumpsuit: ClothingUniformJumpsuitNinja
-    back: ClothingBackpackSatchel
+    back: ClothingBackpackSatchelNinja
     mask: ClothingMaskNinja
     head: ClothingHeadHelmetSpaceNinja
     eyes: ClothingEyesVisorNinja
diff --git a/Resources/Textures/Clothing/Back/Satchels/ninja.rsi/equipped-BACKPACK.png b/Resources/Textures/Clothing/Back/Satchels/ninja.rsi/equipped-BACKPACK.png
new file mode 100644
index 0000000000000000000000000000000000000000..bcb6f2475e9cf791e32623b0e5c7bff03e454293
GIT binary patch
literal 711
zcmV;&0yzDNP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF0007vNkl<ZcwX(A
zze)o^5XL8<X;g@RVr@W(U=ZyC5?>*uSXuc_T8U*|K@rkNC4zxKY;26ips_iHl_^dR
zF*>t5d)aVvRUkVv-}l?uyJ9B?8Gmva_YVp{J0Rl(^ay0U0rVxPM?jB&Ac6UXIWu~D
z_tsTD@{5Yy-q|$W?mhT`facfN*WjvkE2>#68Jd?C_giyH*AW3AE$Y8hDOt}MfTWoJ
zj3@t>s_O(mN(9HaGz4n^lQtiNaMfW2z_qCDj*p9T(Zd2ztyay|b<4|V&J_xNCNT&1
z6HEqx=JT_&aDH(?j&U``jo+))O!V;q&1RFVk+iT<shHJb5f+!0pwVcMVz}ZZ*4OKG
z^D-E~W4{mWcAKP=v}opF*KD+&$w?*5*yg~^y4zWX&(lkiH`1cg*_J6CF9+TJF)%!;
z4@a-i+rJ@sBQ2VS^PdEOzp3v55&%qyFPM;DfJp#U^B6-0V0$J*k5d4l?~reO+5x@^
zhn`<MAoLybtxr3^H{sCpYX^kBL%#KC2lyr&dVcMI(09nUKJ5VCghS7-9U!?wE;lr`
zI<RIOYjZs>)&Y|;pEPZwVQK-4Gs}fAl>q)SIS~NdqPFK9<D_eebbz!d7eL%t1;8OD
z_2S{w^u3nV0lxvjd&ANDi}?JWZ{u-(763H+^WM#7C?PF#lsaSpXnr^xLb+W29+E)w
zI5g4ebf8cukZ)uu!qQs90)QhjIDLT+4k6&s1U@)D!W~WVWe^7>sM8^+feiqS=JR>z
z9X>(nWCfxq0tAyLfN>_d=2-x6aXcsixdb<3QZ+B#IphwA3nPS|A~*vH(gs}fu>rUi
t3@u&(gtjAT>(LHKn|NsTGT#ATj2<gc_k2`c00000NkvXXu0mjf0037IJH`M2

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Clothing/Back/Satchels/ninja.rsi/icon.png b/Resources/Textures/Clothing/Back/Satchels/ninja.rsi/icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..21e92836863b30e1a52235a0c4675361a57415af
GIT binary patch
literal 684
zcmV;d0#p5oP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80007VNkl<ZSV!%a
zzfw~{6vj`mM4f~Sc4W|8VnN}*o9F{z;#j71cmReM;2D%A72{K+HriTXh@wRbLlO!*
z;gSq!X#(HM**SOb-akUYjFZ!3bMM(bzy0>x-J79nj?6XJrzyZxf&Wv1hmTe!a(8{*
z>qJg8wE{P9%?1Wd+P-VA*68QqA-RQuPJOer6{?pC0L3fMt27!8!*w&p5R(aIb2)nd
zp-BueIQUNY?%r20CPX3t7w5_W2wD8RFapI946xJssG$Lo&*!OLuj{&(0`Ps`x&n^l
z1OSlq>-2X9o<MO936Tn5V|{~q{l4lC1=0XO?(MhR3IP2W;-3_N{AI69p699JfUx>N
z=z%3*<F(suYPDNh1*BD0Uj}>-sQ|kk02~a$FmfHF+fkUq1i(@>8jW}lKrWC%LbxB%
z@AcGgwOXZSvuX8!eCL%)D(7G@P%60YlKO9+2_Xe!am*gZlF{vUsq-L5i!X-s<K17!
zb9?36kP5C#H)dvZ7xoK7!~(EUu!VT$vN#3?z{#dn0J{B}s8}r0pYb@9fHB#S@?}5)
z6X4Fm0(JNIRla|8r2EAwz)8;hylNJgm(_`w2q5<=k`d+7Q(e@Vn^QA`7vdD)CGd}r
zb>G(RC+qBypcRk+aH&3iN24n#kj-WzXP*iHNuzU!%P4^2h$#7E0q|1Z1H26(G1~9}
zT#w*3zr!=MlZr<I;P&F}VqU}QR=ijiy~r00mRmlzIbXiF?gAu82=0*Pn;@y632i-y
zo;-f0@;-mrG4s`b^EkC8rF<B97u0IC&=-(A!&8o*n3i}QCysE%gekyOfiuMeTrg3U
S3L*di002ovPDHLkV1fW~Nk3}<

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Clothing/Back/Satchels/ninja.rsi/inhand-left.png b/Resources/Textures/Clothing/Back/Satchels/ninja.rsi/inhand-left.png
new file mode 100644
index 0000000000000000000000000000000000000000..dffd1c35c5512a1f0a6f1d471f91f247d23b6d63
GIT binary patch
literal 735
zcmV<50wDc~P)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF0007}Nkl<ZcwX(A
zu}%U(5QY~N8Z^NmbQW|b5+j`j(Lm)(SXuc9K7lWxrSD(`4TT*RnAo9F8_-Bpnj?BL
zt8=+r&K&H{ZPx725IAo4pKt!zOPI+B$6p!8;};Bo9pE?tE&<04z=t500GEK{1h@no
zHvm5cxCFQa94Ejf;J5+ko&vR6%?FtMe*a&&ibN~~U#V22ncD3($(ra)SR0_?JGEm;
z#D)QcA?S*R`-{b*$meomI2xtmE^Po9{BSrFxAl_PICvEgmuq6P_aeX*@V!b|VDJDG
z07$T%j<(*YgR~b6vXsw@!O^n}9w1cD*M;YKVmuxz0a!lV_jd=MGI(z~mG4#pXti4M
z@PkZO%H;qsSXSp;s9tRQ)w5C%ywwhXKq1>`RS+w)Hgkne2>?*czO?{A7(N2yPUyS)
zf%tfzD3w}tU6r#W>8YV4EN;=2)q)=v=wII_3B&8U_b2T`1^_mS6H5`mPJPS2?%j}T
zMKI)xg4i&1D&c8CAP10SIoqx?0NXNRS`RzGG;!PZV+Yul5z~6u0j7!DwjVpdwv3q8
z!wxV_+_wGL0k&ntv>tYVY2vo+#}2S9Bc}DR156XQZNF3;pxYIm2NKmh0y%(2qaptm
zS8a;U8$7nny4|i;3|cow#bWSj_VZy+*^>Wl#6s^7A*eWy6aWao8G*v-m*hj;&%<^+
zIBar~4chUr9}H70>O3+4nEj{YHz{iGF`LR%M|g1Js=5>mWWX$eO6idUfDC{=VLl)Y
z2eg{apLvAY`jBya;lA*BkwFSF03b{bMMQ=q(kKBu0HbG+%GpB(AZ|v0I(Q72avp&U
zKsXx|E%BtsA=NwrIRF#EBOHo(1Tp|P7eF-+kmLZot~-xF24G&nw*Ag|0N>)xNl?zV
R3z+}_002ovPDHLkV1knvK<@wm

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Clothing/Back/Satchels/ninja.rsi/inhand-right.png b/Resources/Textures/Clothing/Back/Satchels/ninja.rsi/inhand-right.png
new file mode 100644
index 0000000000000000000000000000000000000000..cd1da5cef6ea6e410c49cba5bfaaea6a1173e5c9
GIT binary patch
literal 696
zcmV;p0!RIcP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF0007hNkl<ZcwX(A
zF-`(e5Qb+hMU8~86vo0rFp(Isq2T~l7H|YAkKhSBf+w)V#Lh|@8XB>{M6fg#fU-oT
zb!9erWP`%nU3SNbJFg)D_Rask`R8phV?fN85%cqd01yYnoPd--%ncxypp<}=K+Fk9
z3B=q0@)nR1kP?VF0V#o)8^GUNAfM0M?RNWLxyILFs@1C9Y&L;2gi57i*J?FGed-*(
z5P&=5<#O4^&AQ#LvnN*wN@u^{htX)H)u{!L%jMvD^%b^{EqK03!pS)0K;R0XR4Un-
zOvXu4r_<5uoC^T6pUq|gNxq!EJBLRITNfK(nkHKaX#L3o!!V%N>uFuE5J0h51k17<
z2uKw-#KR|(N#J@HC<mZc)U0!Xwgl!~B3w%Vo$J=D)4349+IqtN{22fE&%Ez-H!k(>
zUUX_-gR`4>*_8UAzs2*aQwsn$KP>D|ZFS#z@bt`IK~P$~>STQw3Wx%Lf->hA;sDOs
zq0lA{prFh-hB$z8b||!o11KnSjv)@<oE-{n;s6TDoMVUsIA@1Kn>c`iGUpiL0M6N=
z&?XL8mNM1MKvZ#-b^x}cqwW^t;mvd!ZtL}>_0A^T_lE9F>|7q$*frj3y*c~p`fx$q
zhVdQ?DW@$znlx&|h7bq<&J5g@pQbJIqpMwQ7dFV@@fid#K3jpr`Bx;6eF1RK3}BmF
zEo`4hF*Bg7zd32g<5E5UMx)_N_agYdHgXGc&kSH6-Wm>}KNy5s1{e?Brk3jY;|x$x
zM}=|+%nKgX9WWa&%s9SDQqK%{ZF2{8gl_;Ch<auqN(g}fAOz}}fvDmI1`yP8+@2Ev
e+%iI~=NrHMDo{MkeFp#l002ovPDHLkV1fW}wLAO(

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Clothing/Back/Satchels/ninja.rsi/meta.json b/Resources/Textures/Clothing/Back/Satchels/ninja.rsi/meta.json
new file mode 100644
index 0000000000..845c890b00
--- /dev/null
+++ b/Resources/Textures/Clothing/Back/Satchels/ninja.rsi/meta.json
@@ -0,0 +1,26 @@
+{
+   "version": 1,
+   "license": "CC-BY-SA-3.0",
+   "copyright": "Sprites by YoungThugSS14 (Github) ",
+   "size": {
+     "x": 32,
+     "y": 32
+   },
+   "states": [
+     {
+       "name": "icon"
+     },
+     {
+       "name": "equipped-BACKPACK",
+       "directions": 4
+     },
+     {
+       "name": "inhand-left",
+       "directions": 4
+     },
+     {
+       "name": "inhand-right",
+       "directions": 4
+     }
+   ]
+}

From 4eab48fe355dd6bcc6c0e41254732c58ca3eaff1 Mon Sep 17 00:00:00 2001
From: PJBot <pieterjan.briers+bot@gmail.com>
Date: Wed, 31 Dec 2025 01:38:43 +0000
Subject: [PATCH 117/134] 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 bba8b2d915..5a5212abf5 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -1,11 +1,4 @@
 Entries:
-- author: perryprog
-  changes:
-  - message: "Diona\_nymphs that reform inside of a locker will no longer be invisible."
-    type: Fix
-  id: 8845
-  time: '2025-08-11T11:00:12.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/39505
 - author: Samuka
   changes:
   - message: The Robotics Console now correctly displays the brain installed information
@@ -3937,3 +3930,10 @@
   id: 9345
   time: '2025-12-31T00:23:19.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/42142
+- author: YoungThugSS14
+  changes:
+  - message: Ninjas now spawn with a custom satchel.
+    type: Add
+  id: 9346
+  time: '2025-12-31T01:37:36.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/42112

From 1801f474184dbfdf2672567990c8a0cce5991260 Mon Sep 17 00:00:00 2001
From: Connor Huffine <chuffine@gmail.com>
Date: Tue, 30 Dec 2025 20:27:59 -0500
Subject: [PATCH 118/134] Fix broken FTL references (#42181)

Add broken FTL links
---
 Content.Server/Implants/ImplanterSystem.cs    | 4 ++--
 Content.Shared/Silicons/Bots/MedibotSystem.cs | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Content.Server/Implants/ImplanterSystem.cs b/Content.Server/Implants/ImplanterSystem.cs
index 48e83e4878..08b744ee09 100644
--- a/Content.Server/Implants/ImplanterSystem.cs
+++ b/Content.Server/Implants/ImplanterSystem.cs
@@ -88,7 +88,7 @@ public sealed partial class ImplanterSystem : SharedImplanterSystem
         if (!_doAfter.TryStartDoAfter(args))
             return;
 
-        _popup.PopupEntity(Loc.GetString("injector-component-injecting-user"), target, user);
+        _popup.PopupEntity(Loc.GetString("injector-component-needle-injecting-user"), target, user);
 
         var userName = Identity.Entity(user, EntityManager);
         _popup.PopupEntity(Loc.GetString("implanter-component-implanting-target", ("user", userName)), user, target, PopupType.LargeCaution);
@@ -112,7 +112,7 @@ public sealed partial class ImplanterSystem : SharedImplanterSystem
         };
 
         if (_doAfter.TryStartDoAfter(args))
-            _popup.PopupEntity(Loc.GetString("injector-component-injecting-user"), target, user);
+            _popup.PopupEntity(Loc.GetString("injector-component-needle-injecting-user"), target, user);
 
     }
 
diff --git a/Content.Shared/Silicons/Bots/MedibotSystem.cs b/Content.Shared/Silicons/Bots/MedibotSystem.cs
index 68ee5ff405..2e832da456 100644
--- a/Content.Shared/Silicons/Bots/MedibotSystem.cs
+++ b/Content.Shared/Silicons/Bots/MedibotSystem.cs
@@ -135,7 +135,7 @@ public sealed class MedibotSystem : EntitySystem
         EnsureComp<NPCRecentlyInjectedComponent>(target);
         _solutionContainer.TryAddReagent(injectable.Value, treatment.Reagent, treatment.Quantity, out _);
 
-        _popup.PopupEntity(Loc.GetString("hypospray-component-feel-prick-message"), target, target);
+        _popup.PopupEntity(Loc.GetString("injector-component-feel-prick-message"), target, target);
         _popup.PopupClient(Loc.GetString("medibot-target-injected"), medibot, medibot);
 
         _audio.PlayPredicted(medibot.Comp.InjectSound, medibot, medibot);

From 540f4e4c61dd4f135014f1c428ac2cd0a013d2f6 Mon Sep 17 00:00:00 2001
From: PJBot <pieterjan.briers+bot@gmail.com>
Date: Wed, 31 Dec 2025 01:53:30 +0000
Subject: [PATCH 119/134] Automatic changelog update

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

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index 5a5212abf5..5c5264e5e7 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -1,17 +1,4 @@
 Entries:
-- author: Samuka
-  changes:
-  - message: The Robotics Console now correctly displays the brain installed information
-      if the borg has a empty MMI
-    type: Fix
-  - message: The Robotics Console now shows the borg physical integrity
-    type: Tweak
-  - message: Changed the colors for the battery display in the robotics console so
-      it easier to read the percentage
-    type: Tweak
-  id: 8846
-  time: '2025-08-11T18:57:39.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/38023
 - author: metalgearsloth
   changes:
   - message: Inserting lights now plays an insert animation.
@@ -3937,3 +3924,10 @@
   id: 9346
   time: '2025-12-31T01:37:36.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/42112
+- author: kontakt
+  changes:
+  - message: Fixed broken FTL links for implanters and medibot.
+    type: Fix
+  id: 9347
+  time: '2025-12-31T01:52:22.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/42181

From e9932ec0ea4f3e2954db734c2078e0545d7734a5 Mon Sep 17 00:00:00 2001
From: Ted Lukin <fedorlukin2006@gmail.com>
Date: Wed, 31 Dec 2025 17:59:47 +0700
Subject: [PATCH 120/134] Happy 2026 (#42186)

---
 LICENSE.TXT | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/LICENSE.TXT b/LICENSE.TXT
index 30d1999e16..8a1fc2f00e 100644
--- a/LICENSE.TXT
+++ b/LICENSE.TXT
@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2017-2025 Space Wizards Federation
+Copyright (c) 2017-2026 Space Wizards Federation
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

From 24005e3e936ac7e1256f7a6ad2a5b22ca6c0e64d Mon Sep 17 00:00:00 2001
From: Princess Cheeseballs
 <66055347+Princess-Cheeseballs@users.noreply.github.com>
Date: Wed, 31 Dec 2025 21:29:36 -0800
Subject: [PATCH 121/134] Jet Injector Tweaks and Cleanup. (#42158)

* delete metabolismmovespeedmodifiersystem

* Revert "delete metabolismmovespeedmodifiersystem"

This reverts commit 19572fa0858bfb9385f4717fc77c8956bdbc56c0.

* misc cleanup

* math shows I should do this

* prevent popups

* fix handling as well

* this too

* actually these can create popups so just always handle em...

* remove comment

* final fixes

---------

Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
---
 .../Chemistry/EntitySystems/InjectorSystem.cs |  18 +++++++++---------
 .../Fluids/SharedPuddleSystem.Spillable.cs    |   2 +-
 .../Audio/Items/Medical/attributions.yml      |   7 ++++++-
 .../Audio/Items/Medical/jet_injector.ogg      | Bin 0 -> 49845 bytes
 Resources/Audio/Items/attributions.yml        |   5 -----
 Resources/Audio/Items/jet_injector.ogg        | Bin 20742 -> 0 bytes
 .../components/injector-component.ftl         |   6 +++---
 .../Prototypes/Chemistry/injector_modes.yml   |   2 +-
 .../Objects/Specific/Medical/hypospray.yml    |  13 ++++++-------
 9 files changed, 26 insertions(+), 27 deletions(-)
 create mode 100644 Resources/Audio/Items/Medical/jet_injector.ogg
 delete mode 100644 Resources/Audio/Items/jet_injector.ogg

diff --git a/Content.Shared/Chemistry/EntitySystems/InjectorSystem.cs b/Content.Shared/Chemistry/EntitySystems/InjectorSystem.cs
index 4fa44f2fa4..7abd29a8c4 100644
--- a/Content.Shared/Chemistry/EntitySystems/InjectorSystem.cs
+++ b/Content.Shared/Chemistry/EntitySystems/InjectorSystem.cs
@@ -65,6 +65,7 @@ public sealed partial class InjectorSystem : EntitySystem
             ToggleMode(injector, args.User);
 
         args.Handled = true;
+        args.ApplyDelay = false;
     }
 
     private void OnInjectorAfterInteract(Entity<InjectorComponent> injector, ref AfterInteractEvent args)
@@ -82,12 +83,12 @@ public sealed partial class InjectorSystem : EntitySystem
                 return;
             }
 
-            args.Handled = TryMobsDoAfter(injector, args.User, target);
+            args.Handled |= TryMobsDoAfter(injector, args.User, target);
             return;
         }
 
         // Draw from or inject into jugs, bottles, etc.
-        args.Handled = ContainerDoAfter(injector, args.User, target);
+        args.Handled |= TryContainerDoAfter(injector, args.User, target);
     }
 
     private void OnInjectDoAfter(Entity<InjectorComponent> injector, ref InjectorDoAfterEvent args)
@@ -95,7 +96,7 @@ public sealed partial class InjectorSystem : EntitySystem
         if (args.Cancelled || args.Handled || args.Args.Target == null)
             return;
 
-        args.Handled = TryUseInjector(injector, args.Args.User, args.Args.Target.Value);
+        args.Handled |= TryUseInjector(injector, args.Args.User, args.Args.Target.Value);
     }
 
     private void OnAttack(Entity<InjectorComponent> injector, ref MeleeHitEvent args)
@@ -197,7 +198,7 @@ public sealed partial class InjectorSystem : EntitySystem
             || !GetMobsDoAfterTime(injector, user, target, out var doAfterTime, out var amount)) // Get the DoAfter time.
             return false;
 
-        _doAfter.TryStartDoAfter(new DoAfterArgs(EntityManager, user, doAfterTime, new InjectorDoAfterEvent(), injector.Owner, target: target, used: injector.Owner)
+        if (!_doAfter.TryStartDoAfter(new DoAfterArgs(EntityManager, user, doAfterTime, new InjectorDoAfterEvent(), injector.Owner, target: target, used: injector.Owner)
         {
             BreakOnMove = true,
             BreakOnWeightlessMove = false,
@@ -205,7 +206,8 @@ public sealed partial class InjectorSystem : EntitySystem
             NeedHand = injector.Comp.NeedHand,
             BreakOnHandChange = injector.Comp.BreakOnHandChange,
             MovementThreshold = injector.Comp.MovementThreshold,
-        });
+        }))
+            return false;
 
         // If the DoAfter was instant, don't send popups and logs indicating an attempt.
         if (doAfterTime == TimeSpan.Zero)
@@ -309,12 +311,12 @@ public sealed partial class InjectorSystem : EntitySystem
     #endregion Mob Interaction
 
     #region Container Interaction
-    private bool ContainerDoAfter(Entity<InjectorComponent> injector, EntityUid user, EntityUid target)
+    private bool TryContainerDoAfter(Entity<InjectorComponent> injector, EntityUid user, EntityUid target)
     {
         if (!GetContainerDoAfterTime(injector, user, target, out var doAfterTime))
             return false;
 
-        _doAfter.TryStartDoAfter(new DoAfterArgs(EntityManager, user, doAfterTime, new InjectorDoAfterEvent(), injector.Owner, target: target, used: injector.Owner)
+        return _doAfter.TryStartDoAfter(new DoAfterArgs(EntityManager, user, doAfterTime, new InjectorDoAfterEvent(), injector.Owner, target: target, used: injector.Owner)
         {
             BreakOnMove = true,
             BreakOnWeightlessMove = false,
@@ -323,8 +325,6 @@ public sealed partial class InjectorSystem : EntitySystem
             BreakOnHandChange = injector.Comp.BreakOnHandChange,
             MovementThreshold = injector.Comp.MovementThreshold,
         });
-
-        return true;
     }
 
     /// <summary>
diff --git a/Content.Shared/Fluids/SharedPuddleSystem.Spillable.cs b/Content.Shared/Fluids/SharedPuddleSystem.Spillable.cs
index 9dcd965492..c8bd36f6b0 100644
--- a/Content.Shared/Fluids/SharedPuddleSystem.Spillable.cs
+++ b/Content.Shared/Fluids/SharedPuddleSystem.Spillable.cs
@@ -80,7 +80,7 @@ public abstract partial class SharedPuddleSystem
                 // Injectors should not be hardcoded here.
                 if (TryComp<InjectorComponent>(entity, out var injectorComp)
                     && _prototypeManager.Resolve(injectorComp.ActiveModeProtoId, out var activeMode)
-                    && !activeMode.Behavior.HasFlag(InjectorBehavior.Draw))
+                    && !activeMode.Behavior.HasAnyFlag(InjectorBehavior.Draw | InjectorBehavior.Dynamic))
                 {
                     foreach (var mode in injectorComp.AllowedModes)
                     {
diff --git a/Resources/Audio/Items/Medical/attributions.yml b/Resources/Audio/Items/Medical/attributions.yml
index a6b352ef22..09c4dcd0f5 100644
--- a/Resources/Audio/Items/Medical/attributions.yml
+++ b/Resources/Audio/Items/Medical/attributions.yml
@@ -1,4 +1,9 @@
 - files: ["healthscanner.ogg"]
   license: "CC-BY-4.0"
   copyright: "Taken from FM Synthesis on freesound.org"
-  source: "https://freesound.org/people/FreqMan/sounds/32683/"
\ No newline at end of file
+  source: "https://freesound.org/people/FreqMan/sounds/32683/"
+
+- files: ["jet_injector.ogg"]
+  license: "CC-BY-3.0"
+  copyright: "Orginal audio by EminYILDIRIM -- https://freesound.org/s/548009/ -- License: Attribution 4.0, 2imitk -- https://freesound.org/s/279044/ -- License: Attribution 3.0 and brunoboselli -- https://freesound.org/s/457294/ -- License: Creative Commons 0 --  https://freesound.org/s/460586/ -- License: Attribution NonCommercial 4.0, modified by Princess-Cheeseballs (GitHub)"
+  source: "https://github.com/space-wizards/space-station-14/pull/40076"
diff --git a/Resources/Audio/Items/Medical/jet_injector.ogg b/Resources/Audio/Items/Medical/jet_injector.ogg
new file mode 100644
index 0000000000000000000000000000000000000000..306e11396b296ed23bab8ba54eec376c7a01ae06
GIT binary patch
literal 49845
zcmb@uby!tR`zX8#1(Xt`TSY`c*mS4TA>EyuO>a_CLO@cwL%O?5L`s@XcXxMl7Wh2x
z@BPmAUFZDst!r4$%pG&*%&ggKDQjY)073-)b4@z^tsLr<B_NO^I9S>0Ltyt^2%hzS
zA&j|550x4O*?Y?WT=$d+Kr44%ycOqe`R@ODjUfGH#R6ccLaa^S%i5YynnU!J9|oWl
zr(|MeVq|1zWTAW`Z)9k10I@Wo{AlR_v9+?aFtW6x#RBL^fImTbMR5g1-cPm=O9LYq
zj9%E($OvYnuV-!!!vVmG;)+rqc_obOD8((!j126oYzgm)q=b~Dc@-4EER+gX_Lhc}
zAB~LxAPg6P$=X6pKIqvQ@d5&{(lc?=gPG8P?hk^BA0N7&0SyH!V>?GZTO(dUdqX_~
zh@JC2p|F*;GeB!<$15yMFQi7#{GRb%!2fhpS^)CtnHc>K7!v?1LM)8rjf{<KjR5(1
z??<{9;J%ml=|2sKr5+$R?>+WC?0>Mo06ia!U<S4jYdeUQCGTHdj2?8MG`6y()T1;5
zG>817`Fl!fJwqc(duvK7V@d}-TZolCjMB=^)X0`nSeO#_V2HoOFu?v65GNx;N;@kP
zqk9ZGN&{0P11Kd>r_{5vgV@^Z+ux4~qq-OQqooPN(#Xj6L4HXiXGberLl`f@qrWbG
zCnT(l073=uz*3ZLo&#Y@AP_bPr2C2%Gs0M$HZwBqjdN_I*nO>yF(5WFppDQV2;Bbf
zjgrL>4+KI6dA>mlNnaH=>*F*bqzSQ2<%Gy^WK*Jilbh#6`*rf#z%r{M3u@U%OO1-5
z_6P(-uz(nq?{oS4o4!BQS3=<CM{3(im7Qq&<ZVu>*Au2rN^dEqjf@Bxu8o}Z5U$NP
z6$3&~=_`gLq`)J}21SjJwOnC+oNI~y+|VBMpaf(QdQ4=9Erfc{-k&xr))rv(S1n4A
zC!i)s^!s!1(&yc!q`iZ$WDn`&a9IbLKPo6nD*>0imWqSXn1lV8gPU5cuSSiVT8*#9
zxUbfkuO8vof6BSr+}VA3P@NJ1l=_l0dWrVO3*sM(oIj9!z7`;Y4DU@si5C8XHauNC
z%h;?4l2B!uUuDr<M%P`2{(u5xAM(94pj1eF*8i&*t3@0A-;020=Ub2fV9O30(hi$f
zALU<l*wUdqShy1e_*6iiuFaN36vom4;{l4O-G{D7sorBLtbd(w?{*MK08H9uL)ryc
zL!KUP%c=t79fL`a0j9XO$p88J@(?e8B2-Dn(Po~g%wc*DX7L2r5~iUFqyHTVK=4mn
zri>qmKkDVgj9*F3eVzbs2~bR+sm+Z|c<`WkAJG!vOWHqiZK-hs@vuH|^!UubHD{az
zl)~I0ppR%R5wo3055R*A#iQg-r~<TV1M#alwa<ZCKx6_<Wv$|0e*c6;u6ANy3+Dnr
z5ipqmtwqxUY8QryyS-@legAv-2mpT58z*c}@}hJLd944ODvK(D+%6O|A{E?8n?W8N
zA|jFN{YjpPCezOAL32tF$Oro&ivPVmg!11g&IteZ_RpL09;R-(`&&V4AJ<k%E4DB?
z7>HszRv?OlD_4_YMVw;L%*s*qcbSp$6116rGYW7jrD2%hW1@#7`5J5chc+9?ivM=p
z{;U3HWP|@z`VUCuaHxSY$V9Ke%&VlRq~c(q7GpnE?W;9zKR4z!Hx{fz@b!NWtp8*V
z2uK>Ahn$Sm4+3{2ddmo*{dMranPc<3<2z~B_g9i-ucU|QdJkD-k5~qAKgzL4E8uAj
z;@QLTjTG3l;H*Y)C8H4sqlqdbjcPZws(%vZZ`#a_+5cDO+^5J3&X6UsaOD5VoYXfV
ziyR>@#lv5zg}-)=HVKH&jZ5Ch{qf{~%N)~h*|FcU{lBgGhr9`hh6Kdt)&4O5Q?yn0
ze=YyX98ud>Kmju6qwTBz%AB8IQehyQ%IKtz{_4m(2pH7vBf)<=00jCOhA#OqkI2c>
zkI1u*$kQt+^8TMQ27r#RNW)nG!$yHXL?F<58(?+p@bqYP>?V~zoNrjqw86&Df6uyP
z#tMem?#Jm%aK5R`?gMA~f7jG__x;6hJxneo8QL7dwNY_YdK6&VLk7tK=_ce4{!OSK
zB-ly$Aqb30<l_&1OyxZwh)V4n$%IN36(;|i5NLK$`a}we6Geu}i)Dg9o*)$9?`hgV
z7#@N^A_(La2J;7_;u&Cbq2}6Q%jXe#hjG$S!!RY@P-kLGNB{t)wO59H;%L+v&n3ij
zy~E_+WM+PnFr&>RRFI%|z?OfK2>>9pmCrRK=-a=6QR86pOluiF^6CH}nv*6Ipg>8B
z43~#yW{d&=y8-bH%1C*6NN(h?`Wxy>06-lzstyHbjq0O6uqw<L);FWA8dWcN7(C;C
z@OywbJxoRdg(|8~kQSf-WHIWyXEh}FCNpD5T|Be$lY}I7=BN;DVdbd4RBk1)ggC%T
zT|BpPSiP{Yl8_sf*7shjifHw3;7ojjH<=HEX99y)R^1O?p(qczr!XsQ2L{gt6oi7S
zM$Ll3?W6|1oSDxJ%xK$()r07(NDT^D9UnBu2c)V50QBvENgkx42PmWp+lVC|SOJ5N
zss|TV5-Ugm3Ytmf0!wL6WhEgDptv8Sk`Q3kK?tP>mfxQUAj+RUOrK0UB|wx<fW`SS
zReK^cDs3B~PdjBMp*J>dTPzIwMJ6E(Q>Y!NNp#)UXvutV?)`!-K}!oP%b(_fwOrRb
z>-Qqa_iF(%NC*)`=o6{m!?{KY_`oMjK8SOT)JI<a8@Bv6@LHnxCkcrtc`5MfeV<vb
zyac%Yp)c1c=)Mmd;9LnT{fXY#LbSA%qX4ZPFj{8jI2S+*3<=m<9pDGxWoC}*Z$02q
zXAY|eQu)YBh*M`q>j#2?8h{t69te(Bl$Xc_@B&NQ<t2c5ZxrZjj|avD92QjCuC5?)
zZ!Vxu9SUqzQGg8=g2;flNYux1(_g+QsShFh9IzC+K05eoA`F`e^*an*2!+ZP2!sqn
zc_9c@rj&#jbp}2s5NGmCv}u{2<X=-~D5}$fK-++Mw|@$~VKJlzg`oheSH^Q-Q}Z<v
zFhe`3umoUbgCHQLfxfj!c|he@7;qy6)(c?Y16YsLpa(D)ECjFx(ARMfSW7hcyP5zy
zuD8~};#(qT2=n@$3Zy3@C>K~Iz!DF3CH5r*uu(Hv#K5b7&=R?So00N=o3zyTP%6MX
z_fR1q?e3d^(Ik@Yn`x1eLa4wp0a(r#FnDI9qWarR02wfq@?X1}6@ozf$S9yxL=t6D
z4qD=;bPqZrfPMnGEclqp;C^T11Ka>P3Gd}(OhbQ8T!sS@19oNTfc_{zc0I(FggEVe
zRNP0(eW=|#|DPrlkmbHf$o&9?g1`Q48lc|`4h4^@KR}^9mH#xM5<td53t879fz%#V
zhxI)IQL=D=JjupOxPFNbs_Lduy+iQi0fEG5A2yaicHJBO-W&h!Gr?K^sr^siLv8gR
zK+nB%f;d-6?`acZGC=r$K>`VQ2ERza4MN7d*AW$Pb&%de_=icPM?M%hN|`t_(HrMJ
zqJasDIunR|`l=pITG}W;6?z98pa}$NK`AhEL31nd4T8yl+3XvAJ27krFb$v&5TC##
zI1ZqU#tYNlqX3F(0%QQ7w{q>?AV96KHv68-s3vTW_nu4TYN88ZhFBgBkO1{KN2|n;
z+JdR|gB_+pAQ4(X1I&Ls74<hw|2pn1kns;8ao;q&&tJR00HMzR0{9HvC-wv2lMrnt
zK!Nh$bSj@u68{2lB;I63{>v)!J}>`4!MP7Cd9J@<@^?@2m(@eW$xER9#e3MSMB>~F
z`IiC+z<a#3zW{lOhq%3Gb<Yn7UaEfqz(5a!KLF%~P^td|$OISwQvC%01N~dO=K=x^
zJoxij6uy2okqY^jmrsaZ|IM!jVEOwO*X-55^e=&V<{wV~O7Z`H^Z#=QP);{G%FlH)
z5))N%u6Lvu?;mmyAIP}YSc4Ej8X%3;p|M_{gw``Mh9t~OStSJTjU^AH$tcr$PGq=*
zL}44gK~S8xy!=~W1_kEBQA{BT`bvC_z|vK9C`wueFoWI)SW%;Qm;|(Nh0vgcb8S-a
z4Q=JPeh}-Jx(jA*1;C*4R1@0E=?~2C;89{&FYDQ~B)~ZyTEvQy0>jSA95)MQT}yPq
z<~ko%53XG$w;K>#Be#<%1XjU5UKA?V{n|=ZXfNy9tTz@H>YQ0V5ZKT?-m_$HOE3`0
z11<L`f;EKDe$F#eA55-ua&%B<ur)|PlQBGutGi^#pG5X2_7`A&c>?kW7PKH>0`mFm
z6a8<0Q~ke^8F)x|%>it{Ra=UBhVp_Jvt$l`U?HXqJWKda6(bLhz!eM~{uCIc>!)n(
zP2l;kpaD-g*#3Y;U?JF%qxw6wiV~b=rE8H?UWpZnl3nP6GU`xz!_GG};Hu|LKF=#A
z)i;3YTtC0mE(k21+ZHXc2JGKKULX+CGbUWr=K^28po2IB#KI6kPoAQawSE*3cu$r7
zGu2v(gC>a$IGFJ7!4B|mqXefBzj>R5<k|M<t1GB;U|g)e#`8Ur=0KYkiV&(0wwEfY
z00J5Z$HG^d*?k|9#8d^v&HHigpR4BqD@=f1{D_NNTHikhp*<s_q6Kpbipv4hF>q0W
z&Vfl#+0)<Dc$I^ThfhH0gNT@fl*}i2#s8f7czSw1;0geDPtU)nIzI^>x<L1*I`@cs
z0~@H6W;!NNC{#;JT}$VawyuGp5foy3cb9f|CwX@#ad#(sJcz$LKS29Y%Hx345B&U_
zB+64q>h6^`0?Uo&?wtcyNm07K8@%egj3b)F>Z^%hsp*&`>f7_mwgSSf(6uQx9?K0(
zXec>&Tt7$B;rL{D&!A!Kux8uj7Mz%FA901x8~VgU$)Jf5SZ<%uKo-n*U03{Wg6k$a
z9Ik_VZ)cW_&NiRCD|D?%k!16mD^Coi*bZ*=81G(axG^_|6V}3qdZNwQ5?y0S%zn1f
z&Ry^QM5Hqt!9e^85(J)Xr@b1{5TZbgPe1}#*JLJ3Fi()dMf&x?$m{~|Sg6iZQ7p?%
z=gZp7ttnpK9p|%B)e&Lxozk9L`_bId;FYas>3b7#Yit7;F?n!*k<JnRNt5UqKa$<H
z@UsB4LFD?o??g|hKX30~dT%`{ZT?Dt4s1axz(^|Mb&j;H$DykiB~D5)J3E?*d$xKL
zoZC=Ym!)1<E_8d}Lffico;f)gjY0Cs1dnn*1JspoH{Q%QZ;jsu`pNt3T!M7yZ0@4B
zn4reTQG9N{IX`r6$G;FR6X%9&c4w0P*7^r<U^h*hevG)D%8KH&Hk&Q&p+S8YT#b49
zw4TA^>KJKir97GM&xuJOf6VqQ?+nDSc=tlYSn{#$xav&<KYtW9(gaxH+JSgYM$GR~
z!;HOZj?-L*6)Qva9AuRAwEisLy@$Q{Mpt-8oWT$TYT%@HG{q#NQb$7ieRJa4^zve5
ziGEG5VJ5oHe9q(4(0OwDWL&<yn)_;hb%>|$kNZ072g~!2wT~*Hu}}&*rKMpre(rZE
zVbY&yCrIK`p>z4GJ@`fz=N8#n%eyOf&K~6xE3J`tNu(f94=dVAW}JHs?Ie2YRA2e$
zJ?!SZ6TjW=^X+WE*kqSgMZfY_q-P?VTZ5Vts?rk);v2-8Xw0G#=1Z?T%Z<wHyVwL9
zFd;$c?s9oL=pAWlDHaM%S$|^2@Y-gOLED0Oi?T0OjC_ni{VFo<`4NrDnRj-R{L@!z
zzt&GH%AZw;u6<>K1dF%Gk?TQ8(ZBrA*(l~d*Jy$|c)avYrbW%ZDH;(LqT(?v!5tAD
zV#Q~Vk+tu0^7Xji7(ExFKi11d3EXA+rf~3SCVP~<UZWUxb+~2Ia7^dCkXEHAYvIU-
z5zdm~vVfsWqZW5YWAAZjuBTa7w_H<?7ueWjGwyXa<rsxQCM}puNmBkzL*zw-GZ#8&
zn-^@u7#YGTedV!tIw&@lP&adIG$RWwYvh`lsV3-PuZz@qyWF#+2|G)z)aZz>Dm+a0
zjE*2#|NaK;x;k@#km+#h++<cY$07)4uU$iGI5=(%f1I4ET}coyIJj{r4cB=QHy&vj
z20uP_oLZf}s)oOy-!>1fxQbI(z*ghM+_6yVed`eEyg(9b=}Uj<C#n(G@z_wc_-fE?
z%h|`D$z%feE0<Zd+8ld#J2``8=-3hGN`9T$JdoD3koTv`4D<RP&hK>IIw%-0Go4v^
z=s7Y)Y&XuCmFicH9b%Rkmgljz#Hz`n{dkEi_PbJJ<eYrF4HXoI4{}Ns0L_BtAN_pl
zsR0@V)^KErv_;7rJF)VnZ{ANCHWjf<a`U(LnpMoMnz&s(PHwiN$j)!>s>f!pK_26Q
zGob|I<EjX^=LW)4A3|H?18fE&m5Wh05Z1%6aS#PT>Qs+CDLq+0^B_+~Yao4>m1v)4
zXuob+w!pOBm&@8e;O?hz;j7^^ZxTIiJBh<`T}C<Yyh6~RBjHsmwGhs+$v~xzLh`($
zNAj7Skn$v2KmgSuy%O^Tjn5-^B2A%>KSt(cgCw7wUAWXY9g%~c8`CqF<CVR4>P6u4
zW#+%`wr|qdag32{H_LB4O)fQOi>4@>OYSvp<tx=)3GxlSPJ0^F$wlvNF7zgty!@)(
znew%_-UkpWjsP%$BO~?;JjZkgf#x0O<!=5gC0zwyxFbE+fA-iiOFH%FGXwafZ>+W9
z>i6Mg;c%~p3EckM;bG%euNHU??z+{}=Ah?j>qCTlYh@y0a?4Nou}(vFS~`8oP>6rt
zAEpu(W<%)ZAb^xcP*WoI0vTt{3xia9B@^q(BSny*@%Mty$`<X5Cns&0HZE_EJF17A
z@`Ic&Qo7syqxgH_eh`_6j-=j}%WstqXAIj~gYatyA+HxFzFRsOSN0zd)x4idf}Y=Q
zt_x!JCYg_}o;=ogyoGJPfAIoG@R1^-Kp7{ZnUq=Xe57P9L8^zN^};OaayCVGQ{&vU
zcJo@{+1#JlyS>A6OLwPjoTEJoh0S)hX3o9n>SuU&PgaZEh*P?3>Sh<1nQ_?4k2zv{
zs}bAL9{ZLvDq=S=AM0KVmwp9bc&sf5TjZm2sQ!KoGB?&^jMMcx_HZe_>Su`gte@MM
zY~iuu_>^Jirb^XjX=cjp%9~v-{BXvMOTFp)rAZJ8dp(2rkU}$}oZv@YEBp#8kwV1{
zl#B=sZ*%sLzG6yQwdxhZn3@j<qnAo*ib`<8K==z!3=oU{v#u0cm|2)aTh7A5c}>Ie
zbc<f{SxfGD`{Amyd%~Q}lC()3cR#H9$`NHVA(J~{!AaqkZ)_++5BCMAOr3hDs0}H2
zkNb@NteLP(_-!cR=Rwb$>#0NjWUBV7mc63#w4v7~DcIx{_V`s2cu6lo#2Xo1Ammgb
z=~)jfekb`#ZC|$qo+j&?;}`aB+SVnG)2=<7dAnAL30q@VcvxRA4s#49<7M0?@f)|J
zU2RLY9p*y51JhjDAuPl~n}5@Gt+x_+8{DT&vQ2c6B<;Fe2Z`1$w_s;jgrfJ`%=*{d
z4DfTq!}w#8c(_Ujy0W`c7!)dJS)H%e(Hvuh$IcE6D^tiq4epAL66f}mFLuKmQ?hGH
zIr#f3;qJ72g{3tOniQ^1=b26FhB}{Ti5NmG$c*M<rq1jR&y?J@H|bWIHVN+BILU`l
zEiANEx%Qto7bPT5rRPTMjB74ZQz$I8a78(?P-6~jIFQSSMq_%{iqy8?CUg_JLwi04
z5q5>%h%+P?jOo&z7Fz7tL+|#Lbb{ODkwu6sX3?RK$9CNth;&#A?VRDBi1p~tlvm(d
z4g9sMO?Y^(wX^d1_qneq?v~~!zdvnvA~_iQqKHOrlcgW}$eo`rk%YMJSow^0ZmRnE
z)A+BsPE6N6TZ>#NH+-6=IP4*~!QzHBbb{p;F*mywrFdt&3s%~6byZDZf$sSw;|L`e
zTr@)|annx=E>4eI!0)Xnh4jt*1B3A!%UeX9tE}S*-8#55_EIkG&6Mz5C6DCQiC+wt
z&Yzm7yOiINNMmg=NK0sARa4!X+BO&cm`xrX#;A|)%pw^k^QOS#;E8k))x+><eMubf
z+G7s9DN1u5@0Z3{T*dLFbdRw&dZwH0aECVXMf9e#`S~vqB`ecwW*nR6w`|e$WO`@r
zMg8jQtKV0gz1f3K>I8<&-~Y@zbJH%3nnt-}c_ONv6sSy2*EqLc-61Y<H&)==z;fuM
zNOpm>^Qh!lu|%UVaWaU~q1LO?y1ML{jYLy!Kd}HN(&LbywYJlanA${bUlB<Kz7jVj
z>nDt7=5P;IO|n^SDNo0rQRwrt_TF;F%UJHznmz6Cfk^9I)WAq!R|TaFaiQ?0J^qc;
zdI+qIYs}(xo*8ofz*6+s5SViZtkrj$w1yEJugq_`T+$Jr{MlaP*HPS{q5*F#^K8fW
z0|JZQkn`aX>d58>C^u7Izq})3X<Jpi4da>1l!fX!F0`Y1NhDtBRi~!k5Xr@9>@M+S
zQrM@ZcDEI8$}i)iT%0}WHyMd6+TJIlC9K-J**3T1WTz(rrWF?Rf<h6AMa|G_yK%6I
zp_c<=PicsEbX#6PK(@_Tho7+_T;7W~<K6NqC3RN9Cj<1D%Z)_XZd%#fy{KEvKN`DQ
zo8q&^AQet6m@5Un>t23ev^AxVpru7KQEF*i$@jUrGNEzqzVzb7tf#i+*tbY^)yBf4
zZWonL*jCO%+b9|OQ5tz#2d+JCpU&E^iW!2#lk?m({M24S>DK=Yn`FewpJF&HT-*io
zO3EHIR2A8s8O&L=?w**Ly0sD5H!Cw$X$QK9Kx-Z1VxcO`3fX-+9XlquI~_Jkr|NZW
zHO;gPXf4rjbX1SK5ZA}tb7`OwUNRT**Vp;uTHmed=ABwkmL?{S#=dL5*&@rlI_X6W
z%PgDfyTd|RaHaqKyg$EKgwJ}cyrJMm(jwoa9`4_o8?#2w&aYO!<+#Ie8*7+Uf%%yC
zx3aZur_)jZ?%^ThIDWf-|5k>rMTB%vgVSeRq||d|cmLsM&9kP7>?7axrpiH>f=+u}
zIUvw1AvFkj^RZ{v*;Rc;p8|&Wb6n904$XRq)wlN%cII>z1)^2oz3Ze%4AfWmg7P8B
z!=<=8txcQm9a}71KOh8ZB;XE>i9~80jI}iKOAebYu_2vy-#&vbm_$c)Un8-ZOvmk>
zk&e}em<p(MR$9_lVR|ZF9r>E^%NvJ*<zaEKJqP2-d3$%?l2iWZ301BJyWslLlZ~vN
z`dT+<+bP~poQo_4Nrq8I%&kgWW`|;5>r5XFNp40wVYpcThVn(NcW7voe=eA=V3bNj
zl_j@9y0UMo+nHVUcOhltqx7<gsDdN0GrJhCm8##@6}WI*3z`n)qF=A*l-|)LpCwaY
zq4mJbavqmcbldVR!aEJ0_v~jC79T4)vnm`h((L^<uCZ5IESjt+HU06dhvcp{uV%EC
znsl9^u0cYF1a)DG^cp6F<vr-e#ISgI75GiodSA&TUG-=$*>A@Cy<Y>KKvzk`jQw-x
z;y~W^8@p#WROwWbF=cE<Epl&DAY02-k-O)~x}s-SF-vdGXAX=we8TJMua*D&;L?pn
zG$NM1Th5-}g`axm?bp<+ME&X<TVGeH;Y_NBIfv{2HvJL`Wj)~L{!pAHe>oqj-{qDl
zvn0O5`r8oi*AI2=UgRK~nq5B<_Ro2tn|)aLJWJ4~@$oIPsK#b|E0UB0qOIBODE?2$
zb$>o`y9(<>CGCyGF+A?r)P8@)mpoKvGS#h;XcLnUtiHO-XBlWglLs++zJDL3U61vL
zSOr`xlk0>K1q!NyjS)bzH9mxty2PMkm=>Ik)Dm;6v{(Oq_|=JVjoezB(l-lU&BGb3
z>;bc>!AVvHy;9pU7F3MY>Ec<)B32;lW?rwBMXMztEPf2KV)FFP;I8`)&BE94-Fkt-
zudCpV?<fHZvSe{4MMfuyW{G;x)3DcutqGhJkjpEXmoMSUzc?hbO9jo^3YkkVVVk$e
zym1_a!*Rm54a_N~hspB|0d?!i<D^M)^}T)Tlp_wy=aUg3@mD5=-#fx4gItG;X}I0d
zE6LbCbJ_kJXOR{YhQKl)4((pwZDNtf)VX-i*bFQp+yYzX>ngHh+`;eJ4J?QU-mnL&
za~c?i7PkD3YN5*Y)Sr$e7iV5ffWKqbJB}?}9q4&#nc-)JznNZR<vdl_mutx$g37%!
zH2=kCRd-=weo;c676s>w)f3UbO}G|1^Q|Xq4=c?>u}6fNklE??t%Ev|ldI#MhaKX_
zydz=hELbyzHpt1Uyv+Jtxu&7stcvV!>j<J89G{4(aXhbr%#rM?j=rByxZE-DzTtP+
zK$dq|lrA49RM$Bw6lHx<ks~Q?y0U|www?`6_e`d6eLZ*Vzn0Ww_@GklAnF{_Dwb3m
zU34+I!Cm2!&O+YRrWOAlk>V1ij)ZZyeX(G!-yYX-D;>-<s1h7BuhGc=p1@+=qTSH_
z7*R*7?^D@YSl^VO`s9hrZ}Y<D0$JWP;Rvf5OIj=;$3-r-tC`}_j9)q?a*rUKmq<_J
zi|U7MY<pq~#7;R^h3<bRLk2eGB~K}ZhaaILm{i-p0R40D!VdHU*ZslE{fjmi;IvS}
zyF1~#JAu19(YrhTyF0GCJF$l%>F&RbfV_(MDkos?N|Z+hX4oYqWQNhmFE%h6+BbuP
z(m`yart(MMg*o0&tHS_qD8?_jh&4tg84K*Z8!tFFQz~xGY{FZXTRkRj8lKSbJ(n}u
z%A<Ra&B#91WipR#b#RC}p;edFpg4*WDuhdsRltVp3*L-$Ge5G(A7q0MPbYtD+%gPO
z>^xnImrrU}Ha$35HQTqg_{>^TzOHcv&g*nle~%Yj>9%;XWOI9V>X(!Z;XW&~Hc=h<
zgA+)DKpMaBq!;bV9-6t<RkiZ{Rr=sUtuaTp*fbrn@Dih(gRs(+b*f5zMR1t74yH#x
zN=jenrM@IOs<=@;n*uq^=cH*Ye+dUerU?t5-@e>^=GYo{X*hIoB7J5iP3yIwh8X^f
zCmC%+69ec$##x_@{M!mG&_$qIgRfkYDo<}xRug2j39c|jMJI+6%SB`{iVNvdF{ovz
z{TdFWLy{JPNky)I|7tf@X;)D@8$coP5T+07s8s&kVexL&<ckFXi}M=~^y32inZ4^#
zx7u**nwgRlctM%x7#Xsx)A0f3s}G9Lvqvc)^xYnlb#}fLUsJv*@iO$TB~wga6O3L(
zi9TD2w%j7>*t!t@xLckA?~-+O*X<T`W0D%zeELOts>s>=V=WVWU1xjbo6s7BYsiEC
zPJ7NOCcF7_UB}`^qZ^K<C>reGiYYJjdfc|D^fS%a=-ZRIuFBfYyG+Iv`@8HtE#}{a
zeOOn4#%FCh8r|f?aBD&oDj=!^f=1YGtY3n(bA&yS6kC2!j_o&JrEyfiUZ-H#8=QNH
z#8*;r%x-tyh{*C6Cra<vy8Ye_*ow&-dEW0r9m3`?YoXq2y|Gu}z8)Le?p~4e+WBe^
zvc7y|XI<!0*NjgiHdkF}LC?r&*KmA0zIROUw$<1$%++|gv+U?MR~zBckZ|!HF{DMT
z*HV6Ok}mTNzij@Hfdx%2-1^G2^D@OpD=qAmo806A8`s1Z6^9(=Vykq5kuHl3c7b|K
z+WX5T<8PT3162wN1@DQf*;9_zmZH)fVTcn>tvp~ougn~iT<TILLi8-iOzf~hlDf84
zLeFC@3<@<Y;Y6d!iZRT}nnW3R+VKm#V#e`NN>#%^%9LOA_%1Cur94p!$(c!%f_mCh
zewyt8Z^F*R_8mmLSznx&nsI77T&fkhB)aHuyD;JTF;DFnrNGxh<gniP!+01hd6S^R
zsTz~rUv<BIcf|K!;i~Z}&3RF+Q;3E7$mxvSbsu(796Fd+ru^~4rGkH~wWdBL^KHvs
zSVK#`hYYN^rk(P@Z{>UL$aG!vY2Fo*CcRbmXmY~Z)2F;_oU>j$Ew9E6H9j_z9M$|%
zn<_zL(O!HCj!|~FdK1}8y|i>Rv#b+mG<&s1jA`Tj+I&&Pgq&9?_oeoE73Gym7)czw
z2izo)p_*Jg_G9&~6`mwDyX|gdZaFX2r?_;m@T=knxK7!nR*prv$&van+e*7~+>Se}
zDUQ1bv1Ma?<4-wHn)g}~fk0SW$xqPF_n)Y`Fj*H-lbyW7kv~29kQ3n1&tK<^^D;P+
zZ#gD*%ZXemp4)6DUQ(-ho#wZc)95qV@S%i(z61x$HEL2gkLVSozRT~^{x;PI_FOk@
zpS8GK7OXiHe2dI3_;(4vw+xrd`Mb_D6O+x`IyCm*gSqfICoxlePAlpp!@bPSSw&x7
zOa#xw^UalvBqlg|HNoI)T$&SgWkJh|TasMn6;YHPk4-fE#@&YD)*i2m62Rk_nyUeB
z6uZ2u^G@%2$5lpyL-2!HbL#eR)eA=%RV(dmwT5Sz{8n45Hq{_(Gj3;fdICG7Nth?5
zt?ejLX3V6lb}+-k)-d<;HE5Ig+}pV)D{q+VyinppVdgUwNjzk#_^m4e+!kqYBZ62f
zE|}AwpPxeLkrzCB;2K<VW(W>sa3VN|tino5j3MqW8AjljUaCXe9o^5ra-3~)zDWAl
z8lZ=NZTsocUiN`6sE?%BS`%5SdfaCzJENry=SlRlQkzTW+d2g|VJF^v;&ZM18w#u0
z0+xXD8@1n8V^3?CqHE;OmW3x8CfZd)=DH6N2^u>REHAmnU~|uqEIzHBZgOq0#tdDU
zC2@b5Sz9bMD=acF+D^_v+K4k`w0~A(*Y8-Qu#)v8RHYq9Tb(t$%kFExQBjfX95n6Q
zl|kLp>Pz>{&*9Y`!?n$#=>(eOAv_`&7O#!+Z9hp9^bHZPX0+~LDR^^5a=!259HUj4
z(H&o*TRle3+o*>&D{}2fyWhC^f7cMo{8?8;y`oA60@;Rj0zX~_gFsxMrr6eJpf{94
z($__IoAIegA<toB%M+!UNvatQqOeh~w8Eo}>lA4-DOKd==9|7&1F!Gem)tdM=1H{<
zgrq{fzn3AKRc^O&X`x@$zvv~{W47&2eo)(19gyH>8Id0$To(;QapYz%YBuRLg(}nN
zB}Z3li04z=O}o|iR4q>i@eu9B!i}nLUD|X9$oR-oTS_eKY-o*{he&BOsVC!n-5u9w
z{#487HXhA_{WSa9^l}I#xo11%_CHPK*moLY|K2FE(yDi9b}SMR$%!?fwPb3%oi}bu
zE1fInFvB>SvUnO3|FTW(yWJA^B&ZCsIM_BTB<XE{k0ZlVsEW~R-D4g?kUPM};l0c3
z$FoQOk(^B<v!}gD_N#Q@QW~QF#YrVU#uK`ZZ*`wb+O3Jt3xs|JF|vDM+4q4RY8Mk|
zI1(y<71deIOkl+^t&m@tPpX?m@zG34L=0GJY?-c}s08ceNB?Fgd2OHQYPq~$1?wBs
zrYC<qnn1O;FwSuiI9L_K&518!*rP`uMyocarQAWpAad~eH(zzo=;^3UT>8-;w^{2d
zNf)J2m#F%Yv1*?4qbIf+7ZWZwB=Qyct!1_r?kTQryq!%=IX4u$I+T{rRCH>cvX`nu
zU>5s3dyZ#f4x~$i)kRvimwpYcMnirz&y0D5Z&S$(ixZu9E|%4iG`nv;H49cc*x3ap
z=Z|hDy`Pd0+VCx^Ht!O+RtTjSXyJy<$szp7xH=O3wXNy>a{cQ7@a_hwDuObI57j%~
z`vc<hoPg$j_Lk=@hJ=U#rL)AxwinJuWZm*Sg-<2|0!wYcoo35NO6S(FA3K!+-3NyK
znq^}*oWu=AU<>X{VKhj=%T{cp;x6L>KN_ebv#E6Qso(xG>C}%*a0Ej$<KZVbCn4nV
zs&&e%5JsNQVM?y(SNzdQEPDA2Sk+l<ekVRxsqf?M(L$U_!?QbD_0C+^cN27#$oJbm
zXB$tO(wpHPez%{Tp*K_B)i-1{$Q=}jAPyG~uJB?mgUXPN8*s+5naMBM)x=Qm3>4a=
zednZ_rpaKSOZ;@@ZBSX5%%zPrmTN?j`!ZtTSzymX`$q|jsAm+(OX6_^5yl)As^GV=
zn#V_jViTkV*p~P~J&RF}Go3jNyv939l*!if8R4%JW&aec+(vFq4Ch9$CWl7aNa~`^
zBDyagEsCBrVJTNJozJTnwivg0P>;7zcKz}z4&EIQ>^W+j3K@yK`WTg)Q;gDcb>KGk
zcFs*DG)8!7=KT-M!NqaaP@6afmu%h??XOvHFtUh0V%#x}wUbu%@xQkECR*_aeJ<gM
zKj=_w`Ab#rBa5Oh7K^9>EyBjsygcVTHyttj5%$~1m6Kl*mR;~Z)4!u>^In^x4zqs7
zpzzK&iLK^j?fl)llzH&R^w#u33*TKVR&~I$lr*#-S4tb(<%GL8a@AWmU1+s0li(lA
z;Z=}}Ug0L<ZNoYJU0WF){a=|Q0i?06Si@;dX=Am_(<?u<LB?MYbeW37*g&b&O->P*
z2&f>_hM2P<e@1GPsS2|n%th%Z#uSHH-PyRU?eo`vg4LHl@gJDxbI*jThQMRs9=nr`
zH$Up5<}A5MWKC<FY9D8dJmT)yIrM#v3??n%ZXu?TMS^iqXi-Wt^G0Wo@<C;qa-;pu
z&Y~k$ESVG83D{_&W0MJ+I=##DyK38dE2t~{XFA4LNmdWF3CKk8B{}V;H%$8+gCWgi
znh9&xlXDv-#L=x2Z8PZx>@z_=xyGN(>>x7xx{4_>C^H&wyR1$my?5v7GH{GIE>6dX
zv(8%S0y)B?6$sZy4YYl3(4kOfPOMXOGwa7$Ah<KM_KD;#O~>G*zFA&cs+k-zio%Gz
zD0dfomb%2Qs4sj?;(Cxrffg{n=#4roB=Qi4k%IiMnu*`1otlV|2^QJZgjKxtQr-<u
zv(F|Lu+ON27F@F11Vmhs{L8t=o&B`UmtA}h;EPqo`7}FTL@s%C->Tmz(+!Ps63kUG
zDQsGoGa<f>hZkon(XE^#onc~#o>K(JuyI}=B6QRV2k7R1+(B*^yRmUmFdDA<mb)q0
zk<YuwLUq;~)w^-~=Y970?2iiX_l}#~c-(<M>2*1D9tAA4+F<#_>m@2=jLGf`=9VYy
znq9We_uK2g^bv(M&V>GwyW|T<edQhfrzx+_;F5Psj~rsJUX{qavnS4+nmJ8zflRuU
zt&nu*lflTE7oJSse;QoREk|lJH`U#}@MYl9ZPB#uT%+?XvQyNU!SOswd8YAU{=?S~
zllQOsgKo!uc_J}_KDFNMQcM^d5a+V8S&(@d!``|_og(O?9U7DM;QG;XR<-XQu8Obe
z*l%XK+2+o09qmqI+ALPF4$fVcL&<2gu`s6InM+Mg4!>yKShKgn^j3gO3F5L^zNQ9e
zFOKxDjb`tWW6AsR&2O4%(W#S*owcE6!zW9ncij(_S)}=Pg1cDo;c91*4nxPQzs0-j
zTXNcL^$UQXptQ=_u!Lu1?6xN2DNq7^EklRD?5B<lo3gTN2=SU8jXw)E$k{Wq%ltAL
z#vXwuUu?wh9z<oJB@#by@O_wwJ!|6iQ*^vMyyW*7W}j!B%bv?{NLGPmvd(0&XfgaM
z@clw9o>;QQg;?)OTlTYlWJQ#IokVwb;%rLQXvS>GXfv78<;-Z46KTqiQ7?nV{_bK@
zZn2a6C!>ZmHs;R@V|W+$HJB}6J?87!aJ4|R9)c$oj;ik_gL-8I@PmeQRvr-vr2iIq
zC6b>lrd$0c>ZlRVZl$Ahrlt5(LUAF9$_S!lwby)6e1=NEz^K6<iID>2-N3t9vfCYb
zlIKlzzfMdpejEwo>bz1GC9k@!Pxt{faaP6D`aym@^N!ZdwPEh43=W?+#xhzjOI?{-
zEpZ$F>6{6zG@UeWgrv{)rEtYB;VZnnVjn=zZNokK8m}Myl}<K(rC{PYiT3c9HxeEz
zDFuO(o7+F-^DGg2HgqttFy4Qn(4;R`d=ie~>bCVuY&yw%^i?$Hw$e+LEe9QOP%QoD
z`8(ii2vCU(NH_EuXdoHY6Av_duKx%@8c_h_uCU%bCLznjdXUgD!K`xRS-QnYq<k^k
zrXAY`WFF2eDiYx1eNK2s%x}|Elw~zKrE<D{SJ$5;8?;d|VF)Y1nOrWcgw|u>(s*1%
zCN9leo*WUZMNUMb0zY^(uBf|oRvjfnv1S5h8%-z3XGcdP@^LrnbM4cDlbykbmMjX5
z89R_5_@VE4XQ+ltwAUa{l{?)YN!G$~ZJ~5kfM~RPwGcs+r7fn{stvZ-*&Y<m4ZAu0
zB=M%SmxR5N_YVs%>Z4xYudm^wL6VD9ud620iO@x&)iF8Bqgrep%|z4<8^A7C-M0ik
zW2j;t)C?$NV-iY{S6&SjzLtpSvvrF_>ZT0KV)gIpCUBeb-=ye}VSs`JDP__J>>-Ct
z2NE&FSibmfN3s66SUyNKMBGLe7<PV9d1M?6kGX-D6zVdVon7lhiK{MxykW&DCQ?ei
zmMVQDYjxzJ&9+*Qp2<*2%#w>-swnP+-q$To0j|3T2}9g!ywzD&Mvh8Guj~bW`4(xC
zeU3QHX5ZdbygMW}%26H)EKQ1umFqRUJDF_i2@NzyKhQy2OK}grT{*;h#J#6+LamYV
zGYc<Zsw_hSVb)5Fcf-MUeb1)aUbef$<=co0%BEV?1l=3$yCYPYOZj4{8VpxvrO1Rc
zI@w&d3{FFau$T#?Q-c%@n!AQkhdeIMi_lE`C$DzJAxxFkVqBx+?~=i3e901z4Nb@x
zj6SZ(yqeB}pN~d1ua-)X04GRWPe5BuC?L~>=RcAEJwQ^qpPK$2Al;uap^oI(0tZMR
z?(RN56yCc#_PaZgyF2N-JEdeX+-HbS#6V|m8jy&pK05ZD@4lH$A*=`Pb(7+;uI<aa
zl#LZ;GdaS{HPKbLuUPoiC+?*4oX2iI)>uqW#5Jfu&*a}o`7U-Y4@NUE^j*lQb(njX
zVIEGH*{|uk1P?Mjs_(rlQkfhiDX!0Aw`2|GyaczsvtO91Zmeg~<dQ*^T}x!te>*~l
zZ^?TeHzkbBYW!7HMxN2K!(7PN-ip7*XcyP3C4$S|R?&l}P`M{KcB=xX-D^P~c2g)$
zsO~Bi8pEne!M3Bfx;)AemGzRAgzJ6Q`)YMUNk0SUx{_VU#sIp5$YY76LZ;LZY3=$d
zME)@_AF-Oa)hoK04^UhfF7ToV8{0$(MM^3Iw8Y@C8r(Q?63?j1&zqP-T<@`Lwah*v
z7b<4En9Rw`bar+90%?CcEWegYQ{vL_<2M#0dUa@DrHMTeYo_{hqf!5uQ<$c1uR(%B
zZ9?YAH0;+;G|pw6rySFT)ZDU?t&WS<1DahNWM$!Bt~Ayh*B4!iVVV<0vpUjou)do`
zwF$VYoKV!Hn?iM)Du4gnw{q6EqFMt6;w>@L&wBm7xs5NY+u8G!!Ot7^r(7>18eT31
z9`#kGee_%qao;j%ac1*uw%n5a{#@CVd&AC*WIpv^qcy-}m}I}#wYc(JF7YTLI{(G#
zv4Y9zpdEVZSuiwfI_B5!vBeJJ?y90ja86YWzq^j;T5>6YeR*-7z}fpw>7ppo8IQwD
z8dk2xs3EA{c9~pp(({gXtxnKSKZo<>0Te!!m-o?DQ#=P|9;*!*%mBYo#aYt*9k7M-
zS<L*`N#e%ajZo)T&bTMijT3W~JJY;1(9pxIUH5X<81Pu9EPN{)cgdA|tu#IDTY0M?
zyx&h|%b3ePC)>7p#D6y1Z)j&})yIVs=GbkFZC88f*kJV;RVGuT8~3*i306yn^=g<y
zhav2!BahPF#fbZ7=rt8N^(-q+$ZmDAdA8{6`cgXlQUmN7KbuTEvpB;EX%UxXxESEo
z%2XX%5Uw;IO=#J75>MW0jn*|xo(?n^(LCmDp8SCoq`X5O_=+F8K;U3+H=`UfymoEV
zu)PJYjN{9AP9T~#jwKAmx+!40TYKZumf1^~rLw!abP-k$Es5sumTn4>EJX0+S~+_^
z9DIW*oTbGo-hLos!4#5sj8f>3iy~Prd~)D-)D|u*Xt0>W#mbNCcTjLJVS#%gPbs`d
z(!f2oI43tD(1<1Cw~%e&b=@jy#UAIUOd|sp@M@QDb5HqvNakwn;d02vn@DH&2MYaA
zm4D7gqqb^;$!P?xwr|EHo8wZD4?Z1>;~%A1eM_+hPwADQSI6yJ@~9SEI;ws@x~lC*
zv1M|oTw~cEaT_{aC5}7Sd2my=eAIPtKKR(cfg+}Q1ghpf7Lcz|y}vZwq5e3r&qI%3
z9oj9|Gues*E{~X2IXpe$GpjIu>Fj%CKA>6QE+)QKDbU)VTM2uG|8}(BRblhp<5BMg
z@uoy%rT5q`60aMo7eF}&Q{HsI8&IB$oWL7g_t&fn5;+nXXx^QL+Tf2_kHaL}=xTq5
z^c&2_DSp8$P?UU&8gR2zrA2q`cTUw5^GQ?r>ZwT073q<sU3M1q(C}MB=EqrN#a+ro
zm0}h4yQa~rRWe6n2W2nHYbLA8715*(7y@XUw1Y}8*N`Q72&Sbx+QVCM`nKpF8A#FU
zb3N^vk?LJ%UC9k*Tjf&0kJ#C`O2yim-j(3705eR~1VmYiH@;g?H^U%D#5hTt-;~-u
zVaX<YnhH6jT7<y6iRGO+zQG&HlnvGk%&;lxN{L8=AfGwJ{5}W^GG0}7EBo2MD7s>p
zTXCQ5H#(5ZXmqcd%gy8afY7s${;8A4Dt~6eSofFp{LE24@<py@^XL?5qNC>a+a{1F
znC(3!*4Kdkl47!f!ClNhqA=?t%@&;IWJ-_VyUvl-!5%9L@xZ&o!5{eL-Ko-+SlMhy
z=rWiwZ^y&v{mwJ9+h^g|YW3ab1kCR}>hMZJUsTYd?~W1A<_UDB1{SAFDSR{F#;7fw
z-0E-@^}R-Fp6Q;A=?M4klh$?F=P{FpYW46i;uV)oImnx7&0c2M#3h!E;f@=#=^^Nl
zG~Rur;X6gBww<;a;crC9R}&r_NrE*JODb+Brd|*6R>j|)rwD0<%Bv9_pWnTL1e2Ub
z&E!hCxNl_9P~1#KL*Q%0M<eyjc#sNrFZ-=_<0MUfZMnB?T8OF>;Vd5}Vgm27d2gHP
z&uhT7YBond`Bi~0Sz5l_j>7v^K#kI~f}o$$q~gHWP7l|t@zVXjHIhZmd+n(rNt=<A
zlqr!(zww`nqo!nt&6K|%v0ZH4YRgqt-`?Oms@u!E8ePoWKP8N*BfDB_OXEtCKKFJu
zjIY5h*ZV16eeAu{u(vEWhfH&}DEYE6boiK+#DY4AC?YVsMQCa)gog}=D>{dZ6j_j?
zGh4Vh);6xHOGN+7t3s8=g+Doj%8aGBa#+0kxI3UJU33OYU4aw%hz)m)gYbM-<*_<H
zm$`K;#{^QEx&AnbEXl%bXYUK_&`EVoXRaNSG5-oIpMrOKFB5*;WJDW%uU=EOopa-v
zwAXMO?`IG1`ht=UBWnGO$=cc{8#Ucn8}UhBr(Wn2TH<@DrFF8imnmN3@fK1P6?N|<
zr6O`hm#LQB^H)>N$yE?RpH{Q>Zn|c>9WD3s3(hn~$6^JU9la;3jRkgP;Fs8We-tma
z^VS7pQ8p88h}<M}hMQF4EYi!_^-(UYIGJkR+=Q5I8ECaz@S!{Rw>d=V7e70lC47GJ
z%9MjD2tvclAM<(m?SA_Jm!MG5314t&f>X63{$TQ1u_ZAl8#{(}n}~+^!p`1iOA_d+
zc*m^&oR%m=b`y0BCQ)23Wiis|uPi}=h_=F71+qOnyXn(rX6lbq%J0g(&I)2^Ag#TV
z$`wp0=InDK!5e;Mv?39_!l%F0^$z>zYcYc%<=t!16>?GP$vu#1Y5MAlYLLOgQPs<B
z`LWY+^P01pX}mM;&vw2bPrU8VNP@Oi;u`ngbw6C>Vg~oW?<Vq(S#E?Svgf0;Y}G2`
zuXfoD?FF}MVv1?G)V|*IduJDRN|rGH!BErBkM7i2d~C+m(oDjG4eR|Kz6wtJ=o-`K
z?hNF@2xPcyI{sTbYy+n`UOIWVZqYT)uI#vzT5ezG(+>y6nm<qw*y37n#QluWhF*f{
z&AoUy3Ky1B1Gvc0WM5l-^@dcxCKVDsOjCobbhn;Fyza9Jo2^ot&9K)!HR?&mLao$C
zM%p6S$Zc+Z2g^6_X3ZZ&hfrsTu67x4$HARHC>p2BAa+gqw|}YX!84d)$>qi1!pGZ;
zNz7b{ucON=P;FL&<a+clclnm_ZA8UYdFgUUnJ0Jd)|H-+L9uzO*gL+WtVCTYHy!Fu
zJaz(oE8h9>Lw#2Hrus%pZ>m54?X|A!5&=a&@BDkbv#fM%U0;6Fv*Y>tlcMpLve(T$
zcNc?UBh@C_e&_kkH1!w;>(Fnb;pxz}CNA`BmTUJSQ!UDOfu3t^?)kq^T4YRanX0c6
zleb{MUq@<?XKv#gnX0LP=TII=XS(cFWlLufBsJozd*@I3)Dt>xK##LSugX5}6d8|}
zT=)1Ro_lk?E|31S$iJT2_RYOMIlYQY^21(-zZ*pm7~j1t8Na|$-*r~6=LWh#yISJP
zEEfj<5s4t8dVXUg9e=o1L4JcNKU|l8d80g%WPmRlp1ct!OTnk2o_QcL9*nh}q%5R+
zy<a<(Z$vjljyONh{r;|`7&(!y`r-MXk6jq}o)+=vXCAIeE({@jjP|^{nzxlz5n?dz
zC+SI0s!?k$QiXiUbk-jTxOY*iORLiXJEe5*CWcyQlXe5!N-Q!~p9DXWj;Jbu@z9h!
zpN$TvbmCFj7&t#O9p+mr`aZw&8!ul@b2t3BJhPmiF!yS>Hh_dVX*>S-T#jgAfY*V=
zg07H@cZ5P^bm`}3$NfF{22*$7EJn~3#EDTVW1-+30pw$59HFtnd()oXLLc5hg`4Nf
zM6ny^mp}Gabk7I6MvN>R%wC&?O|Bom3eBL7-F6Fus(!)A-48eSEnbU)Wpn456#j`~
z*wNV&4vc<P61E>EpF{flR4<JEw{Umc@K48&)iV83obZ&7D?YEeF?)YNSQ^FR-6k{w
zU$W!AZNwW8aACGuQ2Tl`p#<7bGs}~nwTg79qn4~@WZiPV^TT!aupb-~m*mftM0p=r
zfDnYSvSoWkbbYxh`_hBo%PL!=PR*y|i6Wg}-G_oq+xm`liiVFFS#56QZ5*x6#VH4Q
zOGqVELJn3IYBzN%yp{gmvz#9N!fL~A<?ZM26Xg-}M@|Q3WnXh<NTTpYk>5U@z3Oy%
zvzOo-s*uLM*sPP*SAPf}s`oWdsv`XzazmFKBEjcA>I-Au&}T@E3nmb7B5m+<mvUY!
zuiCrmK5*I7Sj1;^s>Z1}Cs|~ikUG;`u1!A5CAvu&O-m&x!qk8B`obbIlk$9RjWem!
zIL`HB(|L^jPwvX@_1@jCmcEc&ftl?Xdt}ec*yOE;iAP&S*bCu_KPAkaCwiK0Nc}8g
zhlaE?f+L&@`>S_S$oE;($0m0?etVVmhg7PBLnEju3H$pd)sX&%JPW1DKFgGdRi8{|
z?@{k(>bwaz$K$bn8rjL}Q3dTk9r)0~IkZ#?-Kv6FUY|N*Tyrecw2CNCcvR<SCvdT4
z+Ojb8j?u&iSBA^%Dj)Lpph;S6ZSc9O^li9JQbfPm>VtX6svP3MN*JMSMgh0Gqp%ss
z)qtav1(v;NcmB8@r%c#u2CG9?hoBGXI!@MSB^H}QcGyqU1ykUqeC`E@gj~{Fr7wKg
z^^j5Jdn@4(<xxIp;mjYs6oak6>ijLgamnk3XmuiHGr3UlooFL8#Qnqkz8g*##;T_2
z4{-mC)v{oboVp3sgPks6j+yFSXzHHz1cD7nr<PPLmnC7SyF4c<z}9i^^QjGET&o}A
zVfL*h-VRUMZbm8!(--Zy@{Yatv45`0h?ENBl5G%PC$e^&WHL>Ao9rJ>f9&Ecl>v*u
z0$>X&-+vq+_0g%XOse-rapfQuo0?0Jj%qYXkT<r0=q$ZcrYHAoO$6(#8k8n!_$}A_
z>K>1tOci%~_2*w&?)8(fnylK%&9^-P7se2xXKOj?-JanO-~M3gNh(zu?+aO)y9n-S
zI-ZcR2et%<qNpWv{fU}v3ykqIy|3(ku3E?FF5GtHz8)!NTP{aDQRJ=Ua;qc#sJLV9
zn%K)i(bDH!26ekh&e`_II(B*3=VYB(Qy_unQM>qn&v$|U|6uOpqeH9v54Ax}Y%hWL
z(Lv`y<aWC_g+|KEQWiMgrPP;W@LlE>t{pc{y&+K<UiYZ|^Akqn`eRn|m1*;a)eiKm
zv5?BarB&Msq3m8*f<z)$v~>9nv5&?X_T-G6%(VIH?ysTH*D27IDwNF$oGEvq31SM3
z?jyO5%dXgvXT-0F?Rnz%Pjz`48d=?Je@SB(^g|)(OP}XwOnzxZ6MBOX11~sOu0NnB
zBYS`U&2=EP-fJbbS5!Jdy4lcF5<6Pq!7;}Fhq-#WjY+*#Sk0~kJ7|Um<MIO)N#=LS
zy|wkNZ1|?zqLL=}Iz;5_yS(E->W{?LoNtl#Q(gQ}W@;hc>j@k3UQ~^tYc1J#hjhnp
z=o3=uSqKxu_ChE79ur4CZr8`Q{3Yn*`uWRQ`%}SiQq=H*5_Aw~W*By3l_Qd8g5K1*
zN5Y5aK+wPVzi2wksJ6N;T2r7%ixr9%EiIJd?pBHwcL?qpEVvhU3KR`eic4^Jmxdt0
zy;vyj1n2U8_uhXe8Tpm5#yV?1d(OFTir@Pk)mDl7&i1<+WUy_Zc2f)Xu2Hk;5vk)*
zkgSj#=n*?k7Hi9jcHKH~?)(nb(T`;Px^UN}CKK!)#()0iwQRzG^3<@F@P|~!2u9B|
zsGmc5>q2JLS%g|KQ|0@0F4K4OzRA2V{yiA2mrYv4fGy}#m_Fz3(r-Dge?|9c7Ex5j
zLs!K4_<L6TcO*o0){d^w%n7)&`imJKv02^@Y&r-z{lJhdL)K~Z1nCmB?6ddOJ{w}J
zt-0*1T)&tX?+Lu3#Vi+h78^aD+Y5anQkYL5E;&xVZNCtlb~kzxv$OB!C>qeue{GBm
z)z7P;P8zV{#G=#{eQEdA>E>?pHChnebCH=Sh8mOH|A&qKpBf4DUwQpsnDl&RLwR|y
z%S!z8r1}4O(zEO9S&C%+^rYTtMgQXY7rMvCj3u`$A)M^E`j8c18E930kx6tMC<f6G
zBlJ_QN6?-yoE9Gb?4T5DOq=U9GelOI)g+9jTu2h?Q0D{NT9Rk?#UBn3O_%MDp{+}N
z8Y#`#scZ~QYove$5o<Q~?7`$}nC@DFuvn?Wy6QS8Db*cLii_{$y@iNU8|dSa6Z6Zg
zJf_JLud^<gx^Yrm3VF&M2j>b?+TwVK*#DD@s_r0fyhG&0e}YcPHEknGKPEDQd{~MD
z0`z^;0xH%!)b}%W5iVbT_Fp_2*qw?`g_(X-Qw2>YFgA4=Ek2*|)eQP+uZ8_Bk7!2K
z8cv`GGp;9dN~iv6!VaVJ*&(|J4awEsioiEhF^$|)YVq;sqHTzmW_%^Dg6=BCx^pWU
zIv!QDyV|r;WAoe~w2q63d`5o$4yQOVdF{VJPRt#(z@xH)Q~E5UyfZh5u!8L>^z&Ro
z&g)rrN>Lh%y5ic>>%AeZMUxNR);VA!2j!T8HTQF5pqn8^72AQTo|9X4$42I?k_0;!
z_76du({x|uF!VUlV9pClEh%1}GdnDKP3p*B%P)!sZSEosWC)Gl6_5bM6Ku;73&&mw
z6!9r)mxl{K<(Qn_)X4a$BLQs15wF<(=xl;WlQ{t&uW2ywtn{pJierU7SU+|{nnaBE
z)Tj-POUfT=PDRP@cI+Sek1@-3o|1MdT&mSS5!%aYFK>-t3S_8*1)SsULbWJ$xsaO%
z=~?%zlEavqJAvZEdUIrccb%9L+h$od*k~*p7S3oWCjU#3d9;#x8$v*<i;^=g_*$N)
z6uc*gDCx5y&0n1<IX_=ymxF;dPXo#~{t-bZ$ftbDVOg099c@`};QlyYk_G)6Rz?$T
zOM=D1;rYT5&vrO>-MAALcMIIxP2<sQ5qNf;XIP>PV2nzo?9R-E-Xj7q<ePQYG0GnH
zz@j9}PXtq4GHD_tJRdj*I%OV7^cAt)3hJ!nXf&*85PkoWU8wvaA|rpj_Brk0v_z)z
zGt4~Zc*tD;+F|K>yATHIOdr*U$j^}FI68jS<MneN6)u4UUU;<OdoNhE`g^OGc!>wK
z?06MeaxBAgzel(h$(T*Zp%UMPq)^Fd<gll|kHn0oFFaQ+6wT`x=Vv8zOX(+xF63L)
z{Gt2v?zfqdEu%(_#T$2JwOUgpK90;QsLFeg^4fveh9+2RWfL#tm6$QVmPNpZ8Nst<
z+3kq6pHG_Il;x4u@Ipd)eNhZ>+*2MUS+?m!n&UE|)apbn$U4miyDUg|3^?s+4Rlds
zMSS`NC#oi6-oHJ=*Puh+cY*6I<O~EUUN~KcZm3@$F;g(InV>`-S8pFXY}v2(3RAm=
zIgaPA;`?4}KpM3b&$ja#0s~q`)@v6N8(bFc*81C4IguUSSR$&}^gFQhwP?s?rxw*r
zt?y*SC3u-jAnPG{Ovf=Uye!5-4U+1`l!$kfrqR(ry&24}L%7GpY~nsG5EX*unUO##
zs^hI~-=cwn<3anKzGH~sc@jrK`Qc8tBRYVBHqa^fU&E?6eg*<Yj3E@XZx!GCTyH4^
z&U}vJ+ySk;&tslVhQ9B3;u42TQK&aH>eWI901E^4)a>QP@j3QFF{b+oJ?nikw7h0M
zVPDGk4lfO@fLIihredRXde@~}cd(Gv7~^f}p$>0<fq#Z^n*m-|x_+Dv3_3JZMaZ^u
zL%%+^NnXCV=ZFIi8ggtE>WAv-6ltHzBftT#fxNDwqkYUGc{+`KrP|&7{u!&XR7_PH
z_fQcMZM}C~6OgyJ7st~>#!(!iW$!O4#(`Q`42U}Im^zZ|Z0vy-+iQKH?JJ;_%*3Zh
z<EAPh{Y}zgufYLJ@i(fiKQ{N*RYA=#Wwr;X39hy7hPCCR3S_0<^gfcS=7_aPu8ecW
zjirG)G9ldPwQVXXQu00-k&KPNQsn62c*&msCUnSQaD1(BxcVjL{-?f_N{;~_glfom
zyqGUCxAoq6vI<<i-~zOKO<35LD|Bo=vFDyv(QI`72x}Ds9Zgjwse)F2-3<phYa|_N
z-LQ6Wke%n&>|1fk?uH+zt9AO-6LjGQ{9qn}@8m`$_WB&en>;Z4*bA0l=6~dhYbhq#
zP<U^XM6xZC*8oxbb6Mv5aieN3)mx2%z7$+|85yu8o=E(5C+p`NHAl9p+h2-4Rd436
zw_GGs@AJUjVJH$~px3i%FI7EU-)1!_{xs7y+*bYmMG1_WF@9{He@d~5GpBy*JuQKm
z5$XB~3VqD|c`)*wH;ryx<pa5R%JzTb({m;WkMp}>Nfe2A$^SkPhz-5y)ZVOlmP@`I
ztLhgTUuaF9?$UmqsG4vT;yzq}r^a_23StZsm|0ikvBG6Q^_Gag^Nya3ffY_~>jdpO
zK!~ds4{9;{yPGDi_B)Y2NkZ?q8<8@zf~@=y0;V__-w=~yMERJ1;MrGF$SM+3cA&n1
zQMUJL(QgSlS>0d*hk93^S#`dG(HSG@sSthX7fgmn)-xNAUQA=&osP-3mFwW{`Mo=k
zS-6MHV*MmcuDA%s=PiAViFmcRYT%uIbkpoZo)E)8Njht#4j;8dzxXQ|)9U9+5{?-H
zl@UyxuaQ4m3i)0(eH)!Sxc#P1Ftv#vIxD#?IWVniloOkrBUp<rRjN(9c@at>!WS1a
zCN{SsF~IB7{r+F0w}H~&l@ToY<7mBrrXz-IOf6z1dRcKUkdC?=YJ+#%-q<%SS=uO)
zGrR9Heyg6-HT0xg4Yl`yI>WRA5Eko6{(mQ?IH%WSj?VpsR+85PNxwHaU*BqT<5O}(
z8r-jmfmAkB*IraKsjJHFh_yvmN81+wxk_Ze1J-fEp4R&4Zhw@n6t)JIc3BcP1<UZ!
z#v87r@G#I-wi55mkClwLX(*mv{Xs?;6GztG&zZ9n0VITn_I~k{0`scwcEII!>aQ9+
zwcEn_=ap+5t;YlC5&+P#M>dj4p#aSQ(Tc(%{HoyYr7HqHzba4N8}6_^O15S2ETyL{
ziRI0WLR7h|t>U8-(Yxr8q-wdr>S$`z`{m<sC#c+imGf+r%@}%)IwX633QC?-dV})F
zK>ra9`#H#E?awknWf8~@ZbAX=gIu_7)KroHa{n^xVbeH#Sh~lnRI0Omw;%fqqwgvw
zWf;K;j3O;zlk*Ht>Jc#$s2}3X`%5wE*5%HY9V)Get6bH>*ZUI%Ry2%Vg8$HmXI>f@
zWK>RC)j7|I`4>Es5k#CR+fkhpx^aRU^5YxyIf(no)`eLswZYoFxQv6bng5SgEZo}*
zv%?+-*4Vl!)xTC*AlKhTKfRCKN?*;U&GO|15gR_xapracKTl>M6QJJ}EybeY4_7Ii
zadW6plIixi{OKNZ-H?$Cbny>+LrY5}X?#*H4%$zLpndC&$9A2u%Kl5yK{HZC<*}*D
zRrqgh41E~g-7B(P)8C}#7Lt_CEWEFm3N6ek$yLQUaV5)LTH+AMu7~1ZJVDC$B4Sfa
zqd&@w9~w++f2>*1X8{kdP8So8_W{wKuGF<NBWI;Cm$f1)N(QkZ>Q1G?Gv0qt8~SqV
z{`7gng1_VC-L25RJRXHXap1Qu$Hl+jS?fzsPxBpSN=l8aO0Tmnv*PA%yD<N}Zi^jP
zsEGZdp?}eL)1GSw|6N*^`5pj3UfwxCFl<`?nYg<14O<aq<<Ck6uv@;^PicZiZbiP%
zW(FIh@>iV%LLHl~T%ikqBz-nvdT6v`eEh6)1>c8mb~$9%txBvC+ZqwG(E&N2Q%~3C
z?nE`osFj1HJ+3*itGdFMhRKk1>-_l0yzrmNO{Q0-^EVWe=6nn`&*1x^YH-wZ1xdJ&
zu)`?@1oK}~lW4qn=1<p}RIigV4I3W33yJIB?>^8&$BThY+T`yRlqzp*?8WMH=M|6U
znw%g3&Y-tPvu(u>KKLt<qz$_^$wCxvOu7^bvH%y;8U#_~i~}pjxIv%*b^2XVS}t#%
zw1Arf7a3GifLF9&QEYtQV9xocGp8<1Ag6`D{e+*;kac+N{@#}B&8Lc(qod3EmMFdh
zvLi^%>SN`@zTDaL2}6<W9-z5?KS#=d?9hElc`)n{p>3kQoN_WB+crLI>vsu!Y7`Jt
zn}2n7Rs*!75uIQ2tK(phb3kP2B+SJJj(JX~Bx@d<<t$|)AcC|#(-NvuY&+Z;M+Ar<
zD?$*4>(XuY?n~P+5BC}8GrE=EJ0)_};^cNQo^i8j9k%NN9G2_)%B|ydrMqb;#&Tq;
z?<7Z0d26vg>D%rYLalG(9P3Wy9Z5S{<^;t5Ot1Ye)NS;7!d`POE!N2;`HR)z-r9pp
zm{;<80I|5>*)PZIjoXGbkRY}~v7=P{tsj8~wRae;S-KcW+1p%UA6WBMUih84H``V5
z(4EP@kSYGrCT?&MBGGK>U~|%xwaV98mm%Eg!p`z8PDG~-$>rf{7!ZF0nBLs;I9HiD
z+ha&dHj?HB?rqqSl_2vk-|`Z)3BYyEFGVu)2U(6v>fFKl-XWMvJ?%{!G=A<ShsjS(
zd1Fw8BSUkCKZlH+yRx#!m{&I*Y82A9(d}$A<36ou_i8rKH08zW-c~;nF+t@upv$<D
zNn_SG@c!w{LYw=`j050zW+#3l!sX!#H`|wgjiyof!2dNYlmZ+Iv+FCH7?f4S7u28^
zgeYT2e5E4Q)P`}8g$}q~nT+C{w~5^0lN;!t`0cI9BE=Woc_Hho*{9fCVlYCA^LQ7a
z7-QHZ3cgDK`6Mq^w>FesoHY9y)smk^6t1iL3=kGvUXaPsv+zblRLd+J;XUN5;4g}%
zGtTwdvFMGtOaQFxejJhG%>qAa6Xo#8jP6l<EPf}du>EdP$y~sU`@O8f?)u5lNMiak
z{yrQQNw`{apg1?`O`h!!PfC<n(CPBs3IC>`5BGP>7~#dC8eCn)4U~z0_1y<#PR1Kl
zU!P%=JgELU<AUMs^0EEX-cT6+T<Ra8&KsVr2xiXmk4}i9OsQm2RJy5928<&6+mgTo
z1MciX1|M$SwVJXwA8cNZVDFn=)(lIpIcQcNEGWK6|B|vLYj$+p%n)>SY;)k9I<G)`
zJ+z0t%z2qwTw1xd=;&$LyXH7}!mLC#=M_~8zJV?@X9+kR$?yAUntNZH4z?nzHvjJR
zQ(hs-hL)Kd&0WR_S`Z2L2MmRBeG5$dEQ4l~sydCLcD16+G(}W}!+n6i7;(p~o-Ff$
z%W(k_iirC>mX_+^(dGh~L5G=ZwSAZB`5w_o1fl{Vs*qK~I8=GLB5umUIQOI4&E)f1
zC%bh^ERniIl;9`3bhl)am~k9oM(fLe)H;%KGi57Mr2%KOm7kbW6a<~PUky%PHx4OO
zA3DAC6)06@Nm=x|PWxTxT+-Ugr-po3Xz=7tue7YYdoP?CLO?K52vP{A$NG}9lZYSF
z9g;1q`5**;EAY$%=>I=SNcdls{m<8g@%(r(G(!JO5)7W6RG*$q{-;LKe|pk=<_Q5;
z>h&o4v_bC$kSc#J_PA_f!XH9yyLM%v^YbhiRjGAA<lkvmHpCRSVHGBm?&!MA4Ogyy
zU}x#QdhwICoju&@0G+O_t$xM|!0f`(-e5?lu&3*(IQ%E75JTn~$K8&K>~QleW|kEB
zUGDKrvvpJLi}+KAF98H-&5ma%d%zH{%QAFuSM(+3(st>>rQd%@_dx1+Cz;x#&E;rN
zDYc-%H62_~sD<5kGK||;lwjGIIwt)Kamn45$xy6A;_c9CBWkZbH9^J;m0JxRH`{${
zkPxyNk+a*2OV}1NuhU*H9c!e*Yt>b;y<%mslTPpk4(*vLl233`t_mIZ@Y)t2XiJ5t
z`oM9p`!sE=Yzy(x!J$I~lL7X8A(g6w(`Aad6-F2jETwQ=R~rSJ+Kh0A_{AaIaH-?Z
z+tx9Nn}!~)@$FZt4Wed^2@WwR&M?P#ugh|=c;w@0rR{c#c%aVH%6#DH7b4y{@1h9&
zhKyn;GZ)LwQfm6APGn#UTGO@AW+}HmRUn?(&U=sCH^Pj}-_F_h6<{Y`4JBQ7H^7yZ
z-a<YNnM*62%~`r-OwOl#DO45_oYO1s2ShSVAOiAy_eeRYjQkjsSjE%hIPF8h?)uZ7
zp16SoaZP&39-d6ttz9Jzb?};PS?*Ka=McKro6wt22o_zi+m=MOd>JaBC=0%VJ3O%*
z`13B$MGslCU?dA}M(;1V3{AtGe@q5|{T^;-&)ukom3Qv=gP+EEW0G@S-Vw~Y6{4Y#
z9lb{(<7q+XY8i8lE)ul9B>T>J5%fTW0&}4zsY7{5fzoZLPKIb?h!gT$D#gjBK=1tN
zyh8D6K<2(Zmw)?SidnBwykpCSUnQIGRT0rFHX3N^>}35=Umr>l3f~7Z?)6FkX#e~W
zJ1_$F`b$88&IDeiyt@))HpVLkzHZVxGAiSSWvnSJk|W;rl=VpS>km1F!yY*TJ#@ih
zhYBmCsYHr+B--V<H7AP)cHyoi3-vb+8Cg|^tTO+o<yH2}{hI?2sR6~Kr5BjZB9XM#
zAIBs7rMPT*qn+HlQ^Bd*+R1#~wH+Q?nm%Ve3TP>z1CfHC>_6LFn?aq8IS+uwZH$#w
ze0dB0>_V?S49NK({nJ8jvDbo=LZ+>TDWyR#Yfep8tmwILz_rDblo_8IQjE$5_hwIS
zqgQIJ2OJ{z?JcngI{QNc_++)mZUz#&Mtd;|u=pO!a^9)_JivzLADmwAUOV19_kLij
zsc~9T$6NP9N)fK6z}Q7Wty+HjpLBPcI3iijVMZRSeFc}jzSkvx-0Mm}&*t}q3g=V@
zT%(cI%NF%j)y@J6x4HCrPmr07onz6{VvemI{?JF*f~i+$f%j0fK55SSL0fs9ag+O+
zwEEao$m`4dDK_2YKt>^oRXPE_>huY&L!_N`^?1raXVnRD_n!PZ%W#bg&E1r6m5@$3
zP@t?WN&9z;5hU8okYjDJanYzMMvMP=O`k8tNp~u0Jm9vkCa`*99(?)8lb+Tj0H4%)
zxAsr)<AeBTlxjOa1F<#eP$|lUto7j%Ooj5Imt~aVIX?vjC4}%gZw16HhOzkq4Hf0@
z<3UBEdWriVg#7%q3!eEmMOai`jkK32?pnpj{O>aC;)nIJB2AyJc3bm3WnjXXp)u@m
z*s~FMQRvdrZD4t3Wh)?J%K+XaD)3aqh=CM%&y1XVK(IkHtqt78N}yGfwgtSk(#ZqF
z7sa;8*+weZND`k4#+}pMnqC|IYtW&KX)EDaQlBuHX-s30hnbUDi*6``hPNo0Fe5+V
zlr0)BuU4ZdZ<eFSV(@gH;JnPH7c}O=;hl)c;<&<Z>8W+CLn<{ty8_a64U;8uZV_r~
zdv!Ev^1=pjda2aLRwUGO1TrZ1N49i|Q4lNmIAUCI<6BYLSZCKqgd1DJY4;WYl*X7F
z89NYvLLxa~rB-)Ww)bO@f1S=C?j@H~Vsxg|3trB5_4xc0==UQp2Ae_VJb^ZT5yIHs
zb0<${q7eas&=eJ4G1}X&cC95RB`X|mJ0_JzA2&F0O9rftLOP==(*5^?g1^n~?3*}i
zm%YhqdP<3CEh5ustIONz^To`5zTHN;a>Z&G3a<eoh-q?8PxF*Xhqjb5M5*b_^Tw;}
zZD-jOn)W{IAQ348yAv^$okvsCh||^6toxn6J)|s8$ou2-b4=lbpJts!koUHFmG}=|
zb+0!Zduldz9~d_Z*Qd9;A~h<ws`Aoy|0s`>8+Lmtcih!=*t7E3)|-j2Po64;?FGyb
z)tx0sJ3{fHn{D33Y~Ds<;*NqS6{R9qCWTij7%Y6gE!I+K^X~3LYfA(wA29!wmiQHJ
zvybTgU-XcjXz^YdMS>xD{lcYw84o3gk3KyJ>!bTG)SbKEA#MiD-pzI5bHBTqoodIE
z^V@IDmrVr>DCGl}yJl;}b@>1fvpt<SMa&+ZyBA}(GHt+!^)vJQzLg%gKp9k9ttGb^
zId8b_4>4i2<A^$(vBcwL4TMx|eQ$1#$lR%xy@P%^{vodbdAN{;=)yv6QTb(ZY<;2f
zEsuBQ{`B<5Exi7seoEfb#wgdpaCvrxq?4LU$8|qJO$JZO-XYAEVJKc-oycL1$m+a#
ze{s69(VT5@e4Q4l^0^%I;is!gV7|^=+75D{ICP$_Z!;2em$fRHoF5#NS()0ZJE|}2
z&LL>8!XcvnIy=eGxaRD3UewI8XIi@*|2<CSv5!Xf*b2Sj-&1&8bn%olGapd<$+&^+
z-?BdzE#7?O-FfI|>AE$);}gD--t6))SHb$1$bbMru_u7~{qGbO3Md2#M=slUC=OW>
zb(-V&uAEBGQyafBCzGZDm<P7W+HSG;5Nyb%-6~tW1Lh1~E;@P>2^uVvKN-peo*lA&
zn5{Vrww(-tU@s0*XL`~^<ZJhm*RSIpZhYcfTo?}IYIb0Cmnan;d}YP0&0>Z*wsQ3A
zG&pWOu)_IVj8gnCp^|k8(6e24fw`kt)t4tyEPf&xxA$g!(&stNqS?&6f(vjjxbUNy
zztA${aiy|!yejt~vF(sB{bYeki}nT-Fd~xNP|SRsQ!7mRuP)op0bsGlp!{2&Te4}!
zmK4sqEy1tf52E_Unp=0pA)z<+d^c#b+m6nP5`_LbCMAxM48;f$OcsQW^0(c=9>DoL
zF?bX+<n;Hu0c3v<N!A~TKW+5s!>f)%lZz63%K$^K5f7fEF}4rLw3GofUMih&aFO6_
z#{o6`?BoNJ>1EHE#hTm_&p=&2MW{KBj=Ag0yCqI|mb^>6=h$h8wDu+bSnX~uVX}s@
zrN;shPDNe|YWbw6=m&O)!`Q#c1$oATrA7Y1#7k}Jr)j%}7C#{!xuS<hC4%k?5o@<%
zoo`FEH{1JUm3>AY%xZ2e+RT;#jO{strO&~Wr+gfHw{EVQMME}}^|n4T?gF_#20oWd
z5Ix+!cPGdZ*%!QZ8%f(pveYGG0ce*`8jK4j9oahqa}7?jyGLQe+iyzN#mnY0ze7C2
zY_Af{%ThMAdQ<eM3}CkTjp{Hiobs7Z(|&LIaaL<zRioH0d+A7T`+(g8-a{OxHV=Ni
z2neE39#0A&nLE@Yk+m6VYkw-v@nI10ieXj2e32Qx^e`9w=QLFxf2Ub^(XR*QJGwiG
zm2us-7|Xr?uk(>#@b(^%Gfe%E%b@&5|H4=wtGL{H!FvuBeto~FZrpx<{j)Z*Q$z81
zaL&eQXRWwV5T9N8?SAE$7Mu#ncJgv5eDK1v!gBYXC@U?S4LYOeaJR><=;yT0Ozio}
zw#xIa+*)RqV&|nr(_Ttj#{LHy4@q~G^;M6D!a@@lvm5uL@wLqdx1Q$+VmS4F+y$c(
z$)>#te33_X)oeM$ixw=HvDBHJ(}^dXm@@Xw2;CLhy8|<cn?Yr865ntWBrY%)$n2*T
zf)o62ivJ}k+BNA;)rt81-_nh&__sbk@6<NG*FX^yR9yT$1N`~W5FKls47Ih)W@_<z
zehBNC&8n5kPX1NtM8;V0iqAQmV%%M9C4!O~9G*GN%Ftv^Enh!7k_;KNo5Jz`Diz>2
z!eC9F!B+dDl3RyaVckeHfovWRQ>f+ks*O>n*3ogUoxF(g+`*rR$AK<DKR?~S#D1QY
zk3Qv2xZO5}bnl-^Lp)#Bx8nw&e7}Q?ERKk7=w>`#uvHneOB(mM?KR$Z9t~B4Iv8OV
zqbm%yg-?)C+E38<DxeV^lgiLW(GlZ9f2#BTb%`J>w!CuVsfDw={EW75o^ZQ;Yri^D
zW>>EX2>3kRJA~|ftWHplII<8Y2T+cD$N5vOG|oBK{IJuc!rpKIq%^pX5=@UrBX!CJ
zCb&Od;zNtP=hAxLopb=EMNPVJq6AL?vBviA^0WUCDMc0L=lg$-p>LQE*Ad!ueBWnP
zu-6X@_xWSRW~hDe;kbs5R@eKU&mE;@P%`-ezEVYLpFE_?!S}8uTiL)eFtRuydt@w#
z&K;+qs%_i1sPaNVDr+$MFUSh*a81mt)oq)LC(}WQ)9rh65|OaUP9IUH@0IGEK;4f9
ze56|KSNwf+^HQDZD7He+u&IY0JHLaeU{X!)MY*oGLSe1jQnM$Ex&f}W8K>{=FHZfk
zRn0mV!vZPM6yvrRZURNwji~k0S{yxu1j_Xt4;xh|4m)brq7nzcb1z0-NLoKQuo!0y
z&ry%*-E6q-e`T<63@SdPB>eYOm#mlcOtcchZ?SKNO}{KX%NcSmpObk}Pz0bvK1B7r
z*n{A=-s6=7D*Dz4NusULhyZ7y)yYcPdZrxSd_4UEzs$8A-!!ZJSr8ZN+<9Xho=g!U
z`gZt)#}H&^2KkWEuwQ^r9>XfWE&{-0j??-km8|tTe^UX2w|G#DlJ$Ktpr1q^cJ0!f
zb>i_O%cNas6rMWZv1s+p#>)&3qmEn=kA{}A66Q1EUdmYnPB9zeeS3hASH3(c0($Xs
zoP?d7e=`W&W}s?4lew#wWzd`NQo)L%PFGoW9hI5wiJeVZr17WwN$6qO(v_*W8P%2`
z#<lS0#v-yQDQ)EPNcFaV2U+?u#Klf0u<goY9P*;WrJNx`NwK1ZToWdv;Cl<fYStqU
zrWKvmBh(ztzUO;k(t0)l3I;WIW?Sb(>_FU80Xp2_^o(qcy3C`a-*R#~s$v)JoqiXO
zWLI2=nZ4kbQ=D)Ub?HzVL07@9F~opzwm4EV)6UT-gz08`*zE`J$t5hSiF`zncwN32
z_q}iHZ<|3#9F87d%6$>BnfzVAfp#YjUaq5Q-Gk~kcKj@PnwM!NGzraTe-(Z`n@$_%
z-8awwdfZS5G4SaeSrBhcQZobD1hWKT^QWKpDts3nzP%1^#8nnuUG$c-IjH~<OG46s
zi`}aM(C%S!Y4ICYXLS({>#4rP$Wh{8e)#-&3t1F?)zqJ4AZs+|#*SxbSWWt2JL>k1
zhyTyVNIgt80h7b-4s5p<X#8%N!GJ$#L1v2V>4ia|vnU20tNs_^sS9mE`t2|OKXoYo
zU%&bvb$E{IMyV;IuX&~p+D}i<u)*km_`&dh*|plM&sFylRaGJ~S>29kHn~r73DZ<V
zoDG&J;QFD0v7mAhd!TWK>u^#s?BPgH#jtHvbh>EX5r3bPchX!)aJd*0GLmR@zEzL(
zJm6E}Mx=1iVA^hawdLzo;T5-$Pz|N_Isb5txG5P@j%EUDL?RR##1>f1ovucg@*}!=
zc>K9c+H6&tmotI*q~G1xmCaW&F=PByz$d0#ZkZF}@^V#<GpfB~g6ll(Yd$!Ej(sdk
z`w(MzcfG^M5JvERsvs5IBp~Iq?Z`3*q$qeix|sqL+dVOnxKhs~EF1ZQZ~jNX;bv);
z6!8mmrv)!GEXQq@Ps3>Wim*zIaEj1Ca_I6Dr%rfK8Q8-a0;-)`K5`r4>%>g+M4(kS
zyvRX^NQ^EEqDnN)JFJu6j`l>wjWtfNZkGUfm$Z7${IqOYtt|<)#VuoKNgGmuTywXz
z$PDUR+!zk3y%0(3h=}s{G3LkoX@aw$(8HcAe0FWsJM3b=<I}SPG1j+~+D=nU3%@u#
z_HF!sjt3GMQKi*2hBT)B7)-6i<z=O?&fI2?ZrMah1^eI$$G}<^X0h0zSc1P#H@<^-
zJpnc2ox9q>gv3l8CYq0drGe4o1%CwBI-IJO9+!hAY4s~G_L%T;RV-6WVD~!p_8Wn2
z6w&S$Az=RVoz=Vazxt{arI3KFD*F68HES(53hEZacP+hN2iI!Y@rYFS9BMwDE64VN
z!{G)gsl};Pb#j9;b00o8uzjPsVL+|O3f{r+&?7|mdE}{nopq$x@WQJ&?<iqi)ZnMq
zR}^Xl>VM^z6<EaS%fn8n?fZO(){RvZlD$oT%m?x2;=F;(3SBTs?mfCK`MldP>=4k;
zN*gO86MxRrncw3ZOS5<1&2%SY!IV{*lP%IJhPiyX<q<Hb3Vp+v8zIS|WJ7Hwo=tsL
zVz@?ZDB}a$C6f9AYNO6unHCe7|7Q5SZ)Z_{b+2h_(P_|aKJ-q6S4CgwugmVg$4f0Q
z3j^*2(`m{-h$K2moV_E5tdx90yN2ocTQ7$`4!?FY4E*;UFnEZ5u!+mELjyd&I9YPQ
z({{zsXqlf!oX`kwP)k*~0W{HRiBLtM>t%xgsPCPs?q;vf=}ad8qq5#zj4Uu<6K8wv
zqv?R{=q0ORY7d#!`Z@_(_;-SxkAda3!QOTl%yUWN?G06t=7>fG&ybP`B)N-(fk9uk
zuBPnn-wuuV!1x^@$nEXzRoo@=*}QXQI8l+N4*96bHDCo%^%m!T+jWnWVvPoung=MR
zzhdIMHgMN;h*1fBSI)FDc6Ba*q$=(qku`MhKX+2b8+OIO0X|&hl1_)duX05u&b)Ut
zFpOYklj+yz5sTiKaPdaG)tW(^M(ii^BzQ_tv?+G4Vx@Z9dD;!m&jFcdSk`nzzCsQ+
zIn~d%&6re`nLr}hauS;AM9CF)y20_D8rpy-eMeb-Ywg-?%~iJ4ZGcZU_GO9cB|33w
z<FEkE%TZBJ5@KK<bFOU6(}c#7iA$^?MQ!a|+<{L6{dO4giE_8-VpK(cvetWX;#(}W
z;k&8|Vjq()44>-MXW-dfT{NHB#a6KiehQJHJYEL>udvb<_*%UvV4EN`$S#i`O9C*@
z*2hAfrs&QyHejYHQ@<7}B@41ws7SDHV?Xr2d7t^P(&18uoYM{vl!fsyEy`|PJEmI|
zs1yJ+N@vM44D4`8J8-mbE3*$U^NS6)`l?ghj{D?4i{Qjt)?$lY=vIC?7Dn+s*2CV>
z$krgT2^VC?oNe0!7g<$8IS1UDs7S;VzHo@xnY}!ANF5JS<uD`H+rry~lgT&zRxvN8
z3ReS6U2FGV@c3VHVg+B&RyHA%lk@5H_NwK3bg7$&is3@5?`mgKiFWhk1b~^+pOh_s
z2nrr$UfN(bh-KI`8idEB07e=Ts1n2iK#sTK2d>-)BK9_|g)O$BM?&eO_6enrZUj7r
z#Xzf<QD4qFs^R=fX1HM6sV&&FL1FR>RR9I`tRk&d!?Sth@5%T2)f18B?14l7*jLG|
zTkGxDfA4JC0GKcPUWqrstXsQ!<qf0Hn5EF87U`aqlVRs-MrE~i?!%X1Ek4n2`QCUg
zmGvDp6jXI|N*o_i-IVS4Wp~be8EC`m>h+xpX>RjRHkrXJSK5$JkRmv&vy6jmKbnZ)
z0<OP?9GcIrtykg^@fuQ<(;$4c4A$ET{0*x7S>Fvl+z+aoB~c6tsI{Yh-Av%S2&!48
zk6c=bxw&(e4ob+QJa_hwDn^M8_U*m0s3tF&OxH#3*mJRH$Q^?j_l+5Z*zfMi0#A#I
zjUk?&bY3!WHN>x~%-m)n-FDhvLCtn(co9b6Zpynm8d8Q3M%3aVPV}JY5YQ23M9IMa
zniYzeM_;TdK_RWlkgqnM)j|N5N{_d7oAcUiBMF!(bt(gZ=aP0<D0`b+^v2%IwTsux
zw=T`dNk)&1k&K-DlgF34TplK_+*FJeoIPi42JnE{scsfP`G=eRQR~prGa4H_0LA2A
zm<0;glD%QwtltrNX#Teap^P=q>%w{PPA~ef`%M(@W<q@?m%`!WrVyvi>(*kZFf@uk
z6)qoPx^2VdSv1Cz`40R;v79$6i|5O6BLmpVE!AX*!^6+j+07M7>+-9QVaA<l&Ho_a
z#zEJ9v7l1X($)c<$+mQ|?-4Lgg}WG*IAH*r9VTnTkY$V?n}V5^w@f51$7-B7ysl<T
z*7%Da6)Jn1m(e(u5YNQhLgZ*AKgCBj`9W}1@CX0Ha7}`ngYVP<`dmZU9OB7FxCJRe
zA;(btzEdJelNL*x$R-FQNFxqUv8IH6OwO!u@<PSVC+ADmuW^U_S>%pTSHO|3U<aG?
zf_~<%>}0Ai1Zvm*uu?;~8X(|y@HgJLp>*rh<%6fp3=Hen!KBGzfWChKLy@!%*I1t6
zcDPX2@hm&{-9yXEBj_<6r{nsnCMyW6(}tO7PZ68)Cnw$$m8z-r?nQ@jOKcNdb9F^{
zx8ZIp_6fIqX6!Y$ATX`#*=+b~>uQU1=fa>d?vfIS(fL?b=Kf+ed_xO%Q<G|{#ZA=!
zNt8fzhM-oL^~uR~&OC}M#rDlhX{Gz%0EF<w4O1xlyZ8?J8Nl^Qb6>c^fdUJu@6t;B
z11Kl7^4;>}#fpoV?*pf*GlkR{ajJO@)yCTZWZE1Rt6^wzK^iC%V$A9VlM@KN0<wH?
zW}~eJ%+7P}D(3ul=ABgkKAmn?Cs$=s1*mnp)IxMz>%-i>IR~sqs>_3V)#gO96*0-V
z7{1R-wa}Q1cY!YX1t^UhhL}CoFFGwR5IntGDGFpcSb=YMTvf2zeQ=mGA)<x6h4wXe
zCg_!G?~?5)Nm888t7k`YW;A!W^V`m8dwsYNGIH<~Rlyf4c5pOj=!fmWeBv^>45@dq
znovdcK3`t!Gb1L8E$Fp)Bq0i?UM2gki2D213~D{Od>l-D`qmU`ZK~ZeD=w@_yI7?%
z$uhFx=IkxWPeGg)BAs9c)5QyOmfDs=dU}PuwYKT<O$4PS^(-b1bPj1)5V(zb|Em2h
zA@-LTUlT_84P4gObEcH9sW6?rUzXIs?O0teXojr!q#_pAWEvlce1J2Y$T%$%D#!lC
zX`R5<T$p9y{JCUNmSTXHKi=gW#aUJpI5}OiFlE)x=0@BV#D4B^gvUo5`?SzCgf~Bk
z>ZA$qD1y=WO_>JLZvFEbzIiNlb7EK?!VFEnIr9`2dfF)Xhb=f%w^vE{jc7_`io<Yc
zdLnW|n4QU!Z-$1^ardYT=&9_`<%~fc!6^QaJ4LpT-NYcs#WbHiL@PrgB$rjXR;JPU
zGRNFZ$%pUj*sJzGeh#ilxRE}-8mQ^%j#(9t?g(EmLHlWg+Tw-E&vd}xI$zb~7ewwu
zOk~(Pdrls{?V@LQKI=rR`D^>04hiS-jiMwkL9^xBtG~tHyf96EU>lS(AVNMg;Z@+`
ze7A7!_97UTTSGAl+x(7hhT84fH8v2XnY;h5mhWF~7>Sb}T7diVaaED~+2t#D&%e<f
zAR##9)EPQ<JNfIf$dWhV{B-2CC109)ov2nZVw=(qb%pqSN0Lc|Nr4_^T`rM^Bg?LZ
zc;<7CZwgri4iUe?iV_v7F^&p&uh@32)*y@0oQb^06&<WdKEwxN7OBN_vn!~2H>@@l
ziYU+R;=fpbhCB%c%G3yNJIy+7cEqGxu487RCV4&6mPm`dc%bX!grL2+c8M)+4u*<_
z%BK!qLQSDamj{ay%mJ53&7@Jj)T{c4$H>25%F-w)<3v`C<jTFbTbb|9)s%uIh!(NX
z7FxxVepCo%4%=$pl5d_0Y&dF}Zn)NvH`M$&w|$7r|2pb%n=Kt=Wj|SD8|)uHpMxj5
zzMg<>o@)SR8i?4u(=zkqv*f;{X<86o^XM0)@i;hjsm-}=0PS4Dj*QK-25Y9DxPIih
z={qnRyZr&`P}{eL#4kl>szqx&w9_YS+GO3W{_F~ivR{o4Dq+24;d=zRcPOhITuhcY
z9}k}T4(S`?UTN6#k9nX?+ZTD`LQ?nwshzq7vL@P}6Wr~Q*p18TOJM<+zT<x`2be@O
zt*2bSEO=pO$B)$+kXO=xrCcf9c|z06jf>IMOk>VD(z8h2sjmA6$w#<^;=+cVx{j<;
zYN31Q#Ur5uS9YU4ZTrntF~F*ngUu#u0X6B=T@Rjr>(R24FTRV$1ir_(wX0c<r})`N
zbjd|y+3$(+>7R`KEk}bWC-a&p+~k!}m_`tqSuob`V+U{_qp)JJVV7g2DYwWdb9^a|
z48Br#+4>13uIO|D7x|WK^F>(0ROL>ZQQ=XNO(MbWU2-RNXcA1aYs(ru;==zyv^d{&
zvAGZ%qeV~L!_syF=SjMg*O0{>2hi5qH<d@uh4^-0oK<E2Zw&G8!0zE%M7B<P@XQ71
z`~kVl=*gwOLI)4qUf<s#yMy6DC(TYc-TZSBqVi{V_4Y_-MCEwxbZ{8r|Gmdk!GTUT
zG{2@OtI6rlZp2_qfX8rS?_LDZ+gi`<ZUlG*d%KC#R_q8I%XOCq70T<xns4Y0GDwH~
zYHMO~%o#By^xn0x<QmUoAhuBK*)k*8n(zK=0w-wvc(VTERlmJUM$z)J?aQLs-PM8S
zzMKQu(Ls{5zCICq$ZDF?-#HM!V#6!5aA_0*l8~y!r<=Wy0BQ5<v^iw=;U*R_(yvWC
z@}Q1u;>N%eEl3F3QQjOLfogw};uj>;UgEI$Xtb9C*<XBn^rjkGRN3>k&Ar4c+t*bf
z8K&78C%=Ez+Ou2QRH<=sdUeihfwz5|nhGbnIkYjIK|}~|dvX_@@(DV|a#pTd_jt)3
zyDDmomC3CA&>0cR%rJUPxh;0qJYjbp5tAGTEL5a528;1~cVGa1Y5<ji#Pb6ZPq$H>
z_LeXo=kZeWPyFdW-Izq85>}Rl{5g%Pxskdp^aBl3(f5hx`(nxNf`9zn?LKd2Z@G3P
z4A1xU_rDUIlf`okVDZ_NyW-ZWxw-W8-YHR~F_mJ8lKO8r_hP1^#0+{t^Z(W)cSHaC
z^8Y$1{*$-QP19C9$8tOyD4sFIv!CL5h0b#_$8*f<bH=NRSlDI|id}GQhNp$~SwSXb
zqU?w9mcKbic04{?z#BVb{5WkAaZt|OZTcT~$4}zp156Dv)AwR`jj53><goktt2-KZ
zZiB4o(diCLpLw}nwzZ67h;~bZ-HKdJ=8!Mz%;{<Wj&fiIMMzyEK16y8GMnsoW+!Y^
zr=%~krJ*q7tOhOQSIMn}q*Di2*5fnuB~g&!03$*{|E~YqnvC1vg+0`>HuH;Moh3x%
zEFnO0nU5rC%z$f;)h$}eD{$#KLwZ7hUz*Nf0km`P_7sYD+b_19%U}O2C-eI7cEWf1
ztgz*-cspWGKLtdD;X?DF3&`d)<stN&uMF+<`>q&^`Kz0TjPQsF3TZ>SACE7SEYQ$N
zKhdH{9F;ZB&~A<_8^taq0fuyZ{JcBaeEDf11F?oxFiCSyx%0tNUg2tpwX)ikXik(p
za#v97Ouu@{2{+nV${0hb`0kg#=N9Kb$<ZiBoEz%_%o{>T0`r6*`;AGv=_BbJUma>=
zq*4~kjx{~5$l24A|M*4du1<N*;W6VyQ5RPGxfv!eZvRwv(vuKdUxYlvG;Ss<dDj8*
z;Qs6Epxy`ii2OdngPRjGVJai0Fq@}lwxve`<}yAOt<uWBFC;eIs-oiV`Q~KiU$c<W
zH^SXh2^a6-7829s3vU4`ud!I(udCAWx4LZ3b=Gq%yyL#MIYP$Ksg>Oc3gkU8=5^mt
zkWn^@s5Gz!b_T#}LKfr?T|b@3M!_R=ASvi#7-otxFS_?cf?9nxXujUMfr(IZ!a^j_
z6j82^WIIS~0TFN2f$$F@{fV}d?&&s;zJ=aCjr{^cHJq8sz`=GZ!u%+2io5;O<t(q3
z^d|bgBfr(+Z@fhxf&Puddgir^HoWUoI4WBDeKu6FEJ|syheCEYd2ssQl6W)?odQx!
z;18fhkt?RL`0L?}mIgM276<?I@DyFo2$!qe!4aeW{#oxWhdShML2hL(Swv%EVh<%=
zF5@8`P_Kx-Z^T-5u2)vloa<E5t{RJ+J0@|Rlf90tb)R6`CE3}=v^`$oqpUZdn8%)!
zsi?|12mebnjRY`5H_JO^90o|HC!uEspD;q4<om?MtU0KhM^*{SzrVYqW7GzPC(-jW
zHu$!ET;G@cBEAW1ai~fVoIAaJ*vJ&QC^Y2ZY~w|g&!POjRC#}Sad#`Ha7S9Tvwz}*
zd0r?{!Pg4)Ao{j;F&_coiB$jAA$f_AQE^6GLgrH|aw6H^-09qJST;g$7(6L(hN`cA
zzP-F<Ik^ke$y>Js{rDs{jh*1{nafzBNHeTMH^X0bIjuvKY$i+wvY8F4KHPn!tYoAX
zGC5x{H2Wzq_d)zNKkCA7jgwNKT>E0r3wG2-gDkAgYb5Soy4jd}KgQIM%-IBJLiWj|
zc3%z|i?^%a59$YklS{J}3qoY3kt%gk+(z$xy?%-Z=(ZVBx@=7~6`v2m&sde%?WRx%
zAj0*z9p9luV^#Uzzj)qG%Y1ZCt<15hVMISWozaikbm1zxuR<@QFn*UxzGR-ZZT}wO
zR%ImmZ5*%UbHToF2md_F{qc3dj5Af3Me2*3Fmnl1MHH_cqW#WgzS<TsSMlt!>^<tk
zJL!_r_UYK|i^=lyt5)~=j4Xf(mZ!MWL%qmj5eB_NeJfyYRebR0pm0nnQstIp{A{mp
zy{fS_e+dt~T4jaJD<-m4C#O4Rj!3#7i3fbUTYmb8ZC*MA30?liQ!kF0dvtKt$maxO
z^a7LhNq%Yd7;PtZ%&2vLFsW@25M|X6YTZ}-<ktirk8q#&CGzUE;}noVPHsJ_{@@c=
zCPK9HD(*<Hy;`^;eg%e;#AaRPp_d|fb8E%lu@dFiEQoXI7JEQG)ca}G$wNZd@9hfl
z4=vC#mrC^RY~%5`$aAnXAXyQ%`KPo$+0w!(>Z`Q`88a#3QT4vdgLHQX<Y3-xg03U-
z;0~(uZ{d`+1?GzlY^BT2Bd<YgUh<=wxqdGQrYzW<{zU~s<^wnb8=gp^QwRIWae!c$
z;l&A(#`S8Zd9%3P)LnVLGH>H`YMDFtgJM3sje6u!Z*ogr;OwjON(;K{JCnz7C&&cp
zqbfSP#^K=`l_xeNNRbno-{$rAaC5ud%yV&=!~R5@%)adizC8ETnI-`Q{<R*u?qY<&
zw?*;Or?hfpMSxp37&%Y-TdH*|GxqKiunG$vQtoDD2R-nwOdBIGsVq&Po)(n&ht7@<
zY|yB?x$5&(QgAF@#ePVl!I*LTlGDDQ!&Eh7=(N0W@%wHgykVr25_f@4o?x8qP4X@x
zH?fJW^!lukpeM(U;Q6hD)VsIsT%3(-%u1Pq*5>W5dq2|Vz(@K29gY_oth}Ip?pCPF
zDAg)SY!UG#q^0_{XH^-^w(93CZQd=wT29x%E&=F}@dCEqX7QUqQ|qk_g`C$N4!<EV
zvo%pfWB}-AwcF^(fC>3t!CAfcE%fK50kmh<&o38qQQL=Mt}Zi#Vd&^2Qk+9bG?cWi
zc2`VIFU1pA`HLBnc2dabnigE@0Q2hI5{^mkarqdbK-e!Z8q;2o8nrM2aYLRdW+x*E
zxPmVWG^se_31@po+uJ|;@kSg)i*tW6w?XI9Bw>wL#+V!YJZ$wLPGFT!_wyAMIR^F+
zE83dB>-KItR+^VysI38>mVVC8LF8n%p|0}yu2<Jd&#(Zok}PeN=)aQ>1tB-X)wry!
z&#RI-Y+TJI8offQeA#(+X7tVVbz+Vz7IF0`;!g{fLL?f~%UN<Tg<OwkGR1?uOj3Fi
zkfNxRKrP-W$Ki|H2p%m!`JZE1hGOs3HApw}-k`JA_<cI%eUq`QTE%W?#H!bl<$XXh
zamADKJ#mvtp=^j6{(kSH)1kF*m(@Tyl82<%>CQP@l}bgG>e2Jc{mxTiJo}bCU8CG{
zXY9PIZP*%zzxe2|d#IJ}?LL3*(XRS4d+@ynDZ4{Zr&S*-TO6lm4V>nm|95USo!}UH
zo8Dy)uQTghn}*7qCU}hNLwb!{r{J>ePmpKTd7p-dcH#AUYj7BKjy`d9@3+pm<;k(s
z>_WyQ0D!aVpUYZih?JIf+})~OA^Bq__mR~+C1W=eIf@FZyN)V~2g{E<!Lbp-Q#x!6
z7aX!+B9wqIv|f~lXPw`%0LymL4Hqo+^0wn}h6Ap;vwrj$rXjjWv+L7h399j^HE4wy
z=ZMmE*nZJBZ#gsDq19our0f~~%PHqjD8hwR*o1%mx4$;q7jE4=uk|jfXCdlO3-_RH
zdDCG8HgLV4H+uVzz9&3=sn=ksW079O!~8zkk!l<b8JcwBol>UQYRk1Y-=F^nq7!0~
zHZjqiz9A*f=in4ZXvr+18=dFe<f)Pvwx^uiXq#xx{LrCZQ%=2NzPe&nKy(CbAG9Jz
z)SR4_smDY{*#jIlIHGmTz)&S_&$&mA<Wfmviow9r%AF!$?d}3)u7UP2*=5he{8R$u
z$s=<xK(qrhQt)M`gjeGH{@L40TCwv^m?&ASl_P#fF8ciDnT)@w;(GTVVQXPTrT)}A
zs3A_7ZQRml<%J4;d=a3Bk+W-MxWNuzxvDaUCTJD$<JCJ`pOuYh3Jn)jlm_WJ`$txt
zu#R#pm8oC%@n<T;6^+0&v%`JHHhgVjmTW~dg)8EMLX4_pdVqU#EqgB3-)^OyFJEtd
zKH(4i{%zYylNWtxn=8KH?24uQaVn*R_08|rS+Ez&dyd`ZX*z*wV<&yI*GH_b%2dA4
zuCowltEM9k{DG4clsggnIa8Qgh5`NALK}0;ypwju($n9=Tfr{`EtRPxmY>9_bbow5
zAFvyYmEFtp3Ls2XghnCGx8WVIC={aUevSH7<xQ0P#g}@|BIMRuZ8}^DUV`h_|MPos
zxT2ywhSGn>xWzMJZ66<5NnB6Un1VMSCgK?FyY!ame5%iSSgdSIx+C&JwrAW^Ua&%K
z8{9j^)b2Y^yMc9;bmcx^?j(BBAstCY3NfG@)t)77=`N(GKU=1GY2<Ox#@Eglpi<tN
zkuK&r7VCYS=JqDXix5Me=6J1s@a|!}kL!+?nW{d#3ITZ~UB|C@)?<c2TC=eV>6e^x
zpHmHgtulY~ZnOFOH{F8Gh(Y(mJy;9yw+moxg2LPUa@$1MvRw^f=VdO}*nu<aJ4umo
z4vE9NntoO0Yf}MOwrXf&uZK0atRfj^^}2+X8eyBW0W^w^kCw@10YXE&W%ik}yGI@r
z!%tM2?EQ*B^q`vClz|`AHvYX<xA#k_HuwtfpZqF3MGXSa+kelGvTwh2Ulsk4ebbSU
z@=|}itMc5Wcka{yzfc2Q+!fX+46K(_?x={7&!#K+^zD%9H2-ovX`Z;(P;9pDmr_w}
z`#UH9#V&0mHjhWCAbHut%s(x*4Rq{5dw%}V5Kje=me1)c+`VQ+yDJ~#dA%8L`>%0P
z*b=Pn6<1uW{718Fu#zPRD<D*fB<SCuh>&P9Q_ju+Q}UHDfg3{+aWIK!fOtw{Y|{??
zK*lGe0uEK|*3ogjio1D3DoyNw+gJX6g3^W~9Un_N?qwrq6>$RYi<Is&jcezXTD***
zaA6*1{Hd}^@!1d}DF0>p>MQVbXN&-C0~FDJwy-G1ij}N}j3zxR+Uv(UUmBCp1$|!N
z?)~5KjzH|ck-G-1Tg*Cj5!(UWoyn*D1y}fdX{sM#1M+fcI3kk9uzmP9>dzK!AHUQl
zB&Ya8)Skf#M9uH5yPNwwYm+fE0pBfBSc56_d4VJ&cuG_CE?4&ZpW5xcEY3OU>fQ6{
zUAFdypv0{ZrBT-v%*$y_GHYglb@uE0_$F#0_ezk>4Bt$hn~v<csYKb1c}3ph;td%(
z-;x~}bu<1s3$D25{oY5XfWR1L8c-VF9IHMr;A-`*=99wAHyx*Ia;6?KIcEM^tQha%
zMhFU-*H0Txv|O#+|5Mak2F2BN!NNlz5J3V2f<pqqHMm=V;O_1W!{F{gg9iq8g3I7A
zI3c*Z4estTI3Le@Z+*Aw)TzCHpRT>n>b1IiP$ok{n$GTw5cf;jiD^8)@QGb!uEJ!D
zc6cKvmXq7Lnfw$1W<0<dGrX8{Y^K3Kx%id;hdY~ZM3QMDrh@b!JZQWo=n^Dk2*;=?
zbGPkF8w?UsPWRI`1vFci!RyaY-Y!=2R$`mZG+LfXe0s9jq3T9fyQ_=wO|t7>YIPjE
zG<|NvdDw(E^JRP+_&}3@>hrj4U-=khTf0X^-M?SJKRZ4>Tg4udg}44O$IY|iLWr~k
z*HB+WUK@7E(etJ>Zd1V9M<ti7{)&z~fgiK}<)?1;ZL6_vVw#s>)~7l6f#Tz}DRsVn
zB;Sd#VIdDz;p92e9xQ6ybTvv&(6dFwH$vNo%I%{8)=*`DwKWY{$aQYeXyA$)+HA<)
z(fOF|?uukc@-;}f&AH~RIYzN=Kk2DN-|kosXkONOx=i+|^MKJhUL)mBR*JKKcHCcT
z%l_QXO_CiIGAB}$#jnEYDS{ZXm6~Mla))mak_C7E1snn@Pv|lP-W?@_DND?Oib^h4
zUL@~h;Bx3!J4<y>t}_~#0oTVH{jmuNkh)pdfDCV~8z1*d!)qJ%WA{~uIfQ9VBkx>u
z+u>IE=IEr`oJZ2MX{hf@P%CH5X7+#z6jYcm)$CF%xM(B%OS!Hn=<;;$cA{o+qr<sJ
zOGp*k)h`*6%4(rMcloox(an_?ZeEw+lP?(q&gSUx80PTdPN;*(mvUCA(4g{#ekJ*P
zxogk(hHIlv-K1fK!y|9}w2nh+ygFsZk(FSZ-Osx=6K#gOj$klRbcI25wJP3c^cJm9
zmx3f(W*#%`>j~!QAaHnL`DRzy9(LP+Jb0RE^sPZiQ`U_-P1aFvi*KI0MN6E-zho^?
z5cP=5r!hqyH%{o^0cg08WmLbF!OZ*~L=i(R=MQt&hQF2Tp2P7&E1#1{D7Y?W!tiMo
zXI`lX0)I%8rcbt`_J+0&ujHg8xRC4Ul#y-!zJD?w*yqcMd{@avnu0juWZmQRv7hql
zOWnug?5r@o;0^_)14xt&X{HXf>=%d<EL>AnH>UUS|Gv^rlCEgw52(}iJ80vCz4j!;
z14jw<f0_`y3aKC;3Od$$Z+yX2E-!3MzVy_6mHdx^Ua7V=ro94`GyMC_=Y+>fw*r|e
z?&IWA*6Rj~iWN_1CqK1(tm^V5Wx_EA^ux-sx^pK(lJxJT-*<w*K~pm6AIu(<AcxOm
z8RhLqox=v@_#4DtH47Akfh!&@)%j<OSZaT^ifg=>#>}#0;Q}sWncb!n%Kz8N<Nufr
z{cjTHKfg1l>O89#{^=!7=;aZ8eir&)z!1;#GsE*U<#Ld?2=bFZpv*Gi2%Ln*$0-?%
zFYj4d+w7y|KFp9d*pFnwTSz`ku@p(72ou_JN_(0k!GP+a``EIlDk)K(aWxgsSfrW?
zsz7XsYW61E46ny#RO;kMNzJR0LugPtqm_&<!r5gVP5*hb20qG*xtkmK9LVK=MWD5|
zwN-0@46a?J;9`x&g573nalL;?w1c*T|DHm_C9F@HI6bsj36ge>)lHRSX!<Oa-(o7p
zFmewlsx*2J*}HL+<)Y>l$7o8y+`vD{)-naq|6PtoTeEnkWHj=ICz%j-Wq+x*NOPOC
zGo76~CQ&yS$cJycWb3H0hPq6)?pqUNDhl&$JDdAN)eP$KTF;xryk7@Yp}o1MdC=E*
zP?7pa>QuTQlfq9i-Q$F|VEHi35v=2wi1>>7OOV^xxuz_djomh0jF7x-BScAWK-aT#
zW7@ph%5dpG(jPWAB|hS`I#{E7e&{fKQ}Q}kH9KTI3nRfJu(eaFjtP?0*jog%H#Zcl
za11v4eAkup+NEk6$LQ7C5Z3vv+4SGeoy6iE4WW_QfX?&$jb4R=t)bKKnxCx>!v^zP
zjc^ZR2mEnK-x%NdTzd4sJ>k0%dNZElK<`=PU@w5u^r_4~<FzChQ>c$TKDlieoHJEz
zjgDMMzDp!O{`P53f_&@y)~_Y;XD1(1#D?Ew><QC-Z7KCslTucQCPRB0c>TmP(B*+}
zs*M&Ld<9t}t426CwuWP``&6KN2)m8kqT+3-n?@$R2DAksiy*(0ahV|UN;@eo*_?5u
z^}6G$dhE2$!@}VSqYvrh3Utg^J8Op=i;Q`~ym^<ohXVQ&3KSEGsbh(ic_y)xZacK5
z8|s;8TBr*-jrgH?KwV*+v@P3hzK$8k{Cc8*-yA-tY(mx*<&S1=C&ULvh3&<Yzpi9;
zdj<B>;pK{7tV>?u2D2}$_ZUkQ)GCG)XOFXMb8c@S+!_TOMBLp~5I?!^RflAUqm`)$
zOw%N0D6ltCR(igV9*6>U<N_${xG%s_>3TUg_J<~ITQ~@`h^Gz9axc!={O#mI)U~S~
zF=4UaBGS>tKtFg4T43f+HmQfRqXPo3#|GF{xKOrLLAsWfGcU~XI`_e!3ezZ9SNY--
z=P$!Yp){mnVaB9Z=#<M4GIG@Ee4Y0m{P$AQkXO)=!B*i^tBbW^$QKvl!DFF#wW7Hk
z=Z?o`#1CwuC6DuExNo!HaZpgd3iHJvsC9&nBo&sHyRN>|Y`<wt3Z>>;e?}BE3(|s4
zh6~jP1`tOswdv4&k73*DY4FgorRhw&>Fns}wNn2A{c>M_=>`}za79(K)%M;2Vp94@
z(ruyF#sSr6H^>zyOsS$@Gc<FgCL%<!Bpo<F+&?=b-E#T_<+1|&uXNr`AGKFRUWkY=
zMPbi(A;6!>i=@W1cVPVSlgodIb?C4OU`5A<c!*(e@7{Z-@{7P;IPiRk{xo91?Gt9y
zd;fsK`@23_III?Uz;$Q&`50+ar4{gy^LQF{D&2|f8;tvpa+M7!c@(@rGetcGXFQUd
zxe+{CYf*3QO9`q!{z=&6bx6{K&S}Yhck>nk-Eg;xilka(SuUdq{X)e>^Q$@FHNpwm
z4vT3cq_f4m`@(`)J^?H%V5^{RS-f;j{9*v7Kokihtv0E#&4?n~KoQ-gwN3mN3QhRL
z01dlXy2!V>nDlr~RLf07@*<P<@+3HXM`KWGoW^_11d2LIQG`#&k(GdX-c(NY^(pOC
z+zo3;rA2F-aE4hr7Aop)16hE_;+{m!A)TE^my1k$$4dKJyN8U=xkbLrvsY|e`}fD4
z+c2N6{GNjSI=p|K-RG^HSGNj67n|OIOe%l}s-FfG7G0f-+0H3kUPhs{L_dI-9fIZ3
zaJ!Hu5!KP9$4PrLxLGsDOa?FB{NB@Jbu+|0qh{%MzF~zccUg&&>=}1SW_ZttF!v3f
zrw{S_msXjce;IfT?mOz{gFtEIo0aOfU@dwQ@9`AHS}Mc#Lg^}XP;pPczM2`?TN$tN
z820TC-dA=@J~vXBj^5{nu4!wVgXH+$8E$iI^_4e?-?s%v+#a3{$2V^sCUr4?KJCBu
z@Vm++y5>0Ss>D)y20!p8Dk-Yq3w!BJob??w3b6XRB~x}c8{%fDy(nGAJUgmS5ZJhn
zSu#55W|-@~aClomn!A2_TOGaD(5p*V;St14pnRJfHp|GEbm7s6Fl9SAYP^4v-*^A`
zYGEk$kjv{*vWh1d>~PH2ZViSga!0ww05-%Pr9{TR|L^Si3upnbW<Bfl{3}jXA`hjb
zh6NHZO7Ck3mdSe7kd-&EyQXTKih^R;Qdoa1y`#>Q6EFP6rWp`iz)8K`okC)B1k<xy
zaS`~Y{TR~;`kAoEajO=Cga0Tsj=V0aRZm^j!tS}K#|0_PN0rV+zo?SY-r8NY#*A^*
z#c4`I)ZaTE2x!Yj*#>_UmLV%<Z$|Af1|x<UJM%P)1NU}$P(_8xFO3~5Yu}I-399CP
z6O?Bd^Ut%e+-D<d)eTC_!sHc9Etve4?@9j6?p7_}sn}-a;ZT}imvfd>Z)KrWf6|p;
z7C5=G2+VSD0o&^nMCJZcm+%5@j6Vx&AkLzOSI5#X2Wz_MGFecPhPY89{(L~Ye7)x3
z-nJrhwYB7HRsVcYR(hxyP)(VhKdSPvguhv%Bk8WYlofH}3KAH#II%peqew_*Q|~2V
zkn>4IPv$wm>a8AwPcQiv(0hM;Slfx9&_ZxPpTm?!FKcpr{8#qDy@iOhkBeDD#|>1T
z4OQ+tufYQK4nO=RigfETGyRUI$jbGEm;1u9J1i13s=S42by8`ZHsW1=lT&%VgP(*M
z<u56j@X41sz6zA#)s)?IuR5w6Pfx}r8T2{Rkv&_zaJc8NSs;NjD;uB`Sg`pM+8KGx
zup;8OCuY1+KRJ3Q$l1&<NhThtUO`uq2ttb+Q8~e;je$S!_fQ~dI7NLQUy=jz&SU%r
zEqd3GjELUj3<+>z5C>RoiN%R+VhER&5aj$;u6IBI2n9pbD92~N|4aVo%(4Ym-;w55
zeB|g}bmmU0j0gJatu%6^Iu*2^wk4oBlUG#q_Kw|RvAN^{tDmgRJNOv5AJq;9t+wGw
z6J1+f-*cKeK8cTRXbfsK-|!X`fBIC4MnW3ZP(?blQDknA=b=C2tSffv;dr}<)d&`G
z85D2LBNoN$CsRn(O}q*%CT9v2TfRJ~OSl!~y*!Q|5yE%(kMV{J#<VtO73EaQvb%6<
z8}GE_PH;0)H7#62!-;-O>gd^Qy@(Wbpbm4REAr7ZqtIn1E#FLaP1F@cu*FPJqF8)G
zj&rOKn+dC1-GQq4D8t)krco2;NpWyzBcc1^+}Dj^?_Y0&{B~Hh_b3yRlbL2W?yMy|
zJ}B4re7(hdb~z1fvVc|F=GTI~A#J<cH3rf(%{}4pfvIRlpN;VV-mE!vp6y%Jm)dyY
zfRDMJVpb0Mi+k5!)2y25GAj)FmOrL@S2FDh<qXI!cPRs>t|GruBmVqs74Y*XM&E!B
zYs@!!-o>mc!jO1xA9<`S2^X*?;}+A4o7@44!)GRp1`<A(ce{Y#+fN6JeD<Fc7NO(?
zLPS!D1GnbO)_*0MJDY^Rl<Cj@_>;*dSRQR(vvZLn``!&=xBYO=%koKu#CQ54hKl~=
zHQ5ax&^!!a$|wU_=w1mlu8~K@-B{nfm<8tx-|XZ1E}ZEI$`_a@UV)K5mS}Y>@fXFw
z8XAR?eyfbsj}wDPvsOH=HNoV-Zu9>J=4wEvob)raFYS<v9*VIQ$->XyLM|F&l#I(_
zAnXWaN(WwJE5go0$AzKl6AW(5;dx9mOCQG)MbsImwV4fjt28p^x$M~<a!eee@;piK
z3Udf{ERde<`of@@#LG)$W=zOW1u@EK*lJVCkHyLG4aWJ%S6{Xkn?J*N&8PvYdp%eY
zv7VxDP0nc@Y0AjP*m<5^oa7ULvy&~A$}5fkIl!nk!Jxf2vHoPl!}|$HPBvd1L{~Gj
z|2QwKe1G~!!^i`4Fgiu^`)<eB6YOYYD_oggK55@vb40Lh;a3QudBv$sQz$8)*_U4V
zTOjk^nW@(7!5wqOV|qmzd;poOwFdD8lxO*wk};iB|A7yF=dq8ZZg^HmyOe1YjQ(6f
zu#xEc^+t*OQ{AVMF0P*Uf)!0=rRAgNmm#Qe!K9Ny-xB{>oUNfa!d6H|bj(8<t3X^r
zf_nxk+KAGm*;c=k?g^d~Dj-pk^Qw=AD2?41sN-~v&?1NrIRE@G(WiB=W*%oy{5&>j
z0r}}PagB?`;gU)H1e2D+uZd^wU3`9qd(~eaZH^h~9Q4%YW4yOgM)~?3PogYh?8GmT
zcT^kmq%iq%aeB5EgX=H~r=1~IEHU%uGWhE6!+qr6-&cJ(&Xx7WKlVfr{m(+_zjOBI
z53X%aJE^;g9v|JFtY&bMi7$(x^0-L$B16+XG--{<e}0IeDcl19e+8Nzq4TN1XagC+
ztgn7KYA<7mB7LyyE>uKRH@<ptTFhQ*lhp()2X2U<+#vba%*t|i9VygmsiMI-CUf~r
z<d`NuSoAI_H5JgvMC{DWUL+qL4)=YYv&M*ta{;Ez)>9Vq)`KS(BA?bQlEg9^eZ(e7
z+9jt`cJ6Pg{79@ktAO;p%)xD^jG?!GRJAw+s(}SR_dOrod$IR-?msH3n%e7;OL9kH
zPsRUnd6SCTP8KoF3)W|p{wJUlp^b|+gNy6uG!e)<3R>oNQuC-H;3eYqQeVqFZZv#0
z`QSXdcY0C&P)n+pu{|lVvMInv%AIe*fW^&!u>G{+)sKRQjJHOh4m&Bfn4Ykj=sY`(
zWS#3p5nb0<BtqAbWvJO620;3Fq<f1{*pRw93EX;I5||}>rG=Z?neUiG%6GB0gic%p
zn_Lw9iZP*wRk)U3;`9q!0;rvS!47S9XuV`+xPb^&+t2q_Q-O}cufN`kZOgpZEQ+ik
z-}5?V#&WmxDq=ZyeLGz>9vB#w;9OK87D4MkNyOaXHk#1Cq!X&Nl2aIusVl+xV-X6K
zwl&EVA*~D4gnCOnJ6=zE%7}H$`u(I_?5E|}d0$=~9g}mgg3TvTadv=Zznp+RbD3k~
zT?~8BrOk@}DYcgH#_X4%fb?Glard0l`ETfz3Zkm}#n@b)OI1@<nvZ(vhezt16fHyN
z3c*qxMzrLY8E;sH*<WG$WY==|0J76-{BvD{I%)~@?b71ftSW<7-_G0%Tn>}yJTIeF
zBW1I*lm)(=Gi3R=koOY)NImunLV|DU)i7qTM_Lr_L^B1dS}M02d-AQ14C`D*gy%`$
z8May#NI8&6V-@a_LX(Y-I{EwW#M!@j(5Uv_B-a+F4DFnrUJiVDwBHRA3=|nv$VM@V
zqw#~iZK7thi%L~IlGZ_N(d7iQ=_<-8CIx0cPoEhVYZH~%?;rCHRzi<ru6G0aTp@f*
zq>dAmv)5;i_;&u?<L)j*$c_AI76ku9H#+VH^7uMw6saY2v!nu?&vvYq&v<vAL~ax0
zBYaz%O*yvq###L}<3!}Q3v!^wAL4McCor7)2(rQ-wLfOl^-5{NR|AxI7Gu$Hvc(yE
z7}<~<>C&QdM*HrM8=KT%J91QaB*U3A_pf@)Y^9)4WU|5!klb05Ekm2zWaB*&tU8GH
z0qwQSsYcRcjH4p<#n4#@NywpUNBUiYUXEkR<aD&A-yl<ra^OPKMOsyr<X*4USupEb
z*Txq4F;_=2d=3oJ+41u086K_A)pzot6Fp;T-$%daU3diq0kf_@&%Kl0Nuvt_qpiV&
z%RG>N?R025@LYAj@dhBrF%Y%jvem(jkYLa9LMYXXcIsg%l27e;8q0dMw_hsF*+i;#
z$|XiGk1KXJvW31T#90E1!E^KV*NFZh@;5?V0D#gBeC=;Ny)srCF=cim-6<3Dv+omT
z>u&q}l6VOA6F9Yfk-ZzD1+c~XHsTIgMP}7!0#N_|ey#8SkDC0y^yvRgg6Rx=j$T+E
z+UIBb=jYG=BX_?3Z~f(E`xF!*fi@-*DsAQcZ&dP4aHus9D7=6baR@sDB`mweVotNA
zu_J7Kq;rW6l1au2HX(ag7`eK-p-fJTx18Re7>F*?or}76#HJZ%Tz(8P2zZdB?<rO=
zW!{_KZHd@|B)N+Ba|<_)1y~+RJ{=0+6tf90R`k{yruB44yUvuBgf*qX+BxgS6QWD=
z$NDy+8BKqZ*L?dubG>@qgW0pDk(SE2nIYS(UhNw~3F%i()|oYB)xVTnVH`8ay_?!L
zLX~@Exicx0Z|(WyvV!xx|B>iB5=G9m=DY3Y8taCHdrvPm?^Z{9Lz@J{nYJWu*u#%7
zX7n}|+BK0}t5)88nYByL^0_~C+pyY`ksHwHAQ{NnO0P#cb`|w~e##=70QT<Z-`q=z
zjJRW80*b75nKV4=Dwo6aC6=i_%V%B6WKk3Bp0vq3X0@_&+f%k7LVoisIEs#;ZBZ5G
z39*eU`ilQsdS;*zt~epfiZ-Q?92ffBahW6A^^=~Gq+?dE&AQL$Dn+&pd#>pHXRh}J
z9JMs~w^yjo5v9J*ZKubpq&&+!EjIPB#l3J+|CbBJ1?>O&Ro>f_$biM%^rH$cAyn#%
zbqSE`JV)Ddd)>$q)?kmJoeIe-5r0?6PPC*W)@L$+`unYIyRKfd{UlHtee>6!BEp8X
zWQ^4WT2c=!SJtlqRFnl_WObm|?%|XzuVe&0Z%<m0FvBFbyuyp$I{l2~1Ehx|Ejv4@
zqXuJEqee`6`&IL9Zq!>4?DQXqb7QIOM9Up`+T-aK`xe$r>zE78l^>?rHyw<oGTUB<
z%+?|x`Joro3lnI^8{grnC0=-LHEYX@wF^X4TtUM}1CEI)f%#Lx(^+%TK{!;m&gOol
zV1`=__l&jj{>vHZcz5l#CBAfw+bB*{nu7dh&R<hsX4fLe@43iUhH`#l;R$b85U{j>
z7{gU16L(+LV9IIL8&9B5G7|QJBFo$qQ_=LRJO{tw9J|CmdcN-L905=IxO92nz-<w8
zedX_8`>R~$LG2cL2Pr&Vi!At(BHUYFStw``Z3EZ&y;`3@D-F`N-UNIFC(}-}UE>SM
z0ruG|ev;>6Q<hw8+`|Zq-QKhnb0|a~*f53s^>K@|nZjm`rl-^bTaoO1b}JwM73b{h
zHEqM=vqny*10oi=AoXGGDnh@gatT-*+WkG);$yGQ&^{SU(yUfpZI6LSw9r1%vMch+
z`zF}p%1noR$SPdvMarLzP|$g@+5kwQRSGRc3?Ep45tmgU{O~7)f!=4!Pg=VBa{_z~
znI$FgJ@C^TB*0%Tz4WX3Cx>h=JM;Y8%?|)-y_#J<WB^k~(7k77Uy~_*%0qDwOQ;dF
z213S{G=*AHdTolF+tZre<JGj&tf<K4Xv|lSqePK*_66XY?p3ohJo7lFIQevuba1uA
zu!>&;N8+pmN^C5r0z_`q@nVsN3=;pdMaj&Y>_)L1b3u+Yew?-kHnDR$H<URnE_GaW
zFP2^Or6~xPpBEpwa2pnSE*I~7tb@9Y+>2KapogZ;*2|KMUu=2=^aI;*<3P<l^`R~g
z-2>~IruGJq>`Ay#;s&xf<^8o4Xw#IItljhWDuX0QzT_mSXj|luPhfkmic_k{Me7oT
zX%-opZHWFam1c+U*}BE$edue`o($0s;_)ab)z%zyjAHD;&#i>2gHzuM51c(_N`Z+5
z9BaI630>o!*HcXIEuRGBcsuBUSO&G!Ou<t6mQ+i~n+?Uj8ywiOYtc869tfL?jv0-U
z;~~5meX}F1v_Lw1Dg(k-T`0EoRrse9ViYV-z_Q~bq$#`W-))aSpMnHpDpbkwOe1e(
z!aKFwySH>m1!E3aLI8t|H+D=xtWw$KF<#~KJMw;(M2E2<T#@LrY0n+4y2wr^fuC-m
zb0whQ3Bi%kjHH6M86SOIVa^_;<-J%~Z?yY`+A7YB$8Qfqx@M?#|0LY2#=#!(dbVt>
zp$-_KI)SDWx{=Q#y4@*_5=p@G&Qb4j)Ed+giBRjfXcv^Lo}m?wW}Tjr`a-+KdRRyK
zTagtsXc7hx6e4wK&K~+!1dc1vF<3-1`5YVbpzU53gTvCmJ-yp?O=!avL=&d#+bh(C
z8hZwv&wgp5SH=pm8nxglwU~PfKTkwdeiR0h>3|@x|7s(^dE4KGk(U(!Ae1+0fF_--
z>fdamVU8`9Hgj|}&*$DJM^ZPmVTe)C^KTY`ldAZ%)t}n`iBGSVtn(;2pB^6L^37>m
z8VKcFFNw}}u5_-Rp32M@p|?sc$RWSDXdC-gqtgT=n*U}tK~UNiIhfPIz06T@Tw4h`
zm_1el?i8?o`xbf<<!d$bD?gts{dhArHacURVmVEt)I$e%ct-5i+mrAnLggQ!F?G6E
zM#k*#0(q-CnzJrtdzA0A8FKMfm?oWOFHP6iXnkO=iJyQZ*Coa9lu~ovAbimxB%_b(
z7Vh-I6}!xPI0FiCgCPIyjw-5SM(33|-l7?s5=rlCn-O}|fLFiXqNf%#wIxsHD|IZ+
zelnvq`0WEalZ1Ho?o!;}O#JvXfAsv3O#)rWdo*DZx!!7HiN-|#@T+cFx#8?MgnnCX
zseG(nrTi*nC#c7%iEu6o?lH^_lPY+I;a5E#kGOh<gjJU!1!trYD*ao#29&3ZJ0}RW
z+bBdO(~ESE8?;~Vr0p!@ZvWZ6Sb^`I$P|pm`2Z)3w>-75_f#UtD0wQlPvQ+xGHa&&
zmKvo5HEwi}n{HfAg=N~10lq)?C_PQfm|SE{0Td8#Np-;L>gjF^la_#K*b<Wl^jZv@
zj~D&>Vrfn5C6w7;s?b)OEkZN(+-^N1A-bHECpaE7>FlCE;hkwqNRF|Iib4@*jD|t(
z<}_n!GuG++f((DRw??M`0K>2Uyd+-E5obt0H*KwQRi(hjf@NMYgjmT}HS#vn&f2GT
z6eOOj+vKJK;>0ye&78|}4KHw6#&N4GpjWY0Jt{2bUFygte3*YX+abSnXYH_Y{nf7O
z8{wZVDK;m`d7LN*-?G*+NJK6*&w%<Qdm<Zb-}eBr8f_&}(-s>+XRttgKqtA}RKXO+
zuDFEE3k=JNCbs?M?U~rixy)F?9k6XgShFM$N#ENm-_27t7ZM*Vp><;L;d0M|uR6|}
z!}rhq7gQe(z?}e!@9kWx;1lV1N{h#XeQOGf?fJeua7cF++GUG@a;p96VIn<G5_<Hf
zbu(#}R4Sx++jqm5z>F(L>BLY(NyJ6`<FPDj?7()^$b_&_!l-vC%Sw5vom1-fp@@b*
zpL%WYm`l_Z7ckP`mkP6<EUhgKf~L$E6Jj}VA0sE0UB~C)$G8!X&w4J(D*z`l+f1=2
z5A^)7FH2u<t7QG2(2s~7KoB%?FUC7z;?i7k%`Z&+)my}EUM*RG>0KuMa>rHor($e|
zntNR*&FGp<K`sFLoz~(|7XN6(;&7vQs!)jeiYIp%N8HK%8~+iyR~KNP^M)<kwC9Ex
zaP122{J?kcdLAnUD*fF*19BNlVeD9KZi-)1;cVH~8+(qMBmg5`Q-p`MYoc!=Rt7C5
zT?M_s$)^gsV*4^73oHL%Gohu?nG}@tRilQ$Uwrq2l7SS1Fq4-^f}El4g_p$m2Vx{L
zXUO<Re`-MJ&U8`pRJ0YOfRN>fF29{=iDk=FDZ6D4alRtUNnU89EdfGTTel#VX@2?2
zQjx)dCe+nLEVPO{u=UzGvTtT9Qg!QCwMGZ0US7FiuVuiNeaVt+@E@C`W?ZE6IgplM
z){v|xxP)KJtKA6Gb*bLlA;@^50TXL2dP5+lOe4xQ5}?eumdtQx-zKD&&0p!CYBcrd
z=<5|xhS$^G8GCuA7nSoZ>leTy>oB9_d7orq>nm|nqeHosI$Nh@x71PdMFVSw9$5qH
z0hhd$T~`vUymv8{ZW><ob`xOBi3^X@9|A)sDnS&~{^OhmF<Q4A^FzodufU698=!t1
zS*MdAM<E_RXIIr;T9=Kr%MB$*Y`?~L*Rt$0Vd@b$><Lx9_fTH6@iUMV%**9cx6HBp
zlBw(Kz==vz8<G#Me7E4Q6dTgfaLVUb!SAb{2f4kLZdxCnocw>EbV9Laia1-BxkcI%
zV>)W0hi&~Bea)12Zm<8$MsZJRm-!95_2I%>&#s*h`=`*xDLNmK9~!V{KXRZC4X3c~
z@4d&<6P~~`rz7Ph_UkXBk*F@2A-rl>x{)!GG8Q}&^)F98cL-%M)vnxGlHS|c`z_E(
zFk$O(EM$@Yl{J3-1dVdLtl3zN$hMj@zKQ&VCMiGH^1{NTTMKmW{$|)V(lYJH&1PMW
znaW)I-SgI_>>9gAdVkqVnJf}Hs{3DedsE=QI>^@<!ioQb1Bs_>a3f}TKA(wzvA51b
zYL-cHXLo+Utr!yV*bR)DC!{t6r;Tea2w<cNWKdm|fBt#$E`~$7(5;<RCxS0C#Z)Kj
z&VEa&=Bp;*aIw8>0jkgsdG5}5CiSN|PW_J6BYoZY%F9g$A&n+kjbLx=1xeS(syksf
zyKltrA(*q-UR=rd9h&`|wex!IdSobO#;84iw-wc`nzVHONa9Os2@9k4WI6%00#UO<
zm_$3ol_tHhLqD_LuO+iKBG6{u(Z;ChTo^IO4%u-o9gXp8Ow+zbhb4p)23-DW<@ITu
z9uj4`YXh4_ZJRo}qlKmQD`&a(T8HRr5D0S*WPbp-x+_#a2FnZ@WVq-q<iKFZg+6L~
z@B>oI)!X95y5W7}_4^O?0q^8RSRYx^zV=DFd=$C_nMAhn8rl-@7nMuaX}<BSUUarc
zrGMxd>>WjZoEWLF480Y48eM)@oI~kpIPXP>_#Gi(6O)PzH3cu!sFJ>VWT(dYdh)dN
z%A=X#=_73P{qRV+MK>_WH;8v6W@9^?_RkSd3(*$eXx?k$GS7=y_X=(4(@$mw8QVEg
z_G8O~eFlT__e4r{BCQ^Mf2G!r#C^(Z6+X^67E6nnyve@1j6&jYCVdx#KQ(CM8U{Wh
z5tO>%u!z_vc=A>}No!wY(V5>gl>XXmD>}GXYvUz*Og80PgX&AkC?vUV&hcN43A*rq
zKHUbj>`Y(9<p5d;#)aNcP6Q3);Ow)u8>e+%Dlx<gp5%g{`uyk=ZvnK;_-1F-^CJg*
zlB7do&AybmfSR+X4f86%vI7>iP0nzz2Bs_Ix?%je8}sWoNk7oW#Yv3xV0o|BS)LXK
z`}d0xehgoq085f0M(WANLtTy7^*EsV&BAsHawlYROq3}9k~N`GiJ?Bu_07<qQiJ`<
z?#fGG{xn-BHi4+OlRru1F>R!FE>->&pw-PMOx3H&G2{M<a#66RhpzDcEroU5tTP<C
z4ZAV;B{^UDbKi9R*^AzOy1HU=Dt!e!x3#UkJB_#gHyu}`W_TFiW%D@|6A-b2ko7Ie
zh@Fb|v~DE|5iq8e&>WK2zQd+G&idT#W5^t25A}?E$}Lf%u}}spqN^8vgjV$YgC`d3
zw3R-r_0*<1y1QR(`8Le%sC9`f+&*HiXB_?fSN-53qR~6IprI-?8ao;lUc*Z<e0l0N
ze$gT&)PR0xJi^=!r@NLYTr0BoX2x=!{mBy`JW4IAoZpnYBfPt>6uNRK!sqIq>$FNt
zfokCv@tCPMJNtycn&5R3v?TQv<%y{c9kt32hP%zd`t08-YUFAu=qPH3>4{5TFFsx*
zkGYDOh7pL=%I5ydr{Sl__c&nJp{a^OUu!xfT0=>ezK&E-<Z61Xd|8`*w4cP2wyxc|
zcC##ryl+$PW;&J@8F>S1H+*A|*NN^g^8X#2VfcTP%KI14G{5UV{Pg_%!m8jtKjZvw
z@v?pY{0w-$6{>ZDlu}xYg-}Ls!3j+*sW=2uHQbGANEb5>Y#0SQMvZ5S+A$->9B74P
z;pBZO{ojQ}-GBzE)F8RoRHnzedx7h;>l^TL4~O}uf=}Q@iv@=k$}88>WP~zjRC7fk
zfpAf?A%p2i6uiNSC&E<zWVhQ0?tSGN-tl*N3#t`5b1e`|pb$AoN$-=nP|;rAE?9BD
zExEH@A10P~M_rRVDp-4ctA-6cnr%=ELk}I6o>=7A4!>q{>PdoYUR_TqySTh_Y8flE
zA$JtP?+m}qTx39%n<^&!z7#D=Ug9iFbJctnAVa7420%nu{2asRSyd-*pfkF(fSHVR
z+AoRc&*y)I99I@I?ai=rS^vJcdN16^uPDJ*w$vAEDP?Fm;E(k+#!)!!^a$_dPoZ4f
zSVg1v)>r7)El>_}TpKU%&rB+uiwi=WA$?ztQ}b4?7}U3i^0~RD`0l`;ZS9pO5*}){
z&G`3xo2O?YNDhkU!YRa3ZO+1!dyRhT&X|sDnjjvF7-4a4xuLF6LX-{(b1SAHyp`Yj
z2b%_q=Z!8&Dw}pIHN|=!;rseS+41(Nc>Yt5l=6ZqQxUZ3s8aj8w4queDxTp!{ieNN
z8ulLc_Xt>qmaX){IxwD+ek2+7^-}AsPQC)wYy99*CjhZfoT_K^g(1uzGd~ZCq+s~>
zj$XYU-~llDSw8gpw+g(F{G%^`0SI-mGvN{bp)dkS(ez?z^3YOu4&tO!>crQCD!I{j
z&RncYJ@b@Q46#g1`t8Fl#z?YI@k&~zsHWQ?mE}PSI`e$IHc`ajR1Y77J?=w`<^ujS
zftX(Xx0mEOWlp^nQX2OKv!*9@2YNYFk-J*$8`4yZq5EP;^knknaKm1wViG^vngta{
z5`pC{v_3*j`x-J_WHL|C=g28k{k~~|T2p{W2u5%A27^QPQ;+m%Sd&$hJGUHZ&j_v^
zpEF9rvQetc2Xs^)T*?cZ0<OlhBjHH7pGNkJpoY}BPqrl!{9g=;t#t{8D;+8M*uId3
zawxELCfl+-ThH@bK|_<Y+FK}OGp*fL{sMT^f7_19jGZqWvU??k(_@5IvBCFi+>f~D
z!?5AHoY2hF8;`MS(a@EB$&BHs&iI&cS%B3_71s|*EJnyin4qwSAkBq#l-f(zW}MKk
zr}T|Hq2=$<Sas+(hcBMjm-H-8EE>G%Qnq=Wj~mRP+5p`rV=YYZ){a;=3yURT)z9_=
zjsh9!1%<mZ)z+g>hp%<0fl^MDUANw8r#~N*xcS7#QhEPs{<T{2%92|9TtoyR;VS!x
zx;Xxe`=8kZ{iB26Q`4gttRn!_RiB@)2YII;TyM}Kt6YV6C`?8KVc!i-X|V9+>LLL!
z7Ri<oiTDrY_cwMd8i2nTNPyG!O7<5ljAgyN+MFi)nezO}D2ZkimdS^Z(#|E<ztF++
zdGKd9b`-$Y;7>FH2K5KvZB0|%Fi6k1)t~NvZ;&snMlw>@ME}8FjG(#cuGHj7A;t>^
zukG*-%)t-oHm<s>QG1EbbMA|Ud47h})Hbhk0Ab4X&d~01eysUq1GtA<lVPjxT}mUr
zg7`%(A<30?z~z}h(bVL;54E}7e1R&)q?O#8Z-=BNb970X6RFzMM^6+^vcIry-7)cw
zRN0$8qL=k{8c%YrJlobCUG3j|jIJU?Et;R9+JszvJmB{gIQdd}Q;!KJ`O5>Mpa$qx
z5lk;g-fU^RpeiSY7}L@v1{b=*pFa{mO*vka(v-NbKh>n=(uWWU26K0KY0`n-jP2Wv
z_*~iuIaU_hwY;r7+Gs$}QvFAFQ_pAjTj^P^NXsoMt-$=xOCS~+@q^p4==;YegZ4!V
z<uzU+2KAismEQ%4gHC9=AgW3ZWRuM3ubDC0I`^SjQBQQ{KkQS!6uE?v#A_57j`zW(
zbd$cJT?`+r$%<Tz{VANCL$wK6fTeO^mBI?mSL^el{XirC#v|X^_99Ny_FUMk+e|$b
z1Z<}Pw0>z_VbhnkdzP_f%>B>pf!;OT1%;b)DnV=*>f8cSK1-TPE3o**L&d`88K@F7
zVQ?C5FVd&J&#<qTHNQ^bnynK0XF}YeAwvr>9fDXQWEd}aSaxC`N61x&Wxg9hENO|7
zibG^Cj%08j?Q@ld&+9efdg~g6TvOX1E_wV9y&T-C8RA35?*{3v>S(ygb|JvwYjM28
zw>0I`9cFXiWYf_Fgayeml}eP{-Q+S3cX2ai%JwKeUPC&58-)*MjEbuNQf~K?Y6mMM
zMLR_!HioR>Is@tDO?=zOll!-ZYX0LkTT`hO9-PC{={Am)I6JJ03*!<KU1LTiYjiFo
zT#Fous^w(cz6Gd5k9k#Rr+L$!zeJmktJ5onjL%)lrWwmV({>b^hKjwg(R{jOLcRxW
zNK_W=vx;djjgW<iJ<kTr)Jd-Scxr?g381jTKIXgu+j-rLP4e)Limi~)>zHl|a;Gz6
zaSgp~wHp%aysG%*SC{w&E5{RU-Kep~>S!%#&$jmY<Z&RW{@7oLbaL>`lO`IN&(9rr
z*YRl59H@vV^KpOF_5n=0WH6W&Co>ucnp#Gk%<uZUuPjkQo$Q3)HK_kCVoq=T&9>(#
zK_R&uLmpyF+nv0M-U-S~_V?1^P>-69r=X@87AifTX-0tSuJ#tKFEH$0AE^56-k}#G
z-yT7{>$}#Rq-=nH#og8Y>PzJa$K+$a%)cN-TmXP7Z&~qvoc83(ysd#I#ZQ($YYk_j
zgjqnAW(6Qa#-U>)@JZ3f-B?q7Bx({XYx-fXA1GW%DTt+-W;eNie@SBR^`Af-@Z@v>
zDb?+oLE=bH>^`m>6;JFGC7+nuw1x+cefOI~2{ENYlzye5DRT?LDsWDV*vnSG<rrRA
zY&ARbWa$<Z&e-SiP1^ra?aHE|3z{UwxhX<NfFq;|m(X9EZ^})OVdN7Ss5!asVzk)x
z+i%WWfF7e>we7`hoXQK<)N?o`GAowSi$PVjZ|f?WkG(#woQ+P$OwWwgd_7Hd4j7c_
zPWCM#U~JOa=3&V~A(>T<<SYAT5>Y%WKpMbyvJg5j`!?;e+GXCq%}qZsry#9!{KjC<
z+_3)uoi4AU+URNOEhmT9m!G1bFB?0iaJ&0PDhGg8)^^v$@H&r)*}0lve@r{(dHUy?
zJJCmI?!NY&@9kM4E+X=F;7dE+1p#LS`_vJgSRK(+;mJ4b{nDgKE|v*CmQV%Jy2oG5
zZwKrlfg8||0Zy6*5_lApyNyVkV9HF5zCM9!2}n?7)FF)_-KQ7r%;8C_zu3k7C~DJi
zI6|=%$6Su2U_+SkV}@p7nIQK`Xi0gY<0g8r&Q?W_(qmBy`D{4ZrY=R-y`o%AE2+XS
zFNf}dF76h|(%x)O%o=RR+nA%BgJDdO(Wi9c*gEHL0%MTAS-M|wr2^3Yzuh}56{Th0
z6!oJunfV@--K9d#brlw=FHC+|aR`vD7r-j^RoF<Jhidt*XOd1xft5CKG%bm$KAe?)
zZdp`+ssF2MUqFFdXGlT)fe0g%rQX^cGqTaKvN|${%Nlc}MTMWG`D7xQq%12D+%y<#
z-#*h^mE7hsbz@BDiMik5Yh-q3no?6`ExU3M^{C3Jp}U#fGU|he+EZH_U^J<)mSilC
zk`)DfTqI|hY}uZa;WV#uX3gbea6Otw-r@x>>V{HAT+VGy(4B1*@cK|_$r1hB-#Y)k
z3rnyGvR$~IWGB)<?Hsc*;e5}GN{NR~9+jB2GjUMsnBT}1#m~O$YIojKq#c+sJdUYo
zE34$wNN8I5@$r<~{YS~dIKU#y?T@Yee0k?!1i1&$@bpqEq$Z*SjnBo$uFgaeU5sB9
zZFtMyrgfO}*W2tb6Ja%gTt-(N?H`#cM{J?}(?d*FSIsu-=$2VoUVc*_nBN)q0Cxvs
zbzZeKZGJT2Kn3&=m#X)%aLw=Z6;i|#rupf{FX?l;qVClTo!Qb=H{}Yi`kue^Qe<Zp
zZP;ZC1};GXjwI-_pq$p1^yNbKftIsDV7U+MVe9*KPo8fCq`pn{$!VUmxvGKEIl5>g
zKT^#o^@E;GW7k<~+xSdtxRtMhp+G{etgXE*S+`WPhWcBqVU@RkZ8Co*LAge27HdrF
zZlSq9Xuo$hk33qLJ-e#WQOsF~Zo|t82RYgwQu0A7jiU*fV@ns(iKT6RIo{g3Nlc{V
zGtg6m|6uSR5FpUwhNjrJ{FCm?Y1$Jr!{;_Ad!_aZK8}#d*?((wuK4)3jizMHhL-9X
zAUT(eJo-Y}g$A<O&XzilyvBu$CXK=zvd(+v3v(|2YU5+fngbHP)Wl=!FgD|W%8Qk)
zT({1Wh+=1cD#{-1atfVPdo1uM%YsL54iRZumaxe3d93|@_e47>pGutaD`8(cBD^kD
zO6t@R2C&b))`<LbZHQ!N%a-^X^?+Ei>K)Tnx2#adWM+flySB(Gd`f#?-IXiN^AVDC
zejfVrc4I%U0tqwU0jh#J%t!*rh0=k^?04{p;P=!MQY1h@ykW3RXGQiZUuRJ#)MPu|
zuVO+HKkY&`?a&zAm#<{iQo>r7{wQ-esXzOv@yc5^eNt0fZJ*v92&LLU#GlSZtbZM|
zc|4kN36?i-T|84blQ8_|n^dtMqYb@N8|NdTE=!;)aKUer`hZ8$NHV9c8~vmAt|t*8
zn0AAuW-6%mUH8r&23lcNSAXW*5<cZ}xYxM55{$BdsQqTjJg&B0Y2-V+$c=DoRq%q#
zu$2`(A+FRu@iivOLb4`R2bF2#BGe50008rku2rqFQ)V_5+SAWAlgxG77sCUj=;=6r
zt2#oQ-Xf}-UGUbUxV_X1tvpJS?yo%C9#)U^d|Hk>d7XUviEDCx&|}mtk<g>Oe0?X=
zmUC9zgfaH0LW3;2f03omMtRaVbWK(DI8KO8i*HNDWPWY$)#24r*h>yeLyuMgYze-s
zL$ky8_Nv>sq6oPjXPN@5c6nxS9A6DQ#9;zib~w`<EFaG&Z8fs|!^Raz`$n;u_{`$5
zoP)D|Vac_NIq`NUxm`eBj^a)pJAgDfEaAtnQdS&BXM>V$uJn5^`@SY=4_UkQMC+;g
zo)Gub(Lp1R4NVIre0OqUa-GI+KX%}M8+&8<8m=bFGtRl#MVrNkC)B(S80&xAg4Cg?
zfK`F_qOPCmZQLtfxy{~Img;LqzD6D}Et<Qr!=xBi;)}M3AI|(^{O7WZ%~rGc+IArZ
zw>r_X`P%a8tI*}viK016to_<7nB&PV^DIqNcg!l`=ZZe68_;)Ik@{-%0@5Lsoyal$
zFNC{HEqsvN<HzmcJN{6)0u6_dbw65-(|6vZnwGQYb|!-aQL9LfXLVtSSZk4L<>OQQ
zug;MpVRN#``x$S@004?6;c7YI#GbUDCphVY=2FXzGqG#{sJfU7EA8f7-ouO8=P~Y+
z`Zk}d@SU<Lr~Xscn?b@Y#%QE3Yf*;ymisra{HY_(j&uh3(Osg`pY1fhm?}O6Cq$45
zDPdL;>}3)EvF!g6HyeGhY5vmp2NXF>T>HFCVryiW;Qx=3Krv?hf0V>aoH5`!45*3x
ze14nh<W#)a0eEd4SB5fkeOhV6i%R_nWG9oSi$41e8!xc8^&Ow>N%h@#`I2l|+C2Qn
zI#TV_UK!R8p1I<sKIY}ej}%on_}(gzET<~r_T|SyOGr#rBu$SEAuzFHcsa7C5qh?t
z#@MuieDI{SVD0o_CcCk^09*A<Rx!^S{IK=F_=9h%Y9S4-6u_NtPL<L&I=z3sU|uXV
zD6pGCfY{jTdU`C*A)d$-{Up8FPK`9cQMn5}wRjODid0_$m)8KqfD1p;uee)mUDu;?
z3*8!T24>B#l=i*?sF0CpVDhSZ+!)ENv&EDcz33}T4slAJ?v+kOp9t?NemrV_5Y|(c
zGz8WSmMUD*>SNhjvfwv{{qFRAbhceKE{<KCuYkMx7GE`XbF%YvfzKg<LC%6vzvW;o
zFeCa#KLOZ>rGPN-0giV|=<+tp;STPztLB9+vY$Hx!$O(*CFpDK#d~_YucRnbF3x03
zj3x8J665P{(l|kBjr5RDs$+x*H(^(geBCS}(7{s(T^%oI&}LFPav|2kx)F4uDRh|2
zBP=*do$L!m<k3g8neqiT@&BZrT#Y-0EE0X?PPo{2j0!^nh};UDy%m>B7t7Y!x^L4m
zb@mu;NEb9D$-ixk_l*zWRhL{o@E_V(?)uNo7?A1Yb(ld+_V*`TX}YCW{@Y7C7Vukk
z9m)+|kkax2I*GDxvzF=X-)ZXUqAWR!)a>}D@JC6b{3yO>Pi5;BgyU(xZ*qWn`DP)9
zPWDpSk4@$`AWow8AD!6!z}t3)`|~j7&ZpH&g_u&ZtW8Bi&7`%4h&|Q8PJ%EbtvJ8k
z=42oKrww}hhbVsLRR~|G>BkM6N${JNjI>*}kZ9Tah3uB+D}ux2EbbC=A0Il4tUz@A
zFHGTkPQTGMs9+f9_DkK)#GA&ECQY^NDFT<<_Dgs*qoN*jjYdnQPij+F2k8fPpv(hX
XuV=n0=%c0~?#LMMRkl!0Ch`9V|3u3W

literal 0
HcmV?d00001

diff --git a/Resources/Audio/Items/attributions.yml b/Resources/Audio/Items/attributions.yml
index bed043b3ca..5a5927c878 100644
--- a/Resources/Audio/Items/attributions.yml
+++ b/Resources/Audio/Items/attributions.yml
@@ -174,8 +174,3 @@
   license: "CC0-1.0"
   copyright: "Created by romulofs, converted to OGG, and edited by TiniestShark (Github)"
   source: "https://freesound.org/s/127541/"
-
-- files: ["jet_injector.ogg"]
-  license: "CC-BY-3.0"
-  copyright: "Orginal audio by EminYILDIRIM -- https://freesound.org/s/548009/ -- License: Attribution 4.0, 2imitk -- https://freesound.org/s/279044/ -- License: Attribution 3.0 and brunoboselli -- https://freesound.org/s/457294/ -- License: Creative Commons 0, modified by Princess-Cheeseballs (GitHub)"
-  source: "https://github.com/space-wizards/space-station-14/pull/40076"
diff --git a/Resources/Audio/Items/jet_injector.ogg b/Resources/Audio/Items/jet_injector.ogg
deleted file mode 100644
index 8ccb40d8ce67bd76d254bb169001abd403904679..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 20742
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

diff --git a/Resources/Locale/en-US/chemistry/components/injector-component.ftl b/Resources/Locale/en-US/chemistry/components/injector-component.ftl
index 762816a9d2..a418edd1dd 100644
--- a/Resources/Locale/en-US/chemistry/components/injector-component.ftl
+++ b/Resources/Locale/en-US/chemistry/components/injector-component.ftl
@@ -8,9 +8,9 @@ injector-toggle-verb-text = Toggle Injector Mode
 
 ## Entity
 
-injector-component-inject-mode-name = Inject
-injector-component-draw-mode-name = Draw
-injector-component-dynamic-mode-name = Dynamic
+injector-component-inject-mode-name = inject
+injector-component-draw-mode-name = draw
+injector-component-dynamic-mode-name = dynamic
 injector-component-mode-changed-text = Now {$mode}
 injector-component-transfer-success-message = You transfer {$amount}u into {THE($target)}.
 injector-component-transfer-success-message-self = You transfer {$amount}u into yourself.
diff --git a/Resources/Prototypes/Chemistry/injector_modes.yml b/Resources/Prototypes/Chemistry/injector_modes.yml
index 53a5ee4f73..1e2b38aa41 100644
--- a/Resources/Prototypes/Chemistry/injector_modes.yml
+++ b/Resources/Prototypes/Chemistry/injector_modes.yml
@@ -127,7 +127,7 @@
   abstract: true
   parent: BaseHyposprayMode
   id: BaseJetInjectorMode
-  injectSound: /Audio/Items/jet_injector.ogg
+  injectSound: /Audio/Items/Medical/jet_injector.ogg
   popupUserAttempt: injector-component-spray-injecting-user
   popupTargetAttempt: injector-component-spray-injecting-target
 
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml b/Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml
index eb602ec985..8bf35659e5 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml
@@ -10,6 +10,11 @@
     allowedModes:
     - HyposprayDynamicMode
     - HyposprayInjectMode
+  - type: Spillable
+    solution: hypospray
+  - type: ExaminableSolution
+    solution: hypospray
+    exactVolume: true
   - type: Appearance
 
 - type: entity
@@ -34,9 +39,6 @@
         maxVol: 30
   - type: RefillableSolution
     solution: hypospray
-  - type: ExaminableSolution
-    solution: hypospray
-    exactVolume: true
   - type: UseDelay
     delay: 0.5
   - type: StaticPrice
@@ -98,8 +100,6 @@
         maxVol: 10
   - type: RefillableSolution
     solution: hypospray
-  - type: ExaminableSolution
-    solution: hypospray
   - type: SolutionContainerVisuals
     maxFillLevels: 2
     fillBaseName: borghypo_fill
@@ -124,7 +124,7 @@
   - type: Item
     sprite: Objects/Specific/Medical/jetinjector.rsi
   - type: UseDelay
-    delay: 2.0
+    delay: 1.5
   - type: SolutionContainerManager
     solutions:
       hypospray:
@@ -214,7 +214,6 @@
         maxVol: 15
   - type: ExaminableSolution
     solution: pen
-    exactVolume: true
   - type: Injector
     solutionName: pen
     currentTransferAmount: null

From 67da176eb98b54bf62402653671d20b3f4d76ce0 Mon Sep 17 00:00:00 2001
From: PJBot <pieterjan.briers+bot@gmail.com>
Date: Thu, 1 Jan 2026 05:44:04 +0000
Subject: [PATCH 122/134] 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 5c5264e5e7..381dae9dee 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -1,11 +1,4 @@
 Entries:
-- author: metalgearsloth
-  changes:
-  - message: Inserting lights now plays an insert animation.
-    type: Add
-  id: 8847
-  time: '2025-08-11T21:06:28.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/36541
 - author: sowelipililimute
   changes:
   - message: Borg modules can now have hands!
@@ -3931,3 +3924,10 @@
   id: 9347
   time: '2025-12-31T01:52:22.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/42181
+- author: Princess-Cheeseballs
+  changes:
+  - message: You can now spill the contents out of hyposprays and jet injectors
+    type: Tweak
+  id: 9348
+  time: '2026-01-01T05:42:54.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/42158

From 6e55a7bac48d78617694ac2b470e8cedf3f99751 Mon Sep 17 00:00:00 2001
From: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com>
Date: Thu, 1 Jan 2026 04:05:09 -0800
Subject: [PATCH 123/134] Make some HeatContainerHelpers methods byref (#42197)

* make some HeatContainerHelpers methods byref

* all of them
---
 .../HeatContainerHelpers.Conduct.cs           | 20 +++++++++----------
 .../HeatContainerHelpers.Divide.cs            |  3 +--
 .../HeatContainerHelpers.Exchange.cs          | 16 +++++++--------
 .../HeatContainer/HeatContainerHelpers.cs     |  6 +++---
 4 files changed, 22 insertions(+), 23 deletions(-)

diff --git a/Content.Shared/Temperature/HeatContainer/HeatContainerHelpers.Conduct.cs b/Content.Shared/Temperature/HeatContainer/HeatContainerHelpers.Conduct.cs
index deb705b8e2..c0de657fa9 100644
--- a/Content.Shared/Temperature/HeatContainer/HeatContainerHelpers.Conduct.cs
+++ b/Content.Shared/Temperature/HeatContainer/HeatContainerHelpers.Conduct.cs
@@ -26,7 +26,7 @@ public static partial class HeatContainerHelpers
     /// integration steps with adaptive step size.
     /// </remarks>
     [PublicAPI]
-    public static float ConductHeat(this HeatContainer c, float temp, float deltaTime, float g)
+    public static float ConductHeat(this ref HeatContainer c, float temp, float deltaTime, float g)
     {
         var dQ = c.ConductHeatQuery(temp, deltaTime, g);
         c.AddHeat(dQ);
@@ -55,9 +55,9 @@ public static partial class HeatContainerHelpers
     /// integration steps with adaptive step size.
     /// </remarks>
     [PublicAPI]
-    public static float ConductHeat(this HeatContainer cA, HeatContainer cB, float deltaTime, float g)
+    public static float ConductHeat(this ref HeatContainer cA, ref HeatContainer cB, float deltaTime, float g)
     {
-        var dQ = ConductHeatQuery(cA, cB.Temperature, deltaTime, g);
+        var dQ = ConductHeatQuery(ref cA, cB.Temperature, deltaTime, g);
         cA.AddHeat(dQ);
         cB.AddHeat(-dQ);
         return dQ;
@@ -85,10 +85,10 @@ public static partial class HeatContainerHelpers
     /// integration steps with adaptive step size.
     /// </remarks>
     [PublicAPI]
-    public static float ConductHeatQuery(this HeatContainer c, float temp, float deltaTime, float g)
+    public static float ConductHeatQuery(this ref HeatContainer c, float temp, float deltaTime, float g)
     {
         var dQ = g * (temp - c.Temperature) * deltaTime;
-        var dQMax = Math.Abs(ConductHeatToTempQuery(c, temp));
+        var dQMax = Math.Abs(ConductHeatToTempQuery(ref c, temp));
 
         // Clamp the transferred heat amount in case we are overshooting the equilibrium temperature because our time step was too large.
         return Math.Clamp(dQ, -dQMax, dQMax);
@@ -116,9 +116,9 @@ public static partial class HeatContainerHelpers
     /// integration steps with adaptive step size.
     /// </remarks>
     [PublicAPI]
-    public static float ConductHeatQuery(this HeatContainer c1, HeatContainer c2, float deltaTime, float g)
+    public static float ConductHeatQuery(this ref HeatContainer c1, ref HeatContainer c2, float deltaTime, float g)
     {
-        return ConductHeatQuery(c1, c2.Temperature, deltaTime, g);
+        return ConductHeatQuery(ref c1, c2.Temperature, deltaTime, g);
     }
 
     /// <summary>
@@ -131,9 +131,9 @@ public static partial class HeatContainerHelpers
     /// to reach the target temperature.</returns>
     /// <example>A positive value indicates heat must be added to the container to reach the target temperature.</example>
     [PublicAPI]
-    public static float ConductHeatToTemp(this HeatContainer c, float targetTemp)
+    public static float ConductHeatToTemp(this ref HeatContainer c, float targetTemp)
     {
-        var dQ = ConductHeatToTempQuery(c, targetTemp);
+        var dQ = ConductHeatToTempQuery(ref c, targetTemp);
         c.Temperature = targetTemp;
         return dQ;
     }
@@ -148,7 +148,7 @@ public static partial class HeatContainerHelpers
     /// to reach the target temperature.</returns>
     /// <example>A positive value indicates heat must be added to the container to reach the target temperature.</example>
     [PublicAPI]
-    public static float ConductHeatToTempQuery(this HeatContainer c, float targetTemp)
+    public static float ConductHeatToTempQuery(this ref HeatContainer c, float targetTemp)
     {
         return (targetTemp - c.Temperature) * c.HeatCapacity;
     }
diff --git a/Content.Shared/Temperature/HeatContainer/HeatContainerHelpers.Divide.cs b/Content.Shared/Temperature/HeatContainer/HeatContainerHelpers.Divide.cs
index f1e7206683..e745c59305 100644
--- a/Content.Shared/Temperature/HeatContainer/HeatContainerHelpers.Divide.cs
+++ b/Content.Shared/Temperature/HeatContainer/HeatContainerHelpers.Divide.cs
@@ -38,8 +38,7 @@ public static partial class HeatContainerHelpers
     [PublicAPI]
     public static HeatContainer[] Divide(this HeatContainer c, uint num)
     {
-        if (num == 0)
-            throw new ArgumentException("Cannot divide by zero.", nameof(num));
+        ArgumentOutOfRangeException.ThrowIfZero(num);
 
         var fraction = 1f / num;
         var cFrac = c.Split(fraction);
diff --git a/Content.Shared/Temperature/HeatContainer/HeatContainerHelpers.Exchange.cs b/Content.Shared/Temperature/HeatContainer/HeatContainerHelpers.Exchange.cs
index 6b7eb125dc..a906cfa35e 100644
--- a/Content.Shared/Temperature/HeatContainer/HeatContainerHelpers.Exchange.cs
+++ b/Content.Shared/Temperature/HeatContainer/HeatContainerHelpers.Exchange.cs
@@ -17,7 +17,7 @@ public static partial class HeatContainerHelpers
     /// to bring the containers to thermal equilibrium.</returns>
     /// <example>A positive value indicates heat transfer from a hot cA to a cold cB.</example>
     [PublicAPI]
-    public static float EquilibriumHeatQuery(this HeatContainer cA, HeatContainer cB)
+    public static float EquilibriumHeatQuery(this ref HeatContainer cA, ref HeatContainer cB)
     {
         /*
         The solution is derived from the following facts:
@@ -43,7 +43,7 @@ public static partial class HeatContainerHelpers
     /// <param name="cB">The second <see cref="HeatContainer"/> to exchange heat with.</param>
     /// <returns>The resulting equilibrium temperature both containers will be at.</returns>
     [PublicAPI]
-    public static float EquilibriumTemperatureQuery(this HeatContainer cA, HeatContainer cB)
+    public static float EquilibriumTemperatureQuery(this ref HeatContainer cA, ref HeatContainer cB)
     {
         // Insert the above solution for Q into T_A_final = T_A_initial - Q / C_A and rearrange the result.
         return (cA.HeatCapacity * cA.Temperature - cB.HeatCapacity * cB.Temperature) / (cA.HeatCapacity + cB.HeatCapacity);
@@ -55,9 +55,9 @@ public static partial class HeatContainerHelpers
     /// <param name="cA">The first <see cref="HeatContainer"/> to exchange heat.</param>
     /// <param name="cB">The second <see cref="HeatContainer"/> to exchange heat with.</param>
     [PublicAPI]
-    public static void Equilibrate(this HeatContainer cA, HeatContainer cB)
+    public static void Equilibrate(this ref HeatContainer cA, ref HeatContainer cB)
     {
-        var tFinal = EquilibriumTemperatureQuery(cA, cB);
+        var tFinal = EquilibriumTemperatureQuery(ref cA, ref cB);
         cA.Temperature = tFinal;
         cB.Temperature = tFinal;
     }
@@ -69,10 +69,10 @@ public static partial class HeatContainerHelpers
     /// <param name="cB">The second <see cref="HeatContainer"/> to exchange heat with.</param>
     /// <param name="dQ">The amount of heat in joules that was transferred from container A to B.</param>
     [PublicAPI]
-    public static void Equilibrate(this HeatContainer cA, HeatContainer cB, out float dQ)
+    public static void Equilibrate(this ref HeatContainer cA, ref HeatContainer cB, out float dQ)
     {
         var tInitialA = cA.Temperature;
-        var tFinal = EquilibriumTemperatureQuery(cA, cB);
+        var tFinal = EquilibriumTemperatureQuery(ref cA, ref cB);
         cA.Temperature = tFinal;
         cB.Temperature = tFinal;
         dQ = (tInitialA - tFinal) / cA.HeatCapacity;
@@ -103,7 +103,7 @@ public static partial class HeatContainerHelpers
     /// <param name="cA">The first <see cref="HeatContainer"/> to bring into thermal equilibrium.</param>
     /// <param name="cN">The array of <see cref="HeatContainer"/>s to bring into thermal equilibrium.</param>
     [PublicAPI]
-    public static void Equilibrate(this HeatContainer cA, HeatContainer[] cN)
+    public static void Equilibrate(this ref HeatContainer cA, HeatContainer[] cN)
     {
         var tF = cA.EquilibriumTemperatureQuery(cN);
 
@@ -201,7 +201,7 @@ public static partial class HeatContainerHelpers
     /// <param name="cN">The array of <see cref="HeatContainer"/>s to bring into thermal equilibrium.</param>
     /// <returns>The temperature of all <see cref="HeatContainer"/>s involved after reaching thermal equilibrium.</returns>
     [PublicAPI]
-    public static float EquilibriumTemperatureQuery(this HeatContainer cA, HeatContainer[] cN)
+    public static float EquilibriumTemperatureQuery(this ref HeatContainer cA, HeatContainer[] cN)
     {
         var cAll = new HeatContainer[cN.Length + 1];
         cAll[0] = cA;
diff --git a/Content.Shared/Temperature/HeatContainer/HeatContainerHelpers.cs b/Content.Shared/Temperature/HeatContainer/HeatContainerHelpers.cs
index 39078a810e..6ce01c752e 100644
--- a/Content.Shared/Temperature/HeatContainer/HeatContainerHelpers.cs
+++ b/Content.Shared/Temperature/HeatContainer/HeatContainerHelpers.cs
@@ -16,7 +16,7 @@ public static partial class HeatContainerHelpers
     /// <param name="c">The <see cref="HeatContainer"/> to add or remove energy.</param>
     /// <param name="dQ">The energy in joules to add or remove.</param>
     [PublicAPI]
-    public static void AddHeat(this HeatContainer c, float dQ)
+    public static void AddHeat(this ref HeatContainer c, float dQ)
     {
         c.Temperature = c.AddHeatQuery(dQ);
     }
@@ -30,7 +30,7 @@ public static partial class HeatContainerHelpers
     /// <param name="dQ">The energy in joules to add or remove.</param>
     /// <returns>The resulting temperature in kelvin after the heat change.</returns>
     [PublicAPI]
-    public static float AddHeatQuery(this HeatContainer c, float dQ)
+    public static float AddHeatQuery(this ref HeatContainer c, float dQ)
     {
         // Don't allow the temperature to go below the absolute minimum.
         return Math.Max(0f, c.Temperature + dQ / c.HeatCapacity);
@@ -43,7 +43,7 @@ public static partial class HeatContainerHelpers
     /// <param name="c">The <see cref="HeatContainer"/> to modify.</param>
     /// <param name="newHeatCapacity">The new heat capacity to set.</param>
     [PublicAPI]
-    public static void SetHeatCapacity(this HeatContainer c, float newHeatCapacity)
+    public static void SetHeatCapacity(this ref HeatContainer c, float newHeatCapacity)
     {
         var currentEnergy = c.InternalEnergy;
         c.HeatCapacity = newHeatCapacity;

From 267357a4b06f790af476375011b9ee4ee600b1df Mon Sep 17 00:00:00 2001
From: Princess Cheeseballs
 <66055347+Princess-Cheeseballs@users.noreply.github.com>
Date: Thu, 1 Jan 2026 12:17:43 -0800
Subject: [PATCH 124/134] Fix all currently known markup issues (#42032)

* fix 1

* fafa

* remove

---------

Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
---
 Content.Client/Guidebook/Controls/GuidebookRichPrototypeLink.cs | 2 +-
 Content.Client/Guidebook/DocumentParsingManager.static.cs       | 2 +-
 Content.Client/Info/InfoSection.xaml.cs                         | 2 +-
 Content.Client/Info/ServerInfo.cs                               | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Content.Client/Guidebook/Controls/GuidebookRichPrototypeLink.cs b/Content.Client/Guidebook/Controls/GuidebookRichPrototypeLink.cs
index b54dd8b701..1e8b524997 100644
--- a/Content.Client/Guidebook/Controls/GuidebookRichPrototypeLink.cs
+++ b/Content.Client/Guidebook/Controls/GuidebookRichPrototypeLink.cs
@@ -42,7 +42,7 @@ public sealed class GuidebookRichPrototypeLink : Control, IPrototypeLinkControl
     public void SetMessage(FormattedMessage message)
     {
         _message = message;
-        _richTextLabel.SetMessage(_message);
+        _richTextLabel.SetMessage(_message, tagsAllowed: null);
     }
 
     public IPrototype? LinkedPrototype { get; set; }
diff --git a/Content.Client/Guidebook/DocumentParsingManager.static.cs b/Content.Client/Guidebook/DocumentParsingManager.static.cs
index 3e37942381..c702ac97ad 100644
--- a/Content.Client/Guidebook/DocumentParsingManager.static.cs
+++ b/Content.Client/Guidebook/DocumentParsingManager.static.cs
@@ -82,7 +82,7 @@ public sealed partial class DocumentParsingManager
                     }
 
                     msg.Pop();
-                    rt.SetMessage(msg);
+                    rt.SetMessage(msg, tagsAllowed: null);
                     return rt;
                 },
                 TextParser)
diff --git a/Content.Client/Info/InfoSection.xaml.cs b/Content.Client/Info/InfoSection.xaml.cs
index 9e10a4d7b4..95a74c72c7 100644
--- a/Content.Client/Info/InfoSection.xaml.cs
+++ b/Content.Client/Info/InfoSection.xaml.cs
@@ -18,7 +18,7 @@ public sealed partial class InfoSection : BoxContainer
     {
         TitleLabel.Text = title;
         if (markup)
-            Content.SetMessage(FormattedMessage.FromMarkupOrThrow(text.Trim()));
+            Content.SetMessage(FormattedMessage.FromMarkupOrThrow(text.Trim()), tagsAllowed: null);
         else
             Content.SetMessage(text);
     }
diff --git a/Content.Client/Info/ServerInfo.cs b/Content.Client/Info/ServerInfo.cs
index 901fc91337..a28a3d4a6e 100644
--- a/Content.Client/Info/ServerInfo.cs
+++ b/Content.Client/Info/ServerInfo.cs
@@ -24,7 +24,7 @@ namespace Content.Client.Info
         }
         public void SetInfoBlob(string markup)
         {
-            _richTextLabel.SetMessage(FormattedMessage.FromMarkupOrThrow(markup));
+            _richTextLabel.SetMessage(FormattedMessage.FromMarkupOrThrow(markup), tagsAllowed: null);
         }
     }
 }

From bbc519c523d7ea3031d591830839e954449c835c Mon Sep 17 00:00:00 2001
From: Princess Cheeseballs
 <66055347+Princess-Cheeseballs@users.noreply.github.com>
Date: Sat, 3 Jan 2026 11:33:28 -0800
Subject: [PATCH 125/134] [STAGING] Fix Disabler SMG bolts going through walls
 (#42195)

* RAH RAH RASPUTIN LOVER OF THE RUSSIAN QUEEN!

* delete if we do 0 damage

* actually change that

* dont get soaped into cleaning things up challenge impossible

---------

Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
---
 .../Projectiles/ProjectileSystem.cs           | 82 ++++++++++---------
 1 file changed, 43 insertions(+), 39 deletions(-)

diff --git a/Content.Server/Projectiles/ProjectileSystem.cs b/Content.Server/Projectiles/ProjectileSystem.cs
index 28df1eb42d..01fe80e094 100644
--- a/Content.Server/Projectiles/ProjectileSystem.cs
+++ b/Content.Server/Projectiles/ProjectileSystem.cs
@@ -3,6 +3,7 @@ using Content.Server.Destructible;
 using Content.Server.Effects;
 using Content.Server.Weapons.Ranged.Systems;
 using Content.Shared.Camera;
+using Content.Shared.Damage;
 using Content.Shared.Damage.Components;
 using Content.Shared.Damage.Systems;
 using Content.Shared.Database;
@@ -68,45 +69,11 @@ public sealed class ProjectileSystem : SharedProjectileSystem
                 LogImpact.Medium,
                 $"Projectile {ToPrettyString(uid):projectile} shot by {ToPrettyString(component.Shooter!.Value):user} hit {otherName:target} and dealt {damage:damage} damage");
 
-            // If penetration is to be considered, we need to do some checks to see if the projectile should stop.
-            if (component.PenetrationThreshold != 0)
-            {
-                // If a damage type is required, stop the bullet if the hit entity doesn't have that type.
-                if (component.PenetrationDamageTypeRequirement != null)
-                {
-                    var stopPenetration = false;
-                    foreach (var requiredDamageType in component.PenetrationDamageTypeRequirement)
-                    {
-                        if (!damage.DamageDict.Keys.Contains(requiredDamageType))
-                        {
-                            stopPenetration = true;
-                            break;
-                        }
-                    }
-                    if (stopPenetration)
-                        component.ProjectileSpent = true;
-                }
-
-                // If the object won't be destroyed, it "tanks" the penetration hit.
-                if (damage.GetTotal() < damageRequired)
-                {
-                    component.ProjectileSpent = true;
-                }
-
-                if (!component.ProjectileSpent)
-                {
-                    component.PenetrationAmount += damageRequired;
-                    // The projectile has dealt enough damage to be spent.
-                    if (component.PenetrationAmount >= component.PenetrationThreshold)
-                    {
-                        component.ProjectileSpent = true;
-                    }
-                }
-            }
-            else
-            {
-                component.ProjectileSpent = true;
-            }
+            component.ProjectileSpent = !TryPenetrate((uid, component), damage, damageRequired);
+        }
+        else
+        {
+            component.ProjectileSpent = true;
         }
 
         if (!deleted)
@@ -125,4 +92,41 @@ public sealed class ProjectileSystem : SharedProjectileSystem
             RaiseNetworkEvent(new ImpactEffectEvent(component.ImpactEffect, GetNetCoordinates(xform.Coordinates)), Filter.Pvs(xform.Coordinates, entityMan: EntityManager));
         }
     }
+
+    private bool TryPenetrate(Entity<ProjectileComponent> projectile, DamageSpecifier damage, FixedPoint2 damageRequired)
+    {
+        // If penetration is to be considered, we need to do some checks to see if the projectile should stop.
+        if (projectile.Comp.PenetrationThreshold == 0)
+            return false;
+
+        // If a damage type is required, stop the bullet if the hit entity doesn't have that type.
+        if (projectile.Comp.PenetrationDamageTypeRequirement != null)
+        {
+            foreach (var requiredDamageType in projectile.Comp.PenetrationDamageTypeRequirement)
+            {
+                if (damage.DamageDict.Keys.Contains(requiredDamageType))
+                    continue;
+
+                return false;
+            }
+        }
+
+        // If the object won't be destroyed, it "tanks" the penetration hit.
+        if (damage.GetTotal() < damageRequired)
+        {
+            return false;
+        }
+
+        if (!projectile.Comp.ProjectileSpent)
+        {
+            projectile.Comp.PenetrationAmount += damageRequired;
+            // The projectile has dealt enough damage to be spent.
+            if (projectile.Comp.PenetrationAmount >= projectile.Comp.PenetrationThreshold)
+            {
+                return false;
+            }
+        }
+
+        return true;
+    }
 }

From 6cefe4299d39fefc421ae754f4b419634d40ff92 Mon Sep 17 00:00:00 2001
From: Princess Cheeseballs
 <66055347+Princess-Cheeseballs@users.noreply.github.com>
Date: Sat, 3 Jan 2026 11:39:17 -0800
Subject: [PATCH 126/134] [Staging] Let admins ignore the laws of physics
 again. (#42221)

admin ignore physics

Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
---
 Content.Shared/Movement/Systems/SharedMoverController.cs  | 4 +++-
 Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml | 1 +
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/Content.Shared/Movement/Systems/SharedMoverController.cs b/Content.Shared/Movement/Systems/SharedMoverController.cs
index b3607b8463..bda05da019 100644
--- a/Content.Shared/Movement/Systems/SharedMoverController.cs
+++ b/Content.Shared/Movement/Systems/SharedMoverController.cs
@@ -218,11 +218,13 @@ public abstract partial class SharedMoverController : VirtualController
          * Physics simulation, which will cause issues for Dynamic bodies (Such as Friction being applied twice).
          * Kinematic bodies have even less Physics options and as such aren't suitable for a player, especially
          * when we move to Box2D v3 where there will be more support for players updating outside of simulation.
+         * However, Kinematic bodies are useful currently for mobs which explicitly ignore physics, you should use
+         * this type extremely sparingly and only for mobs which *explicitly* disobey the laws of physics (A-Ghosts).
          * Lastly, static bodies can't move so they shouldn't be updated. If a static body makes it here we're
          * doing unnecessary calculations.
          * Only a Kinematic Controller should be making it to this point.
          */
-        DebugTools.Assert(physicsComponent.BodyType == BodyType.KinematicController,
+        DebugTools.Assert(physicsComponent.BodyType == BodyType.KinematicController || physicsComponent.BodyType == BodyType.Kinematic,
             $"Input mover: {ToPrettyString(uid)} in HandleMobMovement is not the correct BodyType, BodyType found: {physicsComponent.BodyType}, expected: KinematicController.");
 
         // If the body is in air but isn't weightless then it can't move
diff --git a/Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml b/Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml
index 088c0f3ba1..ccfa2cec73 100644
--- a/Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml
+++ b/Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml
@@ -36,6 +36,7 @@
     needsHands: false
   - type: CombatMode
   - type: Physics
+    bodyType: Kinematic # Admin ghosts should ignore the laws of physics.
     ignorePaused: true
   - type: Access
     groups:

From 9bd24023a759aa79ca2cb8194fb1a32034aab2cf Mon Sep 17 00:00:00 2001
From: Pieter-Jan Briers <pieterjan.briers+git@gmail.com>
Date: Thu, 1 Jan 2026 21:34:05 +0100
Subject: [PATCH 127/134] Update RT to 270.1.0 (#42198)

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

diff --git a/RobustToolbox b/RobustToolbox
index 6d31d5ba24..68f8d00931 160000
--- a/RobustToolbox
+++ b/RobustToolbox
@@ -1 +1 @@
-Subproject commit 6d31d5ba2404c9f069c456f10bd717929b00a9d8
+Subproject commit 68f8d00931d6b14f3e592d50c47dd44ef09eed1f

From 3ab84443f948b3830adade2f74b3b7066ebf9fc6 Mon Sep 17 00:00:00 2001
From: Princess Cheeseballs
 <66055347+Princess-Cheeseballs@users.noreply.github.com>
Date: Sat, 3 Jan 2026 16:24:18 -0800
Subject: [PATCH 128/134] [STAGING] Staging Chat Fix (#42206)

Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
---
 .../UserInterface/Systems/Chat/Widgets/ChatBox.xaml.cs          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Content.Client/UserInterface/Systems/Chat/Widgets/ChatBox.xaml.cs b/Content.Client/UserInterface/Systems/Chat/Widgets/ChatBox.xaml.cs
index c389cf4dfb..6e8a41de7c 100644
--- a/Content.Client/UserInterface/Systems/Chat/Widgets/ChatBox.xaml.cs
+++ b/Content.Client/UserInterface/Systems/Chat/Widgets/ChatBox.xaml.cs
@@ -117,7 +117,7 @@ public partial class ChatBox : UIWidget
         formatted.PushColor(color);
         formatted.AddMarkupOrThrow(message);
         formatted.Pop();
-        Contents.AddMessage(formatted);
+        Contents.AddMessage(formatted, tagsAllowed: null);
     }
 
     public void Focus(ChatSelectChannel? channel = null)

From 7c28daf1ed3c11dd109852d08b4be370d17e3686 Mon Sep 17 00:00:00 2001
From: Vasilis The Pikachu <vasilis@pikachu.systems>
Date: Sun, 4 Jan 2026 17:20:13 +0100
Subject: [PATCH 129/134] Revert "Rename LOOC chat to Help chat (#41933)"

This reverts commit 7750e3ca2e54fde0fb10d2456c41f6b121112a9e.

This will have another vulture round, it will be reapplied later after stable is merged back into master again
---
 .../administration/ui/tabs/server-tab.ftl     |  2 +-
 .../en-US/chat/managers/chat-manager.ftl      | 14 +++++-----
 Resources/Locale/en-US/chat/ui/chat-box.ftl   |  4 +--
 .../Guidebook/NewPlayer/Controls/Radio.xml    | 28 ++++++++-----------
 4 files changed, 22 insertions(+), 26 deletions(-)

diff --git a/Resources/Locale/en-US/administration/ui/tabs/server-tab.ftl b/Resources/Locale/en-US/administration/ui/tabs/server-tab.ftl
index 87e52a4b7e..7a41cbe2c7 100644
--- a/Resources/Locale/en-US/administration/ui/tabs/server-tab.ftl
+++ b/Resources/Locale/en-US/administration/ui/tabs/server-tab.ftl
@@ -1,3 +1,3 @@
 server-shutdown = Shutdown
 server-ooc-toggle = Toggle OOC
-server-looc-toggle = Toggle Help (LOOC)
+server-looc-toggle = Toggle LOOC
diff --git a/Resources/Locale/en-US/chat/managers/chat-manager.ftl b/Resources/Locale/en-US/chat/managers/chat-manager.ftl
index fbdd60d89e..93f149bed9 100644
--- a/Resources/Locale/en-US/chat/managers/chat-manager.ftl
+++ b/Resources/Locale/en-US/chat/managers/chat-manager.ftl
@@ -3,12 +3,12 @@
 chat-manager-max-message-length = Your message exceeds {$maxMessageLength} character limit
 chat-manager-ooc-chat-enabled-message = OOC chat has been enabled.
 chat-manager-ooc-chat-disabled-message = OOC chat has been disabled.
-chat-manager-looc-chat-enabled-message = Help chat has been enabled.
-chat-manager-looc-chat-disabled-message = Help chat has been disabled.
-chat-manager-dead-looc-chat-enabled-message = Dead players can now use Help.
-chat-manager-dead-looc-chat-disabled-message = Dead players can no longer use Help.
-chat-manager-crit-looc-chat-enabled-message = Crit players can now use Help.
-chat-manager-crit-looc-chat-disabled-message = Crit players can no longer use Help.
+chat-manager-looc-chat-enabled-message = LOOC chat has been enabled.
+chat-manager-looc-chat-disabled-message = LOOC chat has been disabled.
+chat-manager-dead-looc-chat-enabled-message = Dead players can now use LOOC.
+chat-manager-dead-looc-chat-disabled-message = Dead players can no longer use LOOC.
+chat-manager-crit-looc-chat-enabled-message = Crit players can now use LOOC.
+chat-manager-crit-looc-chat-disabled-message = Crit players can no longer use LOOC.
 chat-manager-admin-ooc-chat-enabled-message = Admin OOC chat has been enabled.
 chat-manager-admin-ooc-chat-disabled-message = Admin OOC chat has been disabled.
 
@@ -34,7 +34,7 @@ chat-manager-entity-me-wrap-message = [italic]{ PROPER($entity) ->
      [true] {CAPITALIZE($entityName)} {$message}[/italic]
     }
 
-chat-manager-entity-looc-wrap-message = Help: [bold]{$entityName}:[/bold] {$message}
+chat-manager-entity-looc-wrap-message = LOOC: [bold]{$entityName}:[/bold] {$message}
 chat-manager-send-ooc-wrap-message = OOC: [bold]{$playerName}:[/bold] {$message}
 chat-manager-send-ooc-patron-wrap-message = OOC: [bold][color={$patronColor}]{$playerName}[/color]:[/bold] {$message}
 
diff --git a/Resources/Locale/en-US/chat/ui/chat-box.ftl b/Resources/Locale/en-US/chat/ui/chat-box.ftl
index 0da3264d03..e00eae702a 100644
--- a/Resources/Locale/en-US/chat/ui/chat-box.ftl
+++ b/Resources/Locale/en-US/chat/ui/chat-box.ftl
@@ -10,7 +10,7 @@ hud-chatbox-select-channel-Dead = Dead
 hud-chatbox-select-channel-Emotes = Emotes
 hud-chatbox-select-channel-Local = Local
 hud-chatbox-select-channel-Whisper = Whisper
-hud-chatbox-select-channel-LOOC = Help
+hud-chatbox-select-channel-LOOC = LOOC
 hud-chatbox-select-channel-OOC = OOC
 hud-chatbox-select-channel-Damage = Damage
 hud-chatbox-select-channel-Visual = Actions
@@ -23,7 +23,7 @@ hud-chatbox-channel-Dead = Dead
 hud-chatbox-channel-Emotes = Emotes
 hud-chatbox-channel-Local = Local
 hud-chatbox-channel-Whisper = Whisper
-hud-chatbox-channel-LOOC = Help
+hud-chatbox-channel-LOOC = LOOC
 hud-chatbox-channel-OOC = OOC
 hud-chatbox-channel-Radio = Radio
 hud-chatbox-channel-Notifications = Notifications
diff --git a/Resources/ServerInfo/Guidebook/NewPlayer/Controls/Radio.xml b/Resources/ServerInfo/Guidebook/NewPlayer/Controls/Radio.xml
index 69e9355d6b..39ee8ae3ff 100644
--- a/Resources/ServerInfo/Guidebook/NewPlayer/Controls/Radio.xml
+++ b/Resources/ServerInfo/Guidebook/NewPlayer/Controls/Radio.xml
@@ -1,17 +1,17 @@
 <Document>
 # Speech and Text Channels
-Talking is a key part of Space Station 14. You can press [color=yellow][bold][keybind="FocusChatInputWindow"/][/bold][/color] to jump to the text box.
+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.
 
-[bold]Local[/bold] is normal speech at normal volume.
+Local is normal speech at normal volume.
 
-[bold]Whisper[/bold] can only be heard when nearby somebody. You automatically whisper into your radio to send messages over it.
+Whisper can only be heard when nearby somebody. You automatically whisper into your radio to send messages over it.
 
-[bold]Emotes[/bold] are gestures that you make. Can be recieved by anyone who is not blinded. You will often see mimes do many emotes.
+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 [color=yellow][bold][keybind="CycleChatChannelForward"/][/bold][/color].
+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.
 
@@ -23,7 +23,7 @@ Your radio allows you to communicate across the entire station and to your speci
   <GuideEntityEmbed Entity="ClothingHeadsetGrey"/>
 </Box>
 
-To send a [color=#a4885c]station-wide[/color] message over the radio preface, use the [color=#32cd32][bold]Common[/bold][/color] channel by beginning your text with [color=#32cd32]semi-colon (;)[/color].
+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
@@ -43,26 +43,22 @@ For example, if you're a Station Engineer then [color=#a4885c]:h[/color] will de
 
 ## 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; in them you are not speaking as your character, but as yourself! They are the Help, Dead and OOC chat.
+OOC (out-of-character) channels exist outside of the game world. They are LOOC, OOC and Dead chat.
 
-[bold]Help[/bold] chat lets you ask other players near you questions about the game. It has the same range as Local chat and can be used even if your character couldn't normally speak.
-
-[bold]Dead[/bold] chat is the main chat you use when you're dead. It's global and can be heard across the game, but only by other dead players.
-
-[bold]OOC[/bold] is the main global chat heard by every player, and is therefore typically off until the round ends.
+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>

From a5977efab6f1974abd1fc42145dfe87005961e1a Mon Sep 17 00:00:00 2001
From: Vasilis The Pikachu <vasilis@pikachu.systems>
Date: Sun, 4 Jan 2026 17:25:36 +0100
Subject: [PATCH 130/134] Revert "Santa anomaly back! (#41654)"

This reverts commit 21d039318e35f849ec55b1b27626ed2e0bb90a5c.

Christmas, no longer a week away. Unwoo

PS: Please review https://github.com/space-wizards/space-station-14/pull/38940
---
 .../Prototypes/Entities/Markers/Spawners/Random/anomaly.yml   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/anomaly.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/anomaly.yml
index 0685bbd49d..dc43052736 100644
--- a/Resources/Prototypes/Entities/Markers/Spawners/Random/anomaly.yml
+++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/anomaly.yml
@@ -22,7 +22,7 @@
     - AnomalyFlora
     - AnomalyShadow
     - AnomalyTech
-    - AnomalySanta
+    #- AnomalySanta
     rareChance: 0.3
     rarePrototypes:
     - RandomAnomalyInjectorSpawner
@@ -72,5 +72,5 @@
     - AnomalyTrapGravity
     - AnomalyTrapTech
     - AnomalyTrapRock
-    - AnomalyTrapSanta
+    #- AnomalyTrapSanta
     chance: 1

From 0ab3b1a075dccc232e60ba7a588050b56ff9be0a Mon Sep 17 00:00:00 2001
From: Vasilis The Pikachu <vasilis@pikachu.systems>
Date: Sun, 4 Jan 2026 17:28:09 +0100
Subject: [PATCH 131/134] Revert "feat: RnD tech research console now have
 reroll feature (#32931)"

This reverts commit 1f2d80297cb81e8dbbd1c1f46aeb531a2624204c.

Discussed during the maintainer meeting and voted to be reverted at this time.
---
 Content.Client/Research/ResearchSystem.cs     |  7 ++-
 .../UI/ResearchConsoleBoundUserInterface.cs   | 16 ++---
 .../Research/UI/ResearchConsoleMenu.xaml      |  3 +-
 .../Research/UI/ResearchConsoleMenu.xaml.cs   | 63 +------------------
 .../Systems/ResearchSystem.Console.cs         | 61 +++---------------
 .../Systems/ResearchSystem.Technology.cs      |  8 +--
 .../Components/ResearchServerComponent.cs     | 35 ++++-------
 .../SharedResearchConsoleComponent.cs         | 24 +++----
 .../Components/TechnologyDatabaseComponent.cs |  9 +--
 .../components/research-console-component.ftl |  2 -
 10 files changed, 60 insertions(+), 168 deletions(-)

diff --git a/Content.Client/Research/ResearchSystem.cs b/Content.Client/Research/ResearchSystem.cs
index 7086fc928b..55d9535272 100644
--- a/Content.Client/Research/ResearchSystem.cs
+++ b/Content.Client/Research/ResearchSystem.cs
@@ -1,5 +1,8 @@
-using Content.Shared.Research.Systems;
+using Content.Shared.Research.Systems;
 
 namespace Content.Client.Research;
 
-public sealed class ResearchSystem : SharedResearchSystem;
+public sealed class ResearchSystem : SharedResearchSystem
+{
+
+}
diff --git a/Content.Client/Research/UI/ResearchConsoleBoundUserInterface.cs b/Content.Client/Research/UI/ResearchConsoleBoundUserInterface.cs
index d5202eea5d..2895ada61f 100644
--- a/Content.Client/Research/UI/ResearchConsoleBoundUserInterface.cs
+++ b/Content.Client/Research/UI/ResearchConsoleBoundUserInterface.cs
@@ -7,22 +7,23 @@ using Robust.Shared.Prototypes;
 namespace Content.Client.Research.UI;
 
 [UsedImplicitly]
-public sealed class ResearchConsoleBoundUserInterface(EntityUid owner, Enum uiKey) : BoundUserInterface(owner, uiKey)
+public sealed class ResearchConsoleBoundUserInterface : BoundUserInterface
 {
     [ViewVariables]
     private ResearchConsoleMenu? _consoleMenu;
 
+    public ResearchConsoleBoundUserInterface(EntityUid owner, Enum uiKey) : base(owner, uiKey)
+    {
+    }
+
     protected override void Open()
     {
         base.Open();
 
-        _consoleMenu = this.CreateWindow<ResearchConsoleMenu>();
-        _consoleMenu.SetEntity(Owner);
+        var owner = Owner;
 
-        _consoleMenu.OnTechnologyRediscoverPressed += () =>
-        {
-            SendMessage(new ConsoleRediscoverTechnologyMessage());
-        };
+        _consoleMenu = this.CreateWindow<ResearchConsoleMenu>();
+        _consoleMenu.SetEntity(owner);
 
         _consoleMenu.OnTechnologyCardPressed += id =>
         {
@@ -55,7 +56,6 @@ public sealed class ResearchConsoleBoundUserInterface(EntityUid owner, Enum uiKe
 
         if (state is not ResearchConsoleBoundInterfaceState castState)
             return;
-
         _consoleMenu?.UpdatePanels(castState);
         _consoleMenu?.UpdateInformationPanel(castState);
     }
diff --git a/Content.Client/Research/UI/ResearchConsoleMenu.xaml b/Content.Client/Research/UI/ResearchConsoleMenu.xaml
index 8e3a74f933..8de9827c0c 100644
--- a/Content.Client/Research/UI/ResearchConsoleMenu.xaml
+++ b/Content.Client/Research/UI/ResearchConsoleMenu.xaml
@@ -1,4 +1,4 @@
-<controls:FancyWindow xmlns="https://spacestation14.io"
+<controls:FancyWindow xmlns="https://spacestation14.io"
                       xmlns:gfx="clr-namespace:Robust.Client.Graphics;assembly=Robust.Client"
                       xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls"
                       xmlns:customControls="clr-namespace:Content.Client.Administration.UI.CustomControls"
@@ -22,7 +22,6 @@
             </BoxContainer>
             <BoxContainer Orientation="Vertical" VerticalExpand="True" HorizontalAlignment="Right">
                 <Button Name="ServerButton" Text="{Loc 'research-console-menu-server-selection-button'}" MinHeight="40"/>
-                <Button Name="RediscoverButton" Margin="0 5 0 0" ToolTip="{Loc 'research-console-menu-server-rediscover-tooltip'}" MinHeight="40"/>
             </BoxContainer>
         </BoxContainer>
         <BoxContainer Orientation="Horizontal"
diff --git a/Content.Client/Research/UI/ResearchConsoleMenu.xaml.cs b/Content.Client/Research/UI/ResearchConsoleMenu.xaml.cs
index e0e6029667..eafbe75fbb 100644
--- a/Content.Client/Research/UI/ResearchConsoleMenu.xaml.cs
+++ b/Content.Client/Research/UI/ResearchConsoleMenu.xaml.cs
@@ -12,7 +12,6 @@ using Robust.Client.UserInterface;
 using Robust.Client.UserInterface.Controls;
 using Robust.Client.UserInterface.XAML;
 using Robust.Shared.Prototypes;
-using Robust.Shared.Timing;
 using Robust.Shared.Utility;
 
 namespace Content.Client.Research.UI;
@@ -21,26 +20,15 @@ namespace Content.Client.Research.UI;
 public sealed partial class ResearchConsoleMenu : FancyWindow
 {
     public Action<string>? OnTechnologyCardPressed;
-    public Action? OnTechnologyRediscoverPressed;
     public Action? OnServerButtonPressed;
 
     [Dependency] private readonly IEntityManager _entity = default!;
     [Dependency] private readonly IPrototypeManager _prototype = default!;
     [Dependency] private readonly IPlayerManager _player = default!;
-    [Dependency] private readonly IGameTiming _timing = default!;
-
     private readonly ResearchSystem _research;
     private readonly SpriteSystem _sprite;
     private readonly AccessReaderSystem _accessReader;
 
-    // if set to null  - we are waiting for server info and should not let rerolls
-    private TimeSpan? _nextRediscover;
-    private int _rediscoverCost;
-    private int _serverPoints;
-
-    private TimeSpan _nextUpdate;
-    private readonly TimeSpan _updateInterval = TimeSpan.FromMilliseconds(500);
-
     public EntityUid Entity;
 
     public ResearchConsoleMenu()
@@ -53,7 +41,6 @@ public sealed partial class ResearchConsoleMenu : FancyWindow
         _accessReader = _entity.System<AccessReaderSystem>();
 
         ServerButton.OnPressed += _ => OnServerButtonPressed?.Invoke();
-        RediscoverButton.OnPressed += OnRediscoverPressed;
     }
 
     public void SetEntity(EntityUid entity)
@@ -77,7 +64,9 @@ public sealed partial class ResearchConsoleMenu : FancyWindow
             MinHeight = 10
         });
 
-        var hasAccess = HasAccess();
+        var hasAccess = _player.LocalEntity is not { } local ||
+                        !_entity.TryGetComponent<AccessReaderComponent>(Entity, out var access) ||
+                        _accessReader.IsAllowed(local, Entity, access);
         foreach (var techId in database.CurrentTechnologyCards)
         {
             var tech = _prototype.Index<TechnologyPrototype>(techId);
@@ -90,12 +79,6 @@ public sealed partial class ResearchConsoleMenu : FancyWindow
         SyncTechnologyList(UnlockedCardsContainer, unlockedTech);
     }
 
-    private void UpdateRediscoverButton()
-    {
-        RediscoverButton.Disabled = !HasAccess() || _serverPoints < _rediscoverCost || _timing.CurTime < _nextRediscover;
-        RediscoverButton.Text = Loc.GetString("research-console-menu-server-rediscover-button", ("cost", _rediscoverCost));
-    }
-
     public void UpdateInformationPanel(ResearchConsoleBoundInterfaceState state)
     {
         var amountMsg = new FormattedMessage();
@@ -154,27 +137,6 @@ public sealed partial class ResearchConsoleMenu : FancyWindow
             };
             TierDisplayContainer.AddChild(control);
         }
-
-        _serverPoints = state.Points;
-        _rediscoverCost = state.RediscoverCost;
-        _nextRediscover = state.NextRediscover;
-
-        UpdateRediscoverButton();
-    }
-
-    private void OnRediscoverPressed(BaseButton.ButtonEventArgs args)
-    {
-        RediscoverButton.Disabled = true;
-        _nextRediscover = null;
-
-        OnTechnologyRediscoverPressed?.Invoke();
-    }
-
-    private bool HasAccess()
-    {
-        return _player.LocalEntity is not { } local
-               || !_entity.TryGetComponent<AccessReaderComponent>(Entity, out var access)
-               || _accessReader.IsAllowed(local, Entity, access);
     }
 
     /// <summary>
@@ -217,24 +179,5 @@ public sealed partial class ResearchConsoleMenu : FancyWindow
             container.Children.Remove(techControl);
         }
     }
-
-    /// <inheritdoc />
-    protected override void FrameUpdate(FrameEventArgs args)
-    {
-        base.FrameUpdate(args);
-
-        if(_nextUpdate > _timing.CurTime)
-            return;
-
-        _nextUpdate = _timing.CurTime + _updateInterval;
-
-        if (!RediscoverButton.Disabled)
-            return;
-
-        if (_nextRediscover == null || _nextRediscover > _timing.CurTime)
-            return;
-
-        UpdateRediscoverButton();
-    }
 }
 
diff --git a/Content.Server/Research/Systems/ResearchSystem.Console.cs b/Content.Server/Research/Systems/ResearchSystem.Console.cs
index 0458408143..baaf06ea71 100644
--- a/Content.Server/Research/Systems/ResearchSystem.Console.cs
+++ b/Content.Server/Research/Systems/ResearchSystem.Console.cs
@@ -17,7 +17,6 @@ public sealed partial class ResearchSystem
     private void InitializeConsole()
     {
         SubscribeLocalEvent<ResearchConsoleComponent, ConsoleUnlockTechnologyMessage>(OnConsoleUnlock);
-        SubscribeLocalEvent<ResearchConsoleComponent, ConsoleRediscoverTechnologyMessage>(OnRediscoverTechnology);
         SubscribeLocalEvent<ResearchConsoleComponent, BeforeActivatableUIOpenEvent>(OnConsoleBeforeUiOpened);
         SubscribeLocalEvent<ResearchConsoleComponent, ResearchServerPointsChangedEvent>(OnPointsChanged);
         SubscribeLocalEvent<ResearchConsoleComponent, ResearchRegistrationChangedEvent>(OnConsoleRegistrationChanged);
@@ -26,41 +25,6 @@ public sealed partial class ResearchSystem
         SubscribeLocalEvent<ResearchConsoleComponent, GotEmaggedEvent>(OnEmagged);
     }
 
-    private void OnRediscoverTechnology(
-        EntityUid uid,
-        ResearchConsoleComponent console,
-        ConsoleRediscoverTechnologyMessage args
-    )
-    {
-        var act = args.Actor;
-
-        if (!this.IsPowered(uid, EntityManager))
-            return;
-
-        if (!HasAccess(uid, act))
-        {
-            _popup.PopupEntity(Loc.GetString("research-console-no-access-popup"), act);
-            return;
-        }
-
-        if (!TryGetClientServer(uid, out var serverEnt, out var serverComponent))
-            return;
-
-        if(serverComponent.NextRediscover > _timing.CurTime)
-            return;
-
-        var rediscoverCost = serverComponent.RediscoverCost;
-        if (rediscoverCost > serverComponent.Points)
-            return;
-
-        serverComponent.NextRediscover = _timing.CurTime + serverComponent.RediscoverInterval;
-
-        ModifyServerPoints(serverEnt.Value, -rediscoverCost);
-        UpdateTechnologyCards(serverEnt.Value);
-        SyncClientWithServer(uid);
-        UpdateConsoleInterface(uid);
-    }
-
     private void OnConsoleUnlock(EntityUid uid, ResearchConsoleComponent component, ConsoleUnlockTechnologyMessage args)
     {
         var act = args.Actor;
@@ -71,7 +35,7 @@ public sealed partial class ResearchSystem
         if (!PrototypeManager.TryIndex<TechnologyPrototype>(args.Id, out var technologyPrototype))
             return;
 
-        if (!HasAccess(uid, act))
+        if (TryComp<AccessReaderComponent>(uid, out var access) && !_accessReader.IsAllowed(act, uid, access))
         {
             _popup.PopupEntity(Loc.GetString("research-console-no-access-popup"), act);
             return;
@@ -108,17 +72,17 @@ public sealed partial class ResearchSystem
         if (!Resolve(uid, ref component, ref clientComponent, false))
             return;
 
-        
-        var points = 0;
-        var nextRediscover = TimeSpan.MaxValue;
-        var rediscoverCost = 0;
-        if (TryGetClientServer(uid, out _, out var serverComponent, clientComponent) && clientComponent.ConnectedToServer)
+        ResearchConsoleBoundInterfaceState state;
+
+        if (TryGetClientServer(uid, out _, out var serverComponent, clientComponent))
         {
-            points = serverComponent.Points;
-            nextRediscover = serverComponent.NextRediscover;
-            rediscoverCost = serverComponent.RediscoverCost;
+            var points = clientComponent.ConnectedToServer ? serverComponent.Points : 0;
+            state = new ResearchConsoleBoundInterfaceState(points);
+        }
+        else
+        {
+            state = new ResearchConsoleBoundInterfaceState(default);
         }
-        var state = new ResearchConsoleBoundInterfaceState(points, nextRediscover, rediscoverCost);
 
         _uiSystem.SetUiState(uid, ResearchConsoleUiKey.Key, state);
     }
@@ -157,9 +121,4 @@ public sealed partial class ResearchSystem
 
         args.Handled = true;
     }
-
-    private bool HasAccess(EntityUid uid, EntityUid act)
-    {
-        return TryComp<AccessReaderComponent>(uid, out var access) && _accessReader.IsAllowed(act, uid, access);
-    }
 }
diff --git a/Content.Server/Research/Systems/ResearchSystem.Technology.cs b/Content.Server/Research/Systems/ResearchSystem.Technology.cs
index 0c871c8071..3e8888276f 100644
--- a/Content.Server/Research/Systems/ResearchSystem.Technology.cs
+++ b/Content.Server/Research/Systems/ResearchSystem.Technology.cs
@@ -165,10 +165,10 @@ public sealed partial class ResearchSystem
         if (args.Server != null)
             return;
         component.MainDiscipline = null;
-        component.CurrentTechnologyCards = new();
-        component.SupportedDisciplines = new();
-        component.UnlockedTechnologies = new();
-        component.UnlockedRecipes = new();
+        component.CurrentTechnologyCards = new List<string>();
+        component.SupportedDisciplines = new List<ProtoId<TechDisciplinePrototype>>();
+        component.UnlockedTechnologies = new List<ProtoId<TechnologyPrototype>>();
+        component.UnlockedRecipes = new List<ProtoId<LatheRecipePrototype>>();
         Dirty(uid, component);
     }
 }
diff --git a/Content.Shared/Research/Components/ResearchServerComponent.cs b/Content.Shared/Research/Components/ResearchServerComponent.cs
index dab33f062d..3663e760f1 100644
--- a/Content.Shared/Research/Components/ResearchServerComponent.cs
+++ b/Content.Shared/Research/Components/ResearchServerComponent.cs
@@ -1,32 +1,26 @@
 using Robust.Shared.GameStates;
+using Robust.Shared.Serialization;
 using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom;
 
 namespace Content.Shared.Research.Components;
 
-[RegisterComponent, NetworkedComponent, AutoGenerateComponentState, AutoGenerateComponentPause]
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
 public sealed partial class ResearchServerComponent : Component
 {
     /// <summary>
     /// The name of the server
     /// </summary>
     [AutoNetworkedField]
-    [DataField]
+    [DataField("serverName"), ViewVariables(VVAccess.ReadWrite)]
     public string ServerName = "RDSERVER";
 
     /// <summary>
     /// The amount of points on the server.
     /// </summary>
     [AutoNetworkedField]
-    [DataField]
+    [DataField("points"), ViewVariables(VVAccess.ReadWrite)]
     public int Points;
 
-    /// <summary>
-    /// Cost of technology research options reroll.
-    /// </summary>
-    [AutoNetworkedField]
-    [DataField]
-    public int RediscoverCost = 2000;
-
     /// <summary>
     /// A unique numeric id representing the server
     /// </summary>
@@ -43,34 +37,27 @@ public sealed partial class ResearchServerComponent : Component
     [ViewVariables(VVAccess.ReadOnly)]
     public List<EntityUid> Clients = new();
 
-    [DataField(customTypeSerializer: typeof(TimeOffsetSerializer))]
+    [DataField("nextUpdateTime", customTypeSerializer: typeof(TimeOffsetSerializer))]
     public TimeSpan NextUpdateTime = TimeSpan.Zero;
 
-    [DataField]
+    [DataField("researchConsoleUpdateTime"), ViewVariables(VVAccess.ReadWrite)]
     public TimeSpan ResearchConsoleUpdateTime = TimeSpan.FromSeconds(1);
-
-    /// <summary>
-    /// Time when next reroll for tech to research will be available.
-    /// </summary>
-    [DataField(customTypeSerializer: typeof(TimeOffsetSerializer)), AutoPausedField]
-    public TimeSpan NextRediscover;
-
-    /// <summary>
-    /// Minimal interval between rediscover actions.
-    /// </summary>
-    [DataField]
-    public TimeSpan RediscoverInterval = TimeSpan.FromSeconds(1);
 }
 
 /// <summary>
 /// Event raised on a server's clients when the point value of the server is changed.
 /// </summary>
+/// <param name="Server"></param>
+/// <param name="Total"></param>
+/// <param name="Delta"></param>
 [ByRefEvent]
 public readonly record struct ResearchServerPointsChangedEvent(EntityUid Server, int Total, int Delta);
 
 /// <summary>
 /// Event raised every second to calculate the amount of points added to the server.
 /// </summary>
+/// <param name="Server"></param>
+/// <param name="Points"></param>
 [ByRefEvent]
 public record struct ResearchServerGetPointsPerSecondEvent(EntityUid Server, int Points);
 
diff --git a/Content.Shared/Research/Components/SharedResearchConsoleComponent.cs b/Content.Shared/Research/Components/SharedResearchConsoleComponent.cs
index bf1269ad01..6b7a210ecb 100644
--- a/Content.Shared/Research/Components/SharedResearchConsoleComponent.cs
+++ b/Content.Shared/Research/Components/SharedResearchConsoleComponent.cs
@@ -9,13 +9,15 @@ namespace Content.Shared.Research.Components
     }
 
     [Serializable, NetSerializable]
-    public sealed class ConsoleUnlockTechnologyMessage(string id) : BoundUserInterfaceMessage
+    public sealed class ConsoleUnlockTechnologyMessage : BoundUserInterfaceMessage
     {
-        public string Id = id;
-    }
+        public string Id;
 
-    [Serializable, NetSerializable]
-    public sealed class ConsoleRediscoverTechnologyMessage : BoundUserInterfaceMessage;
+        public ConsoleUnlockTechnologyMessage(string id)
+        {
+            Id = id;
+        }
+    }
 
     [Serializable, NetSerializable]
     public sealed class ConsoleServerSelectionMessage : BoundUserInterfaceMessage
@@ -24,12 +26,12 @@ namespace Content.Shared.Research.Components
     }
 
     [Serializable, NetSerializable]
-    public sealed class ResearchConsoleBoundInterfaceState(int points, TimeSpan nextRediscover, int rediscoverCost) : BoundUserInterfaceState
+    public sealed class ResearchConsoleBoundInterfaceState : BoundUserInterfaceState
     {
-        public int Points = points;
-
-        public TimeSpan NextRediscover = nextRediscover;
-
-        public int RediscoverCost = rediscoverCost;
+        public int Points;
+        public ResearchConsoleBoundInterfaceState(int points)
+        {
+            Points = points;
+        }
     }
 }
diff --git a/Content.Shared/Research/Components/TechnologyDatabaseComponent.cs b/Content.Shared/Research/Components/TechnologyDatabaseComponent.cs
index 89411a05c0..f00338aac7 100644
--- a/Content.Shared/Research/Components/TechnologyDatabaseComponent.cs
+++ b/Content.Shared/Research/Components/TechnologyDatabaseComponent.cs
@@ -3,6 +3,7 @@ using Content.Shared.Research.Prototypes;
 using Content.Shared.Research.Systems;
 using Robust.Shared.GameStates;
 using Robust.Shared.Prototypes;
+using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
 
 namespace Content.Shared.Research.Components;
 
@@ -13,12 +14,12 @@ public sealed partial class TechnologyDatabaseComponent : Component
     /// A main discipline that locks out other discipline technology past a certain tier.
     /// </summary>
     [AutoNetworkedField]
-    [DataField]
-    public ProtoId<TechDisciplinePrototype>? MainDiscipline;
+    [DataField("mainDiscipline", customTypeSerializer: typeof(PrototypeIdSerializer<TechDisciplinePrototype>))]
+    public string? MainDiscipline;
 
     [AutoNetworkedField]
-    [DataField]
-    public List<ProtoId<TechnologyPrototype>> CurrentTechnologyCards = new();
+    [DataField("currentTechnologyCards")]
+    public List<string> CurrentTechnologyCards = new();
 
     /// <summary>
     /// Which research disciplines are able to be unlocked
diff --git a/Resources/Locale/en-US/research/components/research-console-component.ftl b/Resources/Locale/en-US/research/components/research-console-component.ftl
index 3094b4e773..5a1e074f4d 100644
--- a/Resources/Locale/en-US/research/components/research-console-component.ftl
+++ b/Resources/Locale/en-US/research/components/research-console-component.ftl
@@ -6,8 +6,6 @@ research-console-menu-main-discipline = Main Discipline: [color={$color}]{$name}
 research-console-menu-server-selection-button = Server list
 research-console-menu-server-sync-button = Sync
 research-console-menu-server-research-button = Research
-research-console-menu-server-rediscover-button = Rediscover ({$cost})
-research-console-menu-server-rediscover-tooltip = Reroll list of technologies to research
 research-console-available-text = Researchable Technologies
 research-console-unlocked-text = Unlocked Technologies
 research-console-tier-discipline-info = Tier {$tier}, [color={$color}]{$discipline}[/color]

From f007c757944f27f2d6a873e2d726f9603503dbea Mon Sep 17 00:00:00 2001
From: Vasilis The Pikachu <vasilis@pikachu.systems>
Date: Sun, 4 Jan 2026 17:30:59 +0100
Subject: [PATCH 132/134] Changelog removal of reverted PRs

---
 Resources/Changelog/Changelog.yml | 22 ----------------------
 1 file changed, 22 deletions(-)

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index 381dae9dee..0088c8ab13 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -3061,13 +3061,6 @@
   id: 9240
   time: '2025-12-01T05:47:46.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/41489
-- author: TheShuEd
-  changes:
-  - message: Santa anomaly & santa anomaly infections is back!
-    type: Add
-  id: 9241
-  time: '2025-12-01T11:01:51.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/41654
 - author: Spessmann
   changes:
   - message: Added a new station, Snowball, a round and icy lowpop station.
@@ -3665,13 +3658,6 @@
   id: 9317
   time: '2025-12-18T21:08:51.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/33157
-- author: Fildrance
-  changes:
-  - message: reroll feature for RnD research console
-    type: Add
-  id: 9318
-  time: '2025-12-18T21:22:45.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/32931
 - author: Hitlinemoss
   changes:
   - message: Small cardboard boxes have been added (2x2 instead of 3x3), and can be
@@ -3740,14 +3726,6 @@
   id: 9324
   time: '2025-12-21T20:33:07.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/41932
-- author: SlamBamActionman
-  changes:
-  - message: 'EXPERIMENTAL: Changed the name of the "LOOC" chat channel to "Help"
-      to reflect its primary usage.'
-    type: Tweak
-  id: 9325
-  time: '2025-12-22T00:46:26.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/41933
 - author: MilonPL
   changes:
   - message: Fixed beaker solutions duplicating whenever it's thrown.

From 4d9c25098b65b51051b9f403556a07da60573a30 Mon Sep 17 00:00:00 2001
From: Centronias <me@centronias.com>
Date: Mon, 5 Jan 2026 03:01:00 -0800
Subject: [PATCH 133/134] Fix localization missing spam from Admin Overlay
 (#42244)

playerInfo.StartingJob is already localized
---
 Content.Client/Administration/AdminNameOverlay.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Content.Client/Administration/AdminNameOverlay.cs b/Content.Client/Administration/AdminNameOverlay.cs
index abeed65732..e51d4efe1b 100644
--- a/Content.Client/Administration/AdminNameOverlay.cs
+++ b/Content.Client/Administration/AdminNameOverlay.cs
@@ -213,7 +213,7 @@ internal sealed class AdminNameOverlay : Overlay
             {
                 color = Color.GreenYellow;
                 color.A = alpha;
-                args.ScreenHandle.DrawString(_font, screenCoordinates + currentOffset, Loc.GetString(playerInfo.StartingJob), uiScale, playerInfo.Connected ? color : colorDisconnected);
+                args.ScreenHandle.DrawString(_font, screenCoordinates + currentOffset, playerInfo.StartingJob, uiScale, playerInfo.Connected ? color : colorDisconnected);
                 currentOffset += lineoffset;
             }
 

From 5207c0694a5c744f9b989275f57167719f38f863 Mon Sep 17 00:00:00 2001
From: Princess Cheeseballs
 <66055347+Princess-Cheeseballs@users.noreply.github.com>
Date: Tue, 6 Jan 2026 11:29:10 -0800
Subject: [PATCH 134/134] Fix admin loc spam 2 (#42265)

---
 Content.Client/Administration/AdminNameOverlay.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Content.Client/Administration/AdminNameOverlay.cs b/Content.Client/Administration/AdminNameOverlay.cs
index e51d4efe1b..d1a9f6f7a7 100644
--- a/Content.Client/Administration/AdminNameOverlay.cs
+++ b/Content.Client/Administration/AdminNameOverlay.cs
@@ -134,7 +134,7 @@ internal sealed class AdminNameOverlay : Overlay
                 ? null
                 : _prototypeManager.Index(playerInfo.RoleProto.Value);
 
-            var roleName = Loc.GetString(rolePrototype?.Name ?? RoleTypePrototype.FallbackName);
+            var roleName = rolePrototype?.Name ?? RoleTypePrototype.FallbackName;
             var roleColor = rolePrototype?.Color ?? RoleTypePrototype.FallbackColor;
             var roleSymbol = rolePrototype?.Symbol ?? RoleTypePrototype.FallbackSymbol;
 
@@ -241,7 +241,7 @@ internal sealed class AdminNameOverlay : Overlay
                     color = roleColor;
                     symbol = IsFiltered(playerInfo.RoleProto) ? symbol : string.Empty;
                     text = IsFiltered(playerInfo.RoleProto)
-                        ? roleName.ToUpper()
+                        ? Loc.GetString(roleName).ToUpper()
                         : string.Empty;
                     break;
                 case AdminOverlayAntagFormat.Subtype: