diff --git a/Resources/Maps/ovni.yml b/Resources/Maps/ovni.yml
index 17db5f93c1c..c559ba3b76b 100644
--- a/Resources/Maps/ovni.yml
+++ b/Resources/Maps/ovni.yml
@@ -70,7 +70,7 @@ entities:
       chunks:
         -1,-1:
           ind: -1,-1
-          tiles: UQAAAAAAUQAAAAAAUQAAAAAAUQAAAAAAYQAAAAAASgAAAAAASgAAAAAAGAAAAAABYQAAAAAAGAAAAAADGAAAAAACYQAAAAAAYQAAAAAAYQAAAAAAYQAAAAAAYQAAAAAAUQAAAAAAUQAAAAAAUQAAAAAAUQAAAAAAYQAAAAAASgAAAAAASgAAAAAAGAAAAAABGAAAAAACGAAAAAABGAAAAAABGAAAAAAAYQAAAAAANQAAAAAAYQAAAAAAYQAAAAAAUQAAAAAAUQAAAAAAUQAAAAAAUQAAAAAAYQAAAAAASgAAAAAASgAAAAAAGAAAAAADGAAAAAABGAAAAAADGAAAAAADGAAAAAADYQAAAAAANQAAAAAANQAAAAAANQAAAAAAPQAAAAAANwAAAAAANwAAAAAAPQAAAAAAYQAAAAAASgAAAAAASgAAAAAAGAAAAAAARwAAAAADGAAAAAADGAAAAAAARwAAAAACYQAAAAAAYQAAAAAAYQAAAAAAYQAAAAAARwAAAAADRwAAAAABRwAAAAACRwAAAAACRwAAAAADPQAAAAAAPQAAAAAARwAAAAACRwAAAAADRwAAAAAARwAAAAACRwAAAAABYQAAAAAAPQAAAAAAPQAAAAAAPQAAAAAARwAAAAACRwAAAAAARwAAAAADRwAAAAADRwAAAAACRwAAAAABRwAAAAADRwAAAAABRwAAAAAARwAAAAADRwAAAAADRwAAAAABYQAAAAAAPQAAAAAAYQAAAAAAYQAAAAAARwAAAAADRwAAAAAARwAAAAABRwAAAAADRwAAAAABRwAAAAABRwAAAAABRwAAAAADRwAAAAAARwAAAAABRwAAAAADRwAAAAAAYQAAAAAANwAAAAAAYQAAAAAAXgAAAAABRwAAAAABRwAAAAABRwAAAAADRwAAAAACPQAAAAAAPQAAAAAAPQAAAAAANwAAAAAARwAAAAADRwAAAAACRwAAAAADRwAAAAADXgAAAAAAXgAAAAADXgAAAAACXgAAAAABRwAAAAAAUQAAAAAAYQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAMAAAAAAAMAAAAAAAMAAAAAAARwAAAAAARwAAAAACXgAAAAABXgAAAAACXgAAAAAAXgAAAAACYQAAAAAAYQAAAAAAYQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAMAAAAAAAMAAAAAAAMAAAAAAARwAAAAABRwAAAAACDAAAAAABDAAAAAADDAAAAAADDAAAAAAANQAAAAAAYQAAAAAAYQAAAAAAMAAAAAAAMAAAAAAAMAAAAAAAMAAAAAAAMAAAAAAAMAAAAAAAMAAAAAAARwAAAAAARwAAAAACDAAAAAAADAAAAAABDAAAAAABDAAAAAABNQAAAAAAYQAAAAAAYQAAAAAAMAAAAAAAMAAAAAAAMAAAAAAAMAAAAAAAMAAAAAAAMAAAAAAAMAAAAAAARwAAAAABRwAAAAACDAAAAAABDAAAAAACDAAAAAAADAAAAAADNQAAAAAAYQAAAAAAYQAAAAAAYQAAAAAAYQAAAAAAYQAAAAAAMQAAAAAAMQAAAAAAMQAAAAAAMQAAAAAAMQAAAAAARwAAAAADDAAAAAADDAAAAAADDAAAAAADDAAAAAAAYQAAAAAAYQAAAAAAUQAAAAAAYQAAAAAAYQAAAAAAYQAAAAAAMQAAAAAAMQAAAAAAMQAAAAAAMQAAAAAAYQAAAAAARwAAAAADRwAAAAADAgAAAAAAAgAAAAAAAgAAAAAAYQAAAAAAYQAAAAAAYQAAAAAAYQAAAAAAYQAAAAAAYQAAAAAAMQAAAAAAMQAAAAAAMQAAAAAAMQAAAAAAMQAAAAAARwAAAAACRwAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAYQAAAAAAYQAAAAAAJwAAAAAAJwAAAAAAJwAAAAAAJwAAAAAAMQAAAAAAMQAAAAAAMQAAAAAAMQAAAAAAMQAAAAAARwAAAAADRwAAAAABAgAAAAAAAgAAAAAAAgAAAAAA
+          tiles: UQAAAAAAUQAAAAAAUQAAAAAAUQAAAAAAYQAAAAAASgAAAAAASgAAAAAAGAAAAAABYQAAAAAAGAAAAAADGAAAAAACYQAAAAAAYQAAAAAAYQAAAAAAYQAAAAAAYQAAAAAAUQAAAAAAUQAAAAAAUQAAAAAAUQAAAAAAYQAAAAAASgAAAAAASgAAAAAAGAAAAAABGAAAAAACGAAAAAABGAAAAAABGAAAAAAAYQAAAAAANQAAAAAAYQAAAAAAYQAAAAAAUQAAAAAAUQAAAAAAUQAAAAAAUQAAAAAAYQAAAAAASgAAAAAASgAAAAAAGAAAAAADGAAAAAABGAAAAAADGAAAAAADGAAAAAADYQAAAAAANQAAAAAANQAAAAAANQAAAAAAPQAAAAAANwAAAAAANwAAAAAAPQAAAAAAYQAAAAAASgAAAAAASgAAAAAAGAAAAAAARwAAAAADGAAAAAADGAAAAAAARwAAAAACYQAAAAAAYQAAAAAAYQAAAAAAYQAAAAAARwAAAAADRwAAAAABRwAAAAACRwAAAAACRwAAAAADPQAAAAAAPQAAAAAARwAAAAACRwAAAAADRwAAAAAARwAAAAACRwAAAAABYQAAAAAAPQAAAAAAPQAAAAAAPQAAAAAARwAAAAACRwAAAAAARwAAAAADRwAAAAADRwAAAAACRwAAAAABRwAAAAADRwAAAAABRwAAAAAARwAAAAADRwAAAAADRwAAAAABYQAAAAAAPQAAAAAAYQAAAAAAYQAAAAAARwAAAAADRwAAAAAARwAAAAABRwAAAAADRwAAAAABRwAAAAABRwAAAAABRwAAAAADRwAAAAAARwAAAAABRwAAAAADRwAAAAAAYQAAAAAANwAAAAAAYQAAAAAAXgAAAAABRwAAAAABRwAAAAABRwAAAAADRwAAAAACPQAAAAAAPQAAAAAAPQAAAAAANwAAAAAARwAAAAADRwAAAAACRwAAAAADRwAAAAADXgAAAAAAXgAAAAADXgAAAAACXgAAAAABRwAAAAAAUQAAAAAAYQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAMAAAAAAAMAAAAAAAMAAAAAAARwAAAAAARwAAAAACXgAAAAABXgAAAAACXgAAAAAAXgAAAAACYQAAAAAAYQAAAAAAYQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAMAAAAAAAMAAAAAAAYQAAAAAARwAAAAABRwAAAAACDAAAAAABDAAAAAADDAAAAAADDAAAAAAANQAAAAAAYQAAAAAAYQAAAAAAMAAAAAAAMAAAAAAAMAAAAAAAMAAAAAAAMAAAAAAAMAAAAAAAMAAAAAAARwAAAAAARwAAAAACDAAAAAAADAAAAAABDAAAAAABDAAAAAABNQAAAAAAYQAAAAAAYQAAAAAAMAAAAAAAMAAAAAAAMAAAAAAAMAAAAAAAMAAAAAAAMAAAAAAAMAAAAAAARwAAAAABRwAAAAACDAAAAAABDAAAAAACDAAAAAAADAAAAAADNQAAAAAAYQAAAAAAYQAAAAAAYQAAAAAAYQAAAAAAYQAAAAAAMQAAAAAAMQAAAAAAMQAAAAAAMQAAAAAAMQAAAAAARwAAAAADDAAAAAADDAAAAAADDAAAAAADDAAAAAAAYQAAAAAAYQAAAAAAUQAAAAAAYQAAAAAAYQAAAAAAYQAAAAAAMQAAAAAAMQAAAAAAMQAAAAAAMQAAAAAAYQAAAAAARwAAAAADRwAAAAADAgAAAAAAAgAAAAAAAgAAAAAAYQAAAAAAYQAAAAAAYQAAAAAAYQAAAAAAYQAAAAAAYQAAAAAAMQAAAAAAMQAAAAAAMQAAAAAAMQAAAAAAMQAAAAAARwAAAAACRwAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAYQAAAAAAYQAAAAAAJwAAAAAAJwAAAAAAJwAAAAAAJwAAAAAAMQAAAAAAMQAAAAAAMQAAAAAAMQAAAAAAMQAAAAAARwAAAAADRwAAAAABAgAAAAAAAgAAAAAAAgAAAAAA
           version: 6
         0,-1:
           ind: 0,-1
@@ -154,7 +154,7 @@ entities:
           version: 6
         -2,2:
           ind: -2,2
-          tiles: YQAAAAAAGQAAAAABGQAAAAACGQAAAAACGQAAAAAAYQAAAAAAIQAAAAAAIQAAAAACIQAAAAAAIQAAAAABIQAAAAAAIQAAAAACNQAAAAAANQAAAAAANQAAAAAANQAAAAAAYQAAAAAAYQAAAAAAGQAAAAACGQAAAAACGQAAAAABYQAAAAAAYQAAAAAAYQAAAAAAYQAAAAAAGAAAAAAAYQAAAAAAYQAAAAAAYQAAAAAAYQAAAAAAYQAAAAAAYQAAAAAAAAAAAAAAYQAAAAAAGQAAAAABGQAAAAACGQAAAAACYQAAAAAAYAAAAAAAYAAAAAAAYQAAAAAAGAAAAAAAGAAAAAAAGAAAAAAAGAAAAAAAGAAAAAAAGAAAAAAAYQAAAAAAYAAAAAAAYQAAAAAAYQAAAAAAYQAAAAAAYQAAAAAAYQAAAAAAYAAAAAAAYAAAAAAAYQAAAAAAGAAAAAAAGAAAAAAAGAAAAAAAGAAAAAAAGAAAAAAAGAAAAAAAYQAAAAAAAAAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAYQAAAAAAGAAAAAAAGAAAAAAAGAAAAAAAGAAAAAAAGAAAAAAAGAAAAAAAYQAAAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAAAAYAAAAAAAYAAAAAAAAAAAAAAAYAAAAAAAYQAAAAAAYQAAAAAAPQAAAAAAPQAAAAAAPQAAAAAAPQAAAAAAYQAAAAAAYQAAAAAAYAAAAAAAYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAAAAAAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAAAAAAAAAYAAAAAAAYAAAAAAAAAAAAAAAAAAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAAAAAAAAAAAAAAAAAYAAAAAAAYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAKAAAAAAAAAAAAAAAAAAAAAAAKAAAAAAAAAAAAAAAAAAAAAAAKAAAAAAAAAAAAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAKAAAAAAAAAAAAAAAAAAAAAAAKAAAAAAAAAAAAAAAAAAAAAAAKAAAAAAAAAAAAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAKAAAAAAAAAAAAAAAAAAAAAAAKAAAAAAAAAAAAAAAAAAAAAAAKAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          tiles: YQAAAAAAGQAAAAABGQAAAAACGQAAAAACGQAAAAAAYQAAAAAAIQAAAAAAIQAAAAACIQAAAAAAIQAAAAABIQAAAAAAIQAAAAACNQAAAAAANQAAAAAANQAAAAAANQAAAAAAYQAAAAAAYQAAAAAAGQAAAAACGQAAAAACGQAAAAABYQAAAAAAYQAAAAAAYQAAAAAAYQAAAAAAGAAAAAAAYQAAAAAAYQAAAAAAYQAAAAAAYQAAAAAANwAAAAAAYQAAAAAAAAAAAAAAYQAAAAAAGQAAAAABGQAAAAACGQAAAAACYQAAAAAAYAAAAAAAYAAAAAAAYQAAAAAAGAAAAAAAGAAAAAAAGAAAAAAAGAAAAAAAGAAAAAAAGAAAAAAAYQAAAAAAYAAAAAAAYQAAAAAAYQAAAAAAYQAAAAAAYQAAAAAAYQAAAAAAYAAAAAAAYAAAAAAAYQAAAAAAGAAAAAAAGAAAAAAAGAAAAAAAGAAAAAAAGAAAAAAAGAAAAAAAYQAAAAAAAAAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAYQAAAAAAGAAAAAAAGAAAAAAAGAAAAAAAGAAAAAAAGAAAAAAAGAAAAAAAYQAAAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAAAAYAAAAAAAYAAAAAAAAAAAAAAAYAAAAAAAYQAAAAAAYQAAAAAAPQAAAAAAPQAAAAAAPQAAAAAAPQAAAAAAYQAAAAAAYQAAAAAAYAAAAAAAYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAAAAAAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAAAAAAAAAYAAAAAAAYAAAAAAAAAAAAAAAAAAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAAAAAAAAAAAAAAAAAYAAAAAAAYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAKAAAAAAAAAAAAAAAAAAAAAAAKAAAAAAAAAAAAAAAAAAAAAAAKAAAAAAAAAAAAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAKAAAAAAAAAAAAAAAAAAAAAAAKAAAAAAAAAAAAAAAAAAAAAAAKAAAAAAAAAAAAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAKAAAAAAAAAAAAAAAAAAAAAAAKAAAAAAAAAAAAAAAAAAAAAAAKAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
           version: 6
         -1,2:
           ind: -1,2
@@ -3693,7 +3693,6 @@ entities:
       - 99
       - 103
       - 102
-      - 7727
       - 7728
       - 7729
       - 5859
@@ -3810,7 +3809,6 @@ entities:
       - 7715
       - 7714
       - 6255
-      - 5904
       - 6834
       - 5872
       - 5905
@@ -4089,7 +4087,6 @@ entities:
       - 7669
       - 10454
       - 7640
-      - 7727
       - 7728
       - 7729
       - 413
@@ -4461,9 +4458,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 55.5,-21.5
       parent: 8
-    - type: DeviceLinkSink
-      links:
-      - 8927
     - type: DeviceLinkSource
       linkedPorts:
         8927:
@@ -4521,6 +4515,8 @@ entities:
       parent: 8
   - uid: 466
     components:
+    - type: MetaData
+      name: Substation Locker
     - type: Transform
       pos: -13.5,-2.5
       parent: 8
@@ -4536,11 +4532,15 @@ entities:
       parent: 8
   - uid: 1487
     components:
+    - type: MetaData
+      name: Substation Locker
     - type: Transform
       pos: 20.5,-0.5
       parent: 8
   - uid: 1660
     components:
+    - type: MetaData
+      name: Substation Locker
     - type: Transform
       pos: 27.5,20.5
       parent: 8
@@ -4563,6 +4563,8 @@ entities:
       parent: 8
   - uid: 6259
     components:
+    - type: MetaData
+      name: Substation Locker
     - type: Transform
       pos: 2.5,24.5
       parent: 8
@@ -4624,9 +4626,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: 0.5,-38.5
       parent: 8
-    - type: DeviceLinkSink
-      links:
-      - 165
     - type: DeviceLinkSource
       linkedPorts:
         165:
@@ -4637,9 +4636,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: 0.5,-36.5
       parent: 8
-    - type: DeviceLinkSink
-      links:
-      - 160
     - type: DeviceLinkSource
       linkedPorts:
         160:
@@ -4649,9 +4645,6 @@ entities:
     - type: Transform
       pos: -4.5,-43.5
       parent: 8
-    - type: DeviceLinkSink
-      links:
-      - 1247
     - type: DeviceLinkSource
       linkedPorts:
         1247:
@@ -4661,9 +4654,6 @@ entities:
     - type: Transform
       pos: -6.5,-44.5
       parent: 8
-    - type: DeviceLinkSink
-      links:
-      - 1246
     - type: DeviceLinkSource
       linkedPorts:
         1246:
@@ -4677,8 +4667,6 @@ entities:
       parent: 8
     - type: DeviceLinkSink
       invokeCounter: 1
-      links:
-      - 560
     - type: DeviceLinkSource
       linkedPorts:
         560:
@@ -4690,8 +4678,6 @@ entities:
       parent: 8
     - type: DeviceLinkSink
       invokeCounter: 1
-      links:
-      - 516
     - type: DeviceLinkSource
       linkedPorts:
         516:
@@ -4701,9 +4687,6 @@ entities:
     - type: Transform
       pos: 29.5,-37.5
       parent: 8
-    - type: DeviceLinkSink
-      links:
-      - 2538
     - type: DeviceLinkSource
       linkedPorts:
         2538:
@@ -4713,9 +4696,6 @@ entities:
     - type: Transform
       pos: 29.5,-34.5
       parent: 8
-    - type: DeviceLinkSink
-      links:
-      - 2536
     - type: DeviceLinkSource
       linkedPorts:
         2536:
@@ -4729,8 +4709,6 @@ entities:
       parent: 8
     - type: DeviceLinkSink
       invokeCounter: 1
-      links:
-      - 2365
     - type: DeviceLinkSource
       linkedPorts:
         2365:
@@ -4742,8 +4720,6 @@ entities:
       parent: 8
     - type: DeviceLinkSink
       invokeCounter: 1
-      links:
-      - 2318
     - type: DeviceLinkSource
       linkedPorts:
         2318:
@@ -4753,9 +4729,6 @@ entities:
     - type: Transform
       pos: 42.5,-24.5
       parent: 8
-    - type: DeviceLinkSink
-      links:
-      - 6779
     - type: DeviceLinkSource
       linkedPorts:
         6779:
@@ -4766,9 +4739,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 57.5,-21.5
       parent: 8
-    - type: DeviceLinkSink
-      links:
-      - 123
     - type: DeviceLinkSource
       linkedPorts:
         123:
@@ -4786,9 +4756,6 @@ entities:
     - type: Transform
       pos: -17.5,-40.5
       parent: 8
-    - type: DeviceLinkSink
-      links:
-      - 6251
     - type: DeviceLinkSource
       linkedPorts:
         5180:
@@ -4798,9 +4765,6 @@ entities:
     - type: Transform
       pos: -15.5,-37.5
       parent: 8
-    - type: DeviceLinkSink
-      links:
-      - 5180
     - type: DeviceLinkSource
       linkedPorts:
         6251:
@@ -4810,9 +4774,6 @@ entities:
     - type: Transform
       pos: -15.5,-40.5
       parent: 8
-    - type: DeviceLinkSink
-      links:
-      - 6251
     - type: DeviceLinkSource
       linkedPorts:
         5180:
@@ -4822,9 +4783,6 @@ entities:
     - type: Transform
       pos: -17.5,-37.5
       parent: 8
-    - type: DeviceLinkSink
-      links:
-      - 5180
     - type: DeviceLinkSource
       linkedPorts:
         6251:
@@ -4890,9 +4848,6 @@ entities:
     - type: Transform
       pos: 40.5,-24.5
       parent: 8
-    - type: DeviceLinkSink
-      links:
-      - 3148
     - type: DeviceLinkSource
       linkedPorts:
         3148:
@@ -4911,6 +4866,8 @@ entities:
   entities:
   - uid: 498
     components:
+    - type: MetaData
+      name: Freezer
     - type: Transform
       pos: -10.5,0.5
       parent: 8
@@ -5055,11 +5012,15 @@ entities:
       parent: 8
   - uid: 10709
     components:
+    - type: MetaData
+      name: Library
     - type: Transform
       pos: -25.5,-2.5
       parent: 8
   - uid: 10710
     components:
+    - type: MetaData
+      name: Library
     - type: Transform
       pos: -25.5,-3.5
       parent: 8
@@ -5150,6 +5111,8 @@ entities:
       parent: 8
   - uid: 813
     components:
+    - type: MetaData
+      name: Central Maints
     - type: Transform
       pos: -14.5,-7.5
       parent: 8
@@ -5160,11 +5123,15 @@ entities:
       parent: 8
   - uid: 1309
     components:
+    - type: MetaData
+      name: Central Maints
     - type: Transform
       pos: -15.5,2.5
       parent: 8
   - uid: 1676
     components:
+    - type: MetaData
+      name: North Maints
     - type: Transform
       pos: -11.5,9.5
       parent: 8
@@ -5177,6 +5144,8 @@ entities:
   entities:
   - uid: 5470
     components:
+    - type: MetaData
+      name: Chapel Maints
     - type: Transform
       pos: -12.5,16.5
       parent: 8
@@ -5184,6 +5153,8 @@ entities:
   entities:
   - uid: 6261
     components:
+    - type: MetaData
+      name: Bridge Maints
     - type: Transform
       pos: 2.5,29.5
       parent: 8
@@ -5219,6 +5190,8 @@ entities:
   entities:
   - uid: 9
     components:
+    - type: MetaData
+      name: HoP Maints
     - type: Transform
       pos: -16.5,-1.5
       parent: 8
@@ -5226,6 +5199,8 @@ entities:
   entities:
   - uid: 1323
     components:
+    - type: MetaData
+      name: Botany Maints
     - type: Transform
       pos: -13.5,-5.5
       parent: 8
@@ -5233,6 +5208,8 @@ entities:
   entities:
   - uid: 1270
     components:
+    - type: MetaData
+      name: Freezer Maints
     - type: Transform
       pos: -14.5,0.5
       parent: 8
@@ -5314,27 +5291,50 @@ entities:
   - uid: 5471
     components:
     - type: MetaData
-      name: Morgue
+      name: Morgue Maints
     - type: Transform
       pos: -10.5,15.5
       parent: 8
   - uid: 5472
     components:
+    - type: MetaData
+      name: Med Maints
     - type: Transform
       pos: -0.5,26.5
       parent: 8
 - proto: AirlockMaintRnDLocked
   entities:
+  - uid: 3093
+    components:
+    - type: MetaData
+      name: Epi Lockers Maints
+    - type: Transform
+      pos: -17.5,33.5
+      parent: 8
   - uid: 8842
     components:
+    - type: MetaData
+      name: Epi Maints
     - type: Transform
       pos: -19.5,31.5
       parent: 8
   - uid: 10422
     components:
+    - type: MetaData
+      name: Epi Maints
     - type: Transform
       pos: -12.5,23.5
       parent: 8
+- proto: AirlockMaintRoboticsLocked
+  entities:
+  - uid: 2671
+    components:
+    - type: MetaData
+      name: Robotics Maints
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -12.5,21.5
+      parent: 8
 - proto: AirlockMaintSalvageLocked
   entities:
   - uid: 295
@@ -5405,9 +5405,6 @@ entities:
     - type: Transform
       pos: 2.5,13.5
       parent: 8
-    - type: DeviceLinkSink
-      links:
-      - 11408
   - uid: 904
     components:
     - type: Transform
@@ -5446,9 +5443,6 @@ entities:
     - type: Transform
       pos: -2.5,12.5
       parent: 8
-    - type: DeviceLinkSink
-      links:
-      - 11407
   - uid: 773
     components:
     - type: MetaData
@@ -5458,6 +5452,8 @@ entities:
       parent: 8
   - uid: 4145
     components:
+    - type: MetaData
+      name: Surgery
     - type: Transform
       pos: -2.5,27.5
       parent: 8
@@ -5564,6 +5560,8 @@ entities:
   entities:
   - uid: 2534
     components:
+    - type: MetaData
+      name: Epi Lockers
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -22.5,33.5
@@ -5577,6 +5575,8 @@ entities:
       parent: 8
   - uid: 5466
     components:
+    - type: MetaData
+      name: Server Room
     - type: Transform
       pos: -17.5,25.5
       parent: 8
@@ -5687,11 +5687,6 @@ entities:
       parent: 8
 - proto: AirlockServiceLocked
   entities:
-  - uid: 309
-    components:
-    - type: Transform
-      pos: 9.5,-6.5
-      parent: 8
   - uid: 1869
     components:
     - type: MetaData
@@ -5699,11 +5694,6 @@ entities:
     - type: Transform
       pos: 17.5,-12.5
       parent: 8
-  - uid: 7932
-    components:
-    - type: Transform
-      pos: 12.5,-8.5
-      parent: 8
 - proto: AirlockTheatreLocked
   entities:
   - uid: 1093
@@ -6912,6 +6902,13 @@ entities:
     - type: Transform
       pos: 11.5,-38.5
       parent: 8
+- proto: Biogenerator
+  entities:
+  - uid: 1689
+    components:
+    - type: Transform
+      pos: -9.5,-4.5
+      parent: 8
 - proto: BiomassReclaimer
   entities:
   - uid: 818
@@ -6935,57 +6932,36 @@ entities:
     - type: Transform
       pos: -25.5,-21.5
       parent: 8
-    - type: DeviceLinkSink
-      links:
-      - 9104
   - uid: 1422
     components:
     - type: Transform
       pos: -22.5,-21.5
       parent: 8
-    - type: DeviceLinkSink
-      links:
-      - 9104
   - uid: 1437
     components:
     - type: Transform
       pos: -22.5,-17.5
       parent: 8
-    - type: DeviceLinkSink
-      links:
-      - 9104
   - uid: 1444
     components:
     - type: Transform
       pos: -25.5,-17.5
       parent: 8
-    - type: DeviceLinkSink
-      links:
-      - 9104
   - uid: 11250
     components:
     - type: Transform
       pos: 1.5,-41.5
       parent: 8
-    - type: DeviceLinkSink
-      links:
-      - 5103
   - uid: 11251
     components:
     - type: Transform
       pos: 1.5,-42.5
       parent: 8
-    - type: DeviceLinkSink
-      links:
-      - 5103
   - uid: 11252
     components:
     - type: Transform
       pos: 1.5,-43.5
       parent: 8
-    - type: DeviceLinkSink
-      links:
-      - 5103
 - proto: BlastDoorOpen
   entities:
   - uid: 1300
@@ -6993,197 +6969,117 @@ entities:
     - type: Transform
       pos: 48.5,8.5
       parent: 8
-    - type: DeviceLinkSink
-      links:
-      - 3136
-      - 8587
   - uid: 2796
     components:
     - type: Transform
       pos: 10.5,0.5
       parent: 8
-    - type: DeviceLinkSink
-      links:
-      - 9158
   - uid: 2803
     components:
     - type: Transform
       pos: 10.5,-1.5
       parent: 8
-    - type: DeviceLinkSink
-      links:
-      - 9158
   - uid: 4213
     components:
     - type: Transform
       pos: 10.5,-0.5
       parent: 8
-    - type: DeviceLinkSink
-      links:
-      - 9158
   - uid: 6166
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -26.5,26.5
       parent: 8
-    - type: DeviceLinkSink
-      links:
-      - 6298
   - uid: 7619
     components:
     - type: Transform
       pos: 48.5,9.5
       parent: 8
-    - type: DeviceLinkSink
-      links:
-      - 3136
-      - 8587
   - uid: 7620
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 45.5,5.5
       parent: 8
-    - type: DeviceLinkSink
-      links:
-      - 3136
-      - 8587
   - uid: 7621
     components:
     - type: Transform
       pos: 48.5,10.5
       parent: 8
-    - type: DeviceLinkSink
-      links:
-      - 3136
-      - 8587
   - uid: 7622
     components:
     - type: Transform
       pos: 48.5,11.5
       parent: 8
-    - type: DeviceLinkSink
-      links:
-      - 3136
-      - 8587
   - uid: 7623
     components:
     - type: Transform
       pos: 48.5,12.5
       parent: 8
-    - type: DeviceLinkSink
-      links:
-      - 3136
-      - 8587
   - uid: 7624
     components:
     - type: Transform
       pos: 48.5,13.5
       parent: 8
-    - type: DeviceLinkSink
-      links:
-      - 3136
-      - 8587
   - uid: 7625
     components:
     - type: Transform
       pos: 48.5,14.5
       parent: 8
-    - type: DeviceLinkSink
-      links:
-      - 3136
-      - 8587
   - uid: 7626
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 44.5,5.5
       parent: 8
-    - type: DeviceLinkSink
-      links:
-      - 3136
-      - 8587
   - uid: 7627
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 43.5,5.5
       parent: 8
-    - type: DeviceLinkSink
-      links:
-      - 3136
-      - 8587
   - uid: 7628
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 42.5,5.5
       parent: 8
-    - type: DeviceLinkSink
-      links:
-      - 3136
-      - 8587
   - uid: 7629
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 41.5,5.5
       parent: 8
-    - type: DeviceLinkSink
-      links:
-      - 3136
-      - 8587
   - uid: 7630
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 41.5,17.5
       parent: 8
-    - type: DeviceLinkSink
-      links:
-      - 3136
-      - 8587
   - uid: 7631
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 42.5,17.5
       parent: 8
-    - type: DeviceLinkSink
-      links:
-      - 3136
-      - 8587
   - uid: 7632
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 43.5,17.5
       parent: 8
-    - type: DeviceLinkSink
-      links:
-      - 3136
-      - 8587
   - uid: 7667
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 44.5,17.5
       parent: 8
-    - type: DeviceLinkSink
-      links:
-      - 3136
-      - 8587
   - uid: 7684
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 45.5,17.5
       parent: 8
-    - type: DeviceLinkSink
-      links:
-      - 3136
-      - 8587
 - proto: BookAtmosDistro
   entities:
   - uid: 9296
@@ -7462,11 +7358,6 @@ entities:
     - type: Transform
       pos: 14.961689,39.100517
       parent: 8
-  - uid: 8811
-    components:
-    - type: Transform
-      pos: 12.1013155,-6.9935136
-      parent: 8
   - uid: 8812
     components:
     - type: Transform
@@ -23532,12 +23423,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 1.5,3.5
       parent: 8
-  - uid: 6234
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 11.5,-6.5
-      parent: 8
   - uid: 6882
     components:
     - type: Transform
@@ -25020,12 +24905,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 26.5,0.5
       parent: 8
-  - uid: 8741
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 13.5,-6.5
-      parent: 8
   - uid: 8822
     components:
     - type: Transform
@@ -25331,211 +25210,136 @@ entities:
     - type: Transform
       pos: -16.5,-14.5
       parent: 8
-    - type: DeviceLinkSink
-      links:
-      - 7318
   - uid: 323
     components:
     - type: Transform
       pos: -16.5,-15.5
       parent: 8
-    - type: DeviceLinkSink
-      links:
-      - 7318
   - uid: 445
     components:
     - type: Transform
       pos: -16.5,-16.5
       parent: 8
-    - type: DeviceLinkSink
-      links:
-      - 7318
   - uid: 474
     components:
     - type: Transform
       pos: -16.5,-12.5
       parent: 8
-    - type: DeviceLinkSink
-      links:
-      - 7318
   - uid: 476
     components:
     - type: Transform
       pos: -16.5,-13.5
       parent: 8
-    - type: DeviceLinkSink
-      links:
-      - 7318
   - uid: 477
     components:
     - type: Transform
       pos: -16.5,-11.5
       parent: 8
-    - type: DeviceLinkSink
-      links:
-      - 7318
   - uid: 3380
     components:
     - type: Transform
       pos: 26.5,-14.5
       parent: 8
-    - type: DeviceLinkSink
-      links:
-      - 9711
   - uid: 3594
     components:
     - type: Transform
       pos: 26.5,-13.5
       parent: 8
-    - type: DeviceLinkSink
-      links:
-      - 9711
   - uid: 3946
     components:
     - type: Transform
       pos: 26.5,-12.5
       parent: 8
-    - type: DeviceLinkSink
-      links:
-      - 9711
   - uid: 8296
     components:
     - type: Transform
       pos: -16.5,-41.5
       parent: 8
-    - type: DeviceLinkSink
-      links:
-      - 9155
   - uid: 8297
     components:
     - type: Transform
       pos: -16.5,-40.5
       parent: 8
-    - type: DeviceLinkSink
-      links:
-      - 9155
   - uid: 8298
     components:
     - type: Transform
       pos: -16.5,-39.5
       parent: 8
-    - type: DeviceLinkSink
-      links:
-      - 9155
   - uid: 8299
     components:
     - type: Transform
       pos: -16.5,-38.5
       parent: 8
-    - type: DeviceLinkSink
-      links:
-      - 9155
   - uid: 8300
     components:
     - type: Transform
       pos: -16.5,-37.5
       parent: 8
-    - type: DeviceLinkSink
-      links:
-      - 9155
   - uid: 8301
     components:
     - type: Transform
       pos: -16.5,-36.5
       parent: 8
-    - type: DeviceLinkSink
-      links:
-      - 9155
   - uid: 9063
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -22.5,-17.5
       parent: 8
-    - type: DeviceLinkSink
-      links:
-      - 9104
   - uid: 9105
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -22.5,-21.5
       parent: 8
-    - type: DeviceLinkSink
-      links:
-      - 9104
   - uid: 9108
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -21.5,-17.5
       parent: 8
-    - type: DeviceLinkSink
-      links:
-      - 9104
   - uid: 9109
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -21.5,-21.5
       parent: 8
-    - type: DeviceLinkSink
-      links:
-      - 9104
   - uid: 9477
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -25.5,-21.5
       parent: 8
-    - type: DeviceLinkSink
-      links:
-      - 9104
   - uid: 9478
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -23.5,-21.5
       parent: 8
-    - type: DeviceLinkSink
-      links:
-      - 9104
   - uid: 9480
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -24.5,-21.5
       parent: 8
-    - type: DeviceLinkSink
-      links:
-      - 9104
   - uid: 9543
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -25.5,-17.5
       parent: 8
-    - type: DeviceLinkSink
-      links:
-      - 9104
   - uid: 9550
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -24.5,-17.5
       parent: 8
-    - type: DeviceLinkSink
-      links:
-      - 9104
   - uid: 10551
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -23.5,-17.5
       parent: 8
-    - type: DeviceLinkSink
-      links:
-      - 9104
 - proto: CrateArtifactContainer
   entities:
   - uid: 877
@@ -26129,6 +25933,13 @@ entities:
     - type: Transform
       pos: 32.5,-23.5
       parent: 8
+- proto: DefaultStationBeaconRobotics
+  entities:
+  - uid: 7932
+    components:
+    - type: Transform
+      pos: -15.5,20.5
+      parent: 8
 - proto: DefaultStationBeaconSalvage
   entities:
   - uid: 11444
@@ -26256,6 +26067,11 @@ entities:
       rot: 5.1464521675370634E-05 rad
       pos: -20.500095,-0.7351999
       parent: 8
+  - uid: 7727
+    components:
+    - type: Transform
+      pos: -6.3072734,-5.552061
+      parent: 8
 - proto: DiceBag
   entities:
   - uid: 1233
@@ -31246,7 +31062,6 @@ entities:
       - 99
       - 103
       - 102
-      - 7727
       - 7728
       - 7729
       - 5859
@@ -31288,7 +31103,6 @@ entities:
       - 7715
       - 7714
       - 6255
-      - 5904
       - 6834
       - 5872
       - 5905
@@ -31906,12 +31720,6 @@ entities:
     - type: Transform
       pos: 24.5,-1.5
       parent: 8
-  - uid: 7727
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -6.5,-6.5
-      parent: 8
   - uid: 7728
     components:
     - type: Transform
@@ -32689,10 +32497,10 @@ entities:
       parent: 8
 - proto: FoodBurgerRobot
   entities:
-  - uid: 11510
+  - uid: 8742
     components:
     - type: Transform
-      pos: -13.653479,21.652191
+      pos: -14.5250435,22.50658
       parent: 8
 - proto: FoodBurgerSuper
   entities:
@@ -32834,7 +32642,7 @@ entities:
     - type: Transform
       pos: 37.42185,-6.5216684
       parent: 8
-- proto: FoodDonutJellyBlumpkin
+- proto: FoodDonutJellyBluePumpkin
   entities:
   - uid: 7108
     components:
@@ -35183,6 +34991,14 @@ entities:
       parent: 8
     - type: AtmosPipeColor
       color: '#990000FF'
+  - uid: 1476
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -17.5,20.5
+      parent: 8
+    - type: AtmosPipeColor
+      color: '#990000FF'
   - uid: 1488
     components:
     - type: Transform
@@ -35286,6 +35102,14 @@ entities:
       parent: 8
     - type: AtmosPipeColor
       color: '#0033CCFF'
+  - uid: 1954
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -16.5,20.5
+      parent: 8
+    - type: AtmosPipeColor
+      color: '#990000FF'
   - uid: 2018
     components:
     - type: Transform
@@ -35323,6 +35147,14 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 8.5,-35.5
       parent: 8
+  - uid: 2157
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -19.5,20.5
+      parent: 8
+    - type: AtmosPipeColor
+      color: '#990000FF'
   - uid: 2250
     components:
     - type: Transform
@@ -37530,13 +37362,6 @@ entities:
       parent: 8
     - type: AtmosPipeColor
       color: '#0055CCFF'
-  - uid: 5877
-    components:
-    - type: Transform
-      pos: -14.5,20.5
-      parent: 8
-    - type: AtmosPipeColor
-      color: '#0055CCFF'
   - uid: 5878
     components:
     - type: Transform
@@ -41292,13 +41117,6 @@ entities:
       parent: 8
     - type: AtmosPipeColor
       color: '#990000FF'
-  - uid: 6817
-    components:
-    - type: Transform
-      pos: -20.5,20.5
-      parent: 8
-    - type: AtmosPipeColor
-      color: '#990000FF'
   - uid: 6818
     components:
     - type: Transform
@@ -41500,6 +41318,14 @@ entities:
       parent: 8
     - type: AtmosPipeColor
       color: '#0055CCFF'
+  - uid: 7332
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -18.5,20.5
+      parent: 8
+    - type: AtmosPipeColor
+      color: '#990000FF'
   - uid: 7379
     components:
     - type: Transform
@@ -44426,6 +44252,14 @@ entities:
       parent: 8
     - type: AtmosPipeColor
       color: '#990000FF'
+  - uid: 2267
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -20.5,20.5
+      parent: 8
+    - type: AtmosPipeColor
+      color: '#990000FF'
   - uid: 2356
     components:
     - type: Transform
@@ -46175,6 +46009,14 @@ entities:
       parent: 8
 - proto: GasVentPump
   entities:
+  - uid: 332
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -14.5,20.5
+      parent: 8
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
   - uid: 436
     components:
     - type: Transform
@@ -46456,14 +46298,6 @@ entities:
       parent: 8
     - type: AtmosPipeColor
       color: '#0055CCFF'
-  - uid: 5904
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -14.5,19.5
-      parent: 8
-    - type: AtmosPipeColor
-      color: '#0055CCFF'
   - uid: 5905
     components:
     - type: Transform
@@ -46955,6 +46789,14 @@ entities:
       color: '#0055CCFF'
 - proto: GasVentScrubber
   entities:
+  - uid: 399
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -15.5,20.5
+      parent: 8
+    - type: AtmosPipeColor
+      color: '#990000FF'
   - uid: 434
     components:
     - type: Transform
@@ -51550,9 +51392,6 @@ entities:
     - type: Transform
       pos: 3.5795627,-42.536514
       parent: 8
-    - type: DeviceLinkSink
-      links:
-      - 6270
 - proto: IngotGold
   entities:
   - uid: 3234
@@ -51740,10 +51579,10 @@ entities:
       parent: 8
 - proto: LeftArmBorg
   entities:
-  - uid: 11512
+  - uid: 9867
     components:
     - type: Transform
-      pos: -13.919104,21.480316
+      pos: -14.8375435,22.44408
       parent: 8
 - proto: Lighter
   entities:
@@ -51818,6 +51657,13 @@ entities:
     - type: Transform
       pos: 0.5,-11.5
       parent: 8
+- proto: LockerBotanistFilled
+  entities:
+  - uid: 7713
+    components:
+    - type: Transform
+      pos: -7.5,-6.5
+      parent: 8
 - proto: LockerBrigmedicFilledHardsuit
   entities:
   - uid: 9871
@@ -52050,13 +51896,11 @@ entities:
     - type: Transform
       pos: -18.5,36.5
       parent: 8
-  - uid: 1689
+  - uid: 663
     components:
     - type: Transform
       pos: -21.5,36.5
       parent: 8
-    - type: Lock
-      locked: False
   - uid: 1690
     components:
     - type: Transform
@@ -52111,7 +51955,7 @@ entities:
     - type: Transform
       pos: -8.5,-31.5
       parent: 8
-- proto: LogicGate
+- proto: LogicGateOr
   entities:
   - uid: 5180
     components:
@@ -52120,10 +51964,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -17.5,-39.5
       parent: 8
-    - type: DeviceLinkSink
-      links:
-      - 124
-      - 146
     - type: DeviceLinkSource
       linkedPorts:
         159:
@@ -52140,10 +51980,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -17.5,-38.5
       parent: 8
-    - type: DeviceLinkSink
-      links:
-      - 159
-      - 141
     - type: DeviceLinkSource
       linkedPorts:
         124:
@@ -52186,12 +52022,8 @@ entities:
   - uid: 8953
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
       pos: -28.5,27.5
       parent: 8
-    - type: DeviceLinkSink
-      links:
-      - 3054
 - proto: MachineCentrifuge
   entities:
   - uid: 3697
@@ -52393,13 +52225,6 @@ entities:
     - type: Transform
       pos: -17.58295,0.3317097
       parent: 8
-- proto: MaterialReclaimer
-  entities:
-  - uid: 9350
-    components:
-    - type: Transform
-      pos: 22.5,-14.5
-      parent: 8
 - proto: MaterialWoodPlank1
   entities:
   - uid: 7033
@@ -52902,16 +52727,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -16.615944,-28.36539
       parent: 8
-  - uid: 8742
-    components:
-    - type: Transform
-      pos: 12.466383,-6.3783016
-      parent: 8
-  - uid: 8743
-    components:
-    - type: Transform
-      pos: 12.622633,-5.7845516
-      parent: 8
   - uid: 8755
     components:
     - type: Transform
@@ -53347,6 +53162,13 @@ entities:
     - type: Transform
       pos: 29.5,16.5
       parent: 8
+- proto: PortableGeneratorJrPacman
+  entities:
+  - uid: 309
+    components:
+    - type: Transform
+      pos: -15.5,-3.5
+      parent: 8
 - proto: PortableGeneratorPacmanMachineCircuitboard
   entities:
   - uid: 2073
@@ -53675,13 +53497,6 @@ entities:
     - type: Transform
       pos: -29.5,30.5
       parent: 8
-- proto: PottedPlantRandomPlastic
-  entities:
-  - uid: 2157
-    components:
-    - type: Transform
-      pos: 10.5,-5.5
-      parent: 8
 - proto: PottedPlantRD
   entities:
   - uid: 2285
@@ -55513,11 +55328,6 @@ entities:
     - type: Transform
       pos: 11.5,-27.5
       parent: 8
-  - uid: 2205
-    components:
-    - type: Transform
-      pos: 10.5,-7.5
-      parent: 8
   - uid: 2448
     components:
     - type: Transform
@@ -56205,6 +56015,9 @@ entities:
       parent: 8
     - type: RandomSpawner
       chance: 0.15
+      prototypes: []
+      rarePrototypes: []
+      gameRules: []
   - uid: 4207
     components:
     - type: Transform
@@ -56581,9 +56394,6 @@ entities:
     - type: Transform
       pos: 26.5,-15.5
       parent: 8
-    - type: DeviceLinkSink
-      links:
-      - 9711
 - proto: ReinforcedGirder
   entities:
   - uid: 1281
@@ -58638,10 +58448,10 @@ entities:
       parent: 8
 - proto: RightArmBorg
   entities:
-  - uid: 11513
+  - uid: 9880
     components:
     - type: Transform
-      pos: -13.450354,21.480316
+      pos: -14.2906685,22.47533
       parent: 8
 - proto: RiotBulletShield
   entities:
@@ -58893,9 +58703,6 @@ entities:
     - type: Transform
       pos: -16.5,-16.5
       parent: 8
-    - type: DeviceLinkSink
-      links:
-      - 1798
 - proto: ShuttersNormalOpen
   entities:
   - uid: 172
@@ -58904,17 +58711,11 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 9.5,-5.5
       parent: 8
-    - type: DeviceLinkSink
-      links:
-      - 2160
   - uid: 7323
     components:
     - type: Transform
       pos: -16.5,-12.5
       parent: 8
-    - type: DeviceLinkSink
-      links:
-      - 1798
 - proto: SignAi
   entities:
   - uid: 9195
@@ -59528,7 +59329,7 @@ entities:
     - type: Transform
       pos: 0.5,16.5
       parent: 8
-- proto: SignHydro2
+- proto: SignHydro1
   entities:
   - uid: 7087
     components:
@@ -59587,15 +59388,13 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -12.5,19.5
       parent: 8
-- proto: SignScience1
+- proto: SignScience
   entities:
   - uid: 7939
     components:
     - type: Transform
       pos: -17.5,15.5
       parent: 8
-- proto: SignScience2
-  entities:
   - uid: 7940
     components:
     - type: Transform
@@ -61629,21 +61428,6 @@ entities:
       parent: 8
 - proto: SpawnPointLawyer
   entities:
-  - uid: 3093
-    components:
-    - type: Transform
-      pos: 13.5,-7.5
-      parent: 8
-  - uid: 3094
-    components:
-    - type: Transform
-      pos: 13.5,-6.5
-      parent: 8
-  - uid: 3095
-    components:
-    - type: Transform
-      pos: 13.5,-5.5
-      parent: 8
   - uid: 11693
     components:
     - type: Transform
@@ -61941,6 +61725,18 @@ entities:
     - type: Transform
       pos: 9.5,26.5
       parent: 8
+- proto: SpawnPointRoboticist
+  entities:
+  - uid: 8811
+    components:
+    - type: Transform
+      pos: -13.5,21.5
+      parent: 8
+  - uid: 9350
+    components:
+    - type: Transform
+      pos: -15.5,21.5
+      parent: 8
 - proto: SpawnPointSalvageSpecialist
   entities:
   - uid: 5554
@@ -62401,7 +62197,7 @@ entities:
     - type: Transform
       pos: 20.5,19.5
       parent: 8
-- proto: SuitStorageSec
+- proto: SuitStorageSecDeltaV
   entities:
   - uid: 3590
     components:
@@ -63173,11 +62969,6 @@ entities:
     - type: Transform
       pos: -5.5,-1.5
       parent: 8
-  - uid: 399
-    components:
-    - type: Transform
-      pos: -6.5,-6.5
-      parent: 8
   - uid: 490
     components:
     - type: Transform
@@ -63541,17 +63332,15 @@ entities:
     - type: Transform
       pos: 5.5,-2.5
       parent: 8
-  - uid: 663
+  - uid: 5904
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -13.5,21.5
+      pos: -14.5,22.5
       parent: 8
-  - uid: 11506
+  - uid: 8741
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -14.5,21.5
+      pos: -15.5,22.5
       parent: 8
 - proto: TableReinforced
   entities:
@@ -63970,16 +63759,6 @@ entities:
     - type: Transform
       pos: -26.5,2.5
       parent: 8
-  - uid: 329
-    components:
-    - type: Transform
-      pos: 12.5,-5.5
-      parent: 8
-  - uid: 528
-    components:
-    - type: Transform
-      pos: 12.5,-6.5
-      parent: 8
   - uid: 993
     components:
     - type: Transform
@@ -64284,12 +64063,6 @@ entities:
     - type: Transform
       pos: 25.5,19.5
       parent: 8
-  - uid: 1954
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 28.5,27.5
-      parent: 8
   - uid: 5847
     components:
     - type: Transform
@@ -64301,6 +64074,14 @@ entities:
     - type: Transform
       pos: 38.5,-6.5
       parent: 8
+- proto: ToiletGoldenDirtyWater
+  entities:
+  - uid: 2205
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 28.5,27.5
+      parent: 8
 - proto: ToolboxArtistic
   entities:
   - uid: 9438
@@ -64325,7 +64106,7 @@ entities:
   - uid: 9442
     components:
     - type: Transform
-      pos: -15.5432205,-3.5108137
+      pos: -15.577398,-2.903272
       parent: 8
   - uid: 10417
     components:
@@ -64749,11 +64530,6 @@ entities:
       parent: 8
 - proto: VendingMachineLawDrobe
   entities:
-  - uid: 332
-    components:
-    - type: Transform
-      pos: 14.5,-6.5
-      parent: 8
   - uid: 8983
     components:
     - type: Transform
@@ -64828,10 +64604,10 @@ entities:
       parent: 8
 - proto: VendingMachineRobotics
   entities:
-  - uid: 9867
+  - uid: 461
     components:
     - type: Transform
-      pos: -15.5,21.5
+      pos: -13.5,22.5
       parent: 8
 - proto: VendingMachineSalvage
   entities:
@@ -67810,11 +67586,6 @@ entities:
     - type: Transform
       pos: -12.5,28.5
       parent: 8
-  - uid: 2267
-    components:
-    - type: Transform
-      pos: -12.5,21.5
-      parent: 8
   - uid: 2268
     components:
     - type: Transform
@@ -68385,11 +68156,6 @@ entities:
     - type: Transform
       pos: -16.5,33.5
       parent: 8
-  - uid: 2671
-    components:
-    - type: Transform
-      pos: -17.5,33.5
-      parent: 8
   - uid: 2672
     components:
     - type: Transform
@@ -72065,6 +71831,12 @@ entities:
     - type: Transform
       pos: 22.5,-16.5
       parent: 8
+  - uid: 3095
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -6.5,-6.5
+      parent: 8
   - uid: 3170
     components:
     - type: Transform
@@ -72493,6 +72265,14 @@ entities:
       parent: 8
 - proto: Windoor
   entities:
+  - uid: 3094
+    components:
+    - type: MetaData
+      name: Mailroom
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -18.5,-12.5
+      parent: 8
   - uid: 5366
     components:
     - type: Transform
@@ -72523,14 +72303,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: 40.5,14.5
       parent: 8
-  - uid: 7332
-    components:
-    - type: MetaData
-      name: Mailroom
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -18.5,-12.5
-      parent: 8
   - uid: 7367
     components:
     - type: Transform
@@ -72584,12 +72356,6 @@ entities:
       parent: 8
 - proto: WindoorHydroponicsLocked
   entities:
-  - uid: 11154
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -6.5,-6.5
-      parent: 8
   - uid: 11155
     components:
     - type: Transform
@@ -72638,16 +72404,16 @@ entities:
     - type: Transform
       pos: -0.5,1.5
       parent: 8
-  - uid: 1476
+  - uid: 5437
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -20.5,-0.5
+      pos: 38.5,-7.5
       parent: 8
-  - uid: 5437
+  - uid: 5877
     components:
     - type: Transform
-      pos: 38.5,-7.5
+      rot: -1.5707963267948966 rad
+      pos: -20.5,-0.5
       parent: 8
 - proto: WindoorSecureArmoryLocked
   entities:
@@ -72675,6 +72441,14 @@ entities:
       rot: 3.141592653589793 rad
       pos: 45.5,-12.5
       parent: 8
+- proto: WindoorSecureClownLocked
+  entities:
+  - uid: 6234
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 4.5,-0.5
+      parent: 8
 - proto: WindoorSecureCommandLocked
   entities:
   - uid: 3337
@@ -72754,14 +72528,18 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -28.5,26.5
       parent: 8
-- proto: WindoorSecureScienceLocked
+- proto: WindoorSecureRoboticsLocked
   entities:
-  - uid: 7036
+  - uid: 528
     components:
+    - type: MetaData
+      name: Robotics
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -15.5,20.5
       parent: 8
+- proto: WindoorSecureScienceLocked
+  entities:
   - uid: 9542
     components:
     - type: Transform
@@ -72789,23 +72567,12 @@ entities:
     - type: Transform
       pos: 13.5,3.5
       parent: 8
-    - type: DeviceLinkSink
-      links:
-      - 11405
   - uid: 4791
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 35.5,7.5
       parent: 8
-- proto: WindoorTheatreLocked
-  entities:
-  - uid: 461
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 4.5,-0.5
-      parent: 8
 - proto: Window
   entities:
   - uid: 1763
@@ -73108,6 +72875,12 @@ entities:
       rot: 3.141592653589793 rad
       pos: 37.5,7.5
       parent: 8
+  - uid: 329
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -15.5,21.5
+      parent: 8
   - uid: 349
     components:
     - type: Transform
@@ -73412,23 +73185,29 @@ entities:
       rot: 3.141592653589793 rad
       pos: 39.5,14.5
       parent: 8
-  - uid: 6827
+  - uid: 6817
     components:
     - type: Transform
       rot: 3.141592653589793 rad
-      pos: -14.5,21.5
+      pos: -15.5,22.5
       parent: 8
-  - uid: 7117
+  - uid: 6827
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -15.5,22.5
+      parent: 8
+  - uid: 7036
     components:
     - type: Transform
       rot: 3.141592653589793 rad
-      pos: -13.5,21.5
+      pos: -14.5,22.5
       parent: 8
-  - uid: 7713
+  - uid: 7117
     components:
     - type: Transform
       rot: 3.141592653589793 rad
-      pos: -15.5,21.5
+      pos: -13.5,22.5
       parent: 8
   - uid: 9712
     components:
@@ -73436,12 +73215,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 25.5,-12.5
       parent: 8
-  - uid: 9880
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -15.5,21.5
-      parent: 8
   - uid: 11159
     components:
     - type: Transform
@@ -73560,14 +73333,14 @@ entities:
       parent: 8
 - proto: Wrench
   entities:
-  - uid: 11372
+  - uid: 8743
     components:
     - type: Transform
-      pos: -30.497417,31.30413
+      pos: -15.4781685,22.459705
       parent: 8
-  - uid: 11511
+  - uid: 11372
     components:
     - type: Transform
-      pos: -14.665802,21.464691
+      pos: -30.497417,31.30413
       parent: 8
 ...
diff --git a/Resources/Prototypes/Maps/ovni.yml b/Resources/Prototypes/Maps/ovni.yml
index 7eff902c23c..5ddaa9e83fd 100644
--- a/Resources/Prototypes/Maps/ovni.yml
+++ b/Resources/Prototypes/Maps/ovni.yml
@@ -16,6 +16,7 @@
       - type: StationJobs
         availableJobs:
           Captain: [ 1, 1 ]
+          StationAi: [ 1, 1 ]
         #service
           HeadOfPersonnel: [ 1, 1 ]
           Bartender: [ 1, 1 ]
@@ -45,14 +46,14 @@
           Psychologist: [ 1, 1 ]
           MedicalDoctor: [ 2, 4 ]
           MedicalIntern: [ 2, 3 ]
-          MedicalBorg: [ 1, 1 ]
         #epistemics
           ResearchDirector: [ 1, 1 ]
           Chaplain: [ 1, 1 ]
           ForensicMantis: [ 1, 1 ]
           Scientist: [ 2, 4 ]
+          Roboticist: [ 1, 1 ]
           ResearchAssistant: [ 2, 3 ]
-          Borg: [ 1, 1 ]
+          Borg: [ 2, 2 ]
         #security
           HeadOfSecurity: [ 1, 1 ]
           Warden: [ 1, 1 ]