]> git.smokeofanarchy.ru Git - space-station-14.git/commitdiff
Update Marathon (#30328)
authorlzk <124214523+lzk228@users.noreply.github.com>
Wed, 24 Jul 2024 20:12:21 +0000 (22:12 +0200)
committerGitHub <noreply@github.com>
Wed, 24 Jul 2024 20:12:21 +0000 (14:12 -0600)
fans
external airlocks
one escape pod
more airlocks in arrivals

Resources/Maps/marathon.yml

index 0a5da0bd316506eeff06aa4a2020f134b691f1bf..58136160e217d558dce43cd87a5b213946bdb9dd 100644 (file)
@@ -140,7 +140,7 @@ entities:
           version: 6
         -4,2:
           ind: -4,2
-          tiles: AAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAbQAAAAAAegAAAAADegAAAAADegAAAAABegAAAAAAegAAAAACegAAAAACAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAHwAAAAABHwAAAAABHwAAAAAAHwAAAAADHwAAAAAAHwAAAAABAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACfgAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAXQAAAAACXQAAAAAAXQAAAAACAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAAAXQAAAAACXQAAAAABAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAbQAAAAAAfgAAAAAAXQAAAAABAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAZAAAAAAAZAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAZAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAZAAAAAAAfgAAAAAAZAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAZAAAAAAAZAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAZAAAAAAAZAAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAXQAAAAABfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAD
+          tiles: AAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAbQAAAAAAegAAAAADegAAAAADegAAAAABegAAAAAAegAAAAACegAAAAACAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAHwAAAAABHwAAAAABHwAAAAAAHwAAAAADHwAAAAAAHwAAAAABAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACfgAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAAAXQAAAAAAXQAAAAACXQAAAAAAXQAAAAACAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAACXQAAAAABAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAHwAAAAAAfgAAAAAAbQAAAAAAfgAAAAAAXQAAAAABAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAZAAAAAAAZAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAZAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAZAAAAAAAfgAAAAAAZAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAZAAAAAAAZAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAZAAAAAAAZAAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAXQAAAAABfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAD
           version: 6
         -4,3:
           ind: -4,3
@@ -4400,6 +4400,12 @@ entities:
             1037: 5,41
             1386: 22,25
             1387: 22,23
+        - node:
+            angle: 1.5707963267948966 rad
+            color: '#FFFFFFFF'
+            id: StandClear
+          decals:
+            3190: -53,36
         - node:
             color: '#334E6DC8'
             id: ThreeQuarterTileOverlayGreyscale
@@ -9735,6 +9741,12 @@ entities:
     - type: Transform
       pos: -82.5,-60.5
       parent: 30
+    - type: DeviceLinkSink
+      invokeCounter: 1
+    - type: DeviceLinkSource
+      linkedPorts:
+        6606:
+        - DoorStatus: Close
   - uid: 17373
     components:
     - type: Transform
@@ -9763,11 +9775,23 @@ entities:
     - type: Transform
       pos: 15.5,30.5
       parent: 30
+    - type: DeviceLinkSink
+      invokeCounter: 1
+    - type: DeviceLinkSource
+      linkedPorts:
+        1826:
+        - DoorStatus: DoorBolt
   - uid: 1826
     components:
     - type: Transform
       pos: 17.5,30.5
       parent: 30
+    - type: DeviceLinkSink
+      invokeCounter: 1
+    - type: DeviceLinkSource
+      linkedPorts:
+        1695:
+        - DoorStatus: DoorBolt
   - uid: 22631
     components:
     - type: Transform
@@ -9884,18 +9908,42 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -8.5,-58.5
       parent: 30
+    - type: DeviceLinkSink
+      invokeCounter: 2
+    - type: DeviceLinkSource
+      linkedPorts:
+        6272:
+        - DoorStatus: DoorBolt
+        7207:
+        - DoorStatus: DoorBolt
   - uid: 6272
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -7.5,-56.5
       parent: 30
+    - type: DeviceLinkSink
+      invokeCounter: 2
+    - type: DeviceLinkSource
+      linkedPorts:
+        3531:
+        - DoorStatus: DoorBolt
+        7207:
+        - DoorStatus: DoorBolt
   - uid: 7207
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -6.5,-58.5
       parent: 30
+    - type: DeviceLinkSink
+      invokeCounter: 2
+    - type: DeviceLinkSource
+      linkedPorts:
+        6272:
+        - DoorStatus: DoorBolt
+        3531:
+        - DoorStatus: DoorBolt
   - uid: 10135
     components:
     - type: Transform
@@ -9939,6 +9987,12 @@ entities:
     - type: Transform
       pos: -63.5,-18.5
       parent: 30
+    - type: DeviceLinkSink
+      invokeCounter: 1
+    - type: DeviceLinkSource
+      linkedPorts:
+        17342:
+        - DoorStatus: DoorBolt
   - uid: 5391
     components:
     - type: Transform
@@ -9971,6 +10025,12 @@ entities:
     - type: Transform
       pos: -63.5,-20.5
       parent: 30
+    - type: DeviceLinkSink
+      invokeCounter: 1
+    - type: DeviceLinkSource
+      linkedPorts:
+        386:
+        - DoorStatus: DoorBolt
   - uid: 18018
     components:
     - type: Transform
@@ -10065,6 +10125,12 @@ entities:
       rot: 3.141592653589793 rad
       pos: 25.5,43.5
       parent: 30
+  - uid: 11449
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -53.5,36.5
+      parent: 30
 - proto: AirlockExternalGlassShuttleLocked
   entities:
   - uid: 11864
@@ -10087,6 +10153,12 @@ entities:
       rot: 3.141592653589793 rad
       pos: -18.5,46.5
       parent: 30
+    - type: DeviceLinkSink
+      invokeCounter: 1
+    - type: DeviceLinkSource
+      linkedPorts:
+        1696:
+        - DoorStatus: DoorBolt
   - uid: 5390
     components:
     - type: Transform
@@ -10101,11 +10173,23 @@ entities:
     - type: Transform
       pos: 45.5,16.5
       parent: 30
+    - type: DeviceLinkSink
+      invokeCounter: 1
+    - type: DeviceLinkSource
+      linkedPorts:
+        15830:
+        - DoorStatus: DoorBolt
   - uid: 15830
     components:
     - type: Transform
       pos: 48.5,16.5
       parent: 30
+    - type: DeviceLinkSink
+      invokeCounter: 1
+    - type: DeviceLinkSource
+      linkedPorts:
+        15829:
+        - DoorStatus: DoorBolt
   - uid: 16278
     components:
     - type: Transform
@@ -10132,6 +10216,12 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -85.5,-60.5
       parent: 30
+    - type: DeviceLinkSource
+      linkedPorts:
+        841:
+        - DoorStatus: Close
+    - type: DeviceLinkSink
+      invokeCounter: 1
 - proto: AirlockFreezerKitchenHydroLocked
   entities:
   - uid: 460
@@ -10516,6 +10606,18 @@ entities:
     - type: Transform
       pos: -69.5,-54.5
       parent: 30
+- proto: AirlockGlassShuttle
+  entities:
+  - uid: 9121
+    components:
+    - type: Transform
+      pos: -52.5,-10.5
+      parent: 30
+  - uid: 11452
+    components:
+    - type: Transform
+      pos: -59.5,-10.5
+      parent: 30
 - proto: AirlockHatchMaintenance
   entities:
   - uid: 9957
@@ -11089,7 +11191,7 @@ entities:
       pos: -20.5,-5.5
       parent: 30
     - type: Door
-      secondsUntilStateChange: -537.51984
+      secondsUntilStateChange: -1046.2256
       state: Opening
     - type: DeviceLinkSource
       lastSignals:
@@ -11276,6 +11378,12 @@ entities:
       rot: 3.141592653589793 rad
       pos: -21.5,46.5
       parent: 30
+    - type: DeviceLinkSink
+      invokeCounter: 1
+    - type: DeviceLinkSource
+      linkedPorts:
+        5070:
+        - DoorStatus: DoorBolt
   - uid: 1756
     components:
     - type: Transform
@@ -12136,8 +12244,6 @@ entities:
       parent: 30
     - type: Apc
       hasAccess: True
-      lastExternalState: Good
-      lastChargeState: Full
   - uid: 7079
     components:
     - type: MetaData
@@ -12163,8 +12269,6 @@ entities:
       parent: 30
     - type: Apc
       hasAccess: True
-      lastExternalState: Good
-      lastChargeState: Full
   - uid: 7433
     components:
     - type: MetaData
@@ -12183,8 +12287,6 @@ entities:
       parent: 30
     - type: Apc
       hasAccess: True
-      lastExternalState: Good
-      lastChargeState: Full
   - uid: 7610
     components:
     - type: MetaData
@@ -13115,72 +13217,77 @@ entities:
     - type: Transform
       pos: -73.5,-38.5
       parent: 30
-- proto: AtmosDeviceFanTiny
+- proto: AtmosDeviceFanDirectional
   entities:
   - uid: 380
     components:
     - type: Transform
-      pos: -59.5,-7.5
+      pos: -52.5,-10.5
       parent: 30
-  - uid: 3707
+  - uid: 868
     components:
     - type: Transform
+      rot: 3.141592653589793 rad
       pos: 25.5,43.5
       parent: 30
-  - uid: 9121
-    components:
-    - type: Transform
-      pos: 38.5,-5.5
-      parent: 30
-  - uid: 9122
+  - uid: 1083
     components:
     - type: Transform
+      rot: 1.5707963267948966 rad
       pos: 38.5,-3.5
       parent: 30
-  - uid: 9123
+  - uid: 1475
     components:
     - type: Transform
-      pos: -16.5,12.5
+      rot: 1.5707963267948966 rad
+      pos: 38.5,-5.5
       parent: 30
-  - uid: 9124
+  - uid: 1490
     components:
     - type: Transform
-      pos: -19.5,17.5
+      rot: -1.5707963267948966 rad
+      pos: -65.5,23.5
       parent: 30
-  - uid: 9798
+  - uid: 1493
     components:
     - type: Transform
-      pos: -52.5,-7.5
+      rot: -1.5707963267948966 rad
+      pos: -65.5,15.5
       parent: 30
-  - uid: 16402
+  - uid: 3707
     components:
     - type: Transform
-      pos: -65.5,23.5
+      rot: -1.5707963267948966 rad
+      pos: -65.5,13.5
       parent: 30
-  - uid: 16403
+  - uid: 11451
     components:
     - type: Transform
-      pos: -65.5,21.5
+      pos: -59.5,-10.5
       parent: 30
-  - uid: 16404
+  - uid: 11453
     components:
     - type: Transform
-      pos: -65.5,15.5
+      rot: -1.5707963267948966 rad
+      pos: -53.5,36.5
       parent: 30
-  - uid: 16405
+  - uid: 11454
     components:
     - type: Transform
-      pos: -65.5,13.5
+      rot: -1.5707963267948966 rad
+      pos: -65.5,21.5
       parent: 30
-  - uid: 20590
+- proto: AtmosDeviceFanTiny
+  entities:
+  - uid: 9123
     components:
     - type: Transform
-      pos: -52.5,2.5
+      pos: -16.5,12.5
       parent: 30
-  - uid: 20591
+  - uid: 9124
     components:
     - type: Transform
-      pos: -59.5,2.5
+      pos: -19.5,17.5
       parent: 30
 - proto: AtmosFixBlockerMarker
   entities:
@@ -14242,7 +14349,7 @@ entities:
     - type: Transform
       pos: -60.353844,-63.575558
       parent: 30
-- proto: BookChefGaming
+- proto: BookHowToCookForFortySpaceman
   entities:
   - uid: 9948
     components:
@@ -49781,6 +49888,11 @@ entities:
         - 0
         - 0
         - 0
+  - uid: 11456
+    components:
+    - type: Transform
+      pos: -52.5,37.5
+      parent: 30
   - uid: 11750
     components:
     - type: Transform
@@ -54510,6 +54622,13 @@ entities:
     - type: Transform
       pos: 1.5,-33.5
       parent: 30
+- proto: DefaultStationBeaconEscapePod
+  entities:
+  - uid: 11455
+    components:
+    - type: Transform
+      pos: -52.5,36.5
+      parent: 30
 - proto: DefaultStationBeaconEVAStorage
   entities:
   - uid: 20552
@@ -89848,10 +89967,11 @@ entities:
     - type: Transform
       pos: -42.5,34.5
       parent: 30
-  - uid: 1493
+  - uid: 1476
     components:
     - type: Transform
-      pos: -53.5,34.5
+      rot: -1.5707963267948966 rad
+      pos: -53.5,37.5
       parent: 30
   - uid: 1494
     components:
@@ -91782,6 +91902,12 @@ entities:
     - type: Transform
       pos: 24.5,-34.5
       parent: 30
+  - uid: 9122
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -53.5,35.5
+      parent: 30
   - uid: 9129
     components:
     - type: Transform
@@ -93351,11 +93477,6 @@ entities:
     - type: Transform
       pos: -58.5,36.5
       parent: 30
-  - uid: 16951
-    components:
-    - type: Transform
-      pos: -51.5,36.5
-      parent: 30
   - uid: 17032
     components:
     - type: Transform
@@ -108641,21 +108762,11 @@ entities:
     - type: Transform
       pos: -42.5,34.5
       parent: 30
-  - uid: 1476
-    components:
-    - type: Transform
-      pos: -51.5,36.5
-      parent: 30
   - uid: 1489
     components:
     - type: Transform
       pos: -52.5,34.5
       parent: 30
-  - uid: 1490
-    components:
-    - type: Transform
-      pos: -53.5,34.5
-      parent: 30
   - uid: 1491
     components:
     - type: Transform
@@ -110473,6 +110584,18 @@ entities:
     - type: Transform
       pos: -64.5,16.5
       parent: 30
+  - uid: 11448
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -53.5,37.5
+      parent: 30
+  - uid: 11450
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -53.5,35.5
+      parent: 30
   - uid: 11602
     components:
     - type: Transform
@@ -113375,6 +113498,11 @@ entities:
       parent: 30
 - proto: SignAtmos
   entities:
+  - uid: 7012
+    components:
+    - type: Transform
+      pos: 8.5,-21.5
+      parent: 30
   - uid: 9082
     components:
     - type: Transform
@@ -113385,13 +113513,6 @@ entities:
     - type: Transform
       pos: 4.5,-32.5
       parent: 30
-- proto: SignAtmosMinsky
-  entities:
-  - uid: 7012
-    components:
-    - type: Transform
-      pos: 8.5,-21.5
-      parent: 30
 - proto: SignBar
   entities:
   - uid: 1384
@@ -113447,8 +113568,6 @@ entities:
     - type: Transform
       pos: -10.5,-11.5
       parent: 30
-- proto: SignChemistry1
-  entities:
   - uid: 9032
     components:
     - type: Transform
@@ -113909,13 +114028,6 @@ entities:
     - type: Transform
       pos: 47.5,20.5
       parent: 30
-- proto: SignDrones
-  entities:
-  - uid: 12263
-    components:
-    - type: Transform
-      pos: -37.5,26.5
-      parent: 30
 - proto: SignElectricalMed
   entities:
   - uid: 3194
@@ -114041,19 +114153,15 @@ entities:
     - type: Transform
       pos: -20.5,13.5
       parent: 30
-- proto: SignHydro2
-  entities:
-  - uid: 1386
+  - uid: 1385
     components:
     - type: Transform
-      pos: -29.5,4.5
+      pos: -22.5,8.5
       parent: 30
-- proto: SignHydro3
-  entities:
-  - uid: 1385
+  - uid: 1386
     components:
     - type: Transform
-      pos: -22.5,8.5
+      pos: -29.5,4.5
       parent: 30
 - proto: SignInterrogation
   entities:
@@ -114090,6 +114198,13 @@ entities:
     - type: Transform
       pos: 18.5,-0.5
       parent: 30
+- proto: SignMaterials
+  entities:
+  - uid: 12263
+    components:
+    - type: Transform
+      pos: -37.5,26.5
+      parent: 30
 - proto: SignMedical
   entities:
   - uid: 6763
@@ -114102,13 +114217,6 @@ entities:
     - type: Transform
       pos: -12.5,0.5
       parent: 30
-- proto: SignMinerDock
-  entities:
-  - uid: 8445
-    components:
-    - type: Transform
-      pos: 15.5,-9.5
-      parent: 30
 - proto: SignMorgue
   entities:
   - uid: 6903
@@ -114245,26 +114353,22 @@ entities:
       pos: 16.5,24.5
       parent: 30
 - proto: SignScience
-  entities:
-  - uid: 13389
-    components:
-    - type: Transform
-      pos: 16.5,16.5
-      parent: 30
-- proto: SignScience1
   entities:
   - uid: 6576
     components:
     - type: Transform
       pos: 11.5,19.5
       parent: 30
-- proto: SignScience2
-  entities:
   - uid: 13388
     components:
     - type: Transform
       pos: 11.5,13.5
       parent: 30
+  - uid: 13389
+    components:
+    - type: Transform
+      pos: 16.5,16.5
+      parent: 30
 - proto: SignSecurearea
   entities:
   - uid: 11895
@@ -114355,6 +114459,13 @@ entities:
     - type: Transform
       pos: -37.5,38.5
       parent: 30
+- proto: SignShipDock
+  entities:
+  - uid: 8445
+    components:
+    - type: Transform
+      pos: 15.5,-9.5
+      parent: 30
 - proto: SignSmoking
   entities:
   - uid: 9125
@@ -123118,11 +123229,6 @@ entities:
     - type: Transform
       pos: -50.5,11.5
       parent: 30
-  - uid: 868
-    components:
-    - type: Transform
-      pos: -59.5,-10.5
-      parent: 30
   - uid: 882
     components:
     - type: Transform
@@ -123223,11 +123329,6 @@ entities:
     - type: Transform
       pos: -61.5,-10.5
       parent: 30
-  - uid: 1083
-    components:
-    - type: Transform
-      pos: -52.5,-10.5
-      parent: 30
   - uid: 1140
     components:
     - type: Transform
@@ -123424,12 +123525,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -51.5,34.5
       parent: 30
-  - uid: 1475
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -51.5,35.5
-      parent: 30
   - uid: 1477
     components:
     - type: Transform
@@ -127408,6 +127503,12 @@ entities:
     - type: Transform
       pos: -39.5,-22.5
       parent: 30
+  - uid: 9798
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -53.5,34.5
+      parent: 30
   - uid: 9855
     components:
     - type: Transform