From 181f7008c9ebb337375403b10d955baeb2656c9f Mon Sep 17 00:00:00 2001
From: deltanedas <39013340+deltanedas@users.noreply.github.com>
Date: Sun, 14 May 2023 19:00:14 +0000
Subject: [PATCH] saltern 4.4 (#16432)

---
 Resources/Maps/saltern.yml | 1749 ++++++++++++++++++------------------
 1 file changed, 874 insertions(+), 875 deletions(-)

diff --git a/Resources/Maps/saltern.yml b/Resources/Maps/saltern.yml
index 519cb3c463..95f759a2ba 100644
--- a/Resources/Maps/saltern.yml
+++ b/Resources/Maps/saltern.yml
@@ -44,7 +44,7 @@ entities:
           tiles: TgAAAE4AAABOAAAATgAAAE4AAABOAAAATgAAAE4AAABOAAAAXgAAAFEAAABRAAAAUQAAAFEAAABRAAAAUQAAAF4AAABeAAAAXgAAAF4AAABeAAAAXgAAAF4AAABOAAAATgAAAF4AAABRAAAAUQAAAFEAAABRAAAAUQAAAFEAAABeAAAAXgAAAF4AAABeAAAAXgAAAF4AAABeAAAATgAAAE4AAABeAAAAUQAAAFEAAABRAAAAUQAAAFEAAABRAAAAXgAAAF4AAABbAAAAWwAAAFsAAABeAAAAXgAAAE4AAABOAAAAXgAAAFEAAABRAAAAUQAAAF4AAABeAAAAXgAAAFsAAABbAAAAWwAAAF4AAABeAAAAXgAAAF4AAABOAAAATgAAAF4AAABeAAAAUQAAAF4AAABeAAAATgAAAE4AAABeAAAAXgAAAFsAAABbAAAAWwAAAF4AAABeAAAAXgAAAF4AAABeAAAAXgAAAF4AAABeAAAAXgAAAF4AAABeAAAAXgAAAE4AAABeAAAAWwAAAF4AAABeAAAAXgAAAF4AAABeAAAAXgAAAF4AAABeAAAAXgAAAF4AAABeAAAAXgAAAE4AAABOAAAAXgAAAFsAAABeAAAAXgAAAF4AAABeAAAAXgAAAF4AAABeAAAAXgAAAF4AAABeAAAAXgAAAF4AAABOAAAATgAAAF4AAABbAAAAWwAAAFsAAABbAAAAXgAAAF4AAABeAAAAXgAAAF4AAABeAAAAXgAAAF4AAABeAAAATgAAAE4AAABeAAAAWwAAAFsAAABbAAAAWwAAAFsAAAAxAAAAMQAAADEAAAAxAAAAMQAAAFsAAABbAAAAWwAAAE4AAABeAAAAXgAAAF4AAABeAAAAXgAAAF4AAABeAAAAMQAAADEAAAAxAAAAMQAAADEAAABbAAAAWwAAAFsAAABOAAAAJQAAACUAAAAlAAAAJQAAACUAAAAlAAAAXgAAAFsAAABbAAAAWwAAAFsAAABbAAAAWwAAAFsAAABbAAAAXgAAAF4AAAAlAAAAJQAAACUAAAAlAAAAJQAAAF4AAABbAAAAWwAAAFsAAABbAAAAWwAAAFsAAABbAAAAWwAAAF4AAABeAAAAXgAAACUAAABeAAAAXgAAAF4AAABeAAAAWwAAAFsAAABbAAAAWwAAAFsAAABbAAAAWwAAAFsAAABeAAAALwAAAC8AAAAvAAAALwAAAC8AAABbAAAAWwAAAFsAAABbAAAAWwAAAFsAAABbAAAAWwAAAFsAAABbAAAAXgAAAC8AAAAvAAAALwAAAC8AAABEAAAAWwAAAFsAAABbAAAAWwAAAFsAAABbAAAAWwAAAFsAAABbAAAAWwAAAA==
         -1,0:
           ind: -1,0
-          tiles: LwAAAC8AAAAvAAAALwAAAC8AAABEAAAAWwAAAFsAAABbAAAAWwAAAFsAAABbAAAAWwAAAFsAAABbAAAAWwAAAC8AAAAvAAAALwAAAC8AAAAvAAAARAAAAFsAAABbAAAAWwAAAFsAAABbAAAAWwAAAFsAAABbAAAAWwAAAFsAAABeAAAAXgAAAF4AAABeAAAAXgAAAF4AAABeAAAAXgAAAAwAAAAMAAAADAAAAF4AAABeAAAAXgAAAF4AAABeAAAARAAAAEQAAABEAAAARAAAAEQAAABEAAAARAAAAEQAAABEAAAARAAAAEQAAABEAAAARAAAAEQAAABEAAAARAAAAEQAAABEAAAARAAAAEQAAABEAAAARAAAAEQAAABEAAAARAAAAEQAAABEAAAARAAAAEQAAABEAAAARAAAAEQAAABEAAAARAAAAEQAAABEAAAARAAAAEQAAABEAAAARAAAAEQAAABEAAAARAAAAEQAAABEAAAARAAAAEQAAABEAAAAXgAAAF4AAABeAAAAXgAAAF4AAABeAAAAXgAAAF4AAABeAAAAXgAAAEQAAABEAAAAXgAAAF4AAABEAAAAXgAAAF4AAABeAAAARAAAAEQAAABeAAAARAAAAF4AAABEAAAARAAAAF4AAABEAAAARAAAAF4AAAAWAAAAFgAAABYAAABHAAAAXgAAAEQAAABEAAAAXgAAAEQAAABeAAAARAAAAEQAAABeAAAARAAAAEQAAABEAAAAFgAAABYAAAAWAAAARwAAAF4AAABeAAAARAAAAF4AAABEAAAAXgAAAEQAAABeAAAAXgAAAEQAAABEAAAAXgAAAF4AAABeAAAAXgAAAEcAAABHAAAARAAAAEQAAABEAAAARAAAAEQAAABEAAAARAAAAEQAAABEAAAARAAAAEQAAABEAAAARAAAAEQAAABHAAAAXgAAAEQAAABEAAAARAAAAEQAAABEAAAARAAAAEQAAABEAAAARAAAAEQAAABEAAAAFgAAAEQAAABEAAAAXgAAAF4AAABeAAAAXgAAAF4AAABeAAAARAAAACYAAABEAAAARAAAAEQAAABeAAAAFgAAABYAAABeAAAARAAAAF4AAAA8AAAAPAAAADwAAAA8AAAAXgAAAEQAAABEAAAARAAAAEQAAABEAAAAXgAAABYAAAAWAAAAXgAAAEQAAAAWAAAAPAAAADwAAAA8AAAAPAAAAF4AAABEAAAAJgAAAEQAAABEAAAARAAAAF4AAAAWAAAAFgAAAF4AAAAWAAAAXgAAAEQAAAA8AAAAPAAAADwAAAA8AAAARAAAAEQAAABEAAAARAAAAEQAAABeAAAAXgAAAF4AAABeAAAAXgAAAA==
+          tiles: LwAAAC8AAAAvAAAALwAAAC8AAABEAAAAWwAAAFsAAABbAAAAWwAAAFsAAABbAAAAWwAAAFsAAABbAAAAWwAAAC8AAAAvAAAALwAAAC8AAAAvAAAARAAAAFsAAABbAAAAWwAAAFsAAABbAAAAWwAAAFsAAABbAAAAWwAAAFsAAABeAAAAXgAAAF4AAABeAAAAXgAAAF4AAABeAAAAXgAAAAwAAAAMAAAADAAAAF4AAABeAAAAXgAAAF4AAABeAAAARAAAAEQAAABEAAAARAAAAEQAAABEAAAARAAAAEQAAABEAAAARAAAAEQAAABEAAAARAAAAEQAAABEAAAARAAAAEQAAABEAAAARAAAAEQAAABEAAAARAAAAEQAAABEAAAARAAAAEQAAABEAAAARAAAAEQAAABEAAAARAAAAEQAAABEAAAARAAAAEQAAABEAAAARAAAAEQAAABEAAAARAAAAEQAAABEAAAARAAAAEQAAABEAAAARAAAAEQAAABEAAAAXgAAAF4AAABeAAAAXgAAAF4AAABeAAAAXgAAAF4AAABeAAAAXgAAAEQAAABEAAAAXgAAAF4AAABEAAAAXgAAAF4AAABeAAAARAAAAEQAAABeAAAARAAAAF4AAABEAAAARAAAAF4AAABEAAAARAAAAF4AAAAWAAAAFgAAABYAAABHAAAAXgAAAEQAAABEAAAAXgAAAEQAAABeAAAARAAAAEQAAABeAAAARAAAAEQAAABeAAAAFgAAABYAAAAWAAAARwAAAF4AAABeAAAARAAAAF4AAABEAAAAXgAAAEQAAABeAAAAXgAAAEQAAABEAAAAXgAAAF4AAABeAAAAXgAAAEcAAABHAAAARAAAAEQAAABEAAAARAAAAEQAAABEAAAARAAAAEQAAABEAAAARAAAAEQAAABEAAAARAAAAEQAAABHAAAAXgAAAEQAAABEAAAARAAAAEQAAABEAAAARAAAAEQAAABEAAAARAAAAEQAAABEAAAAFgAAAEQAAABEAAAAXgAAAF4AAABeAAAAXgAAAF4AAABeAAAARAAAACYAAABEAAAARAAAAEQAAABeAAAAFgAAABYAAABeAAAARAAAACUAAAA8AAAAPAAAADwAAAA8AAAAXgAAAEQAAABEAAAARAAAAEQAAABEAAAAXgAAABYAAAAWAAAAXgAAAEQAAAAlAAAAPAAAADwAAAA8AAAAPAAAAF4AAABEAAAAJgAAAEQAAABEAAAARAAAAF4AAAAWAAAAFgAAAF4AAAAWAAAAXgAAAEQAAAA8AAAAPAAAADwAAAA8AAAARAAAAEQAAABEAAAARAAAAEQAAABeAAAAXgAAAF4AAABeAAAAXgAAAA==
         0,-1:
           ind: 0,-1
           tiles: UQAAAEQAAABEAAAARAAAAEQAAABEAAAAXgAAAFEAAABRAAAAUQAAAF4AAAAWAAAAFgAAABYAAAAWAAAAFgAAAF4AAABEAAAARAAAAEQAAABEAAAARAAAAF4AAABRAAAAUQAAAFEAAABeAAAAFgAAABYAAAAWAAAAFgAAABYAAABeAAAARAAAAEQAAABEAAAARAAAAEQAAABeAAAAUQAAAFEAAABRAAAAXgAAABYAAAAWAAAAFgAAABYAAAAWAAAAXgAAAF4AAABEAAAARAAAAEQAAABeAAAAXgAAAFEAAABRAAAAUQAAAF4AAABeAAAAXgAAAF4AAABeAAAAXgAAAE4AAABeAAAARAAAAEQAAABEAAAAXgAAAFEAAABRAAAAXgAAAFEAAABRAAAAUQAAAFEAAABeAAAAUQAAAFEAAABeAAAAXgAAAEQAAABEAAAARAAAAF4AAABRAAAAUQAAAFEAAABRAAAAUQAAAFEAAABRAAAAXgAAAFEAAABRAAAAXgAAAF4AAABEAAAARAAAAEQAAABeAAAAUQAAAFEAAABRAAAAUQAAAFEAAABRAAAAUQAAAFEAAABRAAAAUQAAAF4AAABeAAAARAAAAEQAAABEAAAAXgAAAFEAAABRAAAAUQAAAFEAAABRAAAAUQAAAFEAAABeAAAAUQAAAFEAAABeAAAAXgAAAEQAAABEAAAARAAAAF4AAABRAAAAUQAAAF4AAABRAAAAUQAAAFEAAABRAAAAXgAAAFEAAABRAAAAWwAAAF4AAABEAAAARAAAAEQAAABeAAAAUQAAAFEAAABRAAAAUQAAAFEAAABeAAAAXgAAAFEAAABRAAAAUQAAAFsAAABeAAAARAAAAEQAAABEAAAAXgAAAFEAAABRAAAAUQAAAFEAAABRAAAAUQAAAFEAAABeAAAAUQAAAFEAAABbAAAAXgAAAEQAAABEAAAARAAAAF4AAABRAAAAUQAAAFEAAABRAAAAUQAAAFEAAABRAAAAXgAAAFEAAABRAAAAWwAAAF4AAABEAAAARAAAAEQAAABeAAAAUQAAAFEAAABRAAAAUQAAAFEAAABRAAAAUQAAAF4AAABeAAAAUQAAAFsAAAAMAAAARAAAAEQAAABEAAAAUQAAAFEAAABRAAAAUQAAAFEAAABRAAAAUQAAAFEAAABeAAAAUQAAAFEAAABbAAAARAAAAEQAAABEAAAARAAAAFEAAABRAAAAUQAAAFEAAABRAAAAUQAAAFEAAABRAAAAXgAAAFEAAABRAAAAWwAAAAwAAABEAAAARAAAAEQAAABRAAAAUQAAAFEAAABRAAAAUQAAAFEAAABRAAAAUQAAAF4AAABRAAAAUQAAAA==
@@ -59,7 +59,7 @@ entities:
           tiles: XgAAAEQAAABEAAAARAAAAEQAAABEAAAAXgAAABYAAAAWAAAAFgAAABYAAABeAAAAXgAAAF4AAABOAAAATgAAABYAAABEAAAARAAAAEQAAABEAAAARAAAAFsAAABbAAAAWwAAAFsAAABbAAAAXgAAAF4AAABeAAAATgAAAE4AAABeAAAARAAAAEQAAABEAAAARAAAAEQAAABeAAAAWwAAAFsAAABbAAAAWwAAAF4AAABeAAAAXgAAAE4AAABOAAAAXgAAAEQAAABEAAAARAAAAEQAAABEAAAAXgAAAFsAAABbAAAAWwAAAFsAAAAWAAAAXgAAAF4AAABOAAAAXgAAAF4AAABEAAAARAAAAEQAAABEAAAARAAAAEQAAABbAAAAWwAAAFsAAABbAAAAXgAAAF4AAABeAAAATgAAAF4AAABeAAAARAAAAEQAAABEAAAARAAAAEQAAABeAAAAFgAAABYAAAAWAAAAFgAAAF4AAABeAAAAXgAAAE4AAABeAAAAXgAAAF4AAABeAAAAFgAAAF4AAABeAAAAXgAAAF4AAABeAAAAXgAAAF4AAABeAAAAXgAAAF4AAABeAAAAXgAAABYAAABeAAAAFgAAABYAAAAWAAAAXgAAADEAAAAxAAAAMQAAAF4AAABbAAAAWwAAAFsAAABeAAAAXgAAAAAAAAAWAAAAFgAAABYAAAAWAAAAFgAAAF4AAAAxAAAAMQAAADEAAABeAAAAWwAAAFsAAABbAAAAXgAAAF4AAAAAAAAAFgAAABYAAAAWAAAAFgAAABYAAAAxAAAAMQAAADEAAAAxAAAAWwAAAFsAAABeAAAAWwAAAF4AAABeAAAAAAAAABYAAABeAAAAXgAAABYAAABeAAAAXgAAADEAAAAxAAAAMQAAAF4AAABbAAAAXgAAAFEAAABRAAAAXgAAAAAAAABeAAAAXgAAABYAAAAWAAAAFgAAAF4AAABeAAAAXgAAAF4AAABeAAAAXgAAAF4AAABRAAAAXgAAAF4AAAAAAAAAFgAAABYAAAAWAAAAFgAAABYAAAAWAAAAFgAAABYAAAAWAAAAFgAAAF4AAABeAAAAXgAAAF4AAAAAAAAAAAAAABYAAABeAAAAFgAAABYAAAAWAAAAXgAAABYAAAAWAAAAFgAAABYAAABeAAAAXQAAAAAAAAAAAAAAAAAAAAAAAAAWAAAAFgAAABYAAAAWAAAAFgAAABYAAAAWAAAAFgAAABYAAAAWAAAAXgAAAF0AAAAAAAAAAAAAAAAAAAAAAAAAFgAAABYAAAAWAAAAFgAAABYAAAAWAAAAFgAAABYAAAAWAAAAXgAAAF4AAABdAAAAAAAAAAAAAAAAAAAAAAAAAA==
         -2,0:
           ind: -2,0
-          tiles: XgAAAFsAAABbAAAAWwAAAFsAAABbAAAARAAAAEQAAABEAAAARAAAAF4AAAAuAAAAJgAAACYAAAAmAAAALgAAAF4AAABbAAAAWwAAAFsAAABbAAAAXgAAAF4AAABEAAAARAAAAF4AAABeAAAALgAAAC4AAAAuAAAALgAAAC4AAABeAAAAXgAAAF4AAABeAAAAXgAAAF4AAABEAAAARAAAAEQAAABEAAAAXgAAAF4AAABeAAAAXgAAAF4AAABEAAAARAAAAEQAAABEAAAARAAAAEQAAABEAAAARAAAAEQAAABEAAAARAAAAEQAAABEAAAARAAAAEQAAABEAAAARAAAAEQAAABEAAAARAAAAEQAAABEAAAARAAAAEQAAABEAAAARAAAAEQAAABEAAAARAAAAEQAAABEAAAARAAAAEQAAABEAAAARAAAAEQAAABEAAAARAAAAEQAAABEAAAARAAAAEQAAABEAAAARAAAAEQAAABEAAAARAAAAEQAAABEAAAAXgAAAF4AAABeAAAAXgAAAF4AAABeAAAARAAAAEQAAABEAAAARAAAAF4AAABeAAAAXgAAAF4AAABeAAAAXgAAAE4AAABeAAAARAAAAEQAAABEAAAAXgAAAF4AAABEAAAARAAAAF4AAABeAAAAFgAAABYAAABeAAAAXgAAAF4AAABOAAAAXgAAAEQAAABEAAAARAAAAEQAAABEAAAARAAAAEQAAABeAAAAFgAAABYAAAAWAAAAXgAAAEcAAABHAAAATgAAAF4AAABEAAAARAAAAEQAAABEAAAAXgAAAEQAAABEAAAAFgAAABYAAAAWAAAAFgAAAF4AAABHAAAARwAAAE4AAABeAAAARAAAAEQAAABEAAAARAAAAEQAAABEAAAARAAAAF4AAAAWAAAAFgAAABYAAABeAAAARwAAAEcAAABOAAAAXgAAAEQAAABEAAAARAAAAEQAAABeAAAARAAAAEQAAABeAAAAXgAAABYAAABeAAAAXgAAAEcAAABHAAAATgAAAF4AAABeAAAAXgAAAF4AAABeAAAAXgAAAF4AAABeAAAAXgAAAE4AAABOAAAATgAAAF4AAABeAAAAXgAAAE4AAABOAAAATgAAAE4AAABOAAAATgAAAE4AAABOAAAATgAAAF4AAABOAAAATgAAAE4AAABOAAAATgAAAE4AAABeAAAAXgAAAF4AAABeAAAAXgAAAF4AAABeAAAAXgAAAF4AAABeAAAAXgAAAF4AAABeAAAAXgAAAF4AAABeAAAAXgAAAF4AAABeAAAAXgAAAF4AAABeAAAAXgAAAF4AAABeAAAAXgAAAF4AAABeAAAAXgAAAF4AAABeAAAAXgAAAA==
+          tiles: XgAAAFsAAABbAAAAWwAAAFsAAABbAAAARAAAAEQAAABEAAAARAAAAF4AAAAuAAAAJgAAACYAAAAmAAAALgAAAF4AAABbAAAAWwAAAFsAAABbAAAAXgAAAF4AAABEAAAARAAAAF4AAABeAAAALgAAAC4AAAAuAAAALgAAAC4AAABeAAAAXgAAAF4AAABeAAAAXgAAAF4AAABEAAAARAAAAEQAAABEAAAAXgAAAF4AAABeAAAAXgAAAF4AAABEAAAARAAAAEQAAABEAAAARAAAAEQAAABEAAAARAAAAEQAAABEAAAARAAAAEQAAABEAAAARAAAAEQAAABEAAAARAAAAEQAAABEAAAARAAAAEQAAABEAAAARAAAAEQAAABEAAAARAAAAEQAAABEAAAARAAAAEQAAABEAAAARAAAAEQAAABEAAAARAAAAEQAAABEAAAARAAAAEQAAABEAAAARAAAAEQAAABEAAAARAAAAEQAAABEAAAARAAAAEQAAABEAAAAXgAAAF4AAABeAAAAXgAAAF4AAABeAAAARAAAAEQAAABEAAAARAAAAF4AAABeAAAAXgAAAF4AAABeAAAAXgAAAE4AAABeAAAARAAAAEQAAABEAAAAXgAAAF4AAABEAAAARAAAAF4AAABeAAAAFgAAABYAAABeAAAAXgAAAF4AAABOAAAAXgAAAEQAAABEAAAARAAAAEQAAABEAAAARAAAAEQAAABeAAAAFgAAABYAAAAWAAAAXgAAAEcAAABHAAAATgAAAF4AAABEAAAARAAAAEQAAABEAAAAXgAAAEQAAABEAAAAFgAAABYAAAAWAAAAFgAAAF4AAABHAAAARwAAAE4AAABeAAAARAAAAEQAAABEAAAARAAAAEQAAABEAAAARAAAAF4AAAAWAAAAFgAAABYAAABeAAAARwAAAEcAAABOAAAAXgAAAEQAAABEAAAARAAAAEQAAABeAAAARAAAAEQAAABeAAAAXgAAABYAAABeAAAAXgAAAEcAAABHAAAATgAAAF4AAABeAAAAXgAAAF4AAABeAAAAXgAAAF4AAABeAAAAXgAAAE4AAABOAAAATgAAAF4AAABeAAAAXgAAAE4AAABOAAAATgAAAE4AAABOAAAATgAAAE4AAABOAAAATgAAAF4AAABOAAAATgAAAE4AAABOAAAATgAAAF4AAABeAAAAXgAAAF4AAABeAAAAXgAAAF4AAABeAAAAXgAAAF4AAABeAAAAXgAAAF4AAABeAAAAXgAAAF4AAAAWAAAAXgAAAF4AAABeAAAAXgAAAF4AAABeAAAAXgAAAF4AAABeAAAAXgAAAF4AAABeAAAAXgAAAF4AAABeAAAAXgAAAA==
         1,-1:
           ind: 1,-1
           tiles: UQAAAFEAAABRAAAAUQAAAF4AAABbAAAAWwAAAFsAAABbAAAAXgAAAF4AAABeAAAAXgAAAF0AAAAAAAAAAAAAAF4AAABRAAAAUQAAAFEAAABRAAAAWwAAAFsAAABbAAAAWwAAAF4AAABeAAAAXgAAAF4AAABdAAAAAAAAAAAAAABeAAAAUQAAAFEAAABRAAAAXgAAAFsAAABbAAAAWwAAAFsAAABeAAAAXgAAAF4AAABeAAAAXQAAAAAAAAAAAAAAXgAAAFEAAABRAAAAUQAAAF4AAABbAAAAWwAAAFsAAABbAAAAXgAAAF4AAABeAAAAXgAAAF0AAAAAAAAAAAAAAFEAAABRAAAAUQAAAFEAAABeAAAAXgAAAF4AAABeAAAAXgAAAF4AAABeAAAAXgAAAF4AAABeAAAAXgAAAF4AAABRAAAAUQAAAFEAAABRAAAAXgAAAF4AAABeAAAAXgAAAF4AAABeAAAAXgAAAE4AAABeAAAAXgAAAEcAAABHAAAAUQAAAFEAAABRAAAAUQAAAF4AAABeAAAATgAAAF4AAABeAAAAXgAAAF4AAABOAAAAXgAAAEcAAABeAAAAXgAAAFEAAABRAAAAUQAAAFEAAABeAAAAXgAAAF4AAABeAAAAXgAAAF4AAABeAAAATgAAAF4AAABeAAAAXgAAAF4AAABRAAAAUQAAAFEAAABRAAAAXgAAAFEAAABRAAAAUQAAAFEAAABeAAAAXgAAAF4AAABeAAAAXgAAAF4AAABeAAAAUQAAAFEAAABRAAAAUQAAAFEAAABRAAAAUQAAAFEAAABRAAAAXgAAAE4AAABOAAAATgAAAE4AAABOAAAATgAAAFEAAABRAAAAUQAAAFEAAABeAAAAUQAAAFEAAABRAAAAUQAAAF4AAABOAAAAXgAAAF4AAABeAAAAXgAAAF4AAABRAAAAUQAAAFEAAABRAAAAXgAAAFEAAABRAAAAUQAAAFEAAABeAAAATgAAAF4AAABeAAAARAAAAEQAAABEAAAAUQAAAFEAAABeAAAAXgAAAF4AAABeAAAAXgAAAF4AAABeAAAAXgAAAE4AAABeAAAAXgAAAEQAAABEAAAARAAAAFEAAABRAAAAUQAAAFEAAABeAAAAXgAAAF4AAABeAAAAXgAAAF4AAABOAAAAXgAAAF4AAABEAAAARAAAAEQAAABRAAAAUQAAAFEAAABRAAAAXgAAAF4AAABOAAAATgAAAE4AAABeAAAATgAAAF4AAABeAAAARAAAAEQAAABEAAAAUQAAAFEAAABRAAAAUQAAAF4AAABeAAAATgAAAE4AAABeAAAAXgAAAF4AAABeAAAAXgAAAF4AAABeAAAARAAAAA==
@@ -490,7 +490,8 @@ entities:
           -3,4:
             0: 65535
           -3,5:
-            0: 65535
+            0: 65519
+            1: 16
           -3,6:
             0: 65535
           -2,4:
@@ -827,35 +828,35 @@ entities:
             0: 65535
           8,5:
             0: 43695
-            1: 4368
-            2: 17472
+            2: 4368
+            3: 17472
           8,6:
             0: 65535
           9,4:
             0: 65535
           9,5:
             0: 43695
-            3: 21840
+            4: 21840
           9,6:
             0: 8191
           10,4:
             0: 65535
           10,5:
             0: 43695
-            4: 4368
-            3: 17472
+            5: 4368
+            4: 17472
           11,4:
             0: 65535
           11,5:
             0: 43695
-            3: 21840
+            4: 21840
           12,4:
             0: 65535
           12,5:
             0: 4479
           13,4:
             0: 65501
-            3: 34
+            4: 34
           13,5:
             0: 7
           -8,7:
@@ -1098,7 +1099,7 @@ entities:
             0: 4095
           -7,-7:
             0: 53247
-            3: 8192
+            4: 8192
           -6,-7:
             0: 65535
           -6,-8:
@@ -1137,7 +1138,7 @@ entities:
             0: 65311
           -7,-6:
             0: 64716
-            3: 546
+            4: 546
           -12,0:
             0: 34952
           -12,1:
@@ -1202,6 +1203,21 @@ entities:
           - 0
           - 0
           - 0
+        - volume: 2500
+          temperature: 293.14996
+          moles:
+          - 20.078888
+          - 75.53487
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
         - volume: 2500
           temperature: 293.15
           moles:
@@ -1274,15 +1290,40 @@ entities:
             color: '#FFFFFFFF'
             id: Arrows
           decals:
-            622: 20,17
+            621: 20,17
         - node:
             color: '#FFFFFFFF'
             id: Bot
           decals:
-            615: -35,6
-            616: -30,11
-            623: 30,8
-            624: 30,9
+            614: -35,6
+            615: -30,11
+            622: 30,8
+            623: 30,9
+        - node:
+            color: '#52B4E996'
+            id: BotGreyscale
+          decals:
+            665: -6,28
+        - node:
+            color: '#334E6DC8'
+            id: BotGreyscale
+          decals:
+            663: -8,27
+        - node:
+            color: '#DE3A3A96'
+            id: BotGreyscale
+          decals:
+            664: -7,28
+        - node:
+            color: '#EFB34196'
+            id: BotGreyscale
+          decals:
+            666: -5,28
+        - node:
+            color: '#9FED5896'
+            id: BotGreyscale
+          decals:
+            667: -6,26
         - node:
             color: '#FFFFFFFF'
             id: BotRight
@@ -1293,164 +1334,164 @@ entities:
             color: '#52B4E996'
             id: BrickTileSteelCornerNe
           decals:
+            647: -1,12
             648: -1,12
-            649: -1,12
         - node:
             color: '#52B4E996'
             id: BrickTileSteelCornerNw
           decals:
+            645: 0,12
             646: 0,12
-            647: 0,12
         - node:
             color: '#52B4E996'
             id: BrickTileSteelCornerSe
           decals:
+            651: -1,13
             652: -1,13
-            653: -1,13
         - node:
             color: '#52B4E996'
             id: BrickTileSteelCornerSw
           decals:
+            649: 0,13
             650: 0,13
-            651: 0,13
         - node:
             color: '#FFFFFFFF'
             id: Bushf1
           decals:
-            431: 49.70676,-26.348543
-            432: 45.878635,-24.817293
-            433: 47.878635,-24.286043
-            434: 47.98801,-22.239168
-            435: 50.01926,-24.348543
+            430: 49.70676,-26.348543
+            431: 45.878635,-24.817293
+            432: 47.878635,-24.286043
+            433: 47.98801,-22.239168
+            434: 50.01926,-24.348543
         - node:
             color: '#FFFFFFFF'
             id: Bushf2
           decals:
-            436: 48.534885,-26.832918
+            435: 48.534885,-26.832918
         - node:
             color: '#FFFFFFFF'
             id: Bushi1
           decals:
-            430: 50.61301,-24.082918
+            429: 50.61301,-24.082918
         - node:
             color: '#FFFFFFFF'
             id: Bushi2
           decals:
-            428: 46.11301,-26.098543
-            429: 47.73801,-24.957918
+            427: 46.11301,-26.098543
+            428: 47.73801,-24.957918
         - node:
             color: '#FFFFFFFF'
             id: Bushi3
           decals:
-            426: 49.941135,-27.348543
-            427: 46.05051,-23.989168
+            425: 49.941135,-27.348543
+            426: 46.05051,-23.989168
         - node:
             color: '#FFFFFFFF'
             id: Bushi4
           decals:
-            423: 47.61301,-25.629793
-            424: 48.08176,-27.989168
-            425: 51.878635,-25.864168
+            422: 47.61301,-25.629793
+            423: 48.08176,-27.989168
+            424: 51.878635,-25.864168
         - node:
             color: '#FFFFFFFF'
             id: Bushk1
           decals:
-            457: 51.01926,-26.036043
-            458: 46.972385,-23.754793
-            459: 48.61301,-26.082918
+            456: 51.01926,-26.036043
+            457: 46.972385,-23.754793
+            458: 48.61301,-26.082918
         - node:
             color: '#FFFFFFFF'
             id: Bushm2
           decals:
-            451: 50.503635,-26.161043
-            452: 46.36301,-25.192293
+            450: 50.503635,-26.161043
+            451: 46.36301,-25.192293
         - node:
             color: '#FFFFFFFF'
             id: Bushm3
           decals:
-            453: 48.941135,-27.754793
-            454: 48.05051,-25.379793
+            452: 48.941135,-27.754793
+            453: 48.05051,-25.379793
         - node:
             color: '#FFFFFFFF'
             id: Bushm4
           decals:
-            455: 49.89426,-25.567293
-            456: 51.23801,-23.036043
+            454: 49.89426,-25.567293
+            455: 51.23801,-23.036043
         - node:
             angle: 1.5707963267948966 rad
             color: '#FFFFFFFF'
             id: Caution
           decals:
-            148: 53,2
+            147: 53,2
         - node:
-            color: '#52B4E996'
+            color: '#D381C996'
             id: CheckerNWSE
           decals:
-            483: 19,-19
-            484: 21,-8
-            485: 21,-7
-            486: 21,-6
-            487: 21,-5
-            488: 22,-8
-            489: 22,-7
-            490: 22,-6
-            491: 22,-5
-            492: 23,-8
-            493: 23,-7
-            494: 23,-6
-            495: 23,-5
-            496: 24,-8
-            497: 24,-7
-            498: 24,-6
-            499: 24,-5
+            566: -3,-23
+            567: -4,-23
+            568: -5,-23
+            569: -6,-23
+            570: -4,-22
         - node:
             color: '#D4D4D428'
             id: CheckerNWSE
           decals:
-            580: -40,4
-            581: -40,5
-            582: -40,6
-            583: -36,4
-            584: -36,5
-            585: -36,6
-            596: -37,0
-            597: -37,1
-            598: -37,2
-            599: -37,8
-            600: -37,9
-            601: -37,10
-            617: -37,-9
-            618: -37,-8
-            619: -37,-7
-            620: -37,-6
-            621: -37,-5
+            579: -40,4
+            580: -40,5
+            581: -40,6
+            582: -36,4
+            583: -36,5
+            584: -36,6
+            595: -37,0
+            596: -37,1
+            597: -37,2
+            598: -37,8
+            599: -37,9
+            600: -37,10
+            616: -37,-9
+            617: -37,-8
+            618: -37,-7
+            619: -37,-6
+            620: -37,-5
         - node:
-            color: '#D381C996'
+            color: '#52B4E996'
             id: CheckerNWSE
           decals:
-            567: -3,-23
-            568: -4,-23
-            569: -5,-23
-            570: -6,-23
-            571: -4,-22
+            482: 19,-19
+            483: 21,-8
+            484: 21,-7
+            485: 21,-6
+            486: 21,-5
+            487: 22,-8
+            488: 22,-7
+            489: 22,-6
+            490: 22,-5
+            491: 23,-8
+            492: 23,-7
+            493: 23,-6
+            494: 23,-5
+            495: 24,-8
+            496: 24,-7
+            497: 24,-6
+            498: 24,-5
         - node:
             color: '#FFFFFFFF'
             id: DirtHeavy
           decals:
-            384: -16,10
-            385: -17,11
+            383: -16,10
+            384: -17,11
         - node:
             cleanable: True
             color: '#FFFFFFFF'
             id: DirtHeavy
           decals:
-            663: -24,-25
+            662: -24,-25
         - node:
             color: '#FFFFFFFF'
             id: DirtLight
           decals:
-            388: -18,10
-            389: -17,9
+            387: -18,10
+            388: -17,9
         - node:
             cleanable: True
             color: '#FFFFFFFF'
@@ -1486,36 +1527,36 @@ entities:
             93: 34,-5
             94: 33,0
             95: 7,5
-            154: 52,1
-            155: 53,3
-            156: 55,3
-            157: 57,4
-            158: 45,5
-            159: 35,2
-            602: -40,0
-            603: -36,1
-            604: -38,7
-            605: -40,8
-            606: -38,-4
-            607: -36,-8
-            608: -24,-9
-            609: -24,3
-            610: -25,2
-            611: -7,3
-            613: -36,8
-            614: -38,9
-            654: -23,-24
-            655: -25,-23
-            656: -23,-22
-            657: -25,-25
-            658: -24,-24
-            659: -24,-22
+            153: 52,1
+            154: 53,3
+            155: 55,3
+            156: 57,4
+            157: 45,5
+            158: 35,2
+            601: -40,0
+            602: -36,1
+            603: -38,7
+            604: -40,8
+            605: -38,-4
+            606: -36,-8
+            607: -24,-9
+            608: -24,3
+            609: -25,2
+            610: -7,3
+            612: -36,8
+            613: -38,9
+            653: -23,-24
+            654: -25,-23
+            655: -23,-22
+            656: -25,-25
+            657: -24,-24
+            658: -24,-22
         - node:
             color: '#FFFFFFFF'
             id: DirtMedium
           decals:
-            386: -17,10
-            387: -18,8
+            385: -17,10
+            386: -18,8
         - node:
             cleanable: True
             color: '#FFFFFFFF'
@@ -1526,190 +1567,165 @@ entities:
             63: 27,15
             64: 24,17
             89: 37,6
-            152: 53,1
-            153: 55,4
-            612: -35,8
-            660: -23,-25
-            661: -25,-22
-            662: -25,-24
+            151: 53,1
+            152: 55,4
+            611: -35,8
+            659: -23,-25
+            660: -25,-22
+            661: -25,-24
         - node:
             color: '#FFFFFFFF'
             id: Flowersbr2
           decals:
-            437: 48.80051,-27.911043
-            438: 48.159885,-27.239168
-            439: 51.597385,-24.270418
-            440: 51.86301,-24.895418
-            441: 47.159885,-23.098543
+            436: 48.80051,-27.911043
+            437: 48.159885,-27.239168
+            438: 51.597385,-24.270418
+            439: 51.86301,-24.895418
+            440: 47.159885,-23.098543
         - node:
             color: '#FFFFFFFF'
             id: Flowerspv1
           decals:
-            442: 46.566135,-25.036043
-            443: 47.11301,-25.645418
-            444: 50.80051,-23.317293
+            441: 46.566135,-25.036043
+            442: 47.11301,-25.645418
+            443: 50.80051,-23.317293
         - node:
             color: '#FFFFFFFF'
             id: Flowersy1
           decals:
-            445: 50.80051,-26.098543
-            446: 50.097385,-26.239168
-            447: 47.753635,-26.489168
-            448: 49.95676,-22.848543
-            449: 47.628635,-23.707918
-            450: 50.503635,-26.739168
+            444: 50.80051,-26.098543
+            445: 50.097385,-26.239168
+            446: 47.753635,-26.489168
+            447: 49.95676,-22.848543
+            448: 47.628635,-23.707918
+            449: 50.503635,-26.739168
         - node:
-            color: '#D381C996'
+            color: '#52B4E996'
             id: FullTileOverlayGreyscale
           decals:
-            209: 0,-21
-            210: 0,-20
-            220: -13,-21
-            221: -13,-20
+            168: 13,-7
+            521: 10,-7
+            522: 9,-7
+            538: 10,-10
+            539: 10,-9
+            540: 9,-10
+            541: 10,-11
+            542: 11,-10
+            543: 9,-2
+            544: 9,-3
+            545: 10,-2
+            546: 9,-1
+            547: 8,-2
         - node:
-            color: '#DE3A3A96'
+            color: '#EFB34196'
             id: FullTileOverlayGreyscale
           decals:
-            138: -2,10
-            139: -1,10
-            140: 0,10
+            296: 36,3
+            297: 36,4
+            298: 36,5
+            389: 30,3
         - node:
-            color: '#EFB34196'
+            color: '#D381C996'
             id: FullTileOverlayGreyscale
           decals:
-            297: 36,3
-            298: 36,4
-            299: 36,5
-            390: 30,3
+            208: 0,-21
+            209: 0,-20
+            219: -13,-21
+            220: -13,-20
         - node:
-            color: '#52B4E996'
+            color: '#DE3A3A96'
             id: FullTileOverlayGreyscale
           decals:
-            169: 13,-7
-            522: 10,-7
-            523: 9,-7
-            539: 10,-10
-            540: 10,-9
-            541: 9,-10
-            542: 10,-11
-            543: 11,-10
-            544: 9,-2
-            545: 9,-3
-            546: 10,-2
-            547: 9,-1
-            548: 8,-2
+            137: -2,10
+            138: -1,10
+            139: 0,10
         - node:
             color: '#FFFFFFFF'
             id: Grassb1
           decals:
-            414: 47.034885,-26.332918
-            415: 48.159885,-27.364168
-            416: 51.01926,-23.629793
+            413: 47.034885,-26.332918
+            414: 48.159885,-27.364168
+            415: 51.01926,-23.629793
         - node:
             color: '#FFFFFFFF'
             id: Grassb2
           decals:
-            412: 51.11301,-24.739168
-            413: 46.409885,-25.489168
-            422: 49.409885,-27.004793
+            411: 51.11301,-24.739168
+            412: 46.409885,-25.489168
+            421: 49.409885,-27.004793
         - node:
             color: '#FFFFFFFF'
             id: Grassb3
           decals:
-            417: 50.98801,-27.020418
-            418: 49.972385,-26.176668
+            416: 50.98801,-27.020418
+            417: 49.972385,-26.176668
         - node:
             color: '#FFFFFFFF'
             id: Grassb4
           decals:
-            419: 47.23801,-23.957918
-            420: 46.409885,-24.301668
+            418: 47.23801,-23.957918
+            419: 46.409885,-24.301668
         - node:
             color: '#FFFFFFFF'
             id: Grassb5
           decals:
-            421: 48.347385,-26.270418
+            420: 48.347385,-26.270418
         - node:
             color: '#FFFFFFFF'
             id: Grassd1
           decals:
-            391: 50.628635,-26.192293
-            392: 46.58176,-24.504793
-            393: 47.034885,-25.473543
-            394: 50.01926,-22.832918
-            395: 50.48801,-23.114168
-            396: 48.503635,-27.504793
+            390: 50.628635,-26.192293
+            391: 46.58176,-24.504793
+            392: 47.034885,-25.473543
+            393: 50.01926,-22.832918
+            394: 50.48801,-23.114168
+            395: 48.503635,-27.504793
         - node:
             color: '#FFFFFFFF'
             id: Grassd2
           decals:
-            461: 48.45676,-24.942293
+            460: 48.45676,-24.942293
         - node:
             color: '#FFFFFFFF'
             id: Grassd3
           decals:
-            409: 50.253635,-25.504793
-            410: 49.89426,-27.926668
-            411: 52.159885,-24.020418
+            408: 50.253635,-25.504793
+            409: 49.89426,-27.926668
+            410: 52.159885,-24.020418
         - node:
             color: '#FFFFFFFF'
             id: Grasse1
           decals:
-            404: 46.20676,-25.754793
-            405: 47.034885,-24.598543
-            406: 51.48801,-25.051668
-            407: 50.45676,-26.801668
-            408: 49.64426,-25.004793
+            403: 46.20676,-25.754793
+            404: 47.034885,-24.598543
+            405: 51.48801,-25.051668
+            406: 50.45676,-26.801668
+            407: 49.64426,-25.004793
         - node:
             color: '#FFFFFFFF'
             id: Grasse2
           decals:
-            401: 50.86301,-24.786043
-            402: 51.222385,-25.645418
-            403: 47.14426,-26.770418
+            400: 50.86301,-24.786043
+            401: 51.222385,-25.645418
+            402: 47.14426,-26.770418
         - node:
             color: '#FFFFFFFF'
             id: Grasse3
           decals:
-            397: 49.222385,-27.411043
-            398: 48.11301,-26.239168
-            399: 47.08176,-23.395418
-            400: 51.36301,-24.379793
+            396: 49.222385,-27.411043
+            397: 48.11301,-26.239168
+            398: 47.08176,-23.395418
+            399: 51.36301,-24.379793
         - node:
             color: '#FFD886FF'
             id: HalfTileOverlayGreyscale
           decals:
-            184: 19,1
-            185: 18,1
-            186: 17,1
-            187: 16,1
-            188: 15,1
-            189: 14,1
-        - node:
-            color: '#DE3A3A96'
-            id: HalfTileOverlayGreyscale
-          decals:
-            128: -11,11
-            129: -12,11
-            130: -13,11
-            131: -14,11
-            252: 0,5
-            253: -1,5
-            254: -2,5
-            255: -4,5
-            256: -3,5
-            257: -7,5
-            258: -8,5
-            259: -9,5
-            260: -10,5
-            261: -11,5
-            262: -12,5
-            263: -13,5
-            264: -14,5
-            265: -15,5
-            266: -16,5
-            267: -17,5
-            268: -18,5
+            183: 19,1
+            184: 18,1
+            185: 17,1
+            186: 16,1
+            187: 15,1
+            188: 14,1
         - node:
             color: '#A4610696'
             id: HalfTileOverlayGreyscale
@@ -1718,62 +1734,96 @@ entities:
             23: 14,12
             24: 15,12
             25: 16,12
+        - node:
+            color: '#52B4E996'
+            id: HalfTileOverlayGreyscale
+          decals:
+            159: 19,-5
+            160: 18,-5
+            161: 17,-5
+            162: 16,-5
+            163: 15,-5
+            164: 14,-5
+            194: 6,1
+            195: 7,1
+            196: 8,1
+            197: 9,1
+            198: 10,1
+            199: 11,1
+            523: 9,-8
+            524: 10,-8
+            525: 11,-8
         - node:
             color: '#D381C996'
             id: HalfTileOverlayGreyscale
           decals:
-            211: -8,-18
-            212: -9,-18
-            213: -10,-18
-            214: -11,-18
-            215: -12,-18
-            229: -15,-18
-            230: -16,-18
-            231: -17,-18
-            232: -18,-18
-            466: -2,-14
-            467: -3,-14
-            471: -5,-13
-            625: -11,-26
-            626: -12,-26
-            627: -10,-26
-            628: -9,-26
-            639: -6,-27
+            210: -8,-18
+            211: -9,-18
+            212: -10,-18
+            213: -11,-18
+            214: -12,-18
+            228: -15,-18
+            229: -16,-18
+            230: -17,-18
+            231: -18,-18
+            465: -2,-14
+            466: -3,-14
+            470: -5,-13
+            624: -11,-26
+            625: -12,-26
+            626: -10,-26
+            627: -9,-26
+            638: -6,-27
         - node:
             color: '#EFB34196'
             id: HalfTileOverlayGreyscale
           decals:
             35: 30,-2
-            312: 49,5
-            313: 48,5
-            314: 47,5
-            315: 46,5
-            316: 45,5
-            321: 43,9
-            323: 42,9
-            328: 41,6
-            329: 40,6
-            330: 39,6
-            331: 38,6
+            311: 49,5
+            312: 48,5
+            313: 47,5
+            314: 46,5
+            315: 45,5
+            320: 43,9
+            322: 42,9
+            327: 41,6
+            328: 40,6
+            329: 39,6
+            330: 38,6
         - node:
-            color: '#52B4E996'
+            color: '#DE3A3A96'
             id: HalfTileOverlayGreyscale
           decals:
-            160: 19,-5
-            161: 18,-5
-            162: 17,-5
-            163: 16,-5
-            164: 15,-5
-            165: 14,-5
-            195: 6,1
-            196: 7,1
-            197: 8,1
-            198: 9,1
-            199: 10,1
-            200: 11,1
-            524: 9,-8
-            525: 10,-8
-            526: 11,-8
+            127: -11,11
+            128: -12,11
+            129: -13,11
+            130: -14,11
+            251: 0,5
+            252: -1,5
+            253: -2,5
+            254: -4,5
+            255: -3,5
+            256: -7,5
+            257: -8,5
+            258: -9,5
+            259: -10,5
+            260: -11,5
+            261: -12,5
+            262: -13,5
+            263: -14,5
+            264: -15,5
+            265: -16,5
+            266: -17,5
+            267: -18,5
+        - node:
+            color: '#EFB34196'
+            id: HalfTileOverlayGreyscale180
+          decals:
+            234: 34,-5
+            235: 33,-5
+            236: 32,-5
+            237: 31,-5
+            238: 30,-5
         - node:
             color: '#334E6DC8'
             id: HalfTileOverlayGreyscale180
@@ -1786,82 +1836,88 @@ entities:
             14: 7,28
             15: 8,28
             16: 9,28
-            246: 5,30
-            247: 4,30
-            248: 3,30
-            249: 2,30
-            250: 1,30
+            245: 5,30
+            246: 4,30
+            247: 3,30
+            248: 2,30
+            249: 1,30
         - node:
             color: '#52B4E996'
             id: HalfTileOverlayGreyscale180
           decals:
-            516: 11,-6
-            517: 10,-6
-            518: 9,-6
-            519: 8,-6
-            520: 7,-6
-            521: 6,-6
-            532: 11,-12
-            533: 10,-12
-            534: 9,-12
-            554: 15,-12
-            555: 16,-12
+            515: 11,-6
+            516: 10,-6
+            517: 9,-6
+            518: 8,-6
+            519: 7,-6
+            520: 6,-6
+            531: 11,-12
+            532: 10,-12
+            533: 9,-12
+            553: 15,-12
+            554: 16,-12
         - node:
-            color: '#EFB34196'
+            color: '#DE3A3A96'
             id: HalfTileOverlayGreyscale180
           decals:
-            235: 34,-5
-            236: 33,-5
-            237: 32,-5
-            238: 31,-5
-            239: 30,-5
+            108: -7,10
+            109: -8,10
+            110: -9,10
+            111: -10,10
+            112: -11,10
+            113: -12,10
+            114: -13,10
+            115: -14,10
+            134: -4,10
+            135: -3,10
+            286: -13,13
+            287: -14,13
+            288: -15,13
         - node:
-            color: '#DE3A3A96'
-            id: HalfTileOverlayGreyscale180
+            color: '#D381C996'
+            id: HalfTileOverlayGreyscale270
           decals:
-            109: -7,10
-            110: -8,10
-            111: -9,10
-            112: -10,10
-            113: -11,10
-            114: -12,10
-            115: -13,10
-            116: -14,10
-            135: -4,10
-            136: -3,10
-            287: -13,13
-            288: -14,13
-            289: -15,13
+            216: -12,-19
+            217: -12,-20
+            218: -12,-21
+            471: -6,-18
+            472: -6,-17
+            473: -6,-16
+            474: -6,-15
+            475: -6,-14
         - node:
-            color: '#334E6DC8'
+            color: '#52B4E996'
             id: HalfTileOverlayGreyscale270
           decals:
-            5: 0,23
-            6: 0,24
-            7: 0,25
-            8: 0,26
-            243: 6,29
-            360: 1,16
-            361: 1,17
-            362: 1,18
-            363: 1,19
-            364: 1,20
-            365: 1,21
-            366: 6,7
-            367: 6,8
-            368: 6,9
-            369: 6,10
-            370: 6,11
+            166: 14,-6
+            167: 14,-7
+            178: 7,-18
+            179: 7,-17
+            180: 7,-16
+            181: 7,-15
+            182: 7,-14
+            534: 6,-12
+            535: 6,-11
+            536: 6,-9
+            537: 6,-8
+            548: 14,-8
+            549: 14,-9
+            550: 14,-10
+            551: 14,-11
         - node:
-            color: '#A4610696'
+            color: '#DE3A3A96'
             id: HalfTileOverlayGreyscale270
           decals:
-            17: 12,9
-            18: 12,10
-            19: 12,11
-            20: 12,12
-            273: 12,6
-            274: 12,7
+            99: -6,7
+            100: -6,8
+            101: -6,6
+            102: -6,9
+            120: -10,12
+            121: -10,13
+            122: -10,14
+            123: -10,15
+            124: -10,16
+            125: -10,17
         - node:
             color: '#EFB34196'
             id: HalfTileOverlayGreyscale270
@@ -1876,130 +1932,96 @@ entities:
             33: 29,-2
             37: 31,-1
             38: 31,0
-            291: 31,6
-            300: 37,2
-            301: 37,3
-            302: 37,4
-            303: 37,5
-            304: 37,6
-            305: 55,0
-            306: 55,1
-            307: 55,2
-            308: 55,3
-            309: 55,4
-            325: 42,8
-            326: 42,7
+            290: 31,6
+            299: 37,2
+            300: 37,3
+            301: 37,4
+            302: 37,5
+            303: 37,6
+            304: 55,0
+            305: 55,1
+            306: 55,2
+            307: 55,3
+            308: 55,4
+            324: 42,8
+            325: 42,7
         - node:
-            color: '#52B4E996'
+            color: '#A4610696'
             id: HalfTileOverlayGreyscale270
           decals:
-            167: 14,-6
-            168: 14,-7
-            179: 7,-18
-            180: 7,-17
-            181: 7,-16
-            182: 7,-15
-            183: 7,-14
-            535: 6,-12
-            536: 6,-11
-            537: 6,-9
-            538: 6,-8
-            549: 14,-8
-            550: 14,-9
-            551: 14,-10
-            552: 14,-11
+            17: 12,9
+            18: 12,10
+            19: 12,11
+            20: 12,12
+            272: 12,6
+            273: 12,7
         - node:
-            color: '#D381C996'
+            color: '#334E6DC8'
             id: HalfTileOverlayGreyscale270
           decals:
-            217: -12,-19
-            218: -12,-20
-            219: -12,-21
-            472: -6,-18
-            473: -6,-17
-            474: -6,-16
-            475: -6,-15
-            476: -6,-14
+            5: 0,23
+            6: 0,24
+            7: 0,25
+            8: 0,26
+            242: 6,29
+            359: 1,16
+            360: 1,17
+            361: 1,18
+            362: 1,19
+            363: 1,20
+            364: 1,21
+            365: 6,7
+            366: 6,8
+            367: 6,9
+            368: 6,10
+            369: 6,11
         - node:
             color: '#FFD886FF'
             id: HalfTileOverlayGreyscale270
           decals:
-            191: 14,0
-            192: 14,-1
-            193: 14,-2
-            194: 14,-3
+            190: 14,0
+            191: 14,-1
+            192: 14,-2
+            193: 14,-3
         - node:
-            color: '#DE3A3A96'
-            id: HalfTileOverlayGreyscale270
-          decals:
-            100: -6,7
-            101: -6,8
-            102: -6,6
-            103: -6,9
-            121: -10,12
-            122: -10,13
-            123: -10,14
-            124: -10,15
-            125: -10,16
-            126: -10,17
-        - node:
-            color: '#A4610696'
+            color: '#9FED5896'
             id: HalfTileOverlayGreyscale90
           decals:
-            56: 16,11
-            57: 16,10
-            58: 16,9
-            275: 16,7
-            276: 16,6
-            277: 24,13
-            278: 24,12
-            279: 24,11
-            280: 24,10
-            281: 24,9
-            282: 24,8
+            140: -20,7
+            141: -20,8
+            142: -20,9
+            143: -20,10
         - node:
-            color: '#334E6DC8'
+            color: '#52B4E996'
             id: HalfTileOverlayGreyscale90
           decals:
-            242: 0,29
-            354: 5,16
-            355: 5,17
-            356: 5,18
-            357: 5,19
-            358: 5,20
-            359: 5,21
-            371: 10,7
-            372: 10,8
-            373: 10,9
-            374: 10,10
-            375: 10,11
+            169: 12,-7
+            170: 12,-6
+            171: 12,-5
+            172: 12,-4
+            173: 12,-3
+            174: 12,-2
+            175: 12,-1
+            176: 12,0
+            177: 12,1
+            527: 12,-9
+            528: 12,-10
+            529: 12,-11
         - node:
-            color: '#D381C996'
+            color: '#A4610696'
             id: HalfTileOverlayGreyscale90
           decals:
-            202: -1,-18
-            203: -1,-17
-            204: -1,-16
-            205: -1,-15
-            206: -1,-14
-            207: -1,-21
-            208: -1,-20
-            222: -14,-23
-            223: -14,-22
-            224: -14,-21
-            225: -14,-20
-            226: -14,-19
-            227: -14,-18
-            629: -8,-27
-            630: -8,-28
-            631: -8,-29
-            632: -8,-30
-            640: -5,-28
-            641: -5,-29
-            642: -5,-30
-            643: -5,-31
-            644: -5,-32
-            645: -5,-33
+            56: 16,11
+            57: 16,10
+            58: 16,9
+            274: 16,7
+            275: 16,6
+            276: 24,13
+            277: 24,12
+            278: 24,11
+            279: 24,10
+            280: 24,9
+            281: 24,8
         - node:
             color: '#EFB34196'
             id: HalfTileOverlayGreyscale90
@@ -2010,72 +2032,91 @@ entities:
             42: 35,-2
             43: 35,-1
             44: 35,0
-            292: 35,2
-            293: 35,3
-            294: 35,4
-            295: 35,5
-            296: 35,6
-            310: 50,5
-            318: 44,6
-            334: 29,3
-            335: 29,4
-            336: 29,5
-            337: 29,6
+            291: 35,2
+            292: 35,3
+            293: 35,4
+            294: 35,5
+            295: 35,6
+            309: 50,5
+            317: 44,6
+            333: 29,3
+            334: 29,4
+            335: 29,5
+            336: 29,6
         - node:
-            color: '#9FED5896'
+            color: '#DE3A3A96'
             id: HalfTileOverlayGreyscale90
           decals:
-            141: -20,7
-            142: -20,8
-            143: -20,9
-            144: -20,10
+            103: -5,6
+            104: -5,7
+            105: -5,8
+            106: -5,9
+            116: -3,11
+            117: -3,12
+            118: -3,13
+            119: -3,14
+            282: -12,13
+            283: -12,14
+            284: -12,15
+            285: -12,16
         - node:
-            color: '#52B4E996'
+            color: '#334E6DC8'
             id: HalfTileOverlayGreyscale90
           decals:
-            170: 12,-7
-            171: 12,-6
-            172: 12,-5
-            173: 12,-4
-            174: 12,-3
-            175: 12,-2
-            176: 12,-1
-            177: 12,0
-            178: 12,1
-            528: 12,-9
-            529: 12,-10
-            530: 12,-11
+            241: 0,29
+            353: 5,16
+            354: 5,17
+            355: 5,18
+            356: 5,19
+            357: 5,20
+            358: 5,21
+            370: 10,7
+            371: 10,8
+            372: 10,9
+            373: 10,10
+            374: 10,11
         - node:
-            color: '#DE3A3A96'
+            color: '#D381C996'
             id: HalfTileOverlayGreyscale90
           decals:
-            104: -5,6
-            105: -5,7
-            106: -5,8
-            107: -5,9
-            117: -3,11
-            118: -3,12
-            119: -3,13
-            120: -3,14
-            283: -12,13
-            284: -12,14
-            285: -12,15
-            286: -12,16
+            201: -1,-18
+            202: -1,-17
+            203: -1,-16
+            204: -1,-15
+            205: -1,-14
+            206: -1,-21
+            207: -1,-20
+            221: -14,-23
+            222: -14,-22
+            223: -14,-21
+            224: -14,-20
+            225: -14,-19
+            226: -14,-18
+            628: -8,-27
+            629: -8,-28
+            630: -8,-29
+            631: -8,-30
+            639: -5,-28
+            640: -5,-29
+            641: -5,-30
+            642: -5,-31
+            643: -5,-32
+            644: -5,-33
         - node:
             color: '#D381C996'
             id: QuarterTileOverlayGreyscale
           decals:
-            228: -14,-18
-            465: -1,-14
+            227: -14,-18
+            464: -1,-14
         - node:
             color: '#D4D4D428'
             id: QuarterTileOverlayGreyscale
           decals:
-            591: -36,3
-            592: -37,3
-            593: -38,3
-            594: -39,3
-            595: -40,3
+            590: -36,3
+            591: -37,3
+            592: -38,3
+            593: -39,3
+            594: -40,3
         - node:
             color: '#334E6DC8'
             id: QuarterTileOverlayGreyscale
@@ -2083,28 +2124,28 @@ entities:
             0: 2,23
             1: 2,24
             2: 2,25
-            241: 6,28
+            240: 6,28
         - node:
             color: '#DE3A3A96'
             id: QuarterTileOverlayGreyscale
           decals:
-            127: -10,11
-            132: -14,10
-            270: 1,5
-            271: -6,5
+            126: -10,11
+            131: -14,10
+            269: 1,5
+            270: -6,5
         - node:
             color: '#52B4E996'
             id: QuarterTileOverlayGreyscale
           decals:
-            201: 12,1
+            200: 12,1
         - node:
             color: '#EFB34196'
             id: QuarterTileOverlayGreyscale
           decals:
             36: 31,-2
-            311: 50,5
-            322: 44,9
-            327: 42,6
+            310: 50,5
+            321: 44,9
+            326: 42,6
         - node:
             color: '#A4610696'
             id: QuarterTileOverlayGreyscale180
@@ -2114,201 +2155,201 @@ entities:
             color: '#D4D4D428'
             id: QuarterTileOverlayGreyscale180
           decals:
-            586: -37,7
-            587: -38,7
-            588: -39,7
-            589: -40,7
-            590: -36,7
+            585: -37,7
+            586: -38,7
+            587: -39,7
+            588: -40,7
+            589: -36,7
         - node:
             color: '#DE3A3A96'
             id: QuarterTileOverlayGreyscale180
           decals:
-            134: -5,10
+            133: -5,10
         - node:
-            color: '#334E6DC8'
+            color: '#EFB34196'
             id: QuarterTileOverlayGreyscale180
           decals:
-            244: 0,30
+            232: 29,-5
+            318: 44,7
         - node:
-            color: '#52B4E996'
+            color: '#334E6DC8'
             id: QuarterTileOverlayGreyscale180
           decals:
-            500: 19,-18
-            501: 19,-17
-            502: 19,-16
-            503: 19,-15
-            504: 19,-14
-            505: 19,-13
-            506: 19,-12
-            563: 19,-11
-            564: 19,-10
-            565: 19,-9
-            566: 19,-8
+            243: 0,30
         - node:
-            color: '#EFB34196'
+            color: '#52B4E996'
             id: QuarterTileOverlayGreyscale180
           decals:
-            233: 29,-5
-            319: 44,7
+            499: 19,-18
+            500: 19,-17
+            501: 19,-16
+            502: 19,-15
+            503: 19,-14
+            504: 19,-13
+            505: 19,-12
+            562: 19,-11
+            563: 19,-10
+            564: 19,-9
+            565: 19,-8
         - node:
-            color: '#334E6DC8'
+            color: '#DE3A3A96'
             id: QuarterTileOverlayGreyscale270
           decals:
-            245: 6,30
+            107: -6,10
+            132: -14,11
+            289: -12,13
         - node:
-            color: '#EFB34196'
+            color: '#52B4E996'
             id: QuarterTileOverlayGreyscale270
           decals:
-            234: 35,-5
-            324: 42,9
+            165: 14,-5
+            514: 12,-6
+            555: 17,-12
+            556: 17,-13
+            557: 17,-14
+            558: 17,-15
+            559: 17,-16
+            560: 17,-17
+            561: 17,-18
         - node:
-            color: '#D381C996'
+            color: '#FFD886FF'
             id: QuarterTileOverlayGreyscale270
           decals:
-            216: -12,-18
+            189: 14,1
         - node:
-            color: '#FFD886FF'
+            color: '#D381C996'
             id: QuarterTileOverlayGreyscale270
           decals:
-            190: 14,1
+            215: -12,-18
         - node:
-            color: '#52B4E996'
+            color: '#EFB34196'
             id: QuarterTileOverlayGreyscale270
           decals:
-            166: 14,-5
-            515: 12,-6
-            556: 17,-12
-            557: 17,-13
-            558: 17,-14
-            559: 17,-15
-            560: 17,-16
-            561: 17,-17
-            562: 17,-18
+            233: 35,-5
+            323: 42,9
         - node:
-            color: '#DE3A3A96'
+            color: '#334E6DC8'
             id: QuarterTileOverlayGreyscale270
           decals:
-            108: -6,10
-            133: -14,11
-            290: -12,13
+            244: 6,30
         - node:
-            color: '#DE3A3A96'
+            color: '#A4610696'
             id: QuarterTileOverlayGreyscale90
           decals:
-            137: -3,10
-            269: -19,5
-            272: -5,5
+            21: 12,12
+            506: 16,5
+            507: 17,5
+            508: 18,5
+            509: 19,5
+            510: 20,5
+            511: 21,5
+            512: 22,5
+            513: 23,5
         - node:
-            color: '#EFB34196'
+            color: '#DE3A3A96'
             id: QuarterTileOverlayGreyscale90
           decals:
-            34: 29,-2
-            317: 44,5
-            320: 44,9
-            332: 37,6
-            333: 50,4
-            338: 28,6
-            339: 27,6
-            340: 26,6
-            341: 25,6
+            136: -3,10
+            268: -19,5
+            271: -5,5
         - node:
-            color: '#A4610696'
+            color: '#D381C996'
             id: QuarterTileOverlayGreyscale90
           decals:
-            21: 12,12
-            507: 16,5
-            508: 17,5
-            509: 18,5
-            510: 19,5
-            511: 20,5
-            512: 21,5
-            513: 22,5
-            514: 23,5
+            467: -4,-14
         - node:
-            color: '#D381C996'
+            color: '#EFB34196'
             id: QuarterTileOverlayGreyscale90
           decals:
-            468: -4,-14
+            34: 29,-2
+            316: 44,5
+            319: 44,9
+            331: 37,6
+            332: 50,4
+            337: 28,6
+            338: 27,6
+            339: 26,6
+            340: 25,6
         - node:
             color: '#334E6DC8'
             id: QuarterTileOverlayGreyscale90
           decals:
             3: 4,24
             4: 4,25
-            240: 0,28
-            251: 4,23
+            239: 0,28
+            250: 4,23
         - node:
             color: '#FFFFFFFF'
             id: Rock01
           decals:
-            460: 49.003635,-25.832918
+            459: 49.003635,-25.832918
         - node:
             angle: 1.5707963267948966 rad
             color: '#FFFFFFFF'
             id: StandClear
           decals:
-            353: 60,2
+            352: 60,2
         - node:
             color: '#D381C996'
             id: ThreeQuarterTileOverlayGreyscale
           decals:
-            470: -6,-13
+            469: -6,-13
         - node:
             color: '#52B4E996'
             id: ThreeQuarterTileOverlayGreyscale180
           decals:
-            531: 12,-12
+            530: 12,-12
         - node:
             color: '#52B4E996'
             id: ThreeQuarterTileOverlayGreyscale270
           decals:
-            553: 14,-12
+            552: 14,-12
         - node:
             color: '#D381C996'
             id: ThreeQuarterTileOverlayGreyscale90
           decals:
-            469: -4,-13
-            633: -8,-26
-            638: -5,-27
+            468: -4,-13
+            632: -8,-26
+            637: -5,-27
         - node:
             color: '#52B4E996'
             id: ThreeQuarterTileOverlayGreyscale90
           decals:
-            527: 12,-8
+            526: 12,-8
         - node:
             color: '#FFFFFFFF'
             id: WarnBox
           decals:
-            477: -26,24
+            476: -26,24
         - node:
             color: '#FFFFFFFF'
             id: WarnCornerSmallSW
           decals:
-            634: -38,-9
+            633: -38,-9
         - node:
             color: '#FFFFFFFF'
             id: WarnLineS
           decals:
-            635: -38,-10
-            636: -38,-11
-            637: -38,-12
+            634: -38,-10
+            635: -38,-11
+            636: -38,-12
         - node:
             angle: 1.5707963267948966 rad
             color: '#FFFFFFFF'
             id: WarningLine
           decals:
-            145: 53,1
-            146: 53,2
-            147: 53,3
-            347: 60,0
-            348: 60,1
-            349: 60,2
-            350: 60,3
-            351: 60,4
-            352: 60,-1
-            462: -1,16
-            463: -1,17
-            464: -1,18
+            144: 53,1
+            145: 53,2
+            146: 53,3
+            346: 60,0
+            347: 60,1
+            348: 60,2
+            349: 60,3
+            350: 60,4
+            351: 60,-1
+            461: -1,16
+            462: -1,17
+            463: -1,18
         - node:
             color: '#FFFFFFFF'
             id: WarningLine
@@ -2323,23 +2364,22 @@ entities:
             96: -15,18
             97: -14,18
             98: -13,18
-            99: -12,18
-            149: 50,-1
-            150: 49,-1
-            151: 48,-1
-            342: 46,7
-            343: 47,7
-            344: 48,7
-            345: 49,7
-            346: 50,7
-            376: 8,7
-            380: 7,7
-            381: 9,7
-            478: -22,-15
-            479: -23,-15
-            480: -24,-15
-            481: -25,-15
-            482: -26,-15
+            148: 50,-1
+            149: 49,-1
+            150: 48,-1
+            341: 46,7
+            342: 47,7
+            343: 48,7
+            344: 49,7
+            345: 50,7
+            375: 8,7
+            379: 7,7
+            380: 9,7
+            477: -22,-15
+            478: -23,-15
+            479: -24,-15
+            480: -25,-15
+            481: -26,-15
         - node:
             angle: -3.141592653589793 rad
             color: '#FFFFFFFF'
@@ -2353,52 +2393,52 @@ entities:
             color: '#FFFFFFFF'
             id: WarningLine
           decals:
-            572: -40,0
-            573: -40,1
-            574: -40,2
-            575: -40,8
-            576: -40,9
-            577: -40,10
+            571: -40,0
+            572: -40,1
+            573: -40,2
+            574: -40,8
+            575: -40,9
+            576: -40,10
         - node:
             angle: 3.141592653589793 rad
             color: '#FFFFFFFF'
             id: WarningLine
           decals:
-            377: 8,11
+            376: 8,11
         - node:
             angle: 3.141592653589793 rad
             color: '#FFFFFFFF'
             id: WarningLineCorner
           decals:
-            378: 9,11
+            377: 9,11
         - node:
             color: '#FFFFFFFF'
             id: WarningLineCorner
           decals:
-            383: 6,7
+            382: 6,7
         - node:
             angle: -1.5707963267948966 rad
             color: '#FFFFFFFF'
             id: WarningLineCorner
           decals:
-            578: -40,3
+            577: -40,3
         - node:
             angle: 3.141592653589793 rad
             color: '#FFFFFFFF'
             id: WarningLineCornerFlipped
           decals:
-            379: 7,11
+            378: 7,11
         - node:
             color: '#FFFFFFFF'
             id: WarningLineCornerFlipped
           decals:
-            382: 10,7
+            381: 10,7
         - node:
             angle: -1.5707963267948966 rad
             color: '#FFFFFFFF'
             id: WarningLineCornerFlipped
           decals:
-            579: -40,7
+            578: -40,7
       type: DecalGrid
     - type: OccluderTree
     - type: SpreaderGrid
@@ -3980,9 +4020,9 @@ entities:
       type: Transform
 - proto: AirlockMaintSecLocked
   entities:
-  - uid: 1963
+  - uid: 9132
     components:
-    - pos: -15.5,14.5
+    - pos: -16.5,14.5
       parent: 31
       type: Transform
 - proto: AirlockMaintTheatreLocked
@@ -4843,6 +4883,11 @@ entities:
       type: Transform
 - proto: Bed
   entities:
+  - uid: 608
+    components:
+    - pos: 23.5,-15.5
+      parent: 31
+      type: Transform
   - uid: 1956
     components:
     - pos: -12.5,7.5
@@ -4888,11 +4933,6 @@ entities:
     - pos: 32.5,-10.5
       parent: 31
       type: Transform
-  - uid: 7135
-    components:
-    - pos: 24.5,-15.5
-      parent: 31
-      type: Transform
   - uid: 7163
     components:
     - pos: 12.5,-29.5
@@ -4949,9 +4989,9 @@ entities:
       type: Transform
 - proto: BedsheetCMO
   entities:
-  - uid: 7137
+  - uid: 267
     components:
-    - pos: 24.5,-15.5
+    - pos: 23.5,-15.5
       parent: 31
       type: Transform
 - proto: BedsheetCult
@@ -28845,9 +28885,9 @@ entities:
       type: ContainerContainer
 - proto: ClosetBombFilled
   entities:
-  - uid: 2145
+  - uid: 5116
     components:
-    - pos: -12.5,21.5
+    - pos: -14.5,13.5
       parent: 31
       type: Transform
 - proto: ClosetChefFilled
@@ -29411,38 +29451,6 @@ entities:
     - pos: 61.425255,11.534994
       parent: 31
       type: Transform
-- proto: ClothingHeadHelmetEVA
-  entities:
-  - uid: 1601
-    components:
-    - pos: 10.3581705,7.5407553
-      parent: 31
-      type: Transform
-  - uid: 1663
-    components:
-    - pos: 10.3425455,8.52513
-      parent: 31
-      type: Transform
-  - uid: 9134
-    components:
-    - pos: 8.309405,10.476728
-      parent: 31
-      type: Transform
-  - uid: 9139
-    components:
-    - pos: 8.278155,9.648603
-      parent: 31
-      type: Transform
-- proto: ClothingHeadHelmetRiot
-  entities:
-  - uid: 4294
-    components:
-    - flags: InContainer
-      type: MetaData
-    - parent: 84
-      type: Transform
-    - canCollide: False
-      type: Physics
 - proto: ClothingHeadSafari
   entities:
   - uid: 8300
@@ -29550,16 +29558,6 @@ entities:
     - canCollide: False
       type: Physics
     - type: InsideEntityStorage
-- proto: ClothingOuterArmorRiot
-  entities:
-  - uid: 7797
-    components:
-    - flags: InContainer
-      type: MetaData
-    - parent: 84
-      type: Transform
-    - canCollide: False
-      type: Physics
 - proto: ClothingOuterCoatBomber
   entities:
   - uid: 4659
@@ -29614,45 +29612,6 @@ entities:
     - pos: 36.486282,-15.465345
       parent: 31
       type: Transform
-- proto: ClothingOuterHardsuitEVA
-  entities:
-  - uid: 608
-    components:
-    - pos: 10.5769205,8.52513
-      parent: 31
-      type: Transform
-  - uid: 1140
-    components:
-    - pos: 10.5300455,7.5720053
-      parent: 31
-      type: Transform
-  - uid: 9132
-    components:
-    - pos: 8.528155,9.726728
-      parent: 31
-      type: Transform
-  - uid: 9133
-    components:
-    - pos: 8.54378,10.570478
-      parent: 31
-      type: Transform
-- proto: ClothingOuterHardsuitEVAPrisoner
-  entities:
-  - uid: 4254
-    components:
-    - pos: -11.477263,11.702041
-      parent: 31
-      type: Transform
-- proto: ClothingOuterHardsuitSecurity
-  entities:
-  - uid: 5153
-    components:
-    - flags: InContainer
-      type: MetaData
-    - parent: 84
-      type: Transform
-    - canCollide: False
-      type: Physics
 - proto: ClothingOuterWinterCap
   entities:
   - uid: 9030
@@ -29718,6 +29677,11 @@ entities:
       type: Transform
 - proto: ClothingShoesBootsMag
   entities:
+  - uid: 1014
+    components:
+    - pos: 10.330068,10.623066
+      parent: 31
+      type: Transform
   - uid: 1541
     components:
     - pos: 10.3269205,11.58763
@@ -29728,6 +29692,11 @@ entities:
     - pos: 10.6550455,11.540755
       parent: 31
       type: Transform
+  - uid: 7151
+    components:
+    - pos: 10.642568,10.482441
+      parent: 31
+      type: Transform
 - proto: ClothingShoesBootsPerformer
   entities:
   - uid: 8319
@@ -30124,6 +30093,13 @@ entities:
     - pos: -5.5,-22.5
       parent: 31
       type: Transform
+- proto: ComputerSalvageExpedition
+  entities:
+  - uid: 9136
+    components:
+    - pos: 23.5,17.5
+      parent: 31
+      type: Transform
 - proto: ComputerShuttleCargo
   entities:
   - uid: 6174
@@ -30444,14 +30420,14 @@ entities:
       type: Transform
 - proto: CrateEmptySpawner
   entities:
-  - uid: 7820
+  - uid: 3135
     components:
-    - pos: -27.5,-17.5
+    - pos: -17.5,13.5
       parent: 31
       type: Transform
-  - uid: 7834
+  - uid: 7820
     components:
-    - pos: -16.5,13.5
+    - pos: -27.5,-17.5
       parent: 31
       type: Transform
   - uid: 8045
@@ -30586,17 +30562,6 @@ entities:
         - 0
         - 0
       type: EntityStorage
-- proto: CratePrivateSecure
-  entities:
-  - uid: 7796
-    components:
-    - pos: 18.5,15.5
-      parent: 31
-      type: Transform
-    - containers:
-      - EntityStorageComponent
-      - entity_storage
-      type: Construction
 - proto: CrateSurgery
   entities:
   - uid: 7246
@@ -30738,7 +30703,7 @@ entities:
   entities:
   - uid: 9020
     components:
-    - pos: -12.511813,24.551395
+    - pos: -12.586034,24.541399
       parent: 31
       type: Transform
 - proto: DisposalBend
@@ -33740,10 +33705,7 @@ entities:
       type: Transform
   - uid: 8419
     components:
-    - desc: A comfy-looking fox bed. You can even strap your pet in, in case the gravity turns off.
-      name: fox bed
-      type: MetaData
-    - pos: 11.5,23.5
+    - pos: 8.5,26.5
       parent: 31
       type: Transform
 - proto: DonkpocketBoxSpawner
@@ -33777,16 +33739,6 @@ entities:
       type: Transform
 - proto: DoubleEmergencyOxygenTankFilled
   entities:
-  - uid: 267
-    components:
-    - pos: 10.6550455,10.447005
-      parent: 31
-      type: Transform
-  - uid: 3135
-    components:
-    - pos: 10.3894205,10.478255
-      parent: 31
-      type: Transform
   - uid: 7950
     components:
     - pos: 52.51837,-0.3993065
@@ -34707,11 +34659,6 @@ entities:
     - pos: 6.5,20.5
       parent: 31
       type: Transform
-  - uid: 5116
-    components:
-    - pos: -3.5,8.5
-      parent: 31
-      type: Transform
   - uid: 5217
     components:
     - pos: -27.5,16.5
@@ -35528,6 +35475,11 @@ entities:
       pos: -3.494867,8.58493
       parent: 31
       type: Transform
+  - uid: 9133
+    components:
+    - pos: -2.1903043,7.789385
+      parent: 31
+      type: Transform
 - proto: FoodMeat
   entities:
   - uid: 9057
@@ -35559,6 +35511,13 @@ entities:
     - pos: 3.5003717,-30.269686
       parent: 31
       type: Transform
+- proto: FoodNoodlesSpesslaw
+  entities:
+  - uid: 5153
+    components:
+    - pos: -12.528873,11.525741
+      parent: 31
+      type: Transform
 - proto: FoodPieBananaCream
   entities:
   - uid: 7349
@@ -41981,6 +41940,8 @@ entities:
       type: Transform
     - color: '#990000FF'
       type: AtmosPipeColor
+    - enabled: True
+      type: AmbientSound
   - uid: 6036
     components:
     - rot: 1.5707963267948966 rad
@@ -48073,6 +48034,11 @@ entities:
     - pos: -3.5,6.5
       parent: 31
       type: Transform
+  - uid: 4117
+    components:
+    - pos: -3.5,8.5
+      parent: 31
+      type: Transform
   - uid: 4135
     components:
     - rot: 1.5707963267948966 rad
@@ -50442,7 +50408,7 @@ entities:
     - pos: -13.5,21.5
       parent: 31
       type: Transform
-- proto: GunSafeSubMachineGunVector
+- proto: GunSafeSubMachineGunDrozd
   entities:
   - uid: 4302
     components:
@@ -51428,22 +51394,6 @@ entities:
     - pos: -13.5,13.5
       parent: 31
       type: Transform
-- proto: LockerSyndicatePersonal
-  entities:
-  - uid: 84
-    components:
-    - pos: -11.5,21.5
-      parent: 31
-      type: Transform
-    - containers:
-        entity_storage: !type:Container
-          showEnts: False
-          occludes: True
-          ents:
-          - 7797
-          - 5153
-          - 4294
-      type: ContainerContainer
 - proto: LockerWardenFilled
   entities:
   - uid: 3174
@@ -51924,7 +51874,7 @@ entities:
       type: Transform
   - uid: 8769
     components:
-    - pos: -2.490337,7.54375
+    - pos: -2.7528043,7.726885
       parent: 31
       type: Transform
 - proto: NitrogenCanister
@@ -52006,6 +51956,11 @@ entities:
     - pos: 34.5,23.5
       parent: 31
       type: Transform
+  - uid: 805
+    components:
+    - pos: 35.5,10.5
+      parent: 31
+      type: Transform
   - uid: 1089
     components:
     - pos: 52.5,6.5
@@ -52016,11 +51971,6 @@ entities:
     - pos: -4.5,-8.5
       parent: 31
       type: Transform
-  - uid: 1540
-    components:
-    - pos: 30.5,16.5
-      parent: 31
-      type: Transform
   - uid: 3576
     components:
     - pos: 6.5,7.5
@@ -52370,13 +52320,6 @@ entities:
       pos: -4.5,1.5
       parent: 31
       type: Transform
-- proto: Pickaxe
-  entities:
-  - uid: 3889
-    components:
-    - pos: 18.596403,17.50107
-      parent: 31
-      type: Transform
 - proto: PinpointerNuclear
   entities:
   - uid: 1216
@@ -52817,14 +52760,6 @@ entities:
     - containers:
         stash: !type:ContainerSlot {}
       type: ContainerContainer
-  - uid: 7151
-    components:
-    - pos: 8.5,26.5
-      parent: 31
-      type: Transform
-    - containers:
-        stash: !type:ContainerSlot {}
-      type: ContainerContainer
   - uid: 7230
     components:
     - pos: 12.5,-11.5
@@ -52909,21 +52844,11 @@ entities:
       type: ContainerContainer
 - proto: PottedPlantRD
   entities:
-  - uid: 768
+  - uid: 4313
     components:
-    - pos: -2.5,-22.5
+    - pos: -5.5,-24.5
       parent: 31
       type: Transform
-    - containers:
-        potted_plant_hide: !type:ContainerSlot
-          showEnts: False
-          occludes: True
-          ent: null
-        stash: !type:ContainerSlot
-          showEnts: False
-          occludes: True
-          ent: null
-      type: ContainerContainer
 - proto: PowerCellHigh
   entities:
   - uid: 8
@@ -55197,11 +55122,6 @@ entities:
     - pos: 7.5,-17.5
       parent: 31
       type: Transform
-  - uid: 3221
-    components:
-    - pos: 10.5,7.5
-      parent: 31
-      type: Transform
   - uid: 3229
     components:
     - pos: 10.5,11.5
@@ -55212,11 +55132,6 @@ entities:
     - pos: 10.5,10.5
       parent: 31
       type: Transform
-  - uid: 3417
-    components:
-    - pos: 10.5,8.5
-      parent: 31
-      type: Transform
   - uid: 4149
     components:
     - pos: 29.5,-4.5
@@ -57101,6 +57016,11 @@ entities:
     - pos: -8.5,6.5
       parent: 31
       type: Transform
+  - uid: 7796
+    components:
+    - pos: -3.5,8.5
+      parent: 31
+      type: Transform
   - uid: 7799
     components:
     - pos: 13.5,-8.5
@@ -57746,13 +57666,6 @@ entities:
     - pos: -2.6628776,-13.393286
       parent: 31
       type: Transform
-- proto: Shovel
-  entities:
-  - uid: 6933
-    components:
-    - pos: 18.565153,17.00107
-      parent: 31
-      type: Transform
 - proto: ShowcaseRobot
   entities:
   - uid: 9784
@@ -59175,9 +59088,9 @@ entities:
       type: Transform
 - proto: SpawnMobFoxRenault
   entities:
-  - uid: 8420
+  - uid: 4294
     components:
-    - pos: 11.5,23.5
+    - pos: 8.5,26.5
       parent: 31
       type: Transform
 - proto: SpawnMobMcGriff
@@ -59864,6 +59777,135 @@ entities:
     - pos: -7.5,28.5
       parent: 31
       type: Transform
+- proto: SuitStorageAtmos
+  entities:
+  - uid: 2145
+    components:
+    - pos: 30.5,15.5
+      parent: 31
+      type: Transform
+  - uid: 4140
+    components:
+    - pos: 30.5,16.5
+      parent: 31
+      type: Transform
+- proto: SuitStorageCaptain
+  entities:
+  - uid: 8420
+    components:
+    - pos: 11.5,23.5
+      parent: 31
+      type: Transform
+- proto: SuitStorageCE
+  entities:
+  - uid: 4315
+    components:
+    - pos: 37.5,0.5
+      parent: 31
+      type: Transform
+- proto: SuitStorageCMO
+  entities:
+  - uid: 9134
+    components:
+    - pos: 24.5,-15.5
+      parent: 31
+      type: Transform
+- proto: SuitStorageEngi
+  entities:
+  - uid: 986
+    components:
+    - pos: 31.5,-4.5
+      parent: 31
+      type: Transform
+  - uid: 1601
+    components:
+    - pos: 32.5,-4.5
+      parent: 31
+      type: Transform
+  - uid: 4878
+    components:
+    - pos: 30.5,-4.5
+      parent: 31
+      type: Transform
+- proto: SuitStorageEVA
+  entities:
+  - uid: 1963
+    components:
+    - pos: 8.5,10.5
+      parent: 31
+      type: Transform
+  - uid: 3417
+    components:
+    - pos: 10.5,7.5
+      parent: 31
+      type: Transform
+  - uid: 3889
+    components:
+    - pos: 10.5,8.5
+      parent: 31
+      type: Transform
+  - uid: 7137
+    components:
+    - pos: 8.5,9.5
+      parent: 31
+      type: Transform
+- proto: SuitStorageEVAPrisoner
+  entities:
+  - uid: 1663
+    components:
+    - pos: -11.5,11.5
+      parent: 31
+      type: Transform
+- proto: SuitStorageHOS
+  entities:
+  - uid: 3221
+    components:
+    - pos: -7.5,19.5
+      parent: 31
+      type: Transform
+- proto: SuitStorageRD
+  entities:
+  - uid: 1140
+    components:
+    - pos: -2.5,-22.5
+      parent: 31
+      type: Transform
+- proto: SuitStorageSalv
+  entities:
+  - uid: 4254
+    components:
+    - pos: 18.5,16.5
+      parent: 31
+      type: Transform
+  - uid: 6933
+    components:
+    - pos: 18.5,17.5
+      parent: 31
+      type: Transform
+  - uid: 7135
+    components:
+    - pos: 18.5,15.5
+      parent: 31
+      type: Transform
+- proto: SuitStorageSec
+  entities:
+  - uid: 768
+    components:
+    - pos: -12.5,21.5
+      parent: 31
+      type: Transform
+  - uid: 1540
+    components:
+    - pos: -11.5,21.5
+      parent: 31
+      type: Transform
+- proto: SuitStorageWarden
+  entities:
+  - uid: 1962
+    components:
+    - pos: -2.5,8.5
+      parent: 31
+      type: Transform
 - proto: SurveillanceCameraCommand
   entities:
   - uid: 68
@@ -60540,11 +60582,6 @@ entities:
     - pos: -14.5,-1.5
       parent: 31
       type: Transform
-  - uid: 986
-    components:
-    - pos: -11.5,11.5
-      parent: 31
-      type: Transform
   - uid: 1087
     components:
     - pos: 6.5,-11.5
@@ -60677,16 +60714,6 @@ entities:
       pos: -6.5,13.5
       parent: 31
       type: Transform
-  - uid: 4313
-    components:
-    - pos: 18.5,17.5
-      parent: 31
-      type: Transform
-  - uid: 4315
-    components:
-    - pos: 18.5,16.5
-      parent: 31
-      type: Transform
   - uid: 4466
     components:
     - pos: 18.5,7.5
@@ -60882,16 +60909,6 @@ entities:
     - pos: -20.5,-2.5
       parent: 31
       type: Transform
-  - uid: 9136
-    components:
-    - pos: 8.5,10.5
-      parent: 31
-      type: Transform
-  - uid: 9138
-    components:
-    - pos: 8.5,9.5
-      parent: 31
-      type: Transform
   - uid: 9510
     components:
     - pos: 45.5,-2.5
@@ -61146,11 +61163,6 @@ entities:
     - pos: 40.5,-1.5
       parent: 31
       type: Transform
-  - uid: 4117
-    components:
-    - pos: -3.5,8.5
-      parent: 31
-      type: Transform
   - uid: 4193
     components:
     - pos: 2.5,31.5
@@ -62024,12 +62036,11 @@ entities:
     - pos: 14.5,21.5
       parent: 31
       type: Transform
-  - uid: 1014
+  - uid: 7797
     components:
     - flags: SessionSpecific
-      name: cigarette machine
       type: MetaData
-    - pos: -7.5,19.5
+    - pos: -7.5,17.5
       parent: 31
       type: Transform
   - uid: 8705
@@ -62301,11 +62312,11 @@ entities:
       type: Transform
 - proto: VendingMachineSec
   entities:
-  - uid: 805
+  - uid: 7834
     components:
     - flags: SessionSpecific
       type: MetaData
-    - pos: -14.5,13.5
+    - pos: -15.5,13.5
       parent: 31
       type: Transform
 - proto: VendingMachineSecDrobe
@@ -62510,6 +62521,11 @@ entities:
     - pos: 13.5,2.5
       parent: 31
       type: Transform
+  - uid: 84
+    components:
+    - pos: -16.5,13.5
+      parent: 31
+      type: Transform
   - uid: 89
     components:
     - rot: 1.5707963267948966 rad
@@ -64138,11 +64154,6 @@ entities:
     - pos: -15.5,12.5
       parent: 31
       type: Transform
-  - uid: 1962
-    components:
-    - pos: -15.5,13.5
-      parent: 31
-      type: Transform
   - uid: 1964
     components:
     - pos: -15.5,15.5
@@ -69644,12 +69655,6 @@ entities:
     - pos: 12.5,27.5
       parent: 31
       type: Transform
-  - uid: 4878
-    components:
-    - rot: -1.5707963267948966 rad
-      pos: -3.5,8.5
-      parent: 31
-      type: Transform
   - uid: 4892
     components:
     - pos: -1.5,6.5
@@ -69789,12 +69794,6 @@ entities:
       type: Transform
 - proto: WindoorSecurityLocked
   entities:
-  - uid: 4140
-    components:
-    - rot: 1.5707963267948966 rad
-      pos: -3.5,8.5
-      parent: 31
-      type: Transform
   - uid: 4890
     components:
     - rot: 3.141592653589793 rad
-- 
2.51.2