]> git.smokeofanarchy.ru Git - space-station-14.git/commitdiff
projects / space-station-14.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: f933922)
Cluster Update (#28627)
authorBoaz1111 <149967078+Boaz1111@users.noreply.github.com>
Wed, 5 Jun 2024 17:50:37 +0000 (19:50 +0200)
committerGitHub <noreply@github.com>
Wed, 5 Jun 2024 17:50:37 +0000 (11:50 -0600)
done here

Resources/Maps/cluster.yml patch | blob | history

diff --git a/Resources/Maps/cluster.yml b/Resources/Maps/cluster.yml
index b8540c6f68daf996244a7d1b404aacd8272f4e35..a9f601114c60e7aa6982cdf7f55ab03546953f02 100644 (file)
--- a/Resources/Maps/cluster.yml
+++ b/Resources/Maps/cluster.yml
@@ -38,6 +38,7 @@ tilemap:
   113: FloorWhiteMono
   1: FloorWhitePlastic
   118: FloorWood
+  3: FloorWoodLarge
   120: Lattice
   121: Plating
 entities:
@@ -65,7 +66,7 @@ entities:
           version: 6
         0,-1:
           ind: 0,-1
-          tiles: WQAAAAACWQAAAAACWQAAAAABeQAAAAAAdgAAAAADdgAAAAADdgAAAAABeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAYAAAAAAAWQAAAAADWQAAAAABeQAAAAAAdgAAAAACdgAAAAABdgAAAAADeQAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAWQAAAAAAWQAAAAABWQAAAAABeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAWQAAAAADYAAAAAAAWQAAAAADWQAAAAAAeQAAAAAAaAAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAWQAAAAAAWQAAAAABWQAAAAACWQAAAAABeQAAAAAAWQAAAAAAWQAAAAACWQAAAAACYAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAWQAAAAACYAAAAAAAWQAAAAABWQAAAAADWQAAAAADWQAAAAADWQAAAAAAWQAAAAABeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAWQAAAAABWQAAAAAAWQAAAAACYAAAAAAAWQAAAAABWQAAAAABWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAACWQAAAAABWQAAAAAAYAAAAAAAWQAAAAABWQAAAAABeQAAAAAAeQAAAAAAZAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAWQAAAAAAWQAAAAADWQAAAAAATAAAAAAAWQAAAAAAWQAAAAADWQAAAAACWQAAAAABTAAAAAAAWQAAAAABWQAAAAACWQAAAAADYAAAAAAAWQAAAAADeQAAAAAAWQAAAAAAWQAAAAACYAAAAAAAWQAAAAAAWQAAAAACWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAABWQAAAAADWQAAAAAAWQAAAAABWQAAAAACWQAAAAAAWQAAAAAAZAAAAAAAWQAAAAACeQAAAAAAeQAAAAAAeQAAAAAAOgAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAWQAAAAABYAAAAAAAWQAAAAADWQAAAAAAWQAAAAACWQAAAAAAWQAAAAABZAAAAAAAWQAAAAABJAAAAAACJAAAAAAAJAAAAAADOgAAAAAAJAAAAAAAJAAAAAADeQAAAAAAWQAAAAAAWQAAAAACWQAAAAADWQAAAAAAWQAAAAADYAAAAAAAWQAAAAADeQAAAAAAZAAAAAABJAAAAAABJAAAAAADJAAAAAABOgAAAAAAJAAAAAABJAAAAAABeQAAAAAAYAAAAAAAWQAAAAADWQAAAAAAWQAAAAACWQAAAAACWQAAAAAAWQAAAAABeQAAAAAAWQAAAAABOgAAAAAAOgAAAAAAOgAAAAAAOgAAAAAAOgAAAAAAOgAAAAAAOgAAAAAAWQAAAAABTAAAAAAAWQAAAAADeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAEQAAAAAAJAAAAAAAJAAAAAAAJAAAAAAAOgAAAAAAJAAAAAAAJAAAAAADeQAAAAAAWQAAAAABYAAAAAAAWQAAAAADeQAAAAAAOgAAAAAAOgAAAAAAOgAAAAAAeQAAAAAAeQAAAAAAOgAAAAAAOgAAAAAAOgAAAAAAOgAAAAAAOgAAAAAAOgAAAAAAeQAAAAAAWQAAAAACWQAAAAABWQAAAAACOgAAAAAAOgAAAAAAOgAAAAAAOgAAAAAAHQAAAAADHQAAAAABeQAAAAAAeQAAAAAAeQAAAAAAOgAAAAAAOgAAAAAAeQAAAAAAeQAAAAAAWQAAAAADYAAAAAAAWQAAAAAAeQAAAAAAOgAAAAAAOgAAAAAAOgAAAAAAHQAAAAABHQAAAAAC
+          tiles: WQAAAAACWQAAAAACWQAAAAABeQAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAYAAAAAAAWQAAAAADWQAAAAABeQAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAWQAAAAAAWQAAAAABWQAAAAABeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAWQAAAAADYAAAAAAAWQAAAAADWQAAAAAAeQAAAAAAaAAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAWQAAAAAAWQAAAAABWQAAAAACWQAAAAABeQAAAAAAWQAAAAAAWQAAAAACWQAAAAACYAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAWQAAAAACYAAAAAAAWQAAAAABWQAAAAADWQAAAAADWQAAAAADWQAAAAAAWQAAAAABeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAWQAAAAABWQAAAAAAWQAAAAACYAAAAAAAWQAAAAABWQAAAAABWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAACWQAAAAABWQAAAAAAYAAAAAAAWQAAAAABWQAAAAABeQAAAAAAeQAAAAAAZAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAWQAAAAAAWQAAAAADWQAAAAAATAAAAAAAWQAAAAAAWQAAAAADWQAAAAACWQAAAAABTAAAAAAAWQAAAAABWQAAAAACWQAAAAADYAAAAAAAWQAAAAADeQAAAAAAWQAAAAAAWQAAAAACYAAAAAAAWQAAAAAAWQAAAAACWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAABWQAAAAADWQAAAAAAWQAAAAABWQAAAAACWQAAAAAAWQAAAAAAZAAAAAAAWQAAAAACeQAAAAAAeQAAAAAAeQAAAAAAOgAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAWQAAAAABYAAAAAAAWQAAAAADWQAAAAAAWQAAAAACWQAAAAAAWQAAAAABZAAAAAAAWQAAAAABJAAAAAACJAAAAAAAJAAAAAADOgAAAAAAJAAAAAAAJAAAAAADeQAAAAAAWQAAAAAAWQAAAAACWQAAAAADWQAAAAAAWQAAAAADYAAAAAAAWQAAAAADeQAAAAAAZAAAAAABJAAAAAABJAAAAAADJAAAAAABOgAAAAAAJAAAAAABJAAAAAABeQAAAAAAYAAAAAAAWQAAAAADWQAAAAAAWQAAAAACWQAAAAACWQAAAAAAWQAAAAABeQAAAAAAWQAAAAABOgAAAAAAOgAAAAAAOgAAAAAAOgAAAAAAOgAAAAAAOgAAAAAAOgAAAAAAWQAAAAABTAAAAAAAWQAAAAADeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAEQAAAAAAJAAAAAAAJAAAAAAAJAAAAAAAOgAAAAAAJAAAAAAAJAAAAAADeQAAAAAAWQAAAAABYAAAAAAAWQAAAAADeQAAAAAAOgAAAAAAOgAAAAAAOgAAAAAAeQAAAAAAeQAAAAAAOgAAAAAAOgAAAAAAOgAAAAAAOgAAAAAAOgAAAAAAOgAAAAAAeQAAAAAAWQAAAAACWQAAAAABWQAAAAACOgAAAAAAOgAAAAAAOgAAAAAAOgAAAAAAHQAAAAADHQAAAAABeQAAAAAAeQAAAAAAeQAAAAAAOgAAAAAAOgAAAAAAeQAAAAAAeQAAAAAAWQAAAAADYAAAAAAAWQAAAAAAeQAAAAAAOgAAAAAAOgAAAAAAOgAAAAAAHQAAAAABHQAAAAAC
           version: 6
         -1,1:
           ind: -1,1
@@ -85,7 +86,7 @@ entities:
           version: 6
         0,-2:
           ind: 0,-2
-          tiles: YAAAAAAAWQAAAAACWQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAWQAAAAABYAAAAAAAWQAAAAAAeQAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAWQAAAAABWQAAAAAAYAAAAAAAeQAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAYAAAAAAAWQAAAAADWQAAAAADeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAWQAAAAACWQAAAAAAWQAAAAACeQAAAAAAWQAAAAAAWQAAAAACWQAAAAABeQAAAAAAWQAAAAABWQAAAAACWQAAAAACWQAAAAABWQAAAAABWQAAAAAAWQAAAAABWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAeQAAAAAAWQAAAAAAWQAAAAABWQAAAAACZAAAAAADWQAAAAADWQAAAAAAWQAAAAAAWQAAAAABYAAAAAAAWQAAAAAAWQAAAAADWQAAAAADWQAAAAAAWQAAAAACYAAAAAAAeQAAAAAAWQAAAAACWQAAAAACWQAAAAADeQAAAAAAWQAAAAACWQAAAAAAYAAAAAAAWQAAAAABWQAAAAABWQAAAAAAYAAAAAAAWQAAAAABWQAAAAABWQAAAAACWQAAAAABeQAAAAAAeQAAAAAAZAAAAAADeQAAAAAAeQAAAAAAeQAAAAAAZAAAAAACZAAAAAACeQAAAAAAeQAAAAAAWQAAAAACYAAAAAAAWQAAAAAAWQAAAAABYAAAAAAAWQAAAAACWQAAAAACYAAAAAAAWQAAAAACWQAAAAADZAAAAAADWQAAAAAAYAAAAAAAWQAAAAABWQAAAAABeQAAAAAAWQAAAAAAWQAAAAADYAAAAAAAWQAAAAADWQAAAAABWQAAAAADWQAAAAAAWQAAAAACWQAAAAABYAAAAAAAeQAAAAAAWQAAAAADWQAAAAABYAAAAAAAWQAAAAAAZAAAAAABWQAAAAABYAAAAAAAYAAAAAAAWQAAAAACWQAAAAACWQAAAAAAYAAAAAAAWQAAAAACWQAAAAABWQAAAAADZAAAAAADWQAAAAAAWQAAAAADWQAAAAACWQAAAAAAZAAAAAADYAAAAAAAWQAAAAABWQAAAAAAWQAAAAADWQAAAAACWQAAAAACWQAAAAABYAAAAAAAWQAAAAADYAAAAAAAZAAAAAAAWQAAAAADYAAAAAAAWQAAAAADWQAAAAADeQAAAAAAWQAAAAADWQAAAAABWQAAAAABYAAAAAAAWQAAAAABWQAAAAABWQAAAAABWQAAAAABWQAAAAABYAAAAAAAeQAAAAAAWQAAAAABWQAAAAABWQAAAAADWQAAAAACeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAWQAAAAADWQAAAAAAWQAAAAADeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAWQAAAAABYAAAAAAAWQAAAAADYAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAWQAAAAABWQAAAAABYAAAAAAAeQAAAAAAdgAAAAAAdgAAAAADdgAAAAABdgAAAAAAWQAAAAAAWQAAAAABWQAAAAACWQAAAAADeQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAWQAAAAACWQAAAAAAWQAAAAABeQAAAAAAdgAAAAAAdgAAAAABdgAAAAACeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAA
+          tiles: YAAAAAAAWQAAAAACWQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAWQAAAAABYAAAAAAAWQAAAAAAeQAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAWQAAAAABWQAAAAAAYAAAAAAAeQAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAYAAAAAAAWQAAAAADWQAAAAADeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAWQAAAAACWQAAAAAAWQAAAAACeQAAAAAAWQAAAAAAWQAAAAACWQAAAAABeQAAAAAAWQAAAAABWQAAAAACWQAAAAACWQAAAAABWQAAAAABWQAAAAAAWQAAAAABWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAeQAAAAAAWQAAAAAAWQAAAAABWQAAAAACZAAAAAADWQAAAAADWQAAAAAAWQAAAAAAWQAAAAABYAAAAAAAWQAAAAAAWQAAAAADWQAAAAADWQAAAAAAWQAAAAACYAAAAAAAeQAAAAAAWQAAAAACWQAAAAACWQAAAAADeQAAAAAAWQAAAAACWQAAAAAAYAAAAAAAWQAAAAABWQAAAAABWQAAAAAAYAAAAAAAWQAAAAABWQAAAAABWQAAAAACWQAAAAABeQAAAAAAeQAAAAAAZAAAAAADeQAAAAAAeQAAAAAAeQAAAAAAZAAAAAACZAAAAAACeQAAAAAAeQAAAAAAWQAAAAACYAAAAAAAWQAAAAAAWQAAAAABYAAAAAAAWQAAAAACWQAAAAACYAAAAAAAWQAAAAACWQAAAAADZAAAAAADWQAAAAAAYAAAAAAAWQAAAAABWQAAAAABeQAAAAAAWQAAAAAAWQAAAAADYAAAAAAAWQAAAAADWQAAAAABWQAAAAADWQAAAAAAWQAAAAACWQAAAAABYAAAAAAAeQAAAAAAWQAAAAADWQAAAAABYAAAAAAAWQAAAAAAZAAAAAABWQAAAAABYAAAAAAAYAAAAAAAWQAAAAACWQAAAAACWQAAAAAAYAAAAAAAWQAAAAACWQAAAAABWQAAAAADZAAAAAADWQAAAAAAWQAAAAADWQAAAAACWQAAAAAAZAAAAAADYAAAAAAAWQAAAAABWQAAAAAAWQAAAAADWQAAAAACWQAAAAACWQAAAAABYAAAAAAAWQAAAAADYAAAAAAAZAAAAAAAWQAAAAADYAAAAAAAWQAAAAADWQAAAAADeQAAAAAAWQAAAAADWQAAAAABWQAAAAABYAAAAAAAWQAAAAABWQAAAAABWQAAAAABWQAAAAABWQAAAAABYAAAAAAAeQAAAAAAWQAAAAABWQAAAAABWQAAAAADWQAAAAACeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAWQAAAAADWQAAAAAAWQAAAAADeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAWQAAAAABYAAAAAAAWQAAAAADYAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAWQAAAAABWQAAAAABYAAAAAAAeQAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAdgAAAAAAWQAAAAAAWQAAAAABWQAAAAACWQAAAAADeQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAWQAAAAACWQAAAAAAWQAAAAABeQAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAA
           version: 6
         -2,1:
           ind: -2,1
@@ -7651,11 +7652,6 @@ entities:
       parent: 1
 - proto: Bed
   entities:
-  - uid: 1805
-    components:
-    - type: Transform
-      pos: 25.5,12.5
-      parent: 1
   - uid: 1806
     components:
     - type: Transform
@@ -7676,6 +7672,11 @@ entities:
     - type: Transform
       pos: -20.5,-3.5
       parent: 1
+  - uid: 1852
+    components:
+    - type: Transform
+      pos: 25.5,12.5
+      parent: 1
   - uid: 3482
     components:
     - type: Transform
@@ -7711,15 +7712,15 @@ entities:
     - type: Transform
       pos: 11.5,5.5
       parent: 1
-  - uid: 5663
+  - uid: 5671
     components:
     - type: Transform
-      pos: 16.5,-15.5
+      pos: 20.5,-15.5
       parent: 1
-  - uid: 7442
+  - uid: 7446
     components:
     - type: Transform
-      pos: 4.5,-17.5
+      pos: 6.5,-14.5
       parent: 1
   - uid: 7714
     components:
@@ -7765,11 +7766,10 @@ entities:
       parent: 1
 - proto: BedsheetCE
   entities:
-  - uid: 5662
+  - uid: 4918
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 16.5,-15.5
+      pos: 20.5,-15.5
       parent: 1
 - proto: BedsheetClown
   entities:
@@ -7829,7 +7829,7 @@ entities:
       parent: 1
 - proto: BedsheetHOS
   entities:
-  - uid: 5373
+  - uid: 1863
     components:
     - type: Transform
       pos: 25.5,12.5
@@ -7877,11 +7877,10 @@ entities:
       parent: 1
 - proto: BedsheetQM
   entities:
-  - uid: 7441
+  - uid: 5395
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 4.5,-17.5
+      pos: 6.5,-14.5
       parent: 1
 - proto: BedsheetRD
   entities:
@@ -8242,6 +8241,11 @@ entities:
       parent: 1
 - proto: BoxFolderBase
   entities:
+  - uid: 1805
+    components:
+    - type: Transform
+      pos: -22.477488,-1.5542104
+      parent: 1
   - uid: 1857
     components:
     - type: Transform
@@ -8287,6 +8291,11 @@ entities:
       rot: 3.141592653589793 rad
       pos: -8.510255,48.552643
       parent: 1
+  - uid: 5634
+    components:
+    - type: Transform
+      pos: -22.289988,-1.3667104
+      parent: 1
   - uid: 6055
     components:
     - type: Transform
@@ -8348,16 +8357,6 @@ entities:
       parent: 1
 - proto: BoxFolderGrey
   entities:
-  - uid: 1883
-    components:
-    - type: Transform
-      pos: -21.598257,-1.4382241
-      parent: 1
-  - uid: 1884
-    components:
-    - type: Transform
-      pos: -21.473257,-1.3444741
-      parent: 1
   - uid: 6069
     components:
     - type: Transform
@@ -8385,11 +8384,6 @@ entities:
     - type: Transform
       pos: 28.678442,8.532815
       parent: 1
-  - uid: 5390
-    components:
-    - type: Transform
-      pos: 27.618711,13.570517
-      parent: 1
   - uid: 5397
     components:
     - type: Transform
@@ -8407,18 +8401,28 @@ entities:
       parent: 1
 - proto: BoxFolderWhite
   entities:
-  - uid: 1879
+  - uid: 5377
     components:
     - type: Transform
-      pos: -19.351341,14.63665
+      pos: -19.312119,13.611187
       parent: 1
-  - uid: 1880
+  - uid: 5655
     components:
     - type: Transform
-      pos: -19.445091,14.558525
+      pos: -19.593369,13.439312
       parent: 1
 - proto: BoxFolderYellow
   entities:
+  - uid: 1879
+    components:
+    - type: Transform
+      pos: 4.418282,-17.420078
+      parent: 1
+  - uid: 1881
+    components:
+    - type: Transform
+      pos: 4.277657,-17.638828
+      parent: 1
   - uid: 5095
     components:
     - type: Transform
@@ -8427,7 +8431,7 @@ entities:
   - uid: 5677
     components:
     - type: Transform
-      pos: 18.605122,-14.452038
+      pos: 17.707003,-15.576565
       parent: 1
   - uid: 6787
     components:
@@ -8469,16 +8473,6 @@ entities:
     - type: Transform
       pos: 11.422744,-18.443436
       parent: 1
-  - uid: 7448
-    components:
-    - type: Transform
-      pos: 5.6525464,-15.315514
-      parent: 1
-  - uid: 7449
-    components:
-    - type: Transform
-      pos: 5.4181714,-15.456139
-      parent: 1
   - uid: 9600
     components:
     - type: Transform
@@ -22162,7 +22156,7 @@ entities:
   - uid: 4981
     components:
     - type: Transform
-      pos: 4.562398,31.612326
+      pos: 5.6753416,30.52142
       parent: 1
 - proto: CarbonDioxideCanister
   entities:
@@ -22238,30 +22232,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: 26.5,13.5
       parent: 1
-  - uid: 5625
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 27.5,14.5
-      parent: 1
-  - uid: 5626
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 27.5,13.5
-      parent: 1
-  - uid: 5627
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 28.5,14.5
-      parent: 1
-  - uid: 5628
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 28.5,13.5
-      parent: 1
   - uid: 5629
     components:
     - type: Transform
@@ -22286,18 +22256,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: 25.5,14.5
       parent: 1
-  - uid: 5633
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 27.5,12.5
-      parent: 1
-  - uid: 5634
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 28.5,12.5
-      parent: 1
   - uid: 5635
     components:
     - type: Transform
@@ -22404,6 +22362,11 @@ entities:
       parent: 1
 - proto: CarpetBlue
   entities:
+  - uid: 4091
+    components:
+    - type: Transform
+      pos: -20.5,15.5
+      parent: 1
   - uid: 5645
     components:
     - type: Transform
@@ -22452,35 +22415,10 @@ entities:
       rot: 3.141592653589793 rad
       pos: -19.5,15.5
       parent: 1
-  - uid: 5653
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -21.5,-2.5
-      parent: 1
-  - uid: 5654
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -21.5,-2.5
-      parent: 1
-  - uid: 5655
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -21.5,-3.5
-      parent: 1
-  - uid: 5656
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -20.5,-2.5
-      parent: 1
-  - uid: 5657
+  - uid: 7444
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -20.5,-3.5
+      pos: -20.5,16.5
       parent: 1
 - proto: CarpetGreen
   entities:
@@ -22621,52 +22559,93 @@ entities:
       parent: 1
 - proto: CarpetOrange
   entities:
-  - uid: 5658
+  - uid: 1845
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 16.5,-14.5
+      pos: 6.5,-14.5
       parent: 1
-  - uid: 5659
+  - uid: 5415
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 16.5,-15.5
+      pos: 19.5,-15.5
+      parent: 1
+  - uid: 5626
+    components:
+    - type: Transform
+      pos: 4.5,-14.5
+      parent: 1
+  - uid: 5627
+    components:
+    - type: Transform
+      pos: 5.5,-14.5
+      parent: 1
+  - uid: 5628
+    components:
+    - type: Transform
+      pos: 5.5,-15.5
+      parent: 1
+  - uid: 5653
+    components:
+    - type: Transform
+      pos: 6.5,-15.5
       parent: 1
   - uid: 5660
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 17.5,-14.5
+      pos: 20.5,-14.5
       parent: 1
   - uid: 5661
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 17.5,-15.5
+      pos: 20.5,-15.5
       parent: 1
-  - uid: 12419
+  - uid: 5662
     components:
     - type: Transform
-      pos: 4.5,-17.5
+      pos: 20.5,-13.5
       parent: 1
-  - uid: 12420
+  - uid: 5672
     components:
     - type: Transform
-      pos: 4.5,-16.5
+      pos: 19.5,-14.5
       parent: 1
-  - uid: 12421
+  - uid: 5673
     components:
     - type: Transform
-      pos: 5.5,-17.5
+      pos: 19.5,-13.5
       parent: 1
-  - uid: 12422
+  - uid: 7447
     components:
     - type: Transform
-      pos: 5.5,-16.5
+      pos: 4.5,-15.5
       parent: 1
 - proto: CarpetPurple
   entities:
+  - uid: 1870
+    components:
+    - type: Transform
+      pos: -22.5,-2.5
+      parent: 1
+  - uid: 1871
+    components:
+    - type: Transform
+      pos: -20.5,-2.5
+      parent: 1
+  - uid: 1873
+    components:
+    - type: Transform
+      pos: -21.5,-3.5
+      parent: 1
+  - uid: 1874
+    components:
+    - type: Transform
+      pos: -20.5,-3.5
+      parent: 1
+  - uid: 1877
+    components:
+    - type: Transform
+      pos: -21.5,-2.5
+      parent: 1
   - uid: 5018
     components:
     - type: Transform
@@ -22682,6 +22661,11 @@ entities:
     - type: Transform
       pos: 5.5,10.5
       parent: 1
+  - uid: 5369
+    components:
+    - type: Transform
+      pos: -22.5,-3.5
+      parent: 1
 - proto: CarpetSBlue
   entities:
   - uid: 5639
@@ -26173,17 +26157,17 @@ entities:
     - type: Transform
       pos: 14.5,13.5
       parent: 1
-  - uid: 1710
+  - uid: 1875
     components:
     - type: Transform
       rot: 3.141592653589793 rad
-      pos: 5.5,-16.5
+      pos: -21.5,-2.5
       parent: 1
-  - uid: 1875
+  - uid: 1883
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -21.5,-2.5
+      rot: -1.5707963267948966 rad
+      pos: 5.512032,-16.451328
       parent: 1
   - uid: 2868
     components:
@@ -26342,11 +26326,10 @@ entities:
       rot: 3.141592653589793 rad
       pos: 28.5,17.5
       parent: 1
-  - uid: 5375
+  - uid: 5393
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 28.5,13.5
+      pos: 28.500902,13.478384
       parent: 1
   - uid: 5574
     components:
@@ -26360,12 +26343,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: -36.5,-3.5
       parent: 1
-  - uid: 5673
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 17.5,-14.5
-      parent: 1
   - uid: 5674
     components:
     - type: Transform
@@ -26400,6 +26377,12 @@ entities:
     - type: Transform
       pos: 12.5,-26.5
       parent: 1
+  - uid: 7452
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 17.488253,-14.435939
+      parent: 1
   - uid: 8013
     components:
     - type: Transform
@@ -26449,11 +26432,6 @@ entities:
       parent: 1
 - proto: ChairOfficeLight
   entities:
-  - uid: 1874
-    components:
-    - type: Transform
-      pos: -19.5,15.5
-      parent: 1
   - uid: 5608
     components:
     - type: Transform
@@ -26472,6 +26450,12 @@ entities:
       rot: 3.141592653589793 rad
       pos: -8.5,6.5
       parent: 1
+  - uid: 5633
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -19.499619,14.564312
+      parent: 1
   - uid: 5921
     components:
     - type: Transform
@@ -26636,18 +26620,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -22.5,-29.5
       parent: 1
-- proto: chem_master
-  entities:
-  - uid: 5604
-    components:
-    - type: Transform
-      pos: -8.5,14.5
-      parent: 1
-  - uid: 5605
-    components:
-    - type: Transform
-      pos: -11.5,16.5
-      parent: 1
 - proto: ChemDispenser
   entities:
   - uid: 5606
@@ -26674,6 +26646,18 @@ entities:
     - type: Transform
       pos: -11.5,13.5
       parent: 1
+- proto: ChemMaster
+  entities:
+  - uid: 5604
+    components:
+    - type: Transform
+      pos: -8.5,14.5
+      parent: 1
+  - uid: 5605
+    components:
+    - type: Transform
+      pos: -11.5,16.5
+      parent: 1
 - proto: ChessBoard
   entities:
   - uid: 5058
@@ -27514,6 +27498,13 @@ entities:
     - type: Transform
       pos: -13.503023,28.53958
       parent: 1
+- proto: ClothingHeadHatBeretCmo
+  entities:
+  - uid: 7450
+    components:
+    - type: Transform
+      pos: -20.687119,13.736187
+      parent: 1
 - proto: ClothingHeadHatFedoraBrown
   entities:
   - uid: 12535
@@ -27630,21 +27621,7 @@ entities:
   - uid: 6397
     components:
     - type: Transform
-      pos: 4.585783,31.487268
-      parent: 1
-- proto: ClothingNeckMantleCE
-  entities:
-  - uid: 5675
-    components:
-    - type: Transform
-      pos: 18.495747,-13.358288
-      parent: 1
-- proto: ClothingNeckMantleCMO
-  entities:
-  - uid: 1869
-    components:
-    - type: Transform
-      pos: -20.496048,14.567978
+      pos: 5.4722166,31.005795
       parent: 1
 - proto: ClothingNeckMantleHOP
   entities:
@@ -27655,13 +27632,6 @@ entities:
     - type: Physics
       canCollide: False
     - type: InsideEntityStorage
-- proto: ClothingNeckMantleRD
-  entities:
-  - uid: 1877
-    components:
-    - type: Transform
-      pos: -22.452333,-1.4018333
-      parent: 1
 - proto: ClothingNeckScarfStripedBlue
   entities:
   - uid: 1899
@@ -27779,15 +27749,6 @@ entities:
     - type: Physics
       canCollide: False
     - type: InsideEntityStorage
-- proto: ClothingOuterWinterCE
-  entities:
-  - uid: 5670
-    components:
-    - type: Transform
-      parent: 5669
-    - type: Physics
-      canCollide: False
-    - type: InsideEntityStorage
 - proto: ClothingOuterWinterCMO
   entities:
   - uid: 1868
@@ -27806,33 +27767,6 @@ entities:
     - type: Physics
       canCollide: False
     - type: InsideEntityStorage
-- proto: ClothingOuterWinterHoS
-  entities:
-  - uid: 12478
-    components:
-    - type: Transform
-      parent: 5374
-    - type: Physics
-      canCollide: False
-    - type: InsideEntityStorage
-- proto: ClothingOuterWinterQM
-  entities:
-  - uid: 7444
-    components:
-    - type: Transform
-      parent: 7443
-    - type: Physics
-      canCollide: False
-    - type: InsideEntityStorage
-- proto: ClothingOuterWinterRD
-  entities:
-  - uid: 12418
-    components:
-    - type: Transform
-      parent: 1845
-    - type: Physics
-      canCollide: False
-    - type: InsideEntityStorage
 - proto: ClothingShoesBootsCombat
   entities:
   - uid: 8275
@@ -27914,16 +27848,17 @@ entities:
       parent: 1
 - proto: ComfyChair
   entities:
-  - uid: 1711
+  - uid: 794
     components:
     - type: Transform
-      pos: 5.5,-14.5
+      rot: 3.141592653589793 rad
+      pos: 26.5,12.5
       parent: 1
-  - uid: 1873
+  - uid: 1848
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -19.5,13.5
+      rot: -1.5707963267948966 rad
+      pos: 6.5,-15.5
       parent: 1
   - uid: 1876
     components:
@@ -27968,12 +27903,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 4.5,25.5
       parent: 1
-  - uid: 5377
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 26.5,13.5
-      parent: 1
   - uid: 5573
     components:
     - type: Transform
@@ -27986,6 +27915,11 @@ entities:
       rot: 3.141592653589793 rad
       pos: 2.5,5.5
       parent: 1
+  - uid: 7454
+    components:
+    - type: Transform
+      pos: 19.5,-13.5
+      parent: 1
   - uid: 7712
     components:
     - type: Transform
@@ -28006,11 +27940,16 @@ entities:
         - ArtifactAnalyzerSender: ArtifactAnalyzerReceiver
 - proto: ComputerCargoBounty
   entities:
-  - uid: 7247
+  - uid: 1880
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 16.5,-23.5
+      rot: 1.5707963267948966 rad
+      pos: 4.5,-16.5
+      parent: 1
+  - uid: 5669
+    components:
+    - type: Transform
+      pos: 8.5,-19.5
       parent: 1
 - proto: ComputerCargoOrders
   entities:
@@ -28020,18 +27959,11 @@ entities:
       rot: 3.141592653589793 rad
       pos: 8.5,-22.5
       parent: 1
-  - uid: 7395
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 4.5,-14.5
-      parent: 1
-- proto: ComputerCargoShuttle
-  entities:
-  - uid: 4918
+  - uid: 5366
     components:
     - type: Transform
-      pos: 8.5,-19.5
+      rot: 3.141592653589793 rad
+      pos: 5.5,-17.5
       parent: 1
 - proto: ComputerComms
   entities:
@@ -28048,6 +27980,12 @@ entities:
       parent: 1
 - proto: ComputerCrewMonitoring
   entities:
+  - uid: 1844
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -20.5,14.5
+      parent: 1
   - uid: 1888
     components:
     - type: Transform
@@ -28066,10 +28004,11 @@ entities:
     - type: Transform
       pos: 14.5,15.5
       parent: 1
-  - uid: 5366
+  - uid: 1869
     components:
     - type: Transform
-      pos: 25.5,14.5
+      rot: 3.141592653589793 rad
+      pos: 28.5,12.5
       parent: 1
   - uid: 5370
     components:
@@ -28114,14 +28053,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 1.5,19.5
       parent: 1
-- proto: ComputerMedicalRecords
-  entities:
-  - uid: 1871
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -20.5,13.5
-      parent: 1
 - proto: ComputerPowerMonitoring
   entities:
   - uid: 4072
@@ -28129,10 +28060,11 @@ entities:
     - type: Transform
       pos: -5.5,31.5
       parent: 1
-  - uid: 5415
+  - uid: 5665
     components:
     - type: Transform
-      pos: 19.5,-13.5
+      rot: 1.5707963267948966 rad
+      pos: 16.5,-14.5
       parent: 1
   - uid: 5668
     components:
@@ -28156,11 +28088,11 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -10.5,-3.5
       parent: 1
-  - uid: 5365
+  - uid: 5385
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -22.5,-0.5
+      rot: 3.141592653589793 rad
+      pos: -21.5,-1.5
       parent: 1
 - proto: ComputerRoboticsControl
   entities:
@@ -28186,6 +28118,14 @@ entities:
       rot: 3.141592653589793 rad
       pos: 12.5,-27.5
       parent: 1
+- proto: ComputerShuttleSalvage
+  entities:
+  - uid: 5666
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 16.5,-23.5
+      parent: 1
 - proto: ComputerSolarControl
   entities:
   - uid: 2557
@@ -28244,6 +28184,12 @@ entities:
       rot: 3.141592653589793 rad
       pos: 14.5,12.5
       parent: 1
+  - uid: 1884
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 27.5,13.5
+      parent: 1
   - uid: 3794
     components:
     - type: Transform
@@ -28266,11 +28212,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 25.5,6.5
       parent: 1
-  - uid: 5369
-    components:
-    - type: Transform
-      pos: 26.5,14.5
-      parent: 1
 - proto: ComputerTechnologyDiskTerminal
   entities:
   - uid: 3822
@@ -28822,6 +28763,39 @@ entities:
     - type: Transform
       pos: -41.5,-23.5
       parent: 1
+- proto: CurtainsBlueOpen
+  entities:
+  - uid: 5391
+    components:
+    - type: Transform
+      pos: -18.5,16.5
+      parent: 1
+- proto: CurtainsOrangeOpen
+  entities:
+  - uid: 4933
+    components:
+    - type: Transform
+      pos: 20.5,-15.5
+      parent: 1
+  - uid: 5625
+    components:
+    - type: Transform
+      pos: 6.5,-14.5
+      parent: 1
+- proto: CurtainsPurpleOpen
+  entities:
+  - uid: 5390
+    components:
+    - type: Transform
+      pos: -20.5,-3.5
+      parent: 1
+- proto: CurtainsRedOpen
+  entities:
+  - uid: 5394
+    components:
+    - type: Transform
+      pos: 25.5,12.5
+      parent: 1
 - proto: d20Dice
   entities:
   - uid: 5591
@@ -32502,6 +32476,48 @@ entities:
     - type: Transform
       pos: 5.5,29.5
       parent: 1
+- proto: DresserCaptainFilled
+  entities:
+  - uid: 7445
+    components:
+    - type: Transform
+      pos: 4.5,31.5
+      parent: 1
+- proto: DresserChiefEngineerFilled
+  entities:
+  - uid: 5659
+    components:
+    - type: Transform
+      pos: 20.5,-14.5
+      parent: 1
+- proto: DresserChiefMedicalOfficerFilled
+  entities:
+  - uid: 5657
+    components:
+    - type: Transform
+      pos: -19.5,16.5
+      parent: 1
+- proto: DresserHeadOfSecurityFilled
+  entities:
+  - uid: 6044
+    components:
+    - type: Transform
+      pos: 25.5,13.5
+      parent: 1
+- proto: DresserQuarterMasterFilled
+  entities:
+  - uid: 5373
+    components:
+    - type: Transform
+      pos: 5.5,-14.5
+      parent: 1
+- proto: DresserResearchDirectorFilled
+  entities:
+  - uid: 7442
+    components:
+    - type: Transform
+      pos: -21.5,-3.5
+      parent: 1
 - proto: Drill
   entities:
   - uid: 9639
@@ -38592,10 +38608,14 @@ entities:
   - uid: 8794
     components:
     - type: Transform
+      anchored: False
       pos: -14.5,-45.5
       parent: 1
     - type: AtmosPipeColor
       color: '#990000FF'
+    - type: Physics
+      canCollide: True
+      bodyType: Dynamic
   - uid: 10091
     components:
     - type: Transform
@@ -38830,11 +38850,15 @@ entities:
   - uid: 10130
     components:
     - type: Transform
+      anchored: False
       rot: 1.5707963267948966 rad
       pos: 21.5,-11.5
       parent: 1
     - type: AtmosPipeColor
       color: '#990000FF'
+    - type: Physics
+      canCollide: True
+      bodyType: Dynamic
   - uid: 10131
     components:
     - type: Transform
@@ -43075,13 +43099,6 @@ entities:
       parent: 1
     - type: AtmosPipeColor
       color: '#0055CCFF'
-  - uid: 10974
-    components:
-    - type: Transform
-      pos: -4.5,8.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#0055CCFF'
   - uid: 10975
     components:
     - type: Transform
@@ -44040,11 +44057,15 @@ entities:
   - uid: 11152
     components:
     - type: Transform
+      anchored: False
       rot: 3.141592653589793 rad
       pos: -37.5,0.5
       parent: 1
     - type: AtmosPipeColor
       color: '#0055CCFF'
+    - type: Physics
+      canCollide: True
+      bodyType: Dynamic
   - uid: 11153
     components:
     - type: Transform
@@ -47036,11 +47057,15 @@ entities:
   - uid: 12253
     components:
     - type: Transform
+      anchored: False
       rot: -1.5707963267948966 rad
       pos: -4.5,56.5
       parent: 1
     - type: AtmosPipeColor
       color: '#0055CCFF'
+    - type: Physics
+      canCollide: True
+      bodyType: Dynamic
   - uid: 12254
     components:
     - type: Transform
@@ -54986,27 +55011,11 @@ entities:
       parent: 1
 - proto: HospitalCurtainsOpen
   entities:
-  - uid: 794
-    components:
-    - type: Transform
-      pos: 25.5,12.5
-      parent: 1
   - uid: 1804
     components:
     - type: Transform
       pos: 28.5,5.5
       parent: 1
-  - uid: 1843
-    components:
-    - type: Transform
-      pos: -20.5,-3.5
-      parent: 1
-  - uid: 1852
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -18.5,16.5
-      parent: 1
   - uid: 5371
     components:
     - type: Transform
@@ -55023,18 +55032,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 27.5,16.5
       parent: 1
-  - uid: 5672
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 16.5,-15.5
-      parent: 1
-  - uid: 7440
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 4.5,-17.5
-      parent: 1
   - uid: 7718
     components:
     - type: Transform
@@ -55745,40 +55742,11 @@ entities:
       parent: 1
 - proto: LockerChiefEngineerFilled
   entities:
-  - uid: 5669
+  - uid: 5658
     components:
     - type: Transform
-      pos: 20.5,-15.5
+      pos: 20.5,-13.5
       parent: 1
-    - type: EntityStorage
-      air:
-        volume: 200
-        immutable: False
-        temperature: 93.465614
-        moles:
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-    - type: ContainerContainer
-      containers:
-        entity_storage: !type:Container
-          showEnts: False
-          occludes: True
-          ents:
-          - 5670
-        paper_label: !type:ContainerSlot
-          showEnts: False
-          occludes: True
-          ent: null
 - proto: LockerChiefMedicalOfficerFilled
   entities:
   - uid: 1867
@@ -55986,40 +55954,11 @@ entities:
           ent: null
 - proto: LockerHeadOfSecurityFilled
   entities:
-  - uid: 5374
+  - uid: 7441
     components:
     - type: Transform
-      pos: 29.5,12.5
+      pos: 25.5,14.5
       parent: 1
-    - type: EntityStorage
-      air:
-        volume: 200
-        immutable: False
-        temperature: 293.1496
-        moles:
-        - 1.7459903
-        - 6.568249
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-    - type: ContainerContainer
-      containers:
-        entity_storage: !type:Container
-          showEnts: False
-          occludes: True
-          ents:
-          - 12478
-        paper_label: !type:ContainerSlot
-          showEnts: False
-          occludes: True
-          ent: null
 - proto: LockerMedicalFilled
   entities:
   - uid: 1908
@@ -56056,76 +55995,18 @@ entities:
       parent: 1
 - proto: LockerQuarterMasterFilled
   entities:
-  - uid: 7443
+  - uid: 5656
     components:
     - type: Transform
-      pos: 4.5,-16.5
+      pos: 4.5,-14.5
       parent: 1
-    - type: EntityStorage
-      air:
-        volume: 200
-        immutable: False
-        temperature: 75.31249
-        moles:
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-    - type: ContainerContainer
-      containers:
-        entity_storage: !type:Container
-          showEnts: False
-          occludes: True
-          ents:
-          - 7444
-        paper_label: !type:ContainerSlot
-          showEnts: False
-          occludes: True
-          ent: null
 - proto: LockerResearchDirectorFilled
   entities:
-  - uid: 1845
+  - uid: 7395
     components:
     - type: Transform
-      pos: -21.5,-3.5
+      pos: -22.5,-2.5
       parent: 1
-    - type: EntityStorage
-      air:
-        volume: 200
-        immutable: False
-        temperature: 293.1496
-        moles:
-        - 1.7459903
-        - 6.568249
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-    - type: ContainerContainer
-      containers:
-        entity_storage: !type:Container
-          showEnts: False
-          occludes: True
-          ents:
-          - 12418
-        paper_label: !type:ContainerSlot
-          showEnts: False
-          occludes: True
-          ent: null
 - proto: LockerSalvageSpecialistFilled
   entities:
   - uid: 3594
@@ -56329,15 +56210,15 @@ entities:
       parent: 1
 - proto: MagazinePistolSubMachineGunTopMounted
   entities:
-  - uid: 5386
+  - uid: 1865
     components:
     - type: Transform
-      pos: 27.431211,14.508017
+      pos: 27.625902,12.337759
       parent: 1
-  - uid: 5387
+  - uid: 5365
     components:
     - type: Transform
-      pos: 27.431211,14.367392
+      pos: 27.579027,12.494009
       parent: 1
 - proto: MagazineRifle
   entities:
@@ -57473,12 +57354,6 @@ entities:
     - type: Transform
       pos: 5.5,-20.5
       parent: 1
-  - uid: 7447
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 4.5,-15.5
-      parent: 1
   - uid: 7782
     components:
     - type: Transform
@@ -57540,6 +57415,23 @@ entities:
     - type: Transform
       pos: 4.593648,27.643576
       parent: 1
+- proto: PaperCargoInvoice
+  entities:
+  - uid: 798
+    components:
+    - type: Transform
+      pos: 4.715157,-17.670078
+      parent: 1
+  - uid: 1711
+    components:
+    - type: Transform
+      pos: 4.777657,-17.498203
+      parent: 1
+  - uid: 5392
+    components:
+    - type: Transform
+      pos: 4.777657,-17.310703
+      parent: 1
 - proto: PaperOffice
   entities:
   - uid: 3999
@@ -57682,26 +57574,6 @@ entities:
     - type: Transform
       pos: -4.5472007,19.595882
       parent: 1
-  - uid: 5391
-    components:
-    - type: Transform
-      pos: 27.337461,13.773642
-      parent: 1
-  - uid: 5392
-    components:
-    - type: Transform
-      pos: 27.368711,13.758017
-      parent: 1
-  - uid: 5393
-    components:
-    - type: Transform
-      pos: 27.415586,13.711142
-      parent: 1
-  - uid: 5394
-    components:
-    - type: Transform
-      pos: 27.478086,13.679892
-      parent: 1
   - uid: 5398
     components:
     - type: Transform
@@ -57725,22 +57597,12 @@ entities:
   - uid: 5678
     components:
     - type: Transform
-      pos: 18.339497,-14.389538
-      parent: 1
-  - uid: 5679
-    components:
-    - type: Transform
-      pos: 18.339497,-14.295788
-      parent: 1
-  - uid: 5680
-    components:
-    - type: Transform
-      pos: 18.339497,-14.186413
+      pos: 17.441378,-15.404689
       parent: 1
   - uid: 5681
     components:
     - type: Transform
-      pos: 18.355122,-14.061413
+      pos: 17.332003,-15.56094
       parent: 1
   - uid: 5875
     components:
@@ -57872,25 +57734,10 @@ entities:
     - type: Transform
       pos: 11.453994,-18.162186
       parent: 1
-  - uid: 7450
-    components:
-    - type: Transform
-      pos: 5.1056714,-15.299889
-      parent: 1
-  - uid: 7451
-    components:
-    - type: Transform
-      pos: 5.1056714,-15.299889
-      parent: 1
-  - uid: 7452
-    components:
-    - type: Transform
-      pos: 5.1056714,-15.299889
-      parent: 1
   - uid: 7453
     components:
     - type: Transform
-      pos: 5.1056714,-15.299889
+      pos: 17.566378,-15.264064
       parent: 1
   - uid: 8247
     components:
@@ -58038,15 +57885,10 @@ entities:
       parent: 1
 - proto: Pen
   entities:
-  - uid: 1881
-    components:
-    - type: Transform
-      pos: -19.882591,14.621025
-      parent: 1
-  - uid: 1882
+  - uid: 1780
     components:
     - type: Transform
-      pos: -21.958109,-1.4018333
+      pos: -22.696238,-1.2729604
       parent: 1
   - uid: 3995
     components:
@@ -58092,11 +57934,10 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 25.773567,10.670956
       parent: 1
-  - uid: 5395
+  - uid: 5386
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 27.587461,13.804892
+      pos: -19.937119,13.673687
       parent: 1
   - uid: 5402
     components:
@@ -58119,11 +57960,10 @@ entities:
     - type: Transform
       pos: -39.229885,-5.2659664
       parent: 1
-  - uid: 5682
+  - uid: 5675
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 18.651997,-14.061413
+      pos: 17.097628,-15.217189
       parent: 1
   - uid: 5879
     components:
@@ -58151,10 +57991,10 @@ entities:
     - type: Transform
       pos: 5.313369,-21.14656
       parent: 1
-  - uid: 7454
+  - uid: 7451
     components:
     - type: Transform
-      pos: 5.6369214,-15.503014
+      pos: 4.230782,-17.216953
       parent: 1
   - uid: 9046
     components:
@@ -62393,32 +62233,32 @@ entities:
       parent: 1
 - proto: RCD
   entities:
-  - uid: 7135
+  - uid: 5679
     components:
     - type: Transform
-      pos: 31.574986,-16.418343
+      pos: 16.410128,-15.420314
       parent: 1
-  - uid: 12468
+  - uid: 7135
     components:
     - type: Transform
-      pos: 18.51267,-13.338883
+      pos: 31.574986,-16.418343
       parent: 1
 - proto: RCDAmmo
   entities:
-  - uid: 7136
+  - uid: 5663
     components:
     - type: Transform
-      pos: 31.27811,-16.605843
+      pos: 16.878878,-15.467189
       parent: 1
-  - uid: 12469
+  - uid: 5680
     components:
     - type: Transform
-      pos: 18.278296,-13.526383
+      pos: 17.050753,-15.467189
       parent: 1
-  - uid: 12470
+  - uid: 7136
     components:
     - type: Transform
-      pos: 18.434546,-13.526383
+      pos: 31.27811,-16.605843
       parent: 1
 - proto: ReagentContainerFlour
   entities:
@@ -64453,10 +64293,10 @@ entities:
       parent: 1
 - proto: ResearchAndDevelopmentServer
   entities:
-  - uid: 1848
+  - uid: 4973
     components:
     - type: Transform
-      pos: -22.5,-3.5
+      pos: -22.5,-0.5
       parent: 1
 - proto: RightArmBorg
   entities:
@@ -65035,7 +64875,7 @@ entities:
       parent: 1
     - type: DeviceLinkSink
       links:
-      - 5671
+      - 5682
   - uid: 5684
     components:
     - type: Transform
@@ -65043,7 +64883,7 @@ entities:
       parent: 1
     - type: DeviceLinkSink
       links:
-      - 5671
+      - 5682
   - uid: 5685
     components:
     - type: Transform
@@ -65051,7 +64891,7 @@ entities:
       parent: 1
     - type: DeviceLinkSink
       links:
-      - 5671
+      - 5682
   - uid: 5686
     components:
     - type: Transform
@@ -65059,15 +64899,12 @@ entities:
       parent: 1
     - type: DeviceLinkSink
       links:
-      - 5671
+      - 5682
   - uid: 5687
     components:
     - type: Transform
       pos: 21.5,-15.5
       parent: 1
-    - type: DeviceLinkSink
-      links:
-      - 5671
   - uid: 5887
     components:
     - type: Transform
@@ -65455,16 +65292,14 @@ entities:
         - Pressed: Toggle
         1866:
         - Pressed: Toggle
-  - uid: 5671
+  - uid: 5682
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 21.5,-14.5
+      rot: 3.141592653589793 rad
+      pos: 19.5,-16.5
       parent: 1
     - type: DeviceLinkSource
       linkedPorts:
-        5687:
-        - Pressed: Toggle
         5685:
         - Pressed: Toggle
         5684:
@@ -66405,7 +66240,7 @@ entities:
     - type: Transform
       pos: -43.500492,24.479343
       parent: 1
-- proto: soda_dispenser
+- proto: SodaDispenser
   entities:
   - uid: 5954
     components:
@@ -66949,10 +66784,11 @@ entities:
       parent: 1
 - proto: SpawnMobShiva
   entities:
-  - uid: 8256
+  - uid: 7440
     components:
     - type: Transform
-      pos: 25.5,13.5
+      rot: 3.141592653589793 rad
+      pos: 26.5,12.5
       parent: 1
 - proto: SpawnMobSmile
   entities:
@@ -67055,10 +66891,10 @@ entities:
       parent: 1
 - proto: SpawnPointChiefMedicalOfficer
   entities:
-  - uid: 1870
+  - uid: 1843
     components:
     - type: Transform
-      pos: -19.5,13.5
+      pos: -19.5,14.5
       parent: 1
 - proto: SpawnPointClown
   entities:
@@ -67083,10 +66919,10 @@ entities:
       parent: 1
 - proto: SpawnPointHeadOfSecurity
   entities:
-  - uid: 6044
+  - uid: 7448
     components:
     - type: Transform
-      pos: 26.5,13.5
+      pos: 28.5,13.5
       parent: 1
 - proto: SpawnPointJanitor
   entities:
@@ -67195,10 +67031,10 @@ entities:
       parent: 1
 - proto: SpawnPointQuartermaster
   entities:
-  - uid: 7477
+  - uid: 5375
     components:
     - type: Transform
-      pos: 5.5,-14.5
+      pos: 6.5,-15.5
       parent: 1
 - proto: SpawnPointResearchAssistant
   entities:
@@ -67671,17 +67507,17 @@ entities:
       parent: 1
 - proto: SuitStorageCE
   entities:
-  - uid: 4933
+  - uid: 7477
     components:
     - type: Transform
-      pos: 20.5,-13.5
+      pos: 18.5,-15.5
       parent: 1
 - proto: SuitStorageCMO
   entities:
-  - uid: 1865
+  - uid: 5374
     components:
     - type: Transform
-      pos: -20.5,15.5
+      pos: -18.5,13.5
       parent: 1
 - proto: SuitStorageEngi
   entities:
@@ -67736,17 +67572,17 @@ entities:
       parent: 1
 - proto: SuitStorageHOS
   entities:
-  - uid: 4973
+  - uid: 1864
     components:
     - type: Transform
-      pos: 29.5,14.5
+      pos: 29.5,12.5
       parent: 1
 - proto: SuitStorageRD
   entities:
-  - uid: 4929
+  - uid: 5654
     components:
     - type: Transform
-      pos: -22.5,-2.5
+      pos: -22.5,-3.5
       parent: 1
 - proto: SuitStorageSalv
   entities:
@@ -69595,11 +69431,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -1.5,7.5
       parent: 1
-  - uid: 798
-    components:
-    - type: Transform
-      pos: 27.5,13.5
-      parent: 1
   - uid: 1256
     components:
     - type: Transform
@@ -69624,11 +69455,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -37.5,-4.5
       parent: 1
-  - uid: 1780
-    components:
-    - type: Transform
-      pos: 27.5,14.5
-      parent: 1
   - uid: 1802
     components:
     - type: Transform
@@ -69639,22 +69465,11 @@ entities:
     - type: Transform
       pos: 28.5,16.5
       parent: 1
-  - uid: 1844
-    components:
-    - type: Transform
-      pos: -21.5,-1.5
-      parent: 1
-  - uid: 1863
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -20.5,14.5
-      parent: 1
-  - uid: 1864
+  - uid: 1882
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -19.5,14.5
+      rot: 3.141592653589793 rad
+      pos: 4.5,-17.5
       parent: 1
   - uid: 2782
     components:
@@ -69749,12 +69564,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: -9.5,28.5
       parent: 1
-  - uid: 4091
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 4.5,31.5
-      parent: 1
   - uid: 4092
     components:
     - type: Transform
@@ -69842,6 +69651,12 @@ entities:
       rot: 3.141592653589793 rad
       pos: 46.5,31.5
       parent: 1
+  - uid: 4929
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -19.5,13.5
+      parent: 1
   - uid: 4956
     components:
     - type: Transform
@@ -69898,17 +69713,16 @@ entities:
     - type: Transform
       pos: -22.5,-1.5
       parent: 1
-  - uid: 5665
+  - uid: 5387
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 18.5,-13.5
+      pos: 27.5,12.5
       parent: 1
-  - uid: 5666
+  - uid: 5670
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 18.5,-14.5
+      rot: 1.5707963267948966 rad
+      pos: 17.5,-15.5
       parent: 1
   - uid: 5947
     components:
@@ -69922,17 +69736,17 @@ entities:
       rot: 3.141592653589793 rad
       pos: -0.5,5.5
       parent: 1
-  - uid: 7445
+  - uid: 7247
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 4.5,-15.5
+      rot: 1.5707963267948966 rad
+      pos: 16.5,-15.5
       parent: 1
-  - uid: 7446
+  - uid: 7443
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 5.5,-15.5
+      rot: 1.5707963267948966 rad
+      pos: -20.5,13.5
       parent: 1
   - uid: 7710
     components:
@@ -70362,6 +70176,13 @@ entities:
     - type: Transform
       pos: -6.5061026,52.63185
       parent: 1
+- proto: ToyFigurineChiefMedicalOfficer
+  entities:
+  - uid: 7449
+    components:
+    - type: Transform
+      pos: -20.374619,13.548687
+      parent: 1
 - proto: ToyFireRipley
   entities:
   - uid: 8259
@@ -80010,10 +79831,10 @@ entities:
       parent: 1
 - proto: WeaponSubMachineGunWt550
   entities:
-  - uid: 5385
+  - uid: 1710
     components:
     - type: Transform
-      pos: 27.524961,14.648642
+      pos: 27.516527,12.712759
       parent: 1
 - proto: WeaponTurretSyndicateBroken
   entities:
Форк Space Station 14 с переводами на русский