diff --git a/Resources/Maps/packed.yml b/Resources/Maps/packed.yml
index 48ad004b93..1f0a7e8cad 100644
--- a/Resources/Maps/packed.yml
+++ b/Resources/Maps/packed.yml
@@ -64,7 +64,7 @@ entities:
           tiles: AAAAAAAAAAAAAAAAAAAAAF8AAABfAAAAXwAAAEUAAABFAAABRQAAAl8AAABfAAAAXwAAAF8AAABcAAABXAAAAAAAAAAAAAAAAAAAAAAAAABfAAAAXwAAAF8AAABFAAADRQAAA0UAAAJfAAAAXwAAAF8AAABfAAAAXwAAAF8AAAAAAAAAAAAAAAAAAAAAAAAAXwAAAF8AAABfAAAARQAAAkUAAAJFAAACXwAAAF8AAABfAAAAXwAAAF8AAABfAAAAAAAAAAAAAAAAAAAAAAAAAF8AAABfAAAAXwAAAEUAAANFAAABRQAAA1AAAABfAAAAXwAAAF8AAABQAAAAXwAAAAAAAAAAAAAAAAAAAAAAAABfAAAAXwAAAF8AAABfAAAARQAAAkUAAABfAAAAXwAAAF8AAABFAAAARQAAAkUAAAMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABfAAAARQAAAkUAAANFAAABRQAAAkUAAANFAAACRQAAAUUAAAJFAAADAAAAAAAAAAAAAAAAAAAAAF8AAABfAAAAXwAAAEUAAAJFAAACRQAAAUUAAANFAAACRQAAA0UAAAJFAAADRQAAAAAAAAAAAAAAAAAAAAAAAABfAAAAXwAAAF8AAABFAAACRQAAAUUAAAFFAAABRQAAAEUAAANFAAACRQAAA0UAAAEAAAAAAAAAAAAAAAAAAAAAXwAAAF8AAABfAAAARQAAAEUAAABFAAACRQAAAkUAAAFFAAADRQAAAkUAAANFAAADAAAAAAAAAAAAAAAAAAAAAF8AAABfAAAAXwAAAEUAAANFAAACRQAAA0UAAAJFAAADRQAAA0UAAAJFAAACRQAAAwAAAAAAAAAAAAAAAAAAAABfAAAAXwAAAF8AAABFAAADRQAAAUUAAAFFAAABRQAAA0UAAANFAAADXwAAAF8AAAAAAAAAAAAAAAAAAAAAAAAAXwAAAF8AAABfAAAARQAAAkUAAABFAAACRQAAAkUAAAJFAAACRQAAAF8AAABfAAAAAAAAAAAAAAAAAAAAAAAAAF8AAABfAAAAXwAAAEUAAABFAAADRQAAAkUAAANFAAACRQAAAkUAAANQAAAAXwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXwAAAF8AAABfAAAARQAAAkUAAAFfAAAAXwAAAEUAAANfAAAAXwAAAF8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAF8AAABFAAABRQAAA0UAAABFAAADXwAAAEUAAABFAAABRQAAAF8AAABfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABfAAAARQAAAEUAAAJFAAACRQAAAV8AAABFAAACRQAAAEUAAAFfAAAAXwAAAA==
         1,0:
           ind: 1,0
-          tiles: RQAAAUUAAABFAAABRQAAA0UAAAJFAAABRQAAA0UAAABFAAABRQAAAUUAAABFAAACRQAAA0UAAAFFAAABRQAAA0UAAAJFAAACRQAAAUUAAAJFAAABRQAAAUUAAAFFAAABRQAAA0UAAABFAAADRQAAAUUAAAJFAAADRQAAAUUAAABfAAAAXwAAAFAAAABfAAAAXwAAAF8AAABfAAAAXwAAAF8AAABFAAADRQAAAUUAAAJfAAAAFwAAABcAAAAXAAAAXwAAAF8AAABfAAAAXwAAAF8AAABfAAAAXwAAAF8AAABfAAAARQAAAkUAAAJFAAACXwAAAF8AAABfAAAAXwAAAF8AAABfAAAAXwAAAF8AAABfAAAAXwAAAF8AAABfAAAAXwAAAF8AAABFAAABXwAAAF8AAAAXAAADFwAAAxcAAAJfAAAAMQAAAFIAAANSAAABMQAAAF8AAABfAAAAXwAAAF8AAABSAAAAUgAAA1IAAAJfAAAAFwAAAhcAAAEXAAACXwAAADEAAABSAAAAUgAAADEAAABQAAAAXwAAAF8AAABfAAAAUgAAAVIAAAJSAAAAXwAAADIAAAAyAAAAMgAAAF8AAAAxAAAAUgAAAFIAAAExAAAAXwAAAF8AAABfAAAAXwAAAFIAAAJSAAABUgAAAV8AAAAyAAAAMgAAADIAAABfAAAAMQAAAFIAAABSAAADMQAAAF8AAABfAAAAXwAAAF8AAABSAAABUgAAAVIAAANfAAAAMgAAADIAAAAyAAAARQAAAEUAAANFAAAARQAAAwwAAAJfAAAAXwAAAF8AAABfAAAAXwAAAFAAAABfAAAAXwAAAFAAAABfAAAAFwAAA0UAAAJFAAAARQAAAkUAAAMMAAABXwAAAF8AAABfAAAAXwAAAF8AAABfAAAAXwAAAF8AAABfAAAAXwAAAF8AAABfAAAAXwAAAEUAAABFAAAAXwAAAF8AAABfAAAAXwAAAF8AAABfAAAAUAAAAF8AAABfAAAAXwAAAF8AAABfAAAAXAAAA18AAABFAAADRQAAAEUAAABFAAABRQAAAEUAAABfAAAARQAAAUUAAAFFAAABXwAAAF8AAABfAAAAXwAAAFwAAANcAAAARQAAAEUAAAJFAAADRQAAAUUAAAFFAAADRQAAA0UAAAJFAAABRQAAA0UAAAFFAAAARQAAAUUAAAJcAAADXwAAAEUAAAJFAAABRQAAA0UAAAFFAAADRQAAAUUAAANFAAACRQAAA0UAAAFFAAABRQAAAUUAAANFAAAAXAAAAFwAAAFFAAAARQAAAkUAAAFFAAABRQAAAkUAAANfAAAARQAAAkUAAANFAAACRQAAA0UAAABFAAADRQAAAg==
+          tiles: RQAAAUUAAABFAAABRQAAA0UAAAJFAAABRQAAA0UAAABFAAABRQAAAUUAAABFAAACRQAAA0UAAAFFAAABRQAAA0UAAAJFAAACRQAAAUUAAAJFAAABRQAAAUUAAAFFAAABRQAAA0UAAABFAAADRQAAAUUAAAJFAAADRQAAAUUAAABfAAAAXwAAAFAAAABfAAAAXwAAAF8AAABfAAAAXwAAAF8AAABFAAADRQAAAUUAAAJfAAAAFwAAABcAAAAXAAAAXwAAAF8AAABfAAAAXwAAAF8AAABfAAAAXwAAAF8AAABfAAAARQAAAkUAAAJFAAACXwAAAF8AAABfAAAAXwAAAF8AAABfAAAAXwAAAF8AAABfAAAAXwAAAF8AAABPAAAAXwAAAF8AAABFAAABXwAAAF8AAAAXAAADFwAAAxcAAAJfAAAAMQAAAFIAAANSAAABMQAAAF8AAABfAAAATwAAAF8AAABSAAAAUgAAA1IAAAJfAAAAFwAAAhcAAAEXAAACXwAAADEAAABSAAAAUgAAADEAAABQAAAAXwAAAE8AAABfAAAAUgAAAVIAAAJSAAAAXwAAADIAAAAyAAAAMgAAAF8AAAAxAAAAUgAAAFIAAAExAAAAXwAAAF8AAABPAAAAXwAAAFIAAAJSAAABUgAAAV8AAAAyAAAAMgAAADIAAABfAAAAMQAAAFIAAABSAAADMQAAAF8AAABfAAAATwAAAF8AAABSAAABUgAAAVIAAANfAAAAMgAAADIAAAAyAAAARQAAAEUAAANFAAAARQAAAwwAAAJfAAAAXwAAAF8AAABfAAAAXwAAAFAAAABfAAAAXwAAAFAAAABfAAAAFwAAA0UAAAJFAAAARQAAAkUAAAMMAAABXwAAAF8AAABfAAAAXwAAAF8AAABfAAAAXwAAAF8AAABfAAAAXwAAAF8AAABfAAAAXwAAAEUAAABFAAAAXwAAAF8AAABfAAAAXwAAAF8AAABfAAAAUAAAAF8AAABfAAAAXwAAAF8AAABfAAAAXAAAA18AAABFAAADRQAAAEUAAABFAAABRQAAAEUAAABfAAAARQAAAUUAAAFFAAABXwAAAF8AAABfAAAAXwAAAFwAAANcAAAARQAAAEUAAAJFAAADRQAAAUUAAAFFAAADRQAAA0UAAAJFAAABRQAAA0UAAAFFAAAARQAAAUUAAAJcAAADXwAAAEUAAAJFAAABRQAAA0UAAAFFAAADRQAAAUUAAANFAAACRQAAA0UAAAFFAAABRQAAAUUAAANFAAAAXAAAAFwAAAFFAAAARQAAAkUAAAFFAAABRQAAAkUAAANfAAAARQAAAkUAAANFAAACRQAAA0UAAABFAAADRQAAAg==
         1,-1:
           ind: 1,-1
           tiles: XwAAAF8AAABQAAAAUgAAAUUAAAFFAAAARQAAAhcAAAJfAAAARQAAAEUAAAJFAAAARQAAAEUAAABFAAACRQAAAF8AAABfAAAATwAAAE8AAABPAAAATwAAAF8AAABfAAAAXwAAAEUAAAFFAAAARQAAAF8AAABFAAACRQAAA0UAAAFfAAAAXwAAAF8AAABfAAAAXwAAAF8AAABfAAAAXwAAAF8AAABFAAAARQAAAEUAAAFfAAAAXwAAAF8AAABfAAAAXwAAAF8AAABfAAAAXAAAA1wAAAFcAAACFwAAAhcAAAJfAAAARQAAAUUAAANFAAABXwAAACYAAAAmAAAAJgAAAF8AAABfAAAAXwAAAFwAAAFcAAABXAAAAhcAAAIXAAACFwAAAUUAAAJFAAABRQAAAl8AAAAmAAAAJgAAACYAAABfAAAAXwAAAF8AAABcAAABXAAAAlwAAAMXAAAAFwAAAhcAAAJFAAACRQAAA0UAAAMXAAADJgAAACYAAAAmAAAAXwAAAF8AAABfAAAAXAAAAVwAAAFcAAACFwAAAxcAAAJfAAAARQAAAUUAAABFAAADXwAAACYAAAAmAAAAJgAAAF8AAABfAAAAXwAAAF8AAABQAAAAXwAAAF8AAABfAAAAXwAAAEUAAAJFAAACRQAAAV8AAABfAAAAXwAAAF8AAABPAAAAXwAAAF8AAABfAAAAXwAAAF8AAABfAAAAXwAAAF8AAABFAAAARQAAAkUAAANfAAAAMgAAADIAAAAMAAAAXwAAAF8AAABfAAAAXwAAAF8AAABfAAAAXwAAAF8AAABfAAAARQAAAEUAAANFAAACXwAAADIAAAAyAAAADAAAABcAAAAXAAABXAAAAVwAAAFcAAABXwAAAF8AAABfAAAARQAAA0UAAANFAAABRQAAAF8AAAAyAAAAMgAAAAwAAAEXAAACFwAAAlwAAAJcAAADXAAAAV8AAABfAAAAXwAAAEUAAAFFAAACRQAAA0UAAAFfAAAADAAAAAwAAAEMAAACFwAAAhcAAAFcAAADXAAAA1wAAANfAAAAXwAAAF8AAABfAAAARQAAAUUAAANFAAABXwAAAAwAAAMMAAAADAAAAkUAAANfAAAAXAAAA1wAAAJcAAAAXwAAAF8AAABfAAAAXwAAAEUAAAJFAAABRQAAAV8AAAAMAAACDAAAAQwAAAFFAAACXwAAAF8AAABfAAAAXwAAAF8AAABQAAAAXwAAAF8AAABFAAACRQAAAkUAAABfAAAAXwAAAF8AAABfAAAARQAAAUUAAABFAAACRQAAAkUAAAFFAAADRQAAA0UAAAFFAAAARQAAAEUAAAFFAAAARQAAAUUAAAJFAAADRQAAAw==
@@ -33179,6 +33179,21 @@ entities:
     - pos: 41.5,-18.5
       parent: 2
       type: Transform
+  - uid: 12844
+    components:
+    - pos: 22.5,5.5
+      parent: 2
+      type: Transform
+  - uid: 12845
+    components:
+    - pos: 22.5,6.5
+      parent: 2
+      type: Transform
+  - uid: 12846
+    components:
+    - pos: 22.5,7.5
+      parent: 2
+      type: Transform
 - proto: Cautery
   entities:
   - uid: 7791
@@ -34373,6 +34388,11 @@ entities:
     - pos: 72.5,-5.5
       parent: 2
       type: Transform
+  - uid: 8342
+    components:
+    - pos: 23.5,6.5
+      parent: 2
+      type: Transform
   - uid: 9309
     components:
     - pos: 72.5,23.5
@@ -35348,18 +35368,18 @@ entities:
     - pos: 103.67386,-15.495739
       parent: 2
       type: Transform
-- proto: ClothingUniformJumpskirtJanimaid
+- proto: ClothingUniformJumpskirtJanimaidmini
   entities:
-  - uid: 11438
+  - uid: 12847
     components:
-    - pos: 55.49706,36.60403
+    - pos: 56.502583,35.364388
       parent: 2
       type: Transform
-- proto: ClothingUniformJumpskirtJanimaidmini
+- proto: ClothingUniformJumpskirtTacticalMaid
   entities:
   - uid: 12653
     components:
-    - pos: 57.512684,36.60403
+    - pos: 76.476616,-13.28976
       parent: 2
       type: Transform
 - proto: ClothingUniformJumpsuitCossack
@@ -36445,7 +36465,7 @@ entities:
       type: Transform
 - proto: CrateCoffin
   entities:
-  - uid: 5107
+  - uid: 2538
     components:
     - pos: 38.5,3.5
       parent: 2
@@ -39954,11 +39974,6 @@ entities:
     - pos: 57.63163,-13.7188425
       parent: 2
       type: Transform
-  - uid: 12844
-    components:
-    - pos: 37.61789,43.912018
-      parent: 2
-      type: Transform
 - proto: EmergencyLight
   entities:
   - uid: 1547
@@ -61166,9 +61181,9 @@ entities:
       type: Transform
 - proto: IntercomScience
   entities:
-  - uid: 12293
+  - uid: 5107
     components:
-    - pos: 48.5,16.5
+    - pos: 48.5,20.5
       parent: 2
       type: Transform
 - proto: IntercomSecurity
@@ -61881,6 +61896,11 @@ entities:
     - pos: 80.5,-12.5
       parent: 2
       type: Transform
+  - uid: 12842
+    components:
+    - pos: 23.5,4.5
+      parent: 2
+      type: Transform
 - proto: MaintenanceToolSpawner
   entities:
   - uid: 12284
@@ -62430,13 +62450,6 @@ entities:
     - pos: 43.5,19.5
       parent: 2
       type: Transform
-- proto: PaperCaptainsThoughts
-  entities:
-  - uid: 12842
-    components:
-    - pos: 33.510284,41.599518
-      parent: 2
-      type: Transform
 - proto: ParticleAcceleratorControlBoxUnfinished
   entities:
   - uid: 4800
@@ -64748,14 +64761,6 @@ entities:
       type: Transform
     - powerLoad: 0
       type: ApcPowerReceiver
-  - uid: 2538
-    components:
-    - rot: 3.141592653589793 rad
-      pos: 37.5,5.5
-      parent: 2
-      type: Transform
-    - powerLoad: 0
-      type: ApcPowerReceiver
   - uid: 2539
     components:
     - rot: 1.5707963267948966 rad
@@ -65016,14 +65021,6 @@ entities:
       type: Transform
     - powerLoad: 0
       type: ApcPowerReceiver
-  - uid: 5715
-    components:
-    - rot: 1.5707963267948966 rad
-      pos: 76.5,-12.5
-      parent: 2
-      type: Transform
-    - powerLoad: 0
-      type: ApcPowerReceiver
   - uid: 5723
     components:
     - pos: 73.5,-12.5
@@ -65468,6 +65465,12 @@ entities:
       type: Transform
     - powerLoad: 0
       type: ApcPowerReceiver
+  - uid: 11438
+    components:
+    - rot: 3.141592653589793 rad
+      pos: 38.5,3.5
+      parent: 2
+      type: Transform
   - uid: 11521
     components:
     - pos: 54.5,-17.5
@@ -65551,12 +65554,6 @@ entities:
       pos: 36.5,3.5
       parent: 2
       type: Transform
-  - uid: 12843
-    components:
-    - rot: 3.141592653589793 rad
-      pos: 38.5,3.5
-      parent: 2
-      type: Transform
 - proto: Protolathe
   entities:
   - uid: 5305
@@ -65807,6 +65804,11 @@ entities:
     - pos: 45.5,-19.5
       parent: 2
       type: Transform
+  - uid: 12843
+    components:
+    - pos: 23.5,4.5
+      parent: 2
+      type: Transform
 - proto: RadioHandheld
   entities:
   - uid: 1325
@@ -69861,16 +69863,17 @@ entities:
       type: Transform
 - proto: SignRND
   entities:
-  - uid: 8342
-    components:
-    - pos: 48.5,20.5
-      parent: 2
-      type: Transform
   - uid: 11190
     components:
     - pos: 57.499714,16.503765
       parent: 2
       type: Transform
+  - uid: 12293
+    components:
+    - rot: 1.5707963267948966 rad
+      pos: 48.5,16.5
+      parent: 2
+      type: Transform
 - proto: SignRobo
   entities:
   - uid: 12291
@@ -74585,6 +74588,13 @@ entities:
     - pos: 36.482082,-14.5012665
       parent: 2
       type: Transform
+- proto: ToyAi
+  entities:
+  - uid: 12848
+    components:
+    - pos: 56.486958,35.880013
+      parent: 2
+      type: Transform
 - proto: ToyRubberDuck
   entities:
   - uid: 2321
@@ -85185,6 +85195,11 @@ entities:
     - pos: 65.5,18.5
       parent: 2
       type: Transform
+  - uid: 5715
+    components:
+    - pos: 23.5,7.5
+      parent: 2
+      type: Transform
   - uid: 5730
     components:
     - pos: 72.5,-6.5