fland update (#31034)

diff --git a/Resources/Maps/fland.yml b/Resources/Maps/fland.yml
index f717460fed426e67d65e43a636af94f259daf406..262ee0cccd14d4f2701e77a25c20231a4ef022fb 100644 (file)
--- a/Resources/Maps/fland.yml
+++ b/Resources/Maps/fland.yml
@@ -88,7 +88,7 @@ entities:
           version: 6
         -1,1:
           ind: -1,1
-          tiles: LwAAAAADLwAAAAADLwAAAAAALwAAAAACLwAAAAAAegAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADXQAAAAACLwAAAAABLwAAAAAALwAAAAAALwAAAAABLwAAAAADegAAAAACfgAAAAAADgAAAAADDgAAAAAADgAAAAADDgAAAAADDgAAAAACfgAAAAAAMQAAAAAAXQAAAAACXQAAAAADLwAAAAADLwAAAAAALwAAAAABLwAAAAABLwAAAAAAegAAAAABfgAAAAAADgAAAAADDgAAAAACDgAAAAADDgAAAAABDgAAAAABfgAAAAAAHwAAAAACXQAAAAABXQAAAAAALwAAAAACLwAAAAADLwAAAAAALwAAAAAALwAAAAADegAAAAACfgAAAAAADgAAAAACDgAAAAADDgAAAAABDgAAAAADDgAAAAAAfgAAAAAAHwAAAAABXQAAAAAAXQAAAAADLwAAAAAALwAAAAACLwAAAAAALwAAAAAALwAAAAAAegAAAAAAfgAAAAAADgAAAAADDgAAAAACDgAAAAACDgAAAAAADgAAAAACfgAAAAAAHwAAAAACXQAAAAAAXQAAAAADLwAAAAADLwAAAAAALwAAAAABLwAAAAADLwAAAAACegAAAAACfgAAAAAADgAAAAADDgAAAAACDgAAAAAADgAAAAADDgAAAAACfgAAAAAAHwAAAAABXQAAAAABXQAAAAAAegAAAAABegAAAAABegAAAAACegAAAAADegAAAAABegAAAAACfgAAAAAADgAAAAABDgAAAAABDgAAAAADDgAAAAAADgAAAAABfgAAAAAAHwAAAAAAXQAAAAABXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAADgAAAAACDgAAAAAADgAAAAAADgAAAAADDgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADXQAAAAACHwAAAAAAHwAAAAADHwAAAAACfgAAAAAADgAAAAAADgAAAAABDgAAAAABDgAAAAABDgAAAAAADgAAAAADDgAAAAAADgAAAAAAHwAAAAAAfgAAAAAAXQAAAAADXQAAAAACHwAAAAACHwAAAAAAHwAAAAABHwAAAAAADgAAAAACDgAAAAADDgAAAAACDgAAAAADfgAAAAAAHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAbAAAAAAAHwAAAAABHwAAAAACHwAAAAADfgAAAAAADgAAAAABDgAAAAADDgAAAAABDgAAAAABfgAAAAAALgAAAAAALgAAAAAALgAAAAAALgAAAAAAfgAAAAAAXQAAAAADXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAABfgAAAAAALgAAAAAALgAAAAAALgAAAAAALgAAAAAAfgAAAAAAXQAAAAABXQAAAAADegAAAAAAegAAAAABegAAAAAAegAAAAABfgAAAAAAHwAAAAACHwAAAAACHwAAAAAAHwAAAAAALgAAAAAALgAAAAAALgAAAAAALgAAAAAAfgAAAAAAXQAAAAACXQAAAAACQAAAAAAAQAAAAAAAQAAAAAAAegAAAAABHwAAAAABHwAAAAADHwAAAAADHwAAAAACfgAAAAAALgAAAAAALgAAAAAALgAAAAAALgAAAAAAfgAAAAAAXQAAAAABXQAAAAADegAAAAAAegAAAAACegAAAAADegAAAAABfgAAAAAAHwAAAAADHwAAAAACHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAABHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAADHwAAAAADHwAAAAACHwAAAAAAHwAAAAADHwAAAAABHwAAAAACHwAAAAABfgAAAAAAXQAAAAACXQAAAAAD
+          tiles: LwAAAAADLwAAAAADLwAAAAAALwAAAAACLwAAAAAAegAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADXQAAAAACLwAAAAABLwAAAAAALwAAAAAALwAAAAABLwAAAAADegAAAAACfgAAAAAADgAAAAADDgAAAAAADgAAAAADDgAAAAADDgAAAAACfgAAAAAAMQAAAAAAXQAAAAACXQAAAAADLwAAAAADLwAAAAAALwAAAAABLwAAAAABLwAAAAAAegAAAAABfgAAAAAADgAAAAADDgAAAAACDgAAAAADDgAAAAABDgAAAAABfgAAAAAAHwAAAAACXQAAAAABXQAAAAAALwAAAAACLwAAAAADLwAAAAAALwAAAAAALwAAAAADegAAAAACfgAAAAAADgAAAAACDgAAAAADDgAAAAABDgAAAAADDgAAAAAAfgAAAAAAHwAAAAABXQAAAAAAXQAAAAADLwAAAAAALwAAAAACLwAAAAAALwAAAAAALwAAAAAAegAAAAAAfgAAAAAADgAAAAADDgAAAAACDgAAAAACDgAAAAAADgAAAAACfgAAAAAAHwAAAAACXQAAAAAAXQAAAAADLwAAAAADLwAAAAAALwAAAAABLwAAAAADLwAAAAACegAAAAACfgAAAAAADgAAAAADDgAAAAACDgAAAAAADgAAAAADDgAAAAACfgAAAAAAHwAAAAABXQAAAAABXQAAAAAAegAAAAABegAAAAABegAAAAACegAAAAADegAAAAABegAAAAACfgAAAAAADgAAAAABDgAAAAABDgAAAAADDgAAAAAADgAAAAABfgAAAAAAHwAAAAAAXQAAAAABXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAADgAAAAACDgAAAAAADgAAAAAADgAAAAADDgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADXQAAAAACHwAAAAAAHwAAAAADHwAAAAACfgAAAAAADgAAAAAADgAAAAABDgAAAAABDgAAAAABDgAAAAAADgAAAAADDgAAAAAADgAAAAAAHwAAAAAAfgAAAAAAXQAAAAADXQAAAAACHwAAAAACHwAAAAAAHwAAAAABHwAAAAAADgAAAAACDgAAAAADDgAAAAACDgAAAAADfgAAAAAAHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAbAAAAAAAHwAAAAABHwAAAAACHwAAAAADfgAAAAAADgAAAAABDgAAAAADDgAAAAABDgAAAAABfgAAAAAALgAAAAAALgAAAAAALgAAAAAALgAAAAAAfgAAAAAAXQAAAAADXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAHwAAAAAAHwAAAAAAfgAAAAAALgAAAAAALgAAAAAALgAAAAAALgAAAAAAfgAAAAAAXQAAAAABXQAAAAADegAAAAAAegAAAAABegAAAAAAegAAAAABfgAAAAAAHwAAAAAAHwAAAAAAHwAAAAAAHwAAAAAALgAAAAAALgAAAAAALgAAAAAALgAAAAAAfgAAAAAAXQAAAAACXQAAAAACQAAAAAAAQAAAAAAAQAAAAAAAegAAAAABfgAAAAAAHwAAAAAAHwAAAAAAHwAAAAAAfgAAAAAALgAAAAAALgAAAAAALgAAAAAALgAAAAAAfgAAAAAAXQAAAAABXQAAAAADegAAAAAAegAAAAACegAAAAADegAAAAABfgAAAAAAHwAAAAADHwAAAAACHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAABHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAADHwAAAAADHwAAAAACHwAAAAAAHwAAAAADHwAAAAABHwAAAAACHwAAAAABfgAAAAAAXQAAAAACXQAAAAAD
           version: 6
         0,1:
           ind: 0,1
@@ -112,7 +112,7 @@ entities:
           version: 6
         -1,2:
           ind: -1,2
-          tiles: PAAAAAAAPAAAAAAAPAAAAAAAPAAAAAAAbAAAAAAAHwAAAAAAHwAAAAABHwAAAAABHwAAAAADHwAAAAABHwAAAAAAHwAAAAAAHwAAAAAAHwAAAAADXQAAAAABXQAAAAAAPAAAAAAAPAAAAAAAPAAAAAAAPAAAAAAAfgAAAAAAXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADXQAAAAACPAAAAAAAPAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAADXQAAAAADXQAAAAAAXQAAAAADXQAAAAADXQAAAAACXQAAAAAAfgAAAAAAXQAAAAABXQAAAAADPAAAAAAAPAAAAAAAfgAAAAAAXQAAAAACXQAAAAAAXQAAAAACXQAAAAAAXQAAAAABXQAAAAADXQAAAAACXQAAAAACXQAAAAABXQAAAAAAfgAAAAAAXQAAAAACXQAAAAADXQAAAAADfgAAAAAAfgAAAAAAHwAAAAABPAAAAAAAHwAAAAADHwAAAAACPAAAAAAAHwAAAAABHwAAAAAAXQAAAAABXQAAAAABXQAAAAADfgAAAAAAXQAAAAABXQAAAAABPAAAAAAAPAAAAAAAfgAAAAAAHwAAAAABPAAAAAAAHwAAAAACHwAAAAADPAAAAAAAfgAAAAAAHwAAAAAAXQAAAAADXQAAAAADXQAAAAABfgAAAAAAXQAAAAABXQAAAAAAPAAAAAAAPAAAAAAAfgAAAAAAHwAAAAABPAAAAAAAHwAAAAACHwAAAAACPAAAAAAAHwAAAAABHwAAAAAAXQAAAAADXQAAAAACXQAAAAADfgAAAAAAXQAAAAACXQAAAAAAPAAAAAAAPAAAAAAAHwAAAAABXQAAAAACXQAAAAABXQAAAAACXQAAAAABXQAAAAAAXQAAAAACXQAAAAABXQAAAAADXQAAAAADXQAAAAABfgAAAAAAXQAAAAABXQAAAAABPAAAAAAAPAAAAAAAfgAAAAAAXQAAAAABXQAAAAADXQAAAAAAXQAAAAABXQAAAAADXQAAAAABXQAAAAACXQAAAAABXQAAAAADXQAAAAACfgAAAAAAbAAAAAAAbAAAAAAAPAAAAAAAPAAAAAAAfgAAAAAAHwAAAAACPAAAAAAAHwAAAAACHwAAAAACPAAAAAAAHwAAAAACfgAAAAAADAAAAAAADAAAAAAADAAAAAAAfgAAAAAAXQAAAAACXQAAAAABPAAAAAAAPAAAAAAAfgAAAAAAHwAAAAADPAAAAAAAHwAAAAABHwAAAAAAPAAAAAAAHwAAAAADfgAAAAAADAAAAAAADAAAAAAADAAAAAAAfgAAAAAAXQAAAAADXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACXQAAAAAAXQAAAAADXQAAAAACXQAAAAAAXQAAAAACXQAAAAAAXQAAAAAAXQAAAAABXQAAAAACXQAAAAADbAAAAAAAXQAAAAABXQAAAAADXQAAAAAAXQAAAAACXQAAAAABXQAAAAABXQAAAAAAXQAAAAABXQAAAAABXQAAAAABXQAAAAAAXQAAAAADXQAAAAADXQAAAAABXQAAAAAAbAAAAAAAXQAAAAAAXQAAAAABXQAAAAACXQAAAAABXQAAAAACXQAAAAABXQAAAAABXQAAAAAAXQAAAAABXQAAAAADXQAAAAAAXQAAAAADXQAAAAABXQAAAAACXQAAAAABbAAAAAAAXQAAAAACXQAAAAABXQAAAAABXQAAAAABXQAAAAAAXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAABwAAAAAABwAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAACXQAAAAACfgAAAAAAfgAAAAAAbAAAAAAA
+          tiles: PAAAAAAAPAAAAAAAPAAAAAAAPAAAAAAAbAAAAAAAHwAAAAAAHwAAAAABHwAAAAABHwAAAAADHwAAAAABHwAAAAAAHwAAAAAAHwAAAAAAHwAAAAADXQAAAAABXQAAAAAAPAAAAAAAPAAAAAAAPAAAAAAAPAAAAAAAfgAAAAAAXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADXQAAAAACPAAAAAAAPAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAADXQAAAAADXQAAAAAAXQAAAAADXQAAAAADXQAAAAACXQAAAAAAfgAAAAAAXQAAAAABXQAAAAADPAAAAAAAPAAAAAAAfgAAAAAAPgAAAAAAXQAAAAAAXQAAAAACXQAAAAAAXQAAAAABXQAAAAADXQAAAAACXQAAAAACXQAAAAABXQAAAAAAfgAAAAAAXQAAAAACXQAAAAADXQAAAAADfgAAAAAAfgAAAAAAHwAAAAABPAAAAAAAHwAAAAADHwAAAAACPAAAAAAAHwAAAAABHwAAAAAAXQAAAAABXQAAAAABXQAAAAADfgAAAAAAXQAAAAABXQAAAAABPAAAAAAAPAAAAAAAfgAAAAAAHwAAAAABPAAAAAAAHwAAAAACHwAAAAADPAAAAAAAfgAAAAAAHwAAAAAAXQAAAAADXQAAAAADXQAAAAABfgAAAAAAXQAAAAABXQAAAAAAPAAAAAAAPAAAAAAAfgAAAAAAHwAAAAABPAAAAAAAHwAAAAACHwAAAAACPAAAAAAAHwAAAAABHwAAAAAAXQAAAAADXQAAAAACXQAAAAADfgAAAAAAXQAAAAACXQAAAAAAPAAAAAAAPAAAAAAAHwAAAAABXQAAAAACXQAAAAABXQAAAAACXQAAAAABXQAAAAAAXQAAAAACXQAAAAABXQAAAAADXQAAAAADXQAAAAABfgAAAAAAXQAAAAABXQAAAAABPAAAAAAAPAAAAAAAfgAAAAAAXQAAAAABXQAAAAADXQAAAAAAXQAAAAABXQAAAAADXQAAAAABXQAAAAACXQAAAAABXQAAAAADXQAAAAACfgAAAAAAbAAAAAAAbAAAAAAAPAAAAAAAPAAAAAAAfgAAAAAAHwAAAAACPAAAAAAAHwAAAAACHwAAAAACPAAAAAAAHwAAAAACfgAAAAAADAAAAAAADAAAAAAADAAAAAAAfgAAAAAAXQAAAAACXQAAAAABPAAAAAAAPAAAAAAAfgAAAAAAHwAAAAADPAAAAAAAHwAAAAABHwAAAAAAPAAAAAAAHwAAAAADfgAAAAAADAAAAAAADAAAAAAADAAAAAAAfgAAAAAAXQAAAAADXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACXQAAAAAAXQAAAAADXQAAAAACXQAAAAAAXQAAAAACXQAAAAAAXQAAAAAAXQAAAAABXQAAAAACXQAAAAADbAAAAAAAXQAAAAABXQAAAAADXQAAAAAAXQAAAAACXQAAAAABXQAAAAABXQAAAAAAXQAAAAABXQAAAAABXQAAAAABXQAAAAAAXQAAAAADXQAAAAADXQAAAAABXQAAAAAAbAAAAAAAXQAAAAAAXQAAAAABXQAAAAACXQAAAAABXQAAAAACXQAAAAABXQAAAAABXQAAAAAAXQAAAAABXQAAAAADXQAAAAAAXQAAAAADXQAAAAABXQAAAAACXQAAAAABbAAAAAAAXQAAAAACXQAAAAABXQAAAAABXQAAAAABXQAAAAAAXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAABwAAAAAABwAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAACXQAAAAACfgAAAAAAfgAAAAAAbAAAAAAA
           version: 6
         0,2:
           ind: 0,2
@@ -1091,6 +1091,7 @@ entities:
             8000: 95,44
             8115: 76,-4
             8656: 87,-20
+            8727: -13,35
         - node:
             cleanable: True
             color: '#FFFFFFFF'
@@ -3600,8 +3601,6 @@ entities:
             color: '#D4D4D428'
             id: CheckerNESW
           decals:
-            336: -10,29
-            337: -10,30
             338: -10,31
             421: -16,37
             422: -17,37
@@ -3663,6 +3662,8 @@ entities:
             5470: 76,-12
             5471: 76,-13
             5472: 77,-13
+            8717: -10,29
+            8718: -10,30
         - node:
             color: '#D4D4D42B'
             id: CheckerNESW
@@ -4222,9 +4223,9 @@ entities:
             color: '#D4D4D496'
             id: CheckerNWSE
           decals:
-            341: -10,29
-            342: -10,30
             343: -10,31
+            8715: -10,30
+            8716: -10,29
         - node:
             color: '#DE3A3A96'
             id: CheckerNWSE
@@ -5269,9 +5270,6 @@ entities:
             5733: -5,32
             5734: -8,31
             5735: -10,32
-            5736: -11,29
-            5737: -10,28
-            5738: -10,30
             5881: 96,-21
             5882: 97,-21
             5883: 97,-24
@@ -7142,7 +7140,6 @@ entities:
             color: '#9FED5896'
             id: HalfTileOverlayGreyscale
           decals:
-            185: -13,35
             186: -11,35
             187: -10,35
             188: -8,35
@@ -7228,7 +7225,6 @@ entities:
             326: -7,31
             327: -6,31
             328: -5,31
-            335: -10,28
             1758: -3,-17
             1759: -2,-17
             1760: -1,-17
@@ -7249,6 +7245,7 @@ entities:
             2687: 19,-15
             2688: 20,-15
             2689: 21,-15
+            8723: -10,28
         - node:
             color: '#D4D4D45A'
             id: HalfTileOverlayGreyscale
@@ -7614,8 +7611,6 @@ entities:
             id: HalfTileOverlayGreyscale270
           decals:
             113: -11,9
-            319: -9,29
-            320: -9,30
             352: 5,8
             353: 5,12
             387: 5,9
@@ -7633,6 +7628,8 @@ entities:
             2333: 15,-24
             2334: 15,-23
             7932: 15,-22
+            8721: -9,29
+            8722: -9,30
         - node:
             color: '#D4D4D45A'
             id: HalfTileOverlayGreyscale270
@@ -7735,8 +7732,6 @@ entities:
             color: '#D4D4D428'
             id: HalfTileOverlayGreyscale90
           decals:
-            316: -11,29
-            317: -11,30
             318: -11,31
             348: 2,8
             349: 2,9
@@ -7755,6 +7750,8 @@ entities:
             2328: 5,-24
             2329: 5,-23
             2330: 5,-22
+            8719: -11,29
+            8720: -11,30
         - node:
             color: '#D4D4D453'
             id: HalfTileOverlayGreyscale90
@@ -8077,7 +8074,6 @@ entities:
             color: '#D4D4D428'
             id: QuarterTileOverlayGreyscale
           decals:
-            321: -9,28
             339: -4,31
             670: -36,40
             671: -35,40
@@ -8276,6 +8272,7 @@ entities:
             8491: 71,15
             8492: 72,15
             8493: 73,15
+            8724: -9,28
         - node:
             color: '#D4D4D496'
             id: QuarterTileOverlayGreyscale
@@ -8949,7 +8946,6 @@ entities:
             239: -10,40
             240: -9,40
             241: -8,40
-            242: -13,35
             243: -12,35
             244: -11,35
             245: -10,35
@@ -9233,7 +9229,6 @@ entities:
             color: '#D4D4D428'
             id: QuarterTileOverlayGreyscale90
           decals:
-            322: -11,28
             672: -30,40
             673: -29,40
             674: -28,40
@@ -9443,6 +9438,7 @@ entities:
             7395: 94,14
             7396: 94,13
             7397: 94,12
+            8725: -11,28
         - node:
             color: '#D4D4D42B'
             id: QuarterTileOverlayGreyscale90
@@ -15741,10 +15737,11 @@ entities:
       devices:
       - 665
       - 629
+      - 20458
       - 653
-      - 652
       - 530
       - 568
+      - 20459
   - uid: 612
     components:
     - type: Transform
@@ -15764,8 +15761,6 @@ entities:
       - 650
       - 628
       - 651
-      - 653
-      - 652
       - 451
       - 423
       - 420
@@ -17728,11 +17723,6 @@ entities:
     - type: Transform
       pos: -16.5,27.5
       parent: 13329
-  - uid: 911
-    components:
-    - type: Transform
-      pos: -11.5,29.5
-      parent: 13329
   - uid: 912
     components:
     - type: Transform
@@ -19594,13 +19584,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: 1.5,12.5
       parent: 13329
-- proto: AirlockKitchenGlassLocked
-  entities:
-  - uid: 918
-    components:
-    - type: Transform
-      pos: -8.5,27.5
-      parent: 13329
 - proto: AirlockMaintAtmoLocked
   entities:
   - uid: 20772
@@ -28811,6 +28794,16 @@ entities:
     - type: Transform
       pos: 24.469292,51.5738
       parent: 13329
+  - uid: 20455
+    components:
+    - type: Transform
+      pos: -4.503886,17.58306
+      parent: 13329
+  - uid: 20456
+    components:
+    - type: Transform
+      pos: -4.769511,17.48931
+      parent: 13329
   - uid: 34151
     components:
     - type: Transform
@@ -88497,11 +88490,11 @@ entities:
       parent: 13329
 - proto: ChairFolding
   entities:
-  - uid: 1219
+  - uid: 897
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: -8.5,25.5
+      pos: -8.420344,26.658598
       parent: 13329
   - uid: 1502
     components:
@@ -97796,31 +97789,6 @@ entities:
     - type: Transform
       pos: -5.5,42.5
       parent: 13329
-- proto: CrateNPCCow
-  entities:
-  - uid: 1218
-    components:
-    - type: Transform
-      pos: -5.5,23.5
-      parent: 13329
-    - type: EntityStorage
-      air:
-        volume: 800
-        immutable: False
-        temperature: 293.14987
-        moles:
-        - 12.392727
-        - 46.620262
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
 - proto: CrateNPCHamlet
   entities:
   - uid: 35113
@@ -99687,6 +99655,11 @@ entities:
       rot: 3.141592653589793 rad
       pos: 38.5,-45.5
       parent: 13329
+  - uid: 20473
+    components:
+    - type: Transform
+      pos: -9.5,35.5
+      parent: 13329
   - uid: 21066
     components:
     - type: Transform
@@ -104705,6 +104678,60 @@ entities:
     - type: Transform
       pos: 38.5,-43.5
       parent: 13329
+  - uid: 20462
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -9.5,28.5
+      parent: 13329
+  - uid: 20463
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -9.5,29.5
+      parent: 13329
+  - uid: 20464
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -9.5,30.5
+      parent: 13329
+  - uid: 20465
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -9.5,31.5
+      parent: 13329
+  - uid: 20466
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -9.5,32.5
+      parent: 13329
+  - uid: 20467
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -9.5,33.5
+      parent: 13329
+  - uid: 20468
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -9.5,34.5
+      parent: 13329
+  - uid: 20469
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -10.5,35.5
+      parent: 13329
+  - uid: 20470
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -11.5,35.5
+      parent: 13329
   - uid: 22919
     components:
     - type: Transform
@@ -108263,6 +108290,18 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 40.5,-45.5
       parent: 13329
+  - uid: 20461
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -9.5,27.5
+      parent: 13329
+  - uid: 20472
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -12.5,35.5
+      parent: 13329
   - uid: 24048
     components:
     - type: Transform
@@ -108699,6 +108738,13 @@ entities:
     - type: Transform
       pos: 40.5,-45.5
       parent: 13329
+  - uid: 20460
+    components:
+    - type: MetaData
+      name: chute to kitchen
+    - type: Transform
+      pos: -12.5,35.5
+      parent: 13329
   - uid: 24036
     components:
     - type: Transform
@@ -110557,8 +110603,6 @@ entities:
       - 650
       - 628
       - 651
-      - 653
-      - 652
   - uid: 662
     components:
     - type: Transform
@@ -110568,8 +110612,9 @@ entities:
       devices:
       - 665
       - 629
+      - 20458
       - 653
-      - 652
+      - 20459
   - uid: 663
     components:
     - type: Transform
@@ -111919,16 +111964,15 @@ entities:
     - type: Transform
       pos: -12.5,25.5
       parent: 13329
-  - uid: 652
-    components:
-    - type: Transform
-      pos: -9.5,27.5
-      parent: 13329
   - uid: 653
     components:
     - type: Transform
       pos: -10.5,27.5
       parent: 13329
+    - type: DeviceNetwork
+      deviceLists:
+      - 662
+      - 611
   - uid: 654
     components:
     - type: Transform
@@ -113156,6 +113200,24 @@ entities:
     - type: Transform
       pos: 46.5,-45.5
       parent: 13329
+  - uid: 20458
+    components:
+    - type: Transform
+      pos: -9.5,27.5
+      parent: 13329
+    - type: DeviceNetwork
+      deviceLists:
+      - 662
+      - 611
+  - uid: 20459
+    components:
+    - type: Transform
+      pos: -8.5,27.5
+      parent: 13329
+    - type: DeviceNetwork
+      deviceLists:
+      - 662
+      - 611
   - uid: 21259
     components:
     - type: Transform
@@ -114906,16 +114968,6 @@ entities:
       parent: 13329
 - proto: FoodCondimentBottleEnzyme
   entities:
-  - uid: 1198
-    components:
-    - type: Transform
-      pos: -5.6167603,22.921633
-      parent: 13329
-  - uid: 1199
-    components:
-    - type: Transform
-      pos: -5.4292603,22.781008
-      parent: 13329
   - uid: 10417
     components:
     - type: Transform
@@ -153776,6 +153828,11 @@ entities:
     - type: Transform
       pos: -12.5,34.5
       parent: 13329
+  - uid: 652
+    components:
+    - type: Transform
+      pos: -11.5,29.5
+      parent: 13329
   - uid: 666
     components:
     - type: Transform
@@ -160699,16 +160756,16 @@ entities:
     - type: Transform
       pos: -4.5,25.5
       parent: 13329
-  - uid: 1104
+  - uid: 1105
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -7.5,30.5
+      pos: -6.5,41.5
       parent: 13329
-  - uid: 1105
+  - uid: 1153
     components:
     - type: Transform
-      pos: -6.5,41.5
+      rot: 3.141592653589793 rad
+      pos: -7.5,30.5
       parent: 13329
 - proto: IntercomSupply
   entities:
@@ -160782,6 +160839,18 @@ entities:
     - type: Transform
       pos: -21.5,21.5
       parent: 13329
+- proto: KitchenElectricGrill
+  entities:
+  - uid: 1157
+    components:
+    - type: Transform
+      pos: -7.5,20.5
+      parent: 13329
+  - uid: 1219
+    components:
+    - type: Transform
+      pos: -7.5,21.5
+      parent: 13329
 - proto: KitchenKnife
   entities:
   - uid: 4792
@@ -160791,15 +160860,15 @@ entities:
       parent: 13329
 - proto: KitchenMicrowave
   entities:
-  - uid: 1196
+  - uid: 1222
     components:
     - type: Transform
-      pos: -4.5,17.5
+      pos: -5.5,20.5
       parent: 13329
-  - uid: 1197
+  - uid: 1223
     components:
     - type: Transform
-      pos: -5.5,17.5
+      pos: -5.5,19.5
       parent: 13329
   - uid: 4766
     components:
@@ -160848,16 +160917,6 @@ entities:
       parent: 13329
 - proto: KitchenReagentGrinder
   entities:
-  - uid: 1162
-    components:
-    - type: Transform
-      pos: -7.5,20.5
-      parent: 13329
-  - uid: 1163
-    components:
-    - type: Transform
-      pos: -5.5,20.5
-      parent: 13329
   - uid: 1228
     components:
     - type: Transform
@@ -160868,6 +160927,11 @@ entities:
     - type: Transform
       pos: -3.5,40.5
       parent: 13329
+  - uid: 1798
+    components:
+    - type: Transform
+      pos: -7.5,17.5
+      parent: 13329
   - uid: 4767
     components:
     - type: Transform
@@ -161172,11 +161236,6 @@ entities:
       parent: 13329
 - proto: LargeBeaker
   entities:
-  - uid: 1201
-    components:
-    - type: Transform
-      pos: -6.6480103,17.598469
-      parent: 13329
   - uid: 18490
     components:
     - type: Transform
@@ -162289,11 +162348,6 @@ entities:
           showEnts: False
           occludes: True
           ent: null
-  - uid: 23954
-    components:
-    - type: Transform
-      pos: -7.5,23.5
-      parent: 13329
   - uid: 34116
     components:
     - type: Transform
@@ -176028,15 +176082,15 @@ entities:
       parent: 13329
 - proto: ReagentContainerFlour
   entities:
-  - uid: 1200
+  - uid: 10419
     components:
     - type: Transform
-      pos: -7.5230103,17.671633
+      pos: 51.489376,24.452345
       parent: 13329
-  - uid: 10419
+  - uid: 20454
     components:
     - type: Transform
-      pos: 51.489376,24.452345
+      pos: -4.660136,17.70806
       parent: 13329
   - uid: 34115
     components:
@@ -182946,6 +183000,14 @@ entities:
     - type: Transform
       pos: 53.5,-7.5
       parent: 13329
+- proto: SignKitchen
+  entities:
+  - uid: 20474
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -7.5,27.5
+      parent: 13329
 - proto: SignLaserMed
   entities:
   - uid: 26577
@@ -183924,11 +183986,6 @@ entities:
       parent: 13329
 - proto: SmartFridge
   entities:
-  - uid: 897
-    components:
-    - type: Transform
-      pos: -10.5,27.5
-      parent: 13329
   - uid: 898
     components:
     - type: Transform
@@ -186621,10 +186678,10 @@ entities:
       parent: 13329
 - proto: SpawnMobAlexander
   entities:
-  - uid: 16439
+  - uid: 1162
     components:
     - type: Transform
-      pos: -6.5,21.5
+      pos: -11.5,25.5
       parent: 13329
 - proto: SpawnMobBandito
   entities:
@@ -186696,6 +186753,13 @@ entities:
     - type: Transform
       pos: 83.5,45.5
       parent: 13329
+- proto: SpawnMobGoat
+  entities:
+  - uid: 1218
+    components:
+    - type: Transform
+      pos: -4.5,27.5
+      parent: 13329
 - proto: SpawnMobKangarooWillow
   entities:
   - uid: 13383
@@ -187317,15 +187381,15 @@ entities:
       parent: 13329
 - proto: SpawnPointServiceWorker
   entities:
-  - uid: 1798
+  - uid: 1163
     components:
     - type: Transform
-      pos: -9.5,29.5
+      pos: -15.5,34.5
       parent: 13329
-  - uid: 1799
+  - uid: 1196
     components:
     - type: Transform
-      pos: -9.5,31.5
+      pos: -15.5,33.5
       parent: 13329
 - proto: SpawnPointStationEngineer
   entities:
@@ -187407,6 +187471,25 @@ entities:
     - type: Transform
       pos: 60.527714,6.1146812
       parent: 13329
+- proto: StairDark
+  entities:
+  - uid: 1197
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -18.5,-3.5
+      parent: 13329
+  - uid: 1198
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -17.5,-3.5
+      parent: 13329
+  - uid: 20453
+    components:
+    - type: Transform
+      pos: 50.5,7.5
+      parent: 13329
 - proto: Stairs
   entities:
   - uid: 9640
@@ -187502,18 +187585,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 95.5,-20.5
       parent: 13329
-  - uid: 26354
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -18.5,-3.5
-      parent: 13329
-  - uid: 26356
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -17.5,-3.5
-      parent: 13329
 - proto: StasisBed
   entities:
   - uid: 18576
@@ -190377,55 +190448,65 @@ entities:
       parent: 13329
 - proto: Table
   entities:
-  - uid: 1152
+  - uid: 899
     components:
     - type: Transform
-      pos: -7.5,17.5
+      pos: -6.5,19.5
       parent: 13329
-  - uid: 1153
+  - uid: 1104
     components:
     - type: Transform
-      pos: -6.5,17.5
+      pos: -4.5,17.5
+      parent: 13329
+  - uid: 1152
+    components:
+    - type: Transform
+      pos: -7.5,23.5
       parent: 13329
   - uid: 1154
     components:
     - type: Transform
-      pos: -5.5,17.5
+      pos: -7.5,19.5
       parent: 13329
   - uid: 1155
     components:
     - type: Transform
-      pos: -4.5,17.5
+      pos: -7.5,21.5
       parent: 13329
   - uid: 1156
     components:
     - type: Transform
-      pos: -7.5,19.5
+      pos: -5.5,23.5
       parent: 13329
-  - uid: 1157
+  - uid: 1158
     components:
     - type: Transform
-      pos: -7.5,20.5
+      pos: -5.5,21.5
       parent: 13329
-  - uid: 1158
+  - uid: 1159
+    components:
+    - type: Transform
+      pos: -6.5,17.5
+      parent: 13329
+  - uid: 1160
     components:
     - type: Transform
       pos: -5.5,19.5
       parent: 13329
-  - uid: 1159
+  - uid: 1199
     components:
     - type: Transform
       pos: -5.5,20.5
       parent: 13329
-  - uid: 1160
+  - uid: 1200
     components:
     - type: Transform
-      pos: -5.5,22.5
+      pos: -7.5,17.5
       parent: 13329
-  - uid: 1161
+  - uid: 1201
     components:
     - type: Transform
-      pos: -7.5,22.5
+      pos: -7.5,20.5
       parent: 13329
   - uid: 1227
     components:
@@ -190462,6 +190543,11 @@ entities:
     - type: Transform
       pos: -14.5,35.5
       parent: 13329
+  - uid: 1799
+    components:
+    - type: Transform
+      pos: -5.5,17.5
+      parent: 13329
   - uid: 2212
     components:
     - type: Transform
@@ -191266,6 +191352,11 @@ entities:
     - type: Transform
       pos: 50.5,-16.5
       parent: 13329
+  - uid: 16439
+    components:
+    - type: Transform
+      pos: -6.5,23.5
+      parent: 13329
   - uid: 16953
     components:
     - type: Transform
@@ -192758,11 +192849,6 @@ entities:
     - type: Transform
       pos: -18.5,23.5
       parent: 13329
-  - uid: 899
-    components:
-    - type: Transform
-      pos: -9.5,27.5
-      parent: 13329
   - uid: 900
     components:
     - type: Transform
@@ -192783,6 +192869,21 @@ entities:
     - type: Transform
       pos: -9.5,33.5
       parent: 13329
+  - uid: 911
+    components:
+    - type: Transform
+      pos: -8.5,27.5
+      parent: 13329
+  - uid: 918
+    components:
+    - type: Transform
+      pos: -10.5,27.5
+      parent: 13329
+  - uid: 1161
+    components:
+    - type: Transform
+      pos: -9.5,27.5
+      parent: 13329
   - uid: 1495
     components:
     - type: Transform
@@ -195237,6 +195338,11 @@ entities:
     - type: Transform
       pos: 16.5,59.5
       parent: 13329
+  - uid: 20457
+    components:
+    - type: Transform
+      pos: -11.5,29.5
+      parent: 13329
   - uid: 21216
     components:
     - type: Transform
@@ -220806,27 +220912,34 @@ entities:
       parent: 13329
 - proto: WindoorKitchenHydroponicsLocked
   entities:
-  - uid: 1222
+  - uid: 1224
     components:
     - type: Transform
-      pos: -9.5,27.5
+      pos: -9.5,33.5
       parent: 13329
-  - uid: 1223
+  - uid: 1225
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -9.5,33.5
+      parent: 13329
+  - uid: 20450
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -9.5,27.5
       parent: 13329
-  - uid: 1224
+  - uid: 20451
     components:
     - type: Transform
-      pos: -9.5,33.5
+      rot: 3.141592653589793 rad
+      pos: -10.5,27.5
       parent: 13329
-  - uid: 1225
+  - uid: 20452
     components:
     - type: Transform
       rot: 3.141592653589793 rad
-      pos: -9.5,33.5
+      pos: -8.5,27.5
       parent: 13329
 - proto: WindoorSecureArmoryLocked
   entities: