bagel update (#31342)

diff --git a/Resources/Maps/bagel.yml b/Resources/Maps/bagel.yml
index 555827c7b68588453728ed4bf9150e090a01772a..a25472c0a96643d38f068bcdbed753d060dbf53a 100644 (file)
--- a/Resources/Maps/bagel.yml
+++ b/Resources/Maps/bagel.yml
@@ -326,7 +326,7 @@ entities:
           version: 6
         -2,3:
           ind: -2,3
-          tiles: fQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAATwAAAAAATwAAAAAATwAAAAAATwAAAAAATwAAAAAAUQAAAAAAUQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAATwAAAAAATwAAAAAATwAAAAAATwAAAAAATwAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAATwAAAAAATwAAAAAATwAAAAAATwAAAAAATwAAAAAATwAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAATwAAAAAATwAAAAAATwAAAAAATwAAAAAATwAAAAAATwAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAA
+          tiles: fQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAATwAAAAAATwAAAAAATwAAAAAATwAAAAAATwAAAAAAUQAAAAAAUQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAATwAAAAAATwAAAAAATwAAAAAATwAAAAAATwAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAATwAAAAAATwAAAAAATwAAAAAATwAAAAAATwAAAAAATwAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfgAAAAAATwAAAAAATwAAAAAATwAAAAAATwAAAAAATwAAAAAATwAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAA
           version: 6
         0,2:
           ind: 0,2
@@ -8107,7 +8107,7 @@ entities:
             1: 39312
           -12,8:
             4: 12
-            6: 3072
+            5: 3072
           -11,5:
             0: 63351
           -11,6:
@@ -8116,7 +8116,7 @@ entities:
           -11,8:
             4: 1
             1: 17476
-            6: 256
+            5: 256
           -11,7:
             1: 17484
           -10,5:
@@ -8214,10 +8214,10 @@ entities:
             0: 255
             1: 57344
           -8,11:
-            5: 816
+            6: 816
             1: 34952
           -9,11:
-            5: 2176
+            6: 2176
             1: 8738
           -8,12:
             1: 34959
@@ -8237,7 +8237,7 @@ entities:
           -6,11:
             0: 4095
           -6,12:
-            5: 61166
+            6: 61166
           -5,9:
             0: 65535
           -5,10:
@@ -8245,7 +8245,7 @@ entities:
           -5,11:
             0: 36863
           -5,12:
-            5: 30515
+            6: 30515
             0: 12
           -4,9:
             0: 65535
@@ -8255,7 +8255,7 @@ entities:
             0: 4095
           -4,12:
             0: 1
-            5: 65518
+            6: 65518
           -4,13:
             1: 61680
           -5,13:
@@ -8269,7 +8269,7 @@ entities:
           -5,15:
             1: 17487
           -3,12:
-            5: 13107
+            6: 13107
             1: 34944
           -3,13:
             1: 47792
@@ -8335,7 +8335,7 @@ entities:
             1: 61713
           -12,9:
             0: 16
-            5: 3084
+            6: 3084
           -13,9:
             1: 39305
           -13,10:
@@ -8345,18 +8345,18 @@ entities:
             0: 12544
           -12,10:
             3: 12
-            5: 3072
+            6: 3072
           -12,11:
-            5: 12
+            6: 12
           -11,9:
-            5: 257
+            6: 257
             1: 17476
           -11,10:
             3: 1
-            5: 256
+            6: 256
             1: 17476
           -11,11:
-            5: 1
+            6: 1
             1: 17476
           -11,12:
             1: 17487
@@ -8410,7 +8410,7 @@ entities:
             1: 15
           -13,12:
             1: 34952
-            6: 48
+            5: 48
             4: 12288
           -12,13:
             1: 61455
@@ -8444,11 +8444,11 @@ entities:
             1: 62671
           -7,14:
             1: 244
-            5: 57344
+            6: 57344
             0: 1024
           -7,15:
             1: 61440
-            5: 238
+            6: 238
             0: 1024
           -7,16:
             1: 65524
@@ -8507,7 +8507,7 @@ entities:
           -14,12:
             0: 1
             1: 8738
-            6: 128
+            5: 128
             4: 32768
           -17,12:
             0: 52232
@@ -9033,7 +9033,7 @@ entities:
         - volume: 2500
           temperature: 293.15
           moles:
-          - 0
+          - 6666.982
           - 0
           - 0
           - 0
@@ -9048,7 +9048,7 @@ entities:
         - volume: 2500
           temperature: 293.15
           moles:
-          - 6666.982
+          - 0
           - 0
           - 0
           - 0
@@ -11009,6 +11009,26 @@ entities:
       parent: 60
 - proto: AirlockCommandLocked
   entities:
+  - uid: 5803
+    components:
+    - type: Transform
+      pos: -107.5,17.5
+      parent: 60
+  - uid: 7645
+    components:
+    - type: Transform
+      pos: -111.5,6.5
+      parent: 60
+  - uid: 7705
+    components:
+    - type: Transform
+      pos: -111.5,14.5
+      parent: 60
+  - uid: 11343
+    components:
+    - type: Transform
+      pos: -101.5,17.5
+      parent: 60
   - uid: 13043
     components:
     - type: MetaData
@@ -12383,40 +12403,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 7.5,-70.5
       parent: 60
-- proto: AirlockHatch
-  entities:
-  - uid: 3341
-    components:
-    - type: Transform
-      pos: -111.5,6.5
-      parent: 60
-  - uid: 5803
-    components:
-    - type: Transform
-      pos: -111.5,14.5
-      parent: 60
-  - uid: 7645
-    components:
-    - type: Transform
-      pos: -101.5,17.5
-      parent: 60
-  - uid: 7705
-    components:
-    - type: Transform
-      pos: -107.5,17.5
-      parent: 60
-- proto: AirlockHatchMaintenance
-  entities:
-  - uid: 9621
-    components:
-    - type: Transform
-      pos: -121.5,17.5
-      parent: 60
-  - uid: 11343
-    components:
-    - type: Transform
-      pos: -115.5,17.5
-      parent: 60
 - proto: AirlockHeadOfPersonnelLocked
   entities:
   - uid: 36
@@ -12540,6 +12526,18 @@ entities:
       rot: 3.141592653589793 rad
       pos: 39.5,-33.5
       parent: 60
+- proto: AirlockMaintCommandLocked
+  entities:
+  - uid: 3341
+    components:
+    - type: Transform
+      pos: -121.5,17.5
+      parent: 60
+  - uid: 9621
+    components:
+    - type: Transform
+      pos: -115.5,17.5
+      parent: 60
 - proto: AirlockMaintDetectiveLocked
   entities:
   - uid: 9989
@@ -117353,6 +117351,12 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -12.5,-43.5
       parent: 60
+  - uid: 24766
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 51.5,4.5
+      parent: 60
 - proto: ReinforcedGirder
   entities:
   - uid: 11134
@@ -129584,6 +129588,17 @@ entities:
       - SurveillanceCameraCommand
       nameSet: True
       id: Bridge Exterior Access
+  - uid: 24285
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -68.5,17.5
+      parent: 60
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraCommand
+      nameSet: True
+      id: AI Core Station Entrance
   - uid: 24286
     components:
     - type: Transform
@@ -129595,6 +129610,69 @@ entities:
       - SurveillanceCameraCommand
       nameSet: True
       id: Captain's Bathroom
+  - uid: 24717
+    components:
+    - type: Transform
+      pos: 8.5,-32.5
+      parent: 60
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraCommand
+      nameSet: True
+      id: HoP Bedroom
+  - uid: 24719
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 7.5,-2.5
+      parent: 60
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraCommand
+      nameSet: True
+      id: Bridge Airlock
+  - uid: 24720
+    components:
+    - type: Transform
+      pos: 4.5,-3.5
+      parent: 60
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraCommand
+      nameSet: True
+      id: Bridge Power Closet
+  - uid: 24757
+    components:
+    - type: Transform
+      pos: -94.5,20.5
+      parent: 60
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraCommand
+      nameSet: True
+      id: AI Core Airlock Door
+  - uid: 24758
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -75.5,21.5
+      parent: 60
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraCommand
+      nameSet: True
+      id: AI Core Tunnel Exterior Camera
+  - uid: 24759
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -59.5,16.5
+      parent: 60
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraCommand
+      nameSet: True
+      id: AI Core Station Entrance Door
 - proto: SurveillanceCameraEngineering
   entities:
   - uid: 811
@@ -129867,6 +129945,196 @@ entities:
       - SurveillanceCameraEngineering
       nameSet: True
       id: Engi Main Hall
+  - uid: 24707
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 32.5,-53.5
+      parent: 60
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraEngineering
+      nameSet: True
+      id: Solars South
+  - uid: 24728
+    components:
+    - type: Transform
+      pos: 12.5,-20.5
+      parent: 60
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraEngineering
+      nameSet: True
+      id: Bar North Substation Closet
+  - uid: 24733
+    components:
+    - type: Transform
+      pos: -64.5,-19.5
+      parent: 60
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraEngineering
+      nameSet: True
+      id: Solar South West
+  - uid: 24734
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -70.5,-17.5
+      parent: 60
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraEngineering
+      nameSet: True
+      id: Solars South West Airlock
+  - uid: 24738
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -8.5,-37.5
+      parent: 60
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraEngineering
+      nameSet: True
+      id: Disposals Atmos Closet
+  - uid: 24741
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 30.5,-60.5
+      parent: 60
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraEngineering
+      nameSet: True
+      id: Solars South Airlock
+  - uid: 24742
+    components:
+    - type: Transform
+      pos: 62.5,-39.5
+      parent: 60
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraEngineering
+      nameSet: True
+      id: Solars South East
+  - uid: 24743
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 67.5,-39.5
+      parent: 60
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraEngineering
+      nameSet: True
+      id: Solars South East Airlock
+  - uid: 24751
+    components:
+    - type: Transform
+      pos: -5.5,40.5
+      parent: 60
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraEngineering
+      nameSet: True
+      id: Singulo Cage 1
+  - uid: 24752
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -24.5,49.5
+      parent: 60
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraEngineering
+      nameSet: True
+      id: Engineering North Airlock
+  - uid: 24753
+    components:
+    - type: Transform
+      pos: -24.5,51.5
+      parent: 60
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraEngineering
+      nameSet: True
+      id: Engineering North Airlock Door
+  - uid: 24754
+    components:
+    - type: Transform
+      pos: -24.5,59.5
+      parent: 60
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraEngineering
+      nameSet: True
+      id: 'Solars North '
+  - uid: 24755
+    components:
+    - type: Transform
+      pos: -24.5,63.5
+      parent: 60
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraEngineering
+      nameSet: True
+      id: 'Solars North Airlock '
+  - uid: 24756
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -26.5,57.5
+      parent: 60
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraEngineering
+      nameSet: True
+      id: Solars North Airlock 2
+  - uid: 24760
+    components:
+    - type: Transform
+      pos: 5.5,13.5
+      parent: 60
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraEngineering
+      nameSet: True
+      id: Engineering Lobby
+  - uid: 24761
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 13.5,18.5
+      parent: 60
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraEngineering
+      nameSet: True
+      id: CE Bedroom
+  - uid: 24762
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 10.5,20.5
+      parent: 60
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraEngineering
+      nameSet: True
+      id: CE Office
+  - uid: 24763
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -8.5,32.5
+      parent: 60
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraEngineering
+      nameSet: True
+      id: Engineering Secure Storage
 - proto: SurveillanceCameraGeneral
   entities:
   - uid: 7157
@@ -129922,6 +130190,17 @@ entities:
       - SurveillanceCameraGeneral
       nameSet: True
       id: Dorm Room 4
+  - uid: 21081
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 23.5,-4.5
+      parent: 60
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraGeneral
+      nameSet: True
+      id: Boxing Ring
   - uid: 21086
     components:
     - type: Transform
@@ -130075,17 +130354,6 @@ entities:
       - SurveillanceCameraGeneral
       nameSet: True
       id: Theatre Backroom
-  - uid: 24285
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 22.5,-4.5
-      parent: 60
-    - type: SurveillanceCamera
-      setupAvailableNetworks:
-      - SurveillanceCameraGeneral
-      nameSet: True
-      id: Bungle Zone
   - uid: 24290
     components:
     - type: Transform
@@ -130281,6 +130549,201 @@ entities:
       - SurveillanceCameraGeneral
       nameSet: True
       id: Vox Box
+  - uid: 24711
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 28.5,-22.5
+      parent: 60
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraGeneral
+      nameSet: True
+      id: Main Hallway South East
+  - uid: 24716
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 16.5,-38.5
+      parent: 60
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraGeneral
+      nameSet: True
+      id: Bar Maint Door
+  - uid: 24718
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -0.5,-25.5
+      parent: 60
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraGeneral
+      nameSet: True
+      id: Main Hall Central Intersection
+  - uid: 24721
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 10.5,5.5
+      parent: 60
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraGeneral
+      nameSet: True
+      id: Public Garden
+  - uid: 24722
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 19.5,11.5
+      parent: 60
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraGeneral
+      nameSet: True
+      id: Bathroom
+  - uid: 24724
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 34.5,14.5
+      parent: 60
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraGeneral
+      nameSet: True
+      id: News Room
+  - uid: 24731
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 12.5,-15.5
+      parent: 60
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraGeneral
+      nameSet: True
+      id: Bagel Central Eva Closet
+  - uid: 24732
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 10.5,-15.5
+      parent: 60
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraGeneral
+      nameSet: True
+      id: Bagel Central Eva Airlock
+  - uid: 24739
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -5.5,-40.5
+      parent: 60
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraGeneral
+      nameSet: True
+      id: Disposals Entrance
+  - uid: 24740
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 2.5,-53.5
+      parent: 60
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraGeneral
+      nameSet: True
+      id: Arrivals Entrance
+  - uid: 24745
+    components:
+    - type: Transform
+      pos: 32.5,7.5
+      parent: 60
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraGeneral
+      nameSet: True
+      id: Main Hallway Cargo
+  - uid: 24746
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 44.5,29.5
+      parent: 60
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraGeneral
+      nameSet: True
+      id: Evac Airlock Left
+  - uid: 24747
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 54.5,29.5
+      parent: 60
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraGeneral
+      nameSet: True
+      id: Evac Airlock Right
+  - uid: 24748
+    components:
+    - type: Transform
+      pos: 49.5,31.5
+      parent: 60
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraGeneral
+      nameSet: True
+      id: Evac Airlock Center
+  - uid: 24749
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 17.5,27.5
+      parent: 60
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraGeneral
+      nameSet: True
+      id: Main Hall North East Airlock
+  - uid: 24750
+    components:
+    - type: Transform
+      pos: 17.5,32.5
+      parent: 60
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraGeneral
+      nameSet: True
+      id: North East Airlock Door
+  - uid: 24764
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -8.5,38.5
+      parent: 60
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraGeneral
+      nameSet: True
+      id: Singulo Cage Airlock
+  - uid: 24765
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -7.5,25.5
+      parent: 60
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraGeneral
+      nameSet: True
+      id: Librarian's Room
 - proto: SurveillanceCameraMedical
   entities:
   - uid: 12352
@@ -130381,6 +130844,71 @@ entities:
       - SurveillanceCameraMedical
       nameSet: True
       id: CMO's Office
+  - uid: 24710
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 30.5,-19.5
+      parent: 60
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraMedical
+      nameSet: True
+      id: Exam Room 2
+  - uid: 24712
+    components:
+    - type: Transform
+      pos: 30.5,-17.5
+      parent: 60
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraMedical
+      nameSet: True
+      id: Exam Room 1
+  - uid: 24713
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 29.5,-13.5
+      parent: 60
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraMedical
+      nameSet: True
+      id: CMO Office
+  - uid: 24714
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 33.5,-9.5
+      parent: 60
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraMedical
+      nameSet: True
+      id: CMO Private Clinic
+  - uid: 24715
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 47.5,-12.5
+      parent: 60
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraMedical
+      nameSet: True
+      id: Med Storage
+  - uid: 24744
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 47.5,-31.5
+      parent: 60
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraMedical
+      nameSet: True
+      id: Virology Airlock
 - proto: SurveillanceCameraRouterCommand
   entities:
   - uid: 21019
@@ -130577,6 +131105,39 @@ entities:
       - SurveillanceCameraScience
       nameSet: True
       id: Robotics Bay
+  - uid: 24735
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -57.5,2.5
+      parent: 60
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraScience
+      nameSet: True
+      id: Anomaly Generator
+  - uid: 24736
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -40.5,8.5
+      parent: 60
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraScience
+      nameSet: True
+      id: RD Bedroom
+  - uid: 24737
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -42.5,9.5
+      parent: 60
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraScience
+      nameSet: True
+      id: RD Room
 - proto: SurveillanceCameraSecurity
   entities:
   - uid: 1904
@@ -130885,28 +131446,28 @@ entities:
       - SurveillanceCameraService
       nameSet: True
       id: Bar
-  - uid: 21081
+  - uid: 21082
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 24.5,-30.5
+      rot: 1.5707963267948966 rad
+      pos: 35.5,-31.5
       parent: 60
     - type: SurveillanceCamera
       setupAvailableNetworks:
       - SurveillanceCameraService
       nameSet: True
-      id: Kitchen
-  - uid: 21082
+      id: Hydroponics
+  - uid: 23159
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: 35.5,-31.5
+      pos: 26.5,-34.5
       parent: 60
     - type: SurveillanceCamera
       setupAvailableNetworks:
       - SurveillanceCameraService
       nameSet: True
-      id: Hydroponics
+      id: Kitchen
   - uid: 24306
     components:
     - type: Transform
@@ -130929,6 +131490,28 @@ entities:
       - SurveillanceCameraService
       nameSet: True
       id: Janitor's Office
+  - uid: 24708
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 33.5,-35.5
+      parent: 60
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraService
+      nameSet: True
+      id: Hydroponics Backroom
+  - uid: 24709
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 30.5,-36.5
+      parent: 60
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraService
+      nameSet: True
+      id: Service Animal Pen
 - proto: SurveillanceCameraSupply
   entities:
   - uid: 6153
@@ -131006,6 +131589,69 @@ entities:
       - SurveillanceCameraSupply
       nameSet: True
       id: Salv Locker Room
+  - uid: 24723
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 47.5,14.5
+      parent: 60
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraSupply
+      nameSet: True
+      id: Cargo Bay North
+  - uid: 24725
+    components:
+    - type: Transform
+      pos: 43.5,-1.5
+      parent: 60
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraSupply
+      nameSet: True
+      id: Salvage Bay Maint Door
+  - uid: 24726
+    components:
+    - type: Transform
+      pos: 58.5,14.5
+      parent: 60
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraSupply
+      nameSet: True
+      id: Cargo Dock 1
+  - uid: 24727
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 58.5,12.5
+      parent: 60
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraSupply
+      nameSet: True
+      id: Cargo Dock 2
+  - uid: 24729
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 54.5,0.5
+      parent: 60
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraSupply
+      nameSet: True
+      id: Salvage Airlock 2
+  - uid: 24730
+    components:
+    - type: Transform
+      pos: 54.5,2.5
+      parent: 60
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraSupply
+      nameSet: True
+      id: Salvage Airlock 1
 - proto: SurveillanceCameraWirelessRouterEntertainment
   entities:
   - uid: 17205
@@ -134071,13 +134717,6 @@ entities:
     - type: Transform
       pos: -116.54863,15.725244
       parent: 60
-- proto: ToyAi
-  entities:
-  - uid: 23159
-    components:
-    - type: Transform
-      pos: -111.5,25.5
-      parent: 60
 - proto: ToyFigurinePassenger
   entities:
   - uid: 6331
@@ -134398,6 +135037,17 @@ entities:
         - Left: Forward
         - Right: Reverse
         - Middle: Off
+  - uid: 24767
+    components:
+    - type: Transform
+      pos: 50.5,4.5
+      parent: 60
+    - type: DeviceLinkSource
+      linkedPorts:
+        24766:
+        - Left: Forward
+        - Right: Reverse
+        - Middle: Off
 - proto: UnfinishedMachineFrame
   entities:
   - uid: 3769