]> git.smokeofanarchy.ru Git - space-station-14.git/commitdiff
projects / space-station-14.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: cfb7666)
[map] saltern 4.7 (#16527)
authordeltanedas <39013340+deltanedas@users.noreply.github.com>
Wed, 17 May 2023 20:27:34 +0000 (20:27 +0000)
committerGitHub <noreply@github.com>
Wed, 17 May 2023 20:27:34 +0000 (14:27 -0600)
* saltern 4.7

* proto

* recharges

* VALIIIIID

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
Resources/Maps/saltern.yml patch | blob | history
Resources/Prototypes/Maps/saltern.yml patch | blob | history

diff --git a/Resources/Maps/saltern.yml b/Resources/Maps/saltern.yml
index 0331277ebf4d64d6dd7325b00b2570ac66d3c636..daa50a93e2682266e6fa256cfdf409e46ac12706 100644 (file)
--- a/Resources/Maps/saltern.yml
+++ b/Resources/Maps/saltern.yml
@@ -5,6 +5,7 @@ tilemap:
   0: Space
   12: FloorBar
   15: FloorBlueCircuit
+  18: FloorCarpetOffice
   21: FloorClown
   22: FloorDark
   31: FloorDarkPlastic
@@ -28,6 +29,7 @@ tilemap:
   78: FloorTechMaint
   81: FloorWhite
   91: FloorWood
+  92: FloorWoodTile
   93: Lattice
   94: Plating
 entities:
@@ -53,7 +55,7 @@ entities:
           tiles: WwAAAF4AAABEAAABRAAAA0QAAANEAAAAUQAAAVEAAANRAAADUQAAAFEAAANRAAAAUQAAAl4AAABRAAACUQAAAVsAAABeAAAARAAAAEQAAABEAAACXgAAAFEAAABRAAAAUQAAAVEAAAFRAAAAUQAAAFEAAABeAAAAUQAAAlEAAANeAAAAXgAAAEQAAANEAAABRAAAAF4AAABeAAAAXgAAAF4AAABeAAAAXgAAAF4AAABeAAAAXgAAAF4AAABeAAAARAAAAkQAAAFEAAAARAAAA0QAAAFEAAABRAAAA0QAAAJEAAACRAAAAkQAAAJEAAABRAAAAkQAAABEAAAARAAAAUQAAAFEAAACRAAAAEQAAAFEAAADRAAAA0QAAANEAAACRAAAAUQAAABEAAACRAAAAEQAAAFEAAADRAAAAkQAAANEAAABRAAAAEQAAAFEAAACRAAAAEQAAANEAAABRAAAAkQAAAFEAAACRAAAAUQAAAJEAAACRAAAAUQAAANEAAAAXgAAAF4AAABEAAAARAAAA0QAAABeAAAAXgAAABYAAAJeAAAAFgAAA14AAABeAAAARAAAAkQAAANEAAACRAAAAhYAAAFeAAAARAAAA0QAAANEAAACXgAAABYAAAEWAAACFgAAAxYAAAEWAAACXgAAAEQAAANEAAABRAAAAUQAAAEWAAACXgAAAEQAAANEAAACRAAAA14AAAAWAAACFgAAAhYAAAEWAAAAFgAAAF4AAABeAAAARAAAAkQAAAJEAAABFgAAA14AAABEAAABRAAAAEQAAABeAAAAFgAAAxYAAAAWAAAAFgAAABYAAANeAAAARAAAA0QAAAFEAAABRAAAAEQAAAJeAAAARAAAAEQAAAFEAAACXgAAABYAAAMWAAADFgAAABYAAAAWAAABXgAAAEQAAANEAAACRAAAAkQAAAFEAAACXgAAAEQAAAJEAAADRAAAAF4AAAAWAAABFgAAABYAAAAWAAAAFgAAAV4AAABEAAACRAAAAEQAAANEAAAARAAAAl4AAABEAAADRAAAA0QAAAJeAAAAXgAAAF4AAAAWAAAAXgAAAF4AAABeAAAARAAAAUQAAABEAAABRAAAAEQAAAFeAAAARAAAAkQAAAJEAAABXgAAAE4AAABOAAAATgAAAE4AAABOAAAAXgAAAF4AAABeAAAAXgAAAF4AAAAWAAABXgAAAEQAAANEAAADRAAAAF4AAABeAAAAXgAAAF4AAABeAAAAXgAAAF4AAABeAAAAXgAAAE4AAABOAAAAXgAAAF4AAABEAAABRAAAAEQAAAJeAAAAXgAAAF4AAABeAAAAXgAAAF4AAABeAAAAXgAAAF4AAABOAAAATgAAAA==
         1,0:
           ind: 1,0
-          tiles: UQAAAVEAAAJRAAADUQAAAl4AAABeAAAATgAAAE4AAABeAAAANQAAADUAAAA1AAAANQAAADUAAABeAAAARAAAA1EAAANRAAAAUQAAA1EAAANeAAAAXgAAAE4AAABOAAAAXgAAADUAAAA1AAAANQAAADUAAAA1AAAAXgAAAF4AAABeAAAAXgAAAF4AAABeAAAAXgAAAE4AAABeAAAAXgAAAF4AAABeAAAAXgAAADUAAABeAAAAXgAAAF4AAABEAAABRAAAAEQAAAJEAAADRAAAAUQAAAFEAAAARAAAAkQAAAJEAAACRAAAAEQAAAJEAAACRAAAAUQAAAJEAAACRAAAAkQAAAJEAAACRAAAAUQAAAJEAAABRAAAA0QAAABEAAAARAAAA0QAAANEAAADRAAAAUQAAANEAAABXgAAAEQAAAJEAAABRAAAAkQAAABEAAADRAAAAEQAAABEAAAARAAAAkQAAANEAAAARAAAA0QAAABEAAADRAAAAhYAAAJEAAADRAAAAl4AAABeAAAAXgAAAF4AAABeAAAAXgAAAF4AAABeAAAARAAAAkQAAAJEAAABRAAAA0QAAANeAAAARAAAA0QAAAJeAAAARAAAAUQAAAJEAAADRAAAA0QAAAJEAAACXgAAAF4AAABeAAAAXgAAAF4AAABeAAAAXgAAAF4AAABeAAAAXgAAAEQAAAFEAAACRAAAAkQAAANEAAADRAAAAEQAAAFeAAAARAAAAUQAAANEAAABXgAAAE4AAABOAAAARAAAAF4AAABEAAAARAAAAkQAAAFEAAACRAAAA0QAAANEAAAARAAAAUQAAAFEAAAARAAAAV4AAABOAAAATgAAAEQAAABEAAAARAAAAEQAAAJEAAAARAAAAkQAAAJEAAACRAAAAl4AAABEAAABRAAAAV4AAABeAAAATgAAAE4AAABEAAADRAAAAEQAAAJEAAACRAAAAkQAAANEAAADRAAAAEQAAANeAAAAXgAAAF4AAABeAAAAXgAAAE4AAABOAAAARAAAA14AAABEAAACRAAAAUQAAANEAAACRAAAAEQAAAJEAAADXgAAAF4AAABeAAAAXgAAAF4AAABOAAAAXgAAAF4AAABeAAAARAAAAEQAAAJEAAABRAAAAEQAAAJEAAADRAAAAF4AAABeAAAAXgAAAF4AAABeAAAATgAAAF4AAABeAAAAXgAAAF4AAABeAAAARAAAAEQAAAJeAAAAXgAAAF4AAABeAAAAXgAAAF4AAABeAAAAXgAAAE4AAABeAAAATgAAAF4AAABEAAABRAAAA0QAAAJEAAABRAAAAEQAAANEAAACRAAAA0QAAAFEAAACRAAAAl4AAABOAAAAXgAAAA==
+          tiles: UQAAAVEAAAJRAAADUQAAAl4AAABeAAAATgAAAE4AAABeAAAANQAAADUAAAA1AAAANQAAADUAAABeAAAARAAAA1EAAANRAAAAUQAAA1EAAANeAAAAXgAAAE4AAABOAAAAXgAAADUAAAA1AAAANQAAADUAAAA1AAAAXgAAAF4AAABeAAAAXgAAAF4AAABeAAAAXgAAAE4AAABeAAAAXgAAAF4AAABeAAAAXgAAADUAAABeAAAAXgAAAF4AAABEAAABRAAAAEQAAAJEAAADRAAAAUQAAAFEAAAARAAAAkQAAAJEAAACRAAAAEQAAAJEAAACRAAAAUQAAAJEAAACRAAAAkQAAAJEAAACRAAAAUQAAAJEAAABRAAAA0QAAABEAAAARAAAA0QAAANEAAADRAAAAUQAAANEAAABXgAAAEQAAAJEAAABRAAAAkQAAABEAAADRAAAAEQAAABEAAAARAAAAkQAAANEAAAARAAAA0QAAABEAAADRAAAAhYAAAJEAAADRAAAAl4AAABeAAAAXgAAAF4AAABeAAAAXgAAAF4AAABeAAAARAAAAkQAAAJEAAABRAAAA0QAAANeAAAARAAAA0QAAAJeAAAARAAAAUQAAAJEAAADRAAAA0QAAAJEAAACXgAAAF4AAABeAAAAXgAAAF4AAABeAAAAXgAAAF4AAABeAAAAXgAAAEQAAAFEAAACRAAAAkQAAANEAAADRAAAAEQAAAFeAAAARAAAAUQAAANEAAABXgAAAE4AAABOAAAARAAAAF4AAABEAAAARAAAAkQAAAFEAAACRAAAA0QAAANEAAAARAAAAUQAAAFEAAAARAAAAV4AAABOAAAATgAAAEQAAABEAAAARAAAAEQAAAJEAAAARAAAAkQAAAJEAAACRAAAAl4AAABEAAABRAAAAUQAAABeAAAATgAAAE4AAABEAAADRAAAAEQAAAJEAAACRAAAAkQAAANEAAADRAAAAEQAAANeAAAAXgAAAF4AAABeAAAAXgAAAE4AAABOAAAARAAAA14AAABEAAACRAAAAUQAAANEAAACRAAAAEQAAAJEAAADXgAAAF4AAABeAAAAXgAAAF4AAABOAAAAXgAAAF4AAABeAAAARAAAAEQAAAJEAAABRAAAAEQAAAJEAAADRAAAAF4AAABeAAAAXgAAAF4AAABeAAAATgAAAF4AAABeAAAAXgAAAF4AAABeAAAARAAAAEQAAAJeAAAAXgAAAF4AAABeAAAAXgAAAF4AAABeAAAAXgAAAE4AAABeAAAATgAAAF4AAABEAAABRAAAA0QAAAJEAAABRAAAAEQAAANEAAACRAAAA0QAAAFEAAACRAAAAl4AAABOAAAAXgAAAA==
         0,1:
           ind: 0,1
           tiles: XgAAAEQAAAJEAAACRAAAAkQAAAFEAAAAXgAAABYAAAMWAAADFgAAABYAAANeAAAAXgAAAF4AAABOAAAATgAAABYAAABEAAACRAAAAUQAAANEAAACRAAAAFsAAAFbAAACWwAAAFsAAANbAAACXgAAAF4AAABeAAAATgAAAE4AAABeAAAARAAAAkQAAANEAAACRAAAAEQAAAFeAAAAWwAAA1sAAANbAAACWwAAAF4AAABeAAAAXgAAAE4AAABOAAAAXgAAAEQAAAJEAAAARAAAAkQAAAFEAAABXgAAAFsAAAFbAAACWwAAAVsAAAMWAAAAXgAAAF4AAABOAAAAXgAAAF4AAABEAAAARAAAAUQAAAFEAAAARAAAAUQAAANbAAABWwAAAFsAAAFbAAABXgAAAF4AAABeAAAATgAAAF4AAABeAAAARAAAAkQAAAFEAAADRAAAAUQAAAJeAAAAFgAAAxYAAAAWAAADFgAAA14AAABeAAAAXgAAAE4AAABeAAAAXgAAAF4AAABeAAAAFgAAAV4AAABeAAAAXgAAAF4AAABeAAAAXgAAAF4AAABeAAAAXgAAAF4AAABeAAAAXgAAABYAAANeAAAAFgAAARYAAAMWAAADXgAAADEAAAAxAAAAMQAAAF4AAABbAAACWwAAAlsAAABeAAAAXgAAAAAAAAAWAAABFgAAABYAAAIWAAACFgAAAF4AAAAxAAAAMQAAADEAAABeAAAAWwAAAlsAAANbAAAAXgAAAF4AAAAAAAAAFgAAAhYAAAAWAAABFgAAABYAAAMxAAAAMQAAADEAAAAxAAAAWwAAAFsAAAJeAAAAWwAAAV4AAABeAAAAAAAAABYAAABeAAAAXgAAABYAAABeAAAAXgAAADEAAAAxAAAAMQAAAF4AAABbAAACXgAAAFEAAANRAAACXgAAAAAAAABeAAAAXgAAABYAAAMWAAAAFgAAAV4AAABeAAAAXgAAAF4AAABeAAAAXgAAAF4AAABRAAAAXgAAAF4AAAAAAAAAFgAAAhYAAAMWAAABFgAAAxYAAAEWAAADFgAAAxYAAAIWAAABFgAAAF4AAABeAAAAXgAAAF4AAAAAAAAAAAAAABYAAABeAAAAFgAAAhYAAAAWAAABXgAAABYAAAAWAAADFgAAAhYAAABeAAAAXQAAAAAAAAAAAAAAAAAAAAAAAAAWAAACFgAAAhYAAAEWAAACFgAAAxYAAAAWAAACFgAAAxYAAAEWAAAAXgAAAF0AAAAAAAAAAAAAAAAAAAAAAAAAFgAAAhYAAAMWAAAAFgAAARYAAAEWAAAAFgAAAxYAAAAWAAADXgAAAF4AAABdAAAAAAAAAAAAAAAAAAAAAAAAAA==
@@ -65,7 +67,7 @@ entities:
           tiles: UQAAAlEAAAFRAAABUQAAA14AAABbAAADWwAAAlsAAANbAAABXgAAAF4AAABeAAAAXgAAAF0AAAAAAAAAAAAAAF4AAABRAAAAUQAAAVEAAAFRAAABWwAAAlsAAAFbAAACWwAAAl4AAABeAAAAXgAAAF4AAABdAAAAAAAAAAAAAABeAAAAUQAAAlEAAAFRAAABXgAAAFsAAAFbAAADWwAAAVsAAABeAAAAXgAAAF4AAABeAAAAXQAAAAAAAAAAAAAAXgAAAFEAAABRAAAAUQAAA14AAABbAAAAWwAAAFsAAAFbAAAAXgAAAF4AAABeAAAAXgAAAF0AAAAAAAAAAAAAAFEAAABRAAABUQAAAFEAAAFeAAAAXgAAAF4AAABeAAAAXgAAAF4AAABeAAAAXgAAAF4AAABeAAAAXgAAAF4AAABRAAABUQAAAlEAAANRAAAAXgAAAF4AAABeAAAAXgAAAF4AAABeAAAAXgAAAE4AAABeAAAAXgAAAEcAAABHAAAAUQAAAFEAAANRAAADUQAAAV4AAABeAAAATgAAAF4AAABeAAAAXgAAAF4AAABOAAAAXgAAAEcAAABeAAAAXgAAAFEAAAFRAAACUQAAAVEAAANeAAAAXgAAAF4AAABeAAAAXgAAAF4AAABeAAAATgAAAF4AAABeAAAAXgAAAF4AAABRAAAAUQAAAFEAAAFRAAABXgAAAFEAAABRAAABUQAAA1EAAAFeAAAAXgAAAF4AAABeAAAAXgAAAF4AAABeAAAAUQAAA1EAAANRAAABUQAAAVEAAABRAAAAUQAAAlEAAANRAAACXgAAAE4AAABOAAAATgAAAE4AAABOAAAATgAAAFEAAABRAAACUQAAA1EAAABeAAAAUQAAAVEAAANRAAACUQAAAV4AAABOAAAAXgAAAF4AAABeAAAAXgAAAF4AAABRAAACUQAAAVEAAAFRAAAAXgAAAFEAAABRAAADUQAAAFEAAABeAAAATgAAAF4AAABeAAAARAAAAEQAAABEAAACUQAAAlEAAANeAAAAXgAAAF4AAABeAAAAXgAAAF4AAABeAAAAXgAAAE4AAABeAAAAXgAAAEQAAAJEAAACRAAAAFEAAAJRAAACUQAAAFEAAAJeAAAAXgAAAF4AAABeAAAAXgAAAF4AAABOAAAAXgAAAF4AAABEAAACRAAAAUQAAANRAAABUQAAAlEAAAJRAAADXgAAAF4AAABOAAAATgAAAE4AAABeAAAATgAAAF4AAABeAAAARAAAA0QAAABEAAADUQAAA1EAAABRAAADUQAAAV4AAABeAAAATgAAAE4AAABeAAAAXgAAAF4AAABeAAAAXgAAAF4AAABeAAAARAAAAg==
         0,-2:
           ind: 0,-2
-          tiles: MQAAAF4AAABeAAAAXgAAAF4AAABeAAAAXgAAAF4AAABeAAAAXgAAAF4AAAAxAAAAMQAAAF4AAABeAAAAXgAAADEAAABeAAAARAAAA0QAAAFEAAADXgAAAFsAAABbAAAAWwAAAlsAAANbAAADMQAAADEAAABeAAAAXgAAAF4AAAAxAAAAMQAAAEQAAAFEAAABRAAAAl4AAABbAAABWwAAAFsAAANbAAAAXgAAADEAAAAxAAAAXgAAAF4AAABeAAAAXgAAAF4AAABEAAADRAAAA0QAAAJeAAAAWwAAAlsAAAFbAAABWwAAAF4AAABeAAAAXgAAAF4AAABeAAAAXgAAAE4AAABeAAAARAAAAUQAAABEAAABWwAAA1sAAABbAAAAWwAAA1sAAABbAAADWwAAAlsAAAJeAAAAXgAAAF4AAABOAAAAXgAAAEQAAABEAAADRAAAAVsAAABbAAABWwAAAVsAAAJbAAAAWwAAAVsAAAFbAAADXgAAAF4AAABeAAAATgAAAF4AAABEAAACRAAAAEQAAAFbAAACWwAAAVsAAAJbAAAAWwAAAFsAAAJbAAAAWwAAA14AAABeAAAAXgAAAE4AAABeAAAARAAAAEQAAAJEAAACXgAAAFsAAAFbAAADWwAAAFsAAAFbAAABWwAAAFsAAAFeAAAAXgAAAE4AAABeAAAAXgAAAEQAAAJEAAABRAAAAV4AAABbAAAAWwAAAlsAAANbAAAAWwAAAVsAAAFbAAADXgAAAF4AAABOAAAAXgAAAF4AAABEAAABRAAAAEQAAABeAAAAXgAAAFsAAABbAAAAWwAAA1sAAANbAAADWwAAAl4AAABeAAAATgAAAF4AAABEAAABRAAAAkQAAAFEAAABRAAAAl4AAABeAAAAXgAAAF4AAABeAAAAXgAAAF4AAABeAAAAXgAAAE4AAAAWAAACRAAAA0QAAAJEAAACRAAAA0QAAABeAAAAXgAAAF4AAABeAAAAXgAAAF4AAABeAAAAXgAAAF4AAABOAAAAFgAAAUQAAAJEAAABRAAAAkQAAANEAAADXgAAAE4AAABOAAAATgAAAE4AAABOAAAATgAAAF4AAABOAAAATgAAAF4AAABEAAADRAAAA0QAAAJEAAABRAAAA14AAABeAAAAXgAAAF4AAABeAAAAXgAAAF4AAABeAAAAXgAAAF4AAABeAAAARAAAAUQAAAFEAAADRAAAAUQAAAFeAAAAUQAAAFEAAAFRAAABFgAAAxYAAAIWAAAAFgAAAxYAAAMWAAACXgAAAEQAAANEAAADRAAAA0QAAAJEAAAAXgAAAFEAAAFRAAAAUQAAAF4AAAAWAAAAFgAAARYAAAMWAAADFgAAAw==
+          tiles: EgAAAF4AAABeAAAAXgAAAF4AAABeAAAAXgAAAF4AAABeAAAAXgAAAF4AAAAxAAAAMQAAAF4AAABeAAAAXgAAABIAAABeAAAARAAAA0QAAAFEAAADXgAAAFsAAABbAAAAWwAAAlsAAANbAAADMQAAADEAAABeAAAAXgAAAF4AAAASAAAARAAAAEQAAAFEAAABRAAAAl4AAABbAAABWwAAAFsAAANbAAAAXgAAADEAAAAxAAAAXgAAAF4AAABeAAAAXgAAAF4AAABEAAADRAAAA0QAAAJeAAAAWwAAAlsAAAFbAAABWwAAAF4AAABeAAAAXgAAAF4AAABeAAAAXgAAAE4AAABeAAAARAAAAUQAAABEAAABWwAAA1sAAABbAAAAWwAAA1sAAABbAAADWwAAAlsAAAJeAAAAXgAAAF4AAABOAAAAXgAAAEQAAABEAAADRAAAAVsAAABbAAABWwAAAVsAAAJbAAAAWwAAAVsAAAFbAAADXgAAAF4AAABeAAAATgAAAF4AAABEAAACRAAAAEQAAAFbAAACWwAAAVsAAAJbAAAAWwAAAFsAAAJbAAAAWwAAA14AAABeAAAAXgAAAE4AAABeAAAARAAAAEQAAAJEAAACXgAAAFsAAAFbAAADWwAAAFsAAAFbAAABWwAAAFsAAAFeAAAAXgAAAE4AAABeAAAAXgAAAEQAAAJEAAABRAAAAV4AAABbAAAAWwAAAlsAAANbAAAAWwAAAVsAAAFbAAADXgAAAF4AAABOAAAAXgAAAF4AAABEAAABRAAAAEQAAABeAAAAXgAAAFsAAABbAAAAWwAAA1sAAANbAAADWwAAAl4AAABeAAAATgAAAF4AAABEAAABRAAAAkQAAAFEAAABRAAAAl4AAABeAAAAXgAAAF4AAABeAAAAXgAAAF4AAABeAAAAXgAAAE4AAAAWAAACRAAAA0QAAAJEAAACRAAAA0QAAABeAAAAXgAAAF4AAABeAAAAXgAAAF4AAABeAAAAXgAAAF4AAABOAAAAFgAAAUQAAAJEAAABRAAAAkQAAANEAAADXgAAAE4AAABOAAAATgAAAE4AAABOAAAATgAAAF4AAABOAAAATgAAAF4AAABEAAADRAAAA0QAAAJEAAABRAAAA14AAABeAAAAXgAAAF4AAABeAAAAXgAAAF4AAABeAAAAXgAAAF4AAABeAAAARAAAAUQAAAFEAAADRAAAAUQAAAFeAAAAUQAAAFEAAAFRAAABFgAAAxYAAAIWAAAAFgAAAxYAAAMWAAACXgAAAEQAAANEAAADRAAAA0QAAAJEAAAAXgAAAFEAAAFRAAAAUQAAAF4AAAAWAAAAFgAAARYAAAMWAAADFgAAAw==
         1,-2:
           ind: 1,-2
           tiles: XgAAAF4AAABdAAAAXQAAAF0AAABdAAAAXQAAAF0AAABdAAAAXQAAAF0AAABdAAAAXQAAAF0AAABdAAAAXQAAAF4AAABeAAAAXQAAAF4AAABdAAAAXgAAAF0AAABeAAAAXQAAAF4AAABdAAAAXgAAAF0AAABeAAAAAAAAAAAAAABOAAAAXgAAAF0AAABeAAAAXQAAAF4AAABdAAAAXgAAAF0AAABeAAAAXQAAAF4AAABdAAAAXgAAAAAAAAAAAAAATgAAAF4AAABdAAAAXgAAAF0AAABeAAAAXQAAAF4AAABdAAAAXgAAAF0AAABeAAAAXQAAAF4AAAAAAAAAAAAAAE4AAABeAAAAXQAAAF4AAABdAAAAXgAAAF0AAABeAAAAXQAAAF4AAABdAAAAXgAAAF0AAABeAAAAXQAAAF0AAABeAAAAXgAAAF4AAABeAAAAXgAAAF4AAABeAAAAXgAAAF4AAABeAAAAXgAAAF4AAABeAAAAXQAAAAAAAABeAAAAXgAAAF4AAABeAAAAXgAAAF4AAABeAAAAXgAAAF4AAABeAAAAXgAAADEAAAAxAAAAXgAAAF0AAAAAAAAAXgAAAE4AAABOAAAATgAAAE4AAABOAAAATgAAAF4AAABeAAAAXgAAAF4AAAAxAAAAMQAAAF4AAABdAAAAAAAAAF4AAABeAAAAXgAAAF4AAABeAAAAXgAAAE4AAABeAAAAXgAAAF4AAAAxAAAAMQAAADEAAABeAAAAXQAAAAAAAABeAAAAXgAAADwAAAA8AAAAPAAAAF4AAABOAAAAXgAAAF4AAABeAAAAXgAAADEAAAAxAAAAXgAAAF0AAAAAAAAAXgAAAF4AAAA8AAAAPAAAADwAAABeAAAATgAAAF4AAABeAAAAXgAAAF4AAABeAAAAXgAAAF4AAABdAAAAXQAAAF4AAABeAAAAPAAAADwAAAA8AAAAXgAAAE4AAABeAAAAXgAAAF4AAABeAAAAXgAAAE4AAABeAAAAXgAAAF4AAABeAAAAXgAAADwAAAA8AAAAPAAAAF4AAABeAAAAXgAAAF4AAABeAAAAXgAAAF4AAABeAAAAXgAAAF4AAABeAAAAXgAAAF4AAABeAAAAXgAAAFEAAAFeAAAATgAAAF4AAABeAAAAXgAAAF4AAABeAAAAXgAAAF4AAABeAAAAXgAAAF4AAABeAAAAUQAAA1EAAABRAAAAXgAAAE4AAABeAAAAXgAAAF4AAABeAAAAXgAAAF4AAABeAAAAXgAAAF4AAABeAAAAXgAAAFEAAANRAAAAUQAAAF4AAABeAAAAXgAAAF4AAABeAAAAXgAAAF4AAABeAAAAXgAAAF4AAABeAAAAXgAAAA==
@@ -74,7 +76,7 @@ entities:
           tiles: XgAAAEQAAAE8AAAAPAAAADwAAABeAAAARAAAAiYAAABEAAAARAAAAUQAAANeAAAAFgAAARYAAAEWAAAAFgAAAl4AAABeAAAAXgAAABYAAANeAAAAXgAAAEQAAABEAAACRAAAAEQAAANEAAACXgAAABYAAAMWAAADFgAAAhYAAAJeAAAAOgAAADoAAAA6AAAAOgAAAF4AAABeAAAAWwAAA14AAABeAAAAXgAAAF4AAAAWAAACFgAAAxYAAAAWAAACXgAAADoAAAA6AAAAOgAAADoAAABeAAAAWwAAAlsAAANbAAADXgAAAF4AAABeAAAAXgAAAF4AAABeAAAAXgAAAF4AAAA6AAAAOgAAADoAAAA6AAAAFgAAAFsAAABbAAADWwAAAF4AAABOAAAATgAAAE4AAABOAAAATgAAAE4AAABeAAAAOgAAADoAAAA6AAAAOgAAAF4AAABbAAAAWwAAAFsAAAFeAAAATgAAAF4AAABeAAAAXgAAAF4AAABeAAAAXgAAAF4AAABeAAAAXgAAAF4AAABeAAAAXgAAAF4AAABeAAAAXgAAAE4AAABeAAAAXgAAAF4AAABeAAAAXgAAAF4AAABeAAAAXgAAAF4AAABeAAAAXgAAAE4AAABOAAAATgAAAE4AAABOAAAAXgAAAF4AAAAxAAAAMQAAADEAAABOAAAATgAAAE4AAABOAAAATgAAAF4AAABOAAAATgAAAF4AAABeAAAAXgAAAF4AAABeAAAAMQAAADEAAAAxAAAAXgAAAF4AAABeAAAAXgAAAF4AAABeAAAAXgAAAF4AAABeAAAAOgAAADoAAAA6AAAAOgAAADEAAAAxAAAAMQAAAF4AAABeAAAAXgAAAF4AAABeAAAAXgAAADoAAAA6AAAAOgAAADoAAAA6AAAAOgAAADoAAAAxAAAAMQAAADEAAABdAAAAXQAAAF0AAABdAAAAXQAAAF0AAAA6AAAAOgAAADoAAAA6AAAAOgAAADoAAAA6AAAAXgAAAF4AAABeAAAAXQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOgAAADoAAAA6AAAAOgAAADoAAAA6AAAAOgAAABYAAAIWAAAAFgAAA10AAABdAAAAXQAAAF0AAABdAAAAXQAAADoAAAA6AAAAOgAAADoAAAA6AAAAOgAAADoAAAAWAAADFgAAABYAAAAAAAAAAAAAAAAAAAAAAAAAXQAAAF0AAAA6AAAAOgAAADoAAAA6AAAAOgAAADoAAAA6AAAAFgAAAxYAAAMWAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABdAAAAOgAAADoAAAA6AAAAOgAAADoAAAA6AAAAOgAAAF4AAAAWAAABFgAAAw==
         -2,1:
           ind: -2,1
-          tiles: IgAAACIAAAAiAAAAIgAAAF4AAABOAAAAXgAAAF4AAABHAAAARwAAAEcAAABeAAAAXgAAAF4AAABeAAAAXgAAACIAAAAiAAAAIgAAACIAAABeAAAATgAAAF4AAABeAAAARwAAAEcAAABHAAAAXgAAAF4AAABeAAAAXgAAAF4AAABeAAAAXgAAAF4AAABeAAAAXgAAAE4AAABeAAAAXgAAAF4AAABeAAAAXgAAAF4AAABeAAAAXgAAAE4AAABeAAAAAAAAAAAAAAAAAAAAAAAAAF4AAABOAAAAXgAAAF4AAABeAAAAXgAAAF4AAABeAAAAXgAAAF4AAABOAAAAXgAAAAAAAAAAAAAAAAAAAAAAAABeAAAATgAAAE4AAABOAAAATgAAAF4AAABOAAAAXgAAAF4AAABeAAAATgAAAF4AAABeAAAAXQAAAF4AAABdAAAATgAAAF4AAABeAAAAXgAAAF4AAABeAAAAXgAAAF4AAABeAAAAXgAAAE4AAABeAAAAXgAAAF0AAABeAAAAAAAAAAAAAABeAAAAJwAAAF4AAABOAAAATgAAAE4AAABOAAAAXgAAAF4AAABOAAAAXgAAAF4AAABdAAAAXgAAAAAAAAAAAAAAXgAAAF4AAABeAAAATgAAAE4AAABOAAAATgAAAF4AAABeAAAATgAAAF4AAABdAAAAXQAAAF0AAABdAAAAXQAAAF4AAABeAAAAXgAAAF4AAABeAAAAXgAAAF4AAABeAAAAXgAAAE4AAABOAAAAXgAAAF0AAABeAAAAAAAAAAAAAABeAAAAXgAAAF4AAABeAAAAXgAAAF4AAABeAAAAXgAAAF4AAABeAAAAXgAAAF4AAABdAAAAXgAAAAAAAAAAAAAAAAAAAF0AAABeAAAAXgAAAF4AAABeAAAAXgAAAF4AAABeAAAAXgAAAF4AAABeAAAAXQAAAF4AAABdAAAAXQAAAF0AAABdAAAAXQAAAAAAAAAAAAAAAAAAAAAAAABdAAAAXQAAAF0AAABdAAAAAAAAAF0AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAF0AAABdAAAAXQAAAF0AAABdAAAAAAAAAAAAAAAAAAAAXQAAAF0AAABdAAAAXQAAAF0AAABdAAAAXQAAAF0AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==
+          tiles: XAAAAF4AAAAiAAAAIgAAAF4AAABOAAAAXgAAAF4AAABHAAAARwAAAEcAAABeAAAAXgAAAF4AAABeAAAAXgAAAFsAAABeAAAAIgAAACIAAABeAAAATgAAAF4AAABeAAAARwAAAEcAAABHAAAAXgAAAF4AAABeAAAAXgAAAF4AAABcAAAAXgAAAF4AAABeAAAAXgAAAE4AAABeAAAAXgAAAF4AAABeAAAAXgAAAF4AAABeAAAAXgAAAE4AAABeAAAAXgAAAF4AAABdAAAAXQAAAF4AAABOAAAAXgAAAF4AAABeAAAAXgAAAF4AAABeAAAAXgAAAF4AAABOAAAAXgAAAF0AAABdAAAAXQAAAF0AAABeAAAATgAAAE4AAABOAAAATgAAAF4AAABOAAAAXgAAAF4AAABeAAAATgAAAF4AAABeAAAAXQAAAF4AAABdAAAATgAAAF4AAABeAAAAXgAAAF4AAABeAAAAXgAAAF4AAABeAAAAXgAAAE4AAABeAAAAXgAAAF0AAABeAAAAAAAAAAAAAABeAAAAJwAAAF4AAABOAAAATgAAAE4AAABOAAAAXgAAAF4AAABOAAAAXgAAAF4AAABdAAAAXgAAAAAAAAAAAAAAXgAAAF4AAABeAAAATgAAAE4AAABOAAAATgAAAF4AAABeAAAATgAAAF4AAABdAAAAXQAAAF0AAABdAAAAXQAAAF4AAABeAAAAXgAAAF4AAABeAAAAXgAAAF4AAABeAAAAXgAAAE4AAABOAAAAXgAAAF0AAABeAAAAAAAAAAAAAABeAAAAXgAAAF4AAABeAAAAXgAAAF4AAABeAAAAXgAAAF4AAABeAAAAXgAAAF4AAABdAAAAXgAAAAAAAAAAAAAAAAAAAF0AAABeAAAAXgAAAF4AAABeAAAAXgAAAF4AAABeAAAAXgAAAF4AAABeAAAAXQAAAF4AAABdAAAAXQAAAF0AAABdAAAAXQAAAAAAAAAAAAAAAAAAAAAAAABdAAAAXQAAAF0AAABdAAAAAAAAAF0AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAF0AAABdAAAAXQAAAF0AAABdAAAAAAAAAAAAAAAAAAAAXQAAAF0AAABdAAAAXQAAAF0AAABdAAAAXQAAAF0AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==
         -1,2:
           ind: -1,2
           tiles: AAAAAAAAAAAAAAAAAAAAAAAAAABdAAAAOgAAADoAAAA6AAAAOgAAADoAAAA6AAAAOgAAAF4AAABeAAAAFgAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAXQAAADoAAAA6AAAAOgAAADoAAAA6AAAAOgAAADoAAABdAAAAXgAAAF4AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABdAAAAXQAAAF0AAABdAAAAXQAAAF0AAABdAAAAXQAAAF0AAABdAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==
@@ -95,7 +97,7 @@ entities:
           tiles: AAAAAF0AAABeAAAATgAAAF4AAABeAAAAXgAAAF4AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABdAAAAXgAAAE4AAABeAAAAXgAAAF4AAABeAAAAXgAAAF4AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXQAAAF4AAABOAAAAXgAAAF4AAABOAAAATgAAAE4AAABOAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAF0AAABeAAAATgAAAF4AAABeAAAAXgAAAF4AAABeAAAAXgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAF4AAABeAAAAXgAAAE4AAABeAAAAXgAAAF4AAABeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABeAAAAXgAAAF4AAABeAAAAXgAAAF4AAABeAAAAXgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXgAAAEcAAABeAAAAXgAAAF4AAABeAAAAXgAAAF4AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAF4AAABeAAAAXgAAAF4AAABeAAAAXgAAAF4AAABeAAAAXQAAAF0AAABdAAAAXQAAAF0AAABdAAAAXQAAAF0AAABeAAAAXgAAAF4AAABeAAAAXgAAAF4AAABeAAAAXgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAF4AAABeAAAATgAAAE4AAABOAAAATgAAAE4AAABOAAAAXgAAAF4AAABdAAAAXQAAAF0AAABdAAAAXQAAAF0AAABeAAAAXgAAAF4AAABEAAACXgAAAF4AAABeAAAAXgAAAF4AAABeAAAAXgAAAF4AAABeAAAAXgAAAF4AAABeAAAAXgAAAF4AAABEAAACRAAAA0QAAAFEAAADXgAAAF4AAABeAAAAXgAAAF4AAABeAAAAXgAAAF4AAABeAAAAXgAAAF4AAABeAAAARAAAAEQAAABEAAADRAAAA14AAABeAAAAXgAAAF4AAABeAAAAXgAAAF4AAABeAAAATgAAAF4AAABeAAAAXgAAAEQAAANEAAADRAAAA0QAAAJeAAAAXgAAAF4AAABeAAAAXgAAAF4AAABeAAAAXgAAAF4AAABeAAAAXgAAAF4AAABEAAADRAAAAEQAAAFEAAACXgAAAFsAAABbAAABWwAAA1sAAABeAAAAXgAAAF4AAABOAAAAXgAAAF4AAABeAAAARAAAAUQAAAJEAAADRAAAAV4AAABbAAABWwAAAlsAAABbAAACXgAAAF4AAABeAAAATgAAAE4AAABeAAAAXgAAAA==
         -1,-2:
           ind: -1,-2
-          tiles: XgAAAF4AAABeAAAAXgAAAF4AAABeAAAAFgAAABYAAAEWAAADFgAAABYAAAIWAAABXgAAADEAAAAxAAAAMQAAAF4AAABeAAAAXgAAAF4AAABeAAAAXgAAABYAAAAWAAABFgAAAxYAAAEWAAAAFgAAAl4AAAAxAAAAMQAAADEAAAAAAAAAAAAAAAAAAAAWAAABFgAAARYAAAIfAAACHwAAAR8AAAIWAAADMwAAADMAAABeAAAAMQAAADEAAAAxAAAAXQAAAF0AAABdAAAAFgAAARYAAAIWAAADFgAAABYAAAMWAAAAFgAAAjMAAAAzAAAAXgAAAF4AAABeAAAAXgAAAF4AAABeAAAAXgAAAF4AAAAWAAAAFgAAARYAAAEWAAABFgAAABYAAAIWAAABFgAAAk4AAABOAAAATgAAAE4AAAA6AAAAOgAAADoAAABeAAAAFgAAABYAAAAWAAABFgAAAxYAAAMWAAAAFgAAAxYAAAJeAAAAXgAAAF4AAABeAAAAXgAAADoAAAA6AAAAXgAAABYAAAAWAAABFgAAAxYAAAIWAAADXgAAAF4AAABeAAAAXgAAAF4AAABeAAAAXgAAAF4AAAA6AAAAOgAAAF4AAAAfAAABXgAAAF4AAABeAAAAXgAAAF4AAABbAAABWwAAAVsAAANbAAADXgAAAF4AAABRAAABXgAAAF4AAABeAAAAFgAAAV4AAAAPAAAADwAAAA8AAABeAAAAWwAAAVsAAAJbAAADWwAAAF4AAABeAAAAFgAAAhYAAAIWAAABXgAAABYAAAFeAAAATgAAAE4AAABOAAAAXgAAABYAAAAWAAAAFgAAABYAAAJeAAAAXgAAABYAAAIWAAACFgAAAV4AAAAWAAADXgAAAF4AAABRAAAAXgAAAF4AAABeAAAAXgAAABYAAABeAAAAXgAAAF4AAAAWAAADFgAAABYAAAMWAAABFgAAAhYAAAEWAAACFgAAARYAAAEWAAADFgAAAhYAAAEWAAABFgAAABYAAAEWAAADFgAAAhYAAAEWAAACFgAAAxYAAAIWAAADFgAAAxYAAAAWAAADFgAAAhYAAAIWAAABFgAAARYAAAAWAAABFgAAARYAAAAWAAACFgAAAV4AAAAWAAABFgAAAhYAAAAWAAADFgAAAl4AAABeAAAAXgAAABYAAANeAAAAXgAAAF4AAAAWAAACFgAAABYAAAJeAAAAFgAAARYAAAIWAAABFgAAAhYAAABeAAAAUQAAA1EAAAJRAAABUQAAAVEAAANRAAAAXgAAAF4AAABeAAAAXgAAAF4AAABeAAAAXgAAAF4AAABeAAAAXgAAAFEAAANRAAADUQAAAVEAAAJRAAABUQAAAg==
+          tiles: XgAAAF4AAABeAAAAXgAAAF4AAABeAAAAFgAAABYAAAEWAAADFgAAABYAAAIWAAABXgAAABIAAAASAAAAEgAAAF4AAABeAAAAXgAAAF4AAABeAAAAXgAAABYAAAAWAAABFgAAAxYAAAEWAAAAFgAAAhYAAAASAAAAEgAAABIAAAAAAAAAAAAAAAAAAAAWAAABFgAAARYAAAIfAAACHwAAAR8AAAIWAAADMwAAADMAAABeAAAAEgAAABIAAAASAAAAXQAAAF0AAABdAAAAFgAAARYAAAIWAAADFgAAABYAAAMWAAAAFgAAAjMAAAAzAAAAXgAAAF4AAABeAAAAXgAAAF4AAABeAAAAXgAAAF4AAAAWAAAAFgAAARYAAAEWAAABFgAAABYAAAIWAAABFgAAAk4AAABOAAAATgAAAE4AAAA6AAAAOgAAADoAAABeAAAAFgAAABYAAAAWAAABFgAAAxYAAAMWAAAAFgAAAxYAAAJeAAAAXgAAAF4AAABeAAAAXgAAADoAAAA6AAAAXgAAABYAAAAWAAABFgAAAxYAAAIWAAADXgAAAF4AAABeAAAAXgAAAF4AAABeAAAAXgAAAF4AAAA6AAAAOgAAAF4AAAAfAAABXgAAAF4AAABeAAAAXgAAAF4AAABbAAABWwAAAVsAAANbAAADXgAAAF4AAABRAAABXgAAAF4AAABeAAAAFgAAAV4AAAAPAAAADwAAAA8AAABeAAAAWwAAAVsAAAJbAAADWwAAAF4AAABeAAAAFgAAAhYAAAIWAAABXgAAABYAAAFeAAAATgAAAE4AAABOAAAAXgAAABYAAAAWAAAAFgAAABYAAAJeAAAAXgAAABYAAAIWAAACFgAAAV4AAAAWAAADXgAAAF4AAABRAAAAXgAAAF4AAABeAAAAXgAAABYAAABeAAAAXgAAAF4AAAAWAAADFgAAABYAAAMWAAABFgAAAhYAAAEWAAACFgAAARYAAAEWAAADFgAAAhYAAAEWAAABFgAAABYAAAEWAAADFgAAAhYAAAEWAAACFgAAAxYAAAIWAAADFgAAAxYAAAAWAAADFgAAAhYAAAIWAAABFgAAARYAAAAWAAABFgAAARYAAAAWAAACFgAAAV4AAAAWAAABFgAAAhYAAAAWAAADFgAAAl4AAABeAAAAXgAAABYAAANeAAAAXgAAAF4AAAAWAAACFgAAABYAAAJeAAAAFgAAARYAAAIWAAABFgAAAhYAAABeAAAAUQAAA1EAAAJRAAABUQAAAVEAAANRAAAAXgAAAF4AAABeAAAAXgAAAF4AAABeAAAAXgAAAF4AAABeAAAAXgAAAFEAAANRAAADUQAAAVEAAAJRAAABUQAAAg==
         -2,-2:
           ind: -2,-2
           tiles: FgAAAhYAAANeAAAAXQAAAAAAAAAAAAAAXQAAAF4AAABeAAAAXgAAAF4AAABOAAAAXgAAAF4AAABeAAAAXgAAAF4AAABeAAAAXgAAAAAAAAAAAAAAAAAAAF0AAABeAAAAXgAAAF4AAABeAAAAXgAAAF4AAABeAAAAXgAAAF4AAABeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABdAAAAXgAAAE4AAABeAAAAXgAAAF0AAAAAAAAAXgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXQAAAF4AAABOAAAAXgAAAF4AAABdAAAAXQAAAF4AAABeAAAAXgAAAF4AAABeAAAAXgAAAF4AAABeAAAAXgAAAF4AAABeAAAATgAAAF4AAABeAAAAXgAAAF4AAABeAAAAXgAAAF4AAABeAAAAOQAAADkAAAA5AAAAXgAAAF4AAABeAAAAXgAAAF4AAABeAAAAXgAAAFEAAAFRAAABXgAAAF4AAABeAAAAXgAAAF4AAABeAAAAXgAAAF4AAABeAAAAXgAAAF4AAABOAAAAXgAAAF4AAABRAAABUQAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAXQAAAF4AAAAxAAAAXgAAADEAAABeAAAATgAAAF4AAABeAAAAUQAAAVEAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAF0AAABeAAAAMQAAADEAAABeAAAAXgAAAE4AAABeAAAAXgAAAF4AAAAWAAABXQAAAF0AAABdAAAAAAAAAAAAAABdAAAAXgAAAF4AAABbAAAAWwAAAV4AAABOAAAAXgAAAF4AAAAWAAADFgAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAXQAAAF4AAABbAAABWwAAA14AAABeAAAATgAAAF4AAABeAAAAFgAAAxYAAAAAAAAAAAAAAAAAAABeAAAAXgAAAF4AAABeAAAAXgAAAF4AAABeAAAAXgAAAE4AAABeAAAAXgAAABYAAAIWAAACAAAAAAAAAAAAAAAAXgAAAE4AAABeAAAAXgAAAF4AAABeAAAAXgAAAF4AAABOAAAAXgAAAF4AAAAWAAAAFgAAAQAAAAAAAAAAXQAAAF4AAABOAAAAXgAAAF4AAABeAAAAXgAAAF4AAABeAAAATgAAAF4AAABeAAAAFgAAAhYAAAEAAAAAAAAAAF0AAABeAAAATgAAAF4AAABeAAAAXgAAADMAAABeAAAAXgAAAF4AAABeAAAAXgAAABYAAAIWAAABAAAAAAAAAABdAAAAXgAAAF4AAABeAAAAXgAAAF4AAABeAAAAXgAAADMAAABeAAAAXgAAAF4AAABeAAAAXgAAAA==
@@ -125,7 +127,7 @@ entities:
           tiles: XgAAAF4AAABeAAAAXgAAAF0AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAF0AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEQAAAMWAAACRAAAA14AAABeAAAAXQAAAF0AAAAAAAAAAAAAAAAAAABdAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWAAADFgAAARYAAAMWAAADXgAAAF4AAABeAAAAXQAAAAAAAAAAAAAAXQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAJgAAACYAAAAmAAAAFgAAAhYAAAMWAAADXgAAAF0AAAAAAAAAAAAAAF0AAAAAAAAAAAAAAAAAAAAAAAAAAAAAACgAAAAoAAAAKAAAACYAAAAmAAAAFgAAAF4AAABeAAAAXQAAAAAAAABdAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAoAAAAKAAAACgAAAAoAAAAJgAAABYAAAMWAAADXgAAAF4AAABdAAAAXQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAKAAAACgAAAAoAAAAKAAAACgAAAAmAAAAFgAAABYAAABeAAAAXQAAAF0AAAAAAAAAAAAAAAAAAAAAAAAAAAAAACgAAAAoAAAAKAAAACgAAAAoAAAAJgAAABYAAAMWAAABXgAAAF0AAABdAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAoAAAAKAAAACgAAAAoAAAAKAAAACYAAAAWAAABFgAAAV4AAABdAAAAXQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAKAAAACgAAAAoAAAAKAAAACYAAAAWAAADFgAAAV4AAABeAAAAXQAAAF0AAAAAAAAAAAAAAAAAAAAAAAAAAAAAACgAAAAoAAAAKAAAACYAAAAmAAAAFgAAAF4AAABeAAAAXQAAAAAAAABdAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAmAAAAJgAAACYAAAAWAAABFgAAAxYAAAJeAAAAXQAAAAAAAAAAAAAAXQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFgAAABYAAAIWAAACFgAAA14AAABeAAAAXgAAAF0AAAAAAAAAAAAAAF0AAAAAAAAAAAAAAAAAAAAAAAAAAAAAABYAAAIWAAAAFgAAA14AAABeAAAAXQAAAF0AAAAAAAAAAAAAAAAAAABdAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABeAAAAXgAAAF4AAABeAAAAXQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXQAAAF0AAABdAAAAXQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAF0AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==
         -3,1:
           ind: -3,1
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXQAAAF4AAAAWAAADFgAAAxYAAAIWAAAAWwAAA1sAAAJeAAAAIgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAF0AAABeAAAAFgAAAhYAAAEWAAAALwAAAC8AAAAvAAAAXgAAACIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABdAAAAXgAAABYAAAAWAAABFgAAAS8AAAAvAAAALwAAAF4AAABeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXQAAAF4AAAAWAAABFgAAARYAAAIvAAAALwAAAC8AAAAWAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAF0AAABeAAAAXgAAAF4AAABeAAAAXgAAABYAAAMWAAADFgAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABdAAAAXQAAAF4AAAAAAAAAXgAAAF0AAABeAAAAXQAAAF4AAABdAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAF0AAABdAAAAAAAAAF4AAABdAAAAXgAAAF0AAABeAAAAXQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABdAAAAXQAAAAAAAABeAAAAXQAAAF4AAABdAAAAXgAAAF0AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXQAAAF4AAABdAAAAXQAAAF0AAABdAAAAXQAAAF0AAABdAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAF0AAABdAAAAAAAAAF4AAABdAAAAXgAAAF0AAABeAAAAXQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABdAAAAXQAAAAAAAABeAAAAXQAAAF4AAABdAAAAXgAAAF0AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAF4AAAAAAAAAXgAAAF0AAABeAAAAXQAAAF4AAABdAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABdAAAAXQAAAF0AAABdAAAAXQAAAF0AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXQAAAF4AAAAWAAADFgAAAxYAAAIWAAAAWwAAA1sAAAJeAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAF0AAABeAAAAFgAAAhYAAAEWAAAALwAAAC8AAAAvAAAAXgAAAFsAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABdAAAAXgAAABYAAAAWAAABFgAAAS8AAAAvAAAALwAAAF4AAABcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXQAAAF4AAAAWAAABFgAAARYAAAIvAAAALwAAAC8AAAAWAAADXgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAF0AAABeAAAAXgAAAF4AAABeAAAAXgAAABYAAAMWAAADFgAAAl0AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABdAAAAXQAAAF4AAAAAAAAAXgAAAF0AAABeAAAAXQAAAF4AAABdAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAF0AAABdAAAAAAAAAF4AAABdAAAAXgAAAF0AAABeAAAAXQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABdAAAAXQAAAAAAAABeAAAAXQAAAF4AAABdAAAAXgAAAF0AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXQAAAF4AAABdAAAAXQAAAF0AAABdAAAAXQAAAF0AAABdAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAF0AAABdAAAAAAAAAF4AAABdAAAAXgAAAF0AAABeAAAAXQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABdAAAAXQAAAAAAAABeAAAAXQAAAF4AAABdAAAAXgAAAF0AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAF4AAAAAAAAAXgAAAF0AAABeAAAAXQAAAF4AAABdAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABdAAAAXQAAAF0AAABdAAAAXQAAAF0AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==
         0,-3:
           ind: 0,-3
           tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXQAAAF0AAABdAAAAXQAAAF0AAABdAAAAXQAAAF0AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAF0AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABdAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAF0AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABdAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXgAAAF4AAABdAAAAXQAAAF0AAABdAAAAXQAAAF0AAABdAAAAXQAAAF4AAABeAAAAXgAAAF4AAABeAAAAXgAAAA==
@@ -516,7 +518,7 @@ entities:
             0: 65535
           -1,8:
             0: 52463
-            4: 784
+            2: 784
           4,4:
             0: 65535
           0,8:
@@ -794,9 +796,12 @@ entities:
           7,-8:
             0: 13119
           -8,4:
-            0: 32767
+            0: 32751
+            1: 16
+            2: 32768
           -8,5:
             0: 30707
+            2: 12
           -8,6:
             0: 63359
           -7,6:
@@ -805,15 +810,17 @@ entities:
             0: 4095
           -10,5:
             0: 56784
-            4: 15
+            2: 15
           -10,6:
             0: 56799
           -9,5:
             0: 65520
+            2: 15
           -9,6:
             0: 65535
           -9,4:
             0: 65262
+            2: 273
           3,-9:
             0: 61440
           4,-9:
@@ -830,15 +837,15 @@ entities:
             0: 65535
           8,5:
             0: 43695
-            2: 4368
-            3: 17472
+            3: 4368
+            4: 17472
           8,6:
             0: 65535
           9,4:
             0: 65535
           9,5:
             0: 43695
-            4: 21840
+            2: 21840
           9,6:
             0: 8191
           10,4:
@@ -846,19 +853,19 @@ entities:
           10,5:
             0: 43695
             5: 4368
-            4: 17472
+            2: 17472
           11,4:
             0: 65535
           11,5:
             0: 43695
-            4: 21840
+            2: 21840
           12,4:
             0: 65535
           12,5:
             0: 4479
           13,4:
             0: 65501
-            4: 34
+            2: 34
           13,5:
             0: 7
           -8,7:
@@ -873,7 +880,7 @@ entities:
             0: 17486
           -10,4:
             0: 53247
-            4: 12288
+            2: 12288
           -10,7:
             0: 192
           -9,7:
@@ -942,10 +949,10 @@ entities:
             0: 241
           -3,7:
             0: 252
-            4: 61184
+            2: 61184
           -2,7:
             0: 35071
-            4: 30464
+            2: 30464
           -7,7:
             0: 16
           -6,7:
@@ -980,7 +987,7 @@ entities:
             0: 63487
           -11,3:
             0: 34958
-            4: 17408
+            2: 17408
           -10,3:
             0: 65535
           14,-1:
@@ -989,7 +996,7 @@ entities:
             0: 4369
           -11,4:
             0: 136
-            4: 52292
+            2: 52292
           0,-9:
             0: 63624
           1,-9:
@@ -1197,13 +1204,13 @@ entities:
           4,7:
             0: 12
           -3,8:
-            4: 3310
+            2: 3310
           -2,8:
-            4: 4095
+            2: 4095
           -11,5:
-            4: 35020
+            2: 35020
           -11,6:
-            4: 2184
+            2: 2184
         uniqueMixes:
         - volume: 2500
           temperature: 293.15
@@ -1239,7 +1246,7 @@ entities:
           temperature: 293.15
           moles:
           - 0
-          - 6666.982
+          - 0
           - 0
           - 0
           - 0
@@ -1253,8 +1260,8 @@ entities:
         - volume: 2500
           temperature: 293.15
           moles:
-          - 6666.982
           - 0
+          - 6666.982
           - 0
           - 0
           - 0
@@ -1268,7 +1275,7 @@ entities:
         - volume: 2500
           temperature: 293.15
           moles:
-          - 0
+          - 6666.982
           - 0
           - 0
           - 0
@@ -1308,20 +1315,20 @@ entities:
             color: '#FFFFFFFF'
             id: Arrows
           decals:
-            664: 22,17
+            657: 22,17
         - node:
             color: '#FFFFFFFF'
             id: Arrows
           decals:
             617: 20,17
-            663: 20,17
+            656: 20,17
         - node:
             angle: 3.141592653589793 rad
             color: '#FFFFFFFF'
             id: Bot
           decals:
-            665: 20,17
-            666: 22,17
+            658: 20,17
+            659: 22,17
         - node:
             color: '#FFFFFFFF'
             id: Bot
@@ -1340,66 +1347,66 @@ entities:
             color: '#52B4E996'
             id: BrickTileSteelCornerNe
           decals:
-            643: -1,12
-            644: -1,12
+            636: -1,12
+            637: -1,12
         - node:
             color: '#52B4E996'
             id: BrickTileSteelCornerNw
           decals:
-            641: 0,12
-            642: 0,12
+            634: 0,12
+            635: 0,12
         - node:
             color: '#52B4E996'
             id: BrickTileSteelCornerSe
           decals:
-            647: -1,13
-            648: -1,13
+            640: -1,13
+            641: -1,13
         - node:
             color: '#52B4E996'
             id: BrickTileSteelCornerSw
           decals:
-            645: 0,13
-            646: 0,13
+            638: 0,13
+            639: 0,13
         - node:
             color: '#334E6DC8'
             id: BrickTileWhiteLineE
           decals:
-            674: -8,28
+            667: -8,28
         - node:
             color: '#A4610696'
             id: BrickTileWhiteLineE
           decals:
-            672: -8,30
+            665: -8,30
         - node:
             color: '#EFB34196'
             id: BrickTileWhiteLineE
           decals:
-            671: -8,31
+            664: -8,31
         - node:
             color: '#DE3A3A96'
             id: BrickTileWhiteLineE
           decals:
-            673: -8,29
+            666: -8,29
         - node:
             color: '#D4D4D496'
             id: BrickTileWhiteLineW
           decals:
-            667: -6,28
+            660: -6,28
         - node:
             color: '#9FED5896'
             id: BrickTileWhiteLineW
           decals:
-            668: -6,29
+            661: -6,29
         - node:
             color: '#52B4E996'
             id: BrickTileWhiteLineW
           decals:
-            670: -6,31
+            663: -6,31
         - node:
             color: '#D381C996'
             id: BrickTileWhiteLineW
           decals:
-            669: -6,30
+            662: -6,30
         - node:
             color: '#FFFFFFFF'
             id: Bushf1
@@ -1524,10 +1531,10 @@ entities:
             color: '#FFFFFFFF'
             id: Delivery
           decals:
-            675: -6,-29
-            676: -5,-29
-            677: -5,-30
-            678: -6,-30
+            668: -6,-29
+            669: -5,-29
+            670: -5,-30
+            671: -6,-30
         - node:
             color: '#FFFFFFFF'
             id: DirtHeavy
@@ -1539,7 +1546,7 @@ entities:
             color: '#FFFFFFFF'
             id: DirtHeavy
           decals:
-            658: -24,-25
+            651: -24,-25
         - node:
             color: '#FFFFFFFF'
             id: DirtLight
@@ -1598,12 +1605,12 @@ entities:
             606: -7,3
             608: -36,8
             609: -38,9
-            649: -23,-24
-            650: -25,-23
-            651: -23,-22
-            652: -25,-25
-            653: -24,-24
-            654: -24,-22
+            642: -23,-24
+            643: -25,-23
+            644: -23,-22
+            645: -25,-25
+            646: -24,-24
+            647: -24,-22
         - node:
             color: '#FFFFFFFF'
             id: DirtMedium
@@ -1623,9 +1630,9 @@ entities:
             147: 53,1
             148: 55,4
             607: -35,8
-            655: -23,-25
-            656: -25,-22
-            657: -25,-24
+            648: -23,-25
+            649: -25,-22
+            650: -25,-24
         - node:
             color: '#FFFFFFFF'
             id: Flowersbr2
@@ -1822,7 +1829,7 @@ entities:
             621: -12,-26
             622: -10,-26
             623: -9,-26
-            634: -6,-27
+            630: -6,-27
         - node:
             color: '#EFB34196'
             id: HalfTileOverlayGreyscale
@@ -2068,9 +2075,9 @@ entities:
             220: -14,-20
             221: -14,-19
             222: -14,-18
-            635: -5,-28
-            639: -5,-32
-            640: -5,-33
+            631: -5,-28
+            632: -5,-32
+            633: -5,-33
         - node:
             color: '#EFB34196'
             id: HalfTileOverlayGreyscale90
@@ -2333,7 +2340,7 @@ entities:
             color: '#FFFFFFFF'
             id: StandClear
           decals:
-            661: 21,24
+            654: 21,24
         - node:
             angle: 1.5707963267948966 rad
             color: '#FFFFFFFF'
@@ -2365,8 +2372,8 @@ entities:
             id: ThreeQuarterTileOverlayGreyscale90
           decals:
             464: -4,-13
-            628: -8,-26
-            633: -5,-27
+            624: -8,-26
+            629: -5,-27
         - node:
             color: '#FFFFFFFF'
             id: WarnBox
@@ -2376,21 +2383,21 @@ entities:
             color: '#FFFFFFFF'
             id: WarnCornerSmallSW
           decals:
-            629: -38,-9
+            625: -38,-9
         - node:
             color: '#FFFFFFFF'
             id: WarnLineS
           decals:
-            630: -38,-10
-            631: -38,-11
-            632: -38,-12
+            626: -38,-10
+            627: -38,-11
+            628: -38,-12
         - node:
             color: '#FFFFFFFF'
             id: WarnLineW
           decals:
-            659: 21,24
-            660: 22,24
-            662: 20,24
+            652: 21,24
+            653: 22,24
+            655: 20,24
         - node:
             color: '#FFFFFFFF'
             id: WarningLine
@@ -2491,11 +2498,9 @@ entities:
             574: -40,7
       type: DecalGrid
     - type: OccluderTree
-    - nextUpdate: 0
-      type: SpreaderGrid
+    - type: SpreaderGrid
     - type: Shuttle
-    - nextUpdate: 1992.3928952
-      type: GridPathfinding
+    - type: GridPathfinding
     - type: GasTileOverlay
     - type: RadiationGridResistance
   - uid: 658
@@ -2529,6 +2534,20 @@ entities:
       type: Transform
 - proto: AirAlarm
   entities:
+  - uid: 354
+    components:
+    - rot: 1.5707963267948966 rad
+      pos: -10.5,-30.5
+      parent: 31
+      type: Transform
+    - devices:
+      - 9807
+      - 9806
+      - 9808
+      - 9805
+      - 7408
+      - 7469
+      type: DeviceList
   - uid: 8476
     components:
     - rot: 3.141592653589793 rad
@@ -2650,7 +2669,6 @@ entities:
       type: Transform
     - devices:
       - 8954
-      - 8955
       - 8956
       - 852
       - 1027
@@ -2675,6 +2693,7 @@ entities:
       - 5332
       - 5543
       - 5544
+      - 7460
       type: DeviceList
   - uid: 9980
     components:
@@ -2716,8 +2735,6 @@ entities:
       - 7456
       - 4783
       - 5698
-      - 7462
-      - 7454
       type: DeviceList
   - uid: 9991
     components:
@@ -2834,8 +2851,9 @@ entities:
       type: DeviceList
   - uid: 10007
     components:
-    - rot: 1.5707963267948966 rad
-      pos: 29.5,12.5
+    - anchored: False
+      rot: 1.5707963267948966 rad
+      pos: 29.5,11.5
       parent: 31
       type: Transform
     - devices:
@@ -3144,11 +3162,6 @@ entities:
     - pos: -10.5,9.5
       parent: 31
       type: Transform
-  - uid: 7451
-    components:
-    - pos: 1.5,-29.5
-      parent: 31
-      type: Transform
 - proto: AirlockCaptainGlassLocked
   entities:
   - uid: 1494
@@ -3212,6 +3225,13 @@ entities:
     - pos: 21.5,14.5
       parent: 31
       type: Transform
+- proto: AirlockChapelLocked
+  entities:
+  - uid: 7471
+    components:
+    - pos: -33.5,17.5
+      parent: 31
+      type: Transform
 - proto: AirlockChemistryLocked
   entities:
   - uid: 2128
@@ -3268,13 +3288,6 @@ entities:
     - pos: -3.5,26.5
       parent: 31
       type: Transform
-- proto: AirlockDetectiveLocked
-  entities:
-  - uid: 4211
-    components:
-    - pos: -20.5,16.5
-      parent: 31
-      type: Transform
 - proto: AirlockEngineeringGlassLocked
   entities:
   - uid: 598
@@ -3851,9 +3864,9 @@ entities:
       type: Transform
 - proto: AirlockMaintAtmoLocked
   entities:
-  - uid: 698
+  - uid: 6575
     components:
-    - pos: 29.5,11.5
+    - pos: 29.5,12.5
       parent: 31
       type: Transform
 - proto: AirlockMaintBarLocked
@@ -4088,6 +4101,11 @@ entities:
       type: Transform
 - proto: AirlockMedicalGlassLocked
   entities:
+  - uid: 44
+    components:
+    - pos: 9.5,-6.5
+      parent: 31
+      type: Transform
   - uid: 124
     components:
     - pos: 10.5,-6.5
@@ -4123,11 +4141,6 @@ entities:
     - pos: 13.5,-9.5
       parent: 31
       type: Transform
-  - uid: 7908
-    components:
-    - pos: 9.5,-6.5
-      parent: 31
-      type: Transform
   - uid: 8855
     components:
     - pos: 9.5,-12.5
@@ -4223,6 +4236,18 @@ entities:
     - pos: -16.5,-23.5
       parent: 31
       type: Transform
+  - uid: 7464
+    components:
+    - rot: -1.5707963267948966 rad
+      pos: 1.5,-29.5
+      parent: 31
+      type: Transform
+  - uid: 9168
+    components:
+    - rot: -1.5707963267948966 rad
+      pos: -3.5,-30.5
+      parent: 31
+      type: Transform
 - proto: AirlockScienceLocked
   entities:
   - uid: 7390
@@ -4443,29 +4468,21 @@ entities:
     - pos: -11.505994,-27.414207
       parent: 31
       type: Transform
-    - nextSound: 331.9115437
-      type: EmitSoundOnCollide
   - uid: 3372
     components:
     - pos: -11.505994,-27.414207
       parent: 31
       type: Transform
-    - nextSound: 333.0881709
-      type: EmitSoundOnCollide
   - uid: 9704
     components:
     - pos: -11.505994,-27.414207
       parent: 31
       type: Transform
-    - nextSound: 332.2792231
-      type: EmitSoundOnCollide
   - uid: 10210
     components:
     - pos: -11.505994,-27.414207
       parent: 31
       type: Transform
-    - nextSound: 332.7155208
-      type: EmitSoundOnCollide
 - proto: APCBasic
   entities:
   - uid: 154
@@ -4649,6 +4666,11 @@ entities:
       type: Transform
     - startingCharge: 11999.233
       type: Battery
+  - uid: 4734
+    components:
+    - pos: -6.5,-25.5
+      parent: 31
+      type: Transform
   - uid: 6888
     components:
     - pos: 43.5,10.5
@@ -4673,12 +4695,12 @@ entities:
       type: Transform
   - uid: 7872
     components:
-    - pos: 29.455654,-3.6911888
+    - pos: 29.64934,-1.6702437
       parent: 31
       type: Transform
   - uid: 7873
     components:
-    - pos: 29.455654,-3.6911888
+    - pos: 29.46184,-1.6702437
       parent: 31
       type: Transform
 - proto: APCHighCapacity
@@ -4905,18 +4927,6 @@ entities:
       type: Transform
 - proto: Autolathe
   entities:
-  - uid: 872
-    components:
-    - pos: 29.5,-2.5
-      parent: 31
-      type: Transform
-    - materialWhiteList:
-      - Steel
-      - Plastic
-      - Wood
-      - Glass
-      - Cloth
-      type: MaterialStorage
   - uid: 1041
     components:
     - pos: -5.5,-12.5
@@ -4941,6 +4951,11 @@ entities:
       - Glass
       - Cloth
       type: MaterialStorage
+  - uid: 8955
+    components:
+    - pos: 49.5,3.5
+      parent: 31
+      type: Transform
 - proto: BananaSeeds
   entities:
   - uid: 10137
@@ -4948,15 +4963,11 @@ entities:
     - pos: 48.62532,-27.148758
       parent: 31
       type: Transform
-    - nextSound: 997.4122107
-      type: EmitSoundOnCollide
   - uid: 10138
     components:
     - pos: 48.706337,-27.229776
       parent: 31
       type: Transform
-    - nextSound: 998.4622857
-      type: EmitSoundOnCollide
 - proto: BannerNanotrasen
   entities:
   - uid: 8994
@@ -4971,6 +4982,11 @@ entities:
       type: Transform
 - proto: Barricade
   entities:
+  - uid: 28
+    components:
+    - pos: -20.5,16.5
+      parent: 31
+      type: Transform
   - uid: 9744
     components:
     - pos: -14.5,-9.5
@@ -4995,9 +5011,9 @@ entities:
       type: Transform
 - proto: Bed
   entities:
-  - uid: 608
+  - uid: 125
     components:
-    - pos: 23.5,-15.5
+    - pos: 24.5,-15.5
       parent: 31
       type: Transform
   - uid: 1956
@@ -5070,6 +5086,18 @@ entities:
     - pos: 30.5,-19.5
       parent: 31
       type: Transform
+  - uid: 9516
+    components:
+    - pos: -32.5,16.5
+      parent: 31
+      type: Transform
+- proto: BedsheetBlack
+  entities:
+  - uid: 8271
+    components:
+    - pos: -32.5,16.5
+      parent: 31
+      type: Transform
 - proto: BedsheetCaptain
   entities:
   - uid: 515
@@ -5096,9 +5124,9 @@ entities:
       type: Transform
 - proto: BedsheetCMO
   entities:
-  - uid: 267
+  - uid: 8951
     components:
-    - pos: 23.5,-15.5
+    - pos: 24.5,-15.5
       parent: 31
       type: Transform
 - proto: BedsheetHOP
@@ -5115,6 +5143,11 @@ entities:
     - pos: -0.5,12.5
       parent: 31
       type: Transform
+  - uid: 5224
+    components:
+    - pos: 7.5,-5.5
+      parent: 31
+      type: Transform
   - uid: 7813
     components:
     - pos: 7.5,-11.5
@@ -5199,9 +5232,9 @@ entities:
       type: Transform
 - proto: BiomassReclaimer
   entities:
-  - uid: 44
+  - uid: 160
     components:
-    - pos: 8.5,-17.5
+    - pos: 15.5,-17.5
       parent: 31
       type: Transform
 - proto: BlastDoor
@@ -5231,24 +5264,26 @@ entities:
     - pos: -13.5,-27.5
       parent: 31
       type: Transform
+    - links:
+      - 8225
+      type: DeviceLinkSink
     - inputs:
         Open: []
         Close: []
-        Toggle:
-        - port: Pressed
-          uid: 7249
+        Toggle: []
       type: SignalReceiver
   - uid: 2309
     components:
     - pos: -14.5,-27.5
       parent: 31
       type: Transform
+    - links:
+      - 8225
+      type: DeviceLinkSink
     - inputs:
         Open: []
         Close: []
-        Toggle:
-        - port: Pressed
-          uid: 7249
+        Toggle: []
       type: SignalReceiver
   - uid: 3905
     components:
@@ -5446,8 +5481,6 @@ entities:
     - pos: 13.473363,-13.426226
       parent: 31
       type: Transform
-    - nextSound: 2319.1179787
-      type: EmitSoundOnCollide
 - proto: BoxCartridgeCap
   entities:
   - uid: 8868
@@ -5490,11 +5523,6 @@ entities:
       type: Transform
 - proto: BoxFolderBlue
   entities:
-  - uid: 7484
-    components:
-    - pos: -0.42352122,-29.568285
-      parent: 31
-      type: Transform
   - uid: 8742
     components:
     - name: lizard secrets
@@ -5569,8 +5597,6 @@ entities:
     - pos: 13.9517145,-13.426226
       parent: 31
       type: Transform
-    - nextSound: 2386.9070745
-      type: EmitSoundOnCollide
 - proto: BoxLethalshot
   entities:
   - uid: 4212
@@ -5675,6 +5701,13 @@ entities:
         - port: Open
           uid: 1203
       type: SignalTransmitter
+- proto: Brutepack
+  entities:
+  - uid: 7258
+    components:
+    - pos: 6.461649,-5.4757285
+      parent: 31
+      type: Transform
 - proto: Bucket
   entities:
   - uid: 4129
@@ -5752,6 +5785,13 @@ entities:
       type: Transform
     - fixtures: {}
       type: Fixtures
+  - uid: 167
+    components:
+    - pos: -26.5,16.5
+      parent: 31
+      type: Transform
+    - fixtures: {}
+      type: Fixtures
   - uid: 168
     components:
     - pos: 13.5,1.5
@@ -5761,6 +5801,64 @@ entities:
       type: AmbientSound
     - fixtures: {}
       type: Fixtures
+  - uid: 198
+    components:
+    - pos: -27.5,16.5
+      parent: 31
+      type: Transform
+    - enabled: True
+      type: AmbientSound
+    - fixtures: {}
+      type: Fixtures
+  - uid: 199
+    components:
+    - pos: -28.5,16.5
+      parent: 31
+      type: Transform
+    - fixtures: {}
+      type: Fixtures
+  - uid: 200
+    components:
+    - pos: -37.5,17.5
+      parent: 31
+      type: Transform
+    - fixtures: {}
+      type: Fixtures
+  - uid: 201
+    components:
+    - pos: -36.5,17.5
+      parent: 31
+      type: Transform
+    - fixtures: {}
+      type: Fixtures
+  - uid: 204
+    components:
+    - pos: 53.5,-28.5
+      parent: 31
+      type: Transform
+    - fixtures: {}
+      type: Fixtures
+  - uid: 207
+    components:
+    - pos: 45.5,-28.5
+      parent: 31
+      type: Transform
+    - fixtures: {}
+      type: Fixtures
+  - uid: 208
+    components:
+    - pos: 45.5,-20.5
+      parent: 31
+      type: Transform
+    - fixtures: {}
+      type: Fixtures
+  - uid: 209
+    components:
+    - pos: 53.5,-20.5
+      parent: 31
+      type: Transform
+    - fixtures: {}
+      type: Fixtures
   - uid: 218
     components:
     - pos: -6.5,4.5
@@ -5768,6 +5866,29 @@ entities:
       type: Transform
     - fixtures: {}
       type: Fixtures
+  - uid: 250
+    components:
+    - pos: -34.5,17.5
+      parent: 31
+      type: Transform
+    - fixtures: {}
+      type: Fixtures
+  - uid: 258
+    components:
+    - pos: -33.5,17.5
+      parent: 31
+      type: Transform
+    - enabled: True
+      type: AmbientSound
+    - fixtures: {}
+      type: Fixtures
+  - uid: 266
+    components:
+    - pos: -1.5,-30.5
+      parent: 31
+      type: Transform
+    - fixtures: {}
+      type: Fixtures
   - uid: 297
     components:
     - pos: -6.5,30.5
@@ -6765,15 +6886,6 @@ entities:
       type: Transform
     - fixtures: {}
       type: Fixtures
-  - uid: 2527
-    components:
-    - pos: -28.5,14.5
-      parent: 31
-      type: Transform
-    - enabled: True
-      type: AmbientSound
-    - fixtures: {}
-      type: Fixtures
   - uid: 2528
     components:
     - pos: -22.5,13.5
@@ -12117,6 +12229,13 @@ entities:
       type: Transform
     - fixtures: {}
       type: Fixtures
+  - uid: 4285
+    components:
+    - pos: -4.5,-30.5
+      parent: 31
+      type: Transform
+    - fixtures: {}
+      type: Fixtures
   - uid: 4310
     components:
     - pos: -40.5,8.5
@@ -12354,11 +12473,9 @@ entities:
       type: Fixtures
   - uid: 4664
     components:
-    - pos: 48.5,-24.5
+    - pos: -3.5,-30.5
       parent: 31
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 4665
@@ -12419,11 +12536,16 @@ entities:
       type: Fixtures
   - uid: 4682
     components:
-    - pos: 46.5,-24.5
+    - pos: -2.5,-30.5
+      parent: 31
+      type: Transform
+    - fixtures: {}
+      type: Fixtures
+  - uid: 4709
+    components:
+    - pos: -0.5,-30.5
       parent: 31
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 4720
@@ -12961,36 +13083,6 @@ entities:
       type: AmbientSound
     - fixtures: {}
       type: Fixtures
-  - uid: 5231
-    components:
-    - pos: -28.5,15.5
-      parent: 31
-      type: Transform
-    - enabled: True
-      type: AmbientSound
-    - fixtures: {}
-      type: Fixtures
-  - uid: 5232
-    components:
-    - pos: -28.5,16.5
-      parent: 31
-      type: Transform
-    - fixtures: {}
-      type: Fixtures
-  - uid: 5233
-    components:
-    - pos: -29.5,16.5
-      parent: 31
-      type: Transform
-    - fixtures: {}
-      type: Fixtures
-  - uid: 5234
-    components:
-    - pos: -30.5,16.5
-      parent: 31
-      type: Transform
-    - fixtures: {}
-      type: Fixtures
   - uid: 5243
     components:
     - pos: -21.5,24.5
@@ -14084,65 +14176,25 @@ entities:
       type: AmbientSound
     - fixtures: {}
       type: Fixtures
-  - uid: 7474
+  - uid: 7465
     components:
-    - pos: 3.5,-29.5
+    - pos: -6.5,-25.5
       parent: 31
       type: Transform
+    - enabled: True
+      type: AmbientSound
     - fixtures: {}
       type: Fixtures
-  - uid: 7475
+  - uid: 7474
     components:
-    - pos: 2.5,-29.5
+    - pos: 3.5,-29.5
       parent: 31
       type: Transform
     - fixtures: {}
       type: Fixtures
   - uid: 7476
     components:
-    - pos: 1.5,-29.5
-      parent: 31
-      type: Transform
-    - fixtures: {}
-      type: Fixtures
-  - uid: 7477
-    components:
-    - pos: 0.5,-29.5
-      parent: 31
-      type: Transform
-    - fixtures: {}
-      type: Fixtures
-  - uid: 7478
-    components:
-    - pos: 0.5,-30.5
-      parent: 31
-      type: Transform
-    - fixtures: {}
-      type: Fixtures
-  - uid: 7479
-    components:
-    - pos: 0.5,-31.5
-      parent: 31
-      type: Transform
-    - fixtures: {}
-      type: Fixtures
-  - uid: 7480
-    components:
-    - pos: -0.5,-31.5
-      parent: 31
-      type: Transform
-    - fixtures: {}
-      type: Fixtures
-  - uid: 7481
-    components:
-    - pos: -1.5,-31.5
-      parent: 31
-      type: Transform
-    - fixtures: {}
-      type: Fixtures
-  - uid: 7482
-    components:
-    - pos: -2.5,-31.5
+    - pos: -32.5,17.5
       parent: 31
       type: Transform
     - fixtures: {}
@@ -14472,6 +14524,13 @@ entities:
       type: AmbientSound
     - fixtures: {}
       type: Fixtures
+  - uid: 7944
+    components:
+    - pos: -35.5,17.5
+      parent: 31
+      type: Transform
+    - fixtures: {}
+      type: Fixtures
   - uid: 8019
     components:
     - pos: -6.5,31.5
@@ -14984,15 +15043,6 @@ entities:
       type: Transform
     - fixtures: {}
       type: Fixtures
-  - uid: 8209
-    components:
-    - pos: 47.5,-24.5
-      parent: 31
-      type: Transform
-    - enabled: True
-      type: AmbientSound
-    - fixtures: {}
-      type: Fixtures
   - uid: 8210
     components:
     - pos: 28.5,21.5
@@ -15009,13 +15059,6 @@ entities:
       type: Transform
     - fixtures: {}
       type: Fixtures
-  - uid: 8213
-    components:
-    - pos: -11.5,-23.5
-      parent: 31
-      type: Transform
-    - fixtures: {}
-      type: Fixtures
   - uid: 8214
     components:
     - pos: -11.5,-22.5
@@ -15023,78 +15066,6 @@ entities:
       type: Transform
     - fixtures: {}
       type: Fixtures
-  - uid: 8218
-    components:
-    - pos: 49.5,-24.5
-      parent: 31
-      type: Transform
-    - enabled: True
-      type: AmbientSound
-    - fixtures: {}
-      type: Fixtures
-  - uid: 8219
-    components:
-    - pos: 49.5,-23.5
-      parent: 31
-      type: Transform
-    - enabled: True
-      type: AmbientSound
-    - fixtures: {}
-      type: Fixtures
-  - uid: 8220
-    components:
-    - pos: 49.5,-22.5
-      parent: 31
-      type: Transform
-    - enabled: True
-      type: AmbientSound
-    - fixtures: {}
-      type: Fixtures
-  - uid: 8221
-    components:
-    - pos: 49.5,-25.5
-      parent: 31
-      type: Transform
-    - enabled: True
-      type: AmbientSound
-    - fixtures: {}
-      type: Fixtures
-  - uid: 8222
-    components:
-    - pos: 49.5,-26.5
-      parent: 31
-      type: Transform
-    - enabled: True
-      type: AmbientSound
-    - fixtures: {}
-      type: Fixtures
-  - uid: 8223
-    components:
-    - pos: 50.5,-24.5
-      parent: 31
-      type: Transform
-    - enabled: True
-      type: AmbientSound
-    - fixtures: {}
-      type: Fixtures
-  - uid: 8224
-    components:
-    - pos: 51.5,-24.5
-      parent: 31
-      type: Transform
-    - enabled: True
-      type: AmbientSound
-    - fixtures: {}
-      type: Fixtures
-  - uid: 8225
-    components:
-    - pos: 52.5,-24.5
-      parent: 31
-      type: Transform
-    - enabled: True
-      type: AmbientSound
-    - fixtures: {}
-      type: Fixtures
   - uid: 8226
     components:
     - pos: 53.5,-24.5
@@ -15137,15 +15108,6 @@ entities:
       type: Transform
     - fixtures: {}
       type: Fixtures
-  - uid: 8232
-    components:
-    - pos: 49.5,-27.5
-      parent: 31
-      type: Transform
-    - enabled: True
-      type: AmbientSound
-    - fixtures: {}
-      type: Fixtures
   - uid: 8233
     components:
     - pos: 49.5,-28.5
@@ -15188,15 +15150,6 @@ entities:
       type: Transform
     - fixtures: {}
       type: Fixtures
-  - uid: 8239
-    components:
-    - pos: 49.5,-21.5
-      parent: 31
-      type: Transform
-    - enabled: True
-      type: AmbientSound
-    - fixtures: {}
-      type: Fixtures
   - uid: 8240
     components:
     - pos: 49.5,-20.5
@@ -17718,6 +17671,15 @@ entities:
       type: Transform
     - fixtures: {}
       type: Fixtures
+  - uid: 3123
+    components:
+    - pos: 29.5,12.5
+      parent: 31
+      type: Transform
+    - enabled: True
+      type: AmbientSound
+    - fixtures: {}
+      type: Fixtures
   - uid: 3143
     components:
     - pos: 32.5,8.5
@@ -19884,23 +19846,12 @@ entities:
       type: Fixtures
   - uid: 3569
     components:
-    - pos: 28.5,11.5
+    - pos: 30.5,12.5
       parent: 31
       type: Transform
-    - enabled: True
-      type: AmbientSound
     - fixtures: {}
       type: Fixtures
   - uid: 3570
-    components:
-    - pos: 29.5,11.5
-      parent: 31
-      type: Transform
-    - enabled: True
-      type: AmbientSound
-    - fixtures: {}
-      type: Fixtures
-  - uid: 3571
     components:
     - pos: 30.5,11.5
       parent: 31
@@ -22377,13 +22328,6 @@ entities:
       type: Transform
     - fixtures: {}
       type: Fixtures
-  - uid: 9709
-    components:
-    - pos: -7.5,26.5
-      parent: 31
-      type: Transform
-    - fixtures: {}
-      type: Fixtures
   - uid: 9710
     components:
     - pos: -7.5,25.5
@@ -22429,6 +22373,27 @@ entities:
       type: Transform
     - fixtures: {}
       type: Fixtures
+  - uid: 203
+    components:
+    - pos: -11.5,-23.5
+      parent: 31
+      type: Transform
+    - fixtures: {}
+      type: Fixtures
+  - uid: 245
+    components:
+    - pos: -6.5,27.5
+      parent: 31
+      type: Transform
+    - fixtures: {}
+      type: Fixtures
+  - uid: 312
+    components:
+    - pos: -7.5,-26.5
+      parent: 31
+      type: Transform
+    - fixtures: {}
+      type: Fixtures
   - uid: 618
     components:
     - pos: 37.5,3.5
@@ -22452,6 +22417,13 @@ entities:
       type: AmbientSound
     - fixtures: {}
       type: Fixtures
+  - uid: 872
+    components:
+    - pos: -10.5,-26.5
+      parent: 31
+      type: Transform
+    - fixtures: {}
+      type: Fixtures
   - uid: 890
     components:
     - pos: 12.5,21.5
@@ -22468,6 +22440,13 @@ entities:
       type: Transform
     - fixtures: {}
       type: Fixtures
+  - uid: 986
+    components:
+    - pos: -11.5,-26.5
+      parent: 31
+      type: Transform
+    - fixtures: {}
+      type: Fixtures
   - uid: 1125
     components:
     - pos: 7.5,-18.5
@@ -22546,9 +22525,16 @@ entities:
       type: Transform
     - fixtures: {}
       type: Fixtures
-  - uid: 1888
+  - uid: 2054
     components:
-    - pos: -7.5,26.5
+    - pos: -11.5,-24.5
+      parent: 31
+      type: Transform
+    - fixtures: {}
+      type: Fixtures
+  - uid: 2141
+    components:
+    - pos: -11.5,-25.5
       parent: 31
       type: Transform
     - fixtures: {}
@@ -24687,6 +24673,22 @@ entities:
       type: AmbientSound
     - fixtures: {}
       type: Fixtures
+  - uid: 4806
+    components:
+    - pos: -6.5,-25.5
+      parent: 31
+      type: Transform
+    - enabled: True
+      type: AmbientSound
+    - fixtures: {}
+      type: Fixtures
+  - uid: 4835
+    components:
+    - pos: -6.5,-26.5
+      parent: 31
+      type: Transform
+    - fixtures: {}
+      type: Fixtures
   - uid: 4863
     components:
     - pos: 12.5,23.5
@@ -25049,6 +25051,34 @@ entities:
       type: AmbientSound
     - fixtures: {}
       type: Fixtures
+  - uid: 7266
+    components:
+    - pos: -9.5,-26.5
+      parent: 31
+      type: Transform
+    - fixtures: {}
+      type: Fixtures
+  - uid: 7272
+    components:
+    - pos: -8.5,-26.5
+      parent: 31
+      type: Transform
+    - fixtures: {}
+      type: Fixtures
+  - uid: 7453
+    components:
+    - pos: -11.5,-21.5
+      parent: 31
+      type: Transform
+    - fixtures: {}
+      type: Fixtures
+  - uid: 7625
+    components:
+    - pos: -11.5,-22.5
+      parent: 31
+      type: Transform
+    - fixtures: {}
+      type: Fixtures
   - uid: 8077
     components:
     - pos: 12.5,20.5
@@ -25737,36 +25767,6 @@ entities:
       pos: -10.5,-7.5
       parent: 31
       type: Transform
-  - uid: 7464
-    components:
-    - pos: -2.5,-30.5
-      parent: 31
-      type: Transform
-  - uid: 7465
-    components:
-    - pos: -2.5,-31.5
-      parent: 31
-      type: Transform
-  - uid: 7466
-    components:
-    - pos: -1.5,-31.5
-      parent: 31
-      type: Transform
-  - uid: 7467
-    components:
-    - pos: -1.5,-30.5
-      parent: 31
-      type: Transform
-  - uid: 7468
-    components:
-    - pos: -1.5,-29.5
-      parent: 31
-      type: Transform
-  - uid: 7469
-    components:
-    - pos: -2.5,-29.5
-      parent: 31
-      type: Transform
 - proto: CarpetBlue
   entities:
   - uid: 20
@@ -26302,15 +26302,11 @@ entities:
     - pos: 48.303993,-27.148758
       parent: 31
       type: Transform
-    - nextSound: 993.3771952
-      type: EmitSoundOnCollide
   - uid: 10136
     components:
     - pos: 48.361862,-27.218203
       parent: 31
       type: Transform
-    - nextSound: 994.2123749
-      type: EmitSoundOnCollide
 - proto: Catwalk
   entities:
   - uid: 2
@@ -28191,11 +28187,6 @@ entities:
       type: Transform
 - proto: Chair
   entities:
-  - uid: 28
-    components:
-    - pos: 11.5,1.5
-      parent: 31
-      type: Transform
   - uid: 423
     components:
     - rot: 3.141592653589793 rad
@@ -28339,12 +28330,6 @@ entities:
       pos: 35.5,-14.5
       parent: 31
       type: Transform
-  - uid: 7272
-    components:
-    - rot: -1.5707963267948966 rad
-      pos: 12.5,-2.5
-      parent: 31
-      type: Transform
   - uid: 7286
     components:
     - pos: 10.5,1.5
@@ -28365,30 +28350,12 @@ entities:
     - pos: 7.5,1.5
       parent: 31
       type: Transform
-  - uid: 7473
-    components:
-    - rot: -1.5707963267948966 rad
-      pos: 0.5,-30.5
-      parent: 31
-      type: Transform
   - uid: 7627
     components:
     - rot: -1.5707963267948966 rad
       pos: -28.5,17.5
       parent: 31
       type: Transform
-  - uid: 7628
-    components:
-    - rot: 1.5707963267948966 rad
-      pos: -30.5,17.5
-      parent: 31
-      type: Transform
-  - uid: 7630
-    components:
-    - rot: 1.5707963267948966 rad
-      pos: -32.5,16.5
-      parent: 31
-      type: Transform
   - uid: 7646
     components:
     - pos: -28.5,-7.5
@@ -28751,11 +28718,6 @@ entities:
     - pos: 9.5,-27.5
       parent: 31
       type: Transform
-  - uid: 7472
-    components:
-    - pos: -1.5,-29.5
-      parent: 31
-      type: Transform
   - uid: 8346
     components:
     - rot: -1.5707963267948966 rad
@@ -28884,15 +28846,20 @@ entities:
       pos: -0.5,-15.5
       parent: 31
       type: Transform
-  - uid: 7615
+  - uid: 7479
     components:
-    - pos: 6.5,-10.5
+    - rot: 3.141592653589793 rad
+      pos: 12.5,-3.5
       parent: 31
       type: Transform
-  - uid: 7909
+  - uid: 7490
     components:
-    - rot: 3.141592653589793 rad
-      pos: 7.5,-5.5
+    - pos: 6.5,-4.5
+      parent: 31
+      type: Transform
+  - uid: 7615
+    components:
+    - pos: 6.5,-10.5
       parent: 31
       type: Transform
   - uid: 9120
@@ -29028,34 +28995,29 @@ entities:
       type: Transform
 - proto: CheapRollerBed
   entities:
-  - uid: 7251
-    components:
-    - pos: 24.491184,-5.57038
-      parent: 31
-      type: Transform
-  - uid: 7252
+  - uid: 6959
     components:
-    - pos: 24.47556,-5.97663
+    - pos: 8.466697,-2.4596636
       parent: 31
       type: Transform
-  - uid: 7253
+  - uid: 6995
     components:
-    - pos: 24.491184,-6.41413
+    - pos: 8.482322,-1.9752886
       parent: 31
       type: Transform
-  - uid: 7258
+  - uid: 7251
     components:
-    - pos: 12.417737,-5.4738226
+    - pos: 24.491184,-5.57038
       parent: 31
       type: Transform
-  - uid: 7270
+  - uid: 7252
     components:
-    - pos: 12.417737,-5.0050726
+    - pos: 24.47556,-5.97663
       parent: 31
       type: Transform
-  - uid: 7811
+  - uid: 7253
     components:
-    - pos: 12.433362,-4.4894476
+    - pos: 24.491184,-6.41413
       parent: 31
       type: Transform
 - proto: chem_master
@@ -29282,9 +29244,9 @@ entities:
     - pos: 15.5,14.5
       parent: 31
       type: Transform
-  - uid: 6575
+  - uid: 3571
     components:
-    - pos: 30.5,12.5
+    - pos: 30.5,11.5
       parent: 31
       type: Transform
   - uid: 7426
@@ -29338,9 +29300,9 @@ entities:
       type: Transform
 - proto: ClosetL3VirologyFilled
   entities:
-  - uid: 7254
+  - uid: 6695
     components:
-    - pos: 24.5,-7.5
+    - pos: 14.5,-7.5
       parent: 31
       type: Transform
 - proto: ClosetMaintenanceFilledRandom
@@ -29539,14 +29501,14 @@ entities:
     - pos: -17.458836,-19.170164
       parent: 31
       type: Transform
-  - uid: 8850
+  - uid: 7482
     components:
-    - pos: 29.463833,-4.5136166
+    - pos: 35.56775,-3.545828
       parent: 31
       type: Transform
   - uid: 9697
     components:
-    - pos: -0.5206394,-13.487036
+    - pos: -0.40004647,-17.584152
       parent: 31
       type: Transform
 - proto: ClothingEyesGlasses
@@ -29559,13 +29521,6 @@ entities:
       type: Transform
     - canCollide: False
       type: Physics
-- proto: ClothingEyesGlassesGarOrange
-  entities:
-  - uid: 7633
-    components:
-    - pos: -30.494461,17.378698
-      parent: 31
-      type: Transform
 - proto: ClothingEyesGlassesMeson
   entities:
   - uid: 7582
@@ -29573,9 +29528,9 @@ entities:
     - pos: 43.506165,13.466041
       parent: 31
       type: Transform
-  - uid: 8849
+  - uid: 8213
     components:
-    - pos: 29.463833,-4.4042416
+    - pos: 35.614624,-3.264578
       parent: 31
       type: Transform
 - proto: ClothingEyesGlassesSunglasses
@@ -29661,6 +29616,11 @@ entities:
       type: Transform
 - proto: ClothingHeadHatFedoraBrown
   entities:
+  - uid: 7484
+    components:
+    - pos: -21.550486,17.73303
+      parent: 31
+      type: Transform
   - uid: 7857
     components:
     - flags: InContainer
@@ -29852,11 +29812,6 @@ entities:
     - pos: 29.559704,-19.508926
       parent: 31
       type: Transform
-  - uid: 7629
-    components:
-    - pos: -32.50361,16.378698
-      parent: 31
-      type: Transform
 - proto: ClothingOuterCoatGentle
   entities:
   - uid: 7987
@@ -29866,6 +29821,11 @@ entities:
       type: Transform
 - proto: ClothingOuterCoatInspector
   entities:
+  - uid: 7480
+    components:
+    - pos: -21.602036,17.352358
+      parent: 31
+      type: Transform
   - uid: 7854
     components:
     - flags: InContainer
@@ -30063,11 +30023,23 @@ entities:
       type: Transform
     - canCollide: False
       type: Physics
+  - uid: 7458
+    components:
+    - pos: -23.237986,17.742983
+      parent: 31
+      type: Transform
   - uid: 7973
     components:
     - pos: 14.460975,20.651337
       parent: 31
       type: Transform
+- proto: ClothingUniformJumpsuitDetectiveGrey
+  entities:
+  - uid: 9190
+    components:
+    - pos: -23.456736,17.524233
+      parent: 31
+      type: Transform
 - proto: ClothingUniformJumpsuitParamedic
   entities:
   - uid: 7255
@@ -30082,6 +30054,12 @@ entities:
       type: Transform
 - proto: ComfyChair
   entities:
+  - uid: 268
+    components:
+    - rot: 1.5707963267948966 rad
+      pos: -2.5,-31.5
+      parent: 31
+      type: Transform
   - uid: 478
     components:
     - pos: 10.5,24.5
@@ -30156,6 +30134,12 @@ entities:
       pos: 7.5,23.5
       parent: 31
       type: Transform
+  - uid: 5221
+    components:
+    - rot: -1.5707963267948966 rad
+      pos: -0.5,-31.5
+      parent: 31
+      type: Transform
   - uid: 7165
     components:
     - pos: 12.5,-30.5
@@ -30291,10 +30275,9 @@ entities:
     - pos: 0.5,32.5
       parent: 31
       type: Transform
-  - uid: 7266
+  - uid: 6512
     components:
-    - rot: 1.5707963267948966 rad
-      pos: 6.5,-5.5
+    - pos: 12.5,-2.5
       parent: 31
       type: Transform
 - proto: ComputerCriminalRecords
@@ -30832,15 +30815,18 @@ entities:
     - pos: 50.18672,-26.975147
       parent: 31
       type: Transform
-    - nextSound: 1006.032391
-      type: EmitSoundOnCollide
   - uid: 10140
     components:
     - pos: 50.26774,-27.090889
       parent: 31
       type: Transform
-    - nextSound: 1007.1956292
-      type: EmitSoundOnCollide
+- proto: CrateArtifactContainer
+  entities:
+  - uid: 5225
+    components:
+    - pos: -17.5,-21.5
+      parent: 31
+      type: Transform
 - proto: CrateEmptySpawner
   entities:
   - uid: 3135
@@ -31005,19 +30991,32 @@ entities:
       type: Transform
 - proto: Crematorium
   entities:
-  - uid: 2160
+  - uid: 9134
     components:
     - rot: 3.141592653589793 rad
-      pos: 15.5,-17.5
+      pos: -31.5,16.5
       parent: 31
       type: Transform
+    - air:
+        volume: 200
+        immutable: False
+        temperature: 293.1496
+        moles:
+        - 1.7459903
+        - 6.568249
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+      type: EntityStorage
 - proto: CrewMonitoringServer
   entities:
-  - uid: 624
-    components:
-    - pos: 21.5,-15.5
-      parent: 31
-      type: Transform
   - uid: 10268
     components:
     - pos: -6.5,32.5
@@ -31037,7 +31036,7 @@ entities:
       type: Transform
   - uid: 8937
     components:
-    - pos: -0.50070596,-17.49066
+    - pos: -0.63442147,-17.450098
       parent: 31
       type: Transform
   - uid: 9114
@@ -31089,12 +31088,6 @@ entities:
       pos: -0.5,11.5
       parent: 31
       type: Transform
-  - uid: 9832
-    components:
-    - rot: 3.141592653589793 rad
-      pos: 8.5,-6.5
-      parent: 31
-      type: Transform
   - uid: 9833
     components:
     - rot: -1.5707963267948966 rad
@@ -31118,15 +31111,11 @@ entities:
     - pos: 10.362751,-24.393734
       parent: 31
       type: Transform
-    - nextSound: 1219.7598403
-      type: EmitSoundOnCollide
   - uid: 10208
     components:
     - pos: 10.756269,-24.370586
       parent: 31
       type: Transform
-    - nextSound: 1220.3961672
-      type: EmitSoundOnCollide
 - proto: DiseaseDiagnoser
   entities:
   - uid: 8435
@@ -31161,21 +31150,15 @@ entities:
       pos: 37.5,3.5
       parent: 31
       type: Transform
-  - uid: 255
-    components:
-    - rot: -1.5707963267948966 rad
-      pos: 15.5,3.5
-      parent: 31
-      type: Transform
-  - uid: 268
+  - uid: 247
     components:
-    - pos: 2.5,28.5
+    - rot: 3.141592653589793 rad
+      pos: 12.5,-0.5
       parent: 31
       type: Transform
-  - uid: 329
+  - uid: 310
     components:
-    - rot: 1.5707963267948966 rad
-      pos: 4.5,3.5
+    - pos: 8.5,17.5
       parent: 31
       type: Transform
   - uid: 351
@@ -31206,6 +31189,16 @@ entities:
       pos: -8.5,-14.5
       parent: 31
       type: Transform
+  - uid: 874
+    components:
+    - pos: 7.5,11.5
+      parent: 31
+      type: Transform
+  - uid: 3883
+    components:
+    - pos: 3.5,28.5
+      parent: 31
+      type: Transform
   - uid: 4790
     components:
     - pos: 6.5,-27.5
@@ -31233,6 +31226,11 @@ entities:
       pos: -11.5,-25.5
       parent: 31
       type: Transform
+  - uid: 7420
+    components:
+    - pos: 18.5,-10.5
+      parent: 31
+      type: Transform
   - uid: 7430
     components:
     - rot: 3.141592653589793 rad
@@ -31245,12 +31243,6 @@ entities:
       pos: -7.5,1.5
       parent: 31
       type: Transform
-  - uid: 9168
-    components:
-    - rot: 3.141592653589793 rad
-      pos: -4.5,4.5
-      parent: 31
-      type: Transform
   - uid: 9222
     components:
     - pos: -4.5,12.5
@@ -31262,152 +31254,6 @@ entities:
       pos: -34.5,3.5
       parent: 31
       type: Transform
-  - uid: 9530
-    components:
-    - pos: 3.5,29.5
-      parent: 31
-      type: Transform
-  - uid: 9534
-    components:
-    - pos: 8.5,17.5
-      parent: 31
-      type: Transform
-  - uid: 9562
-    components:
-    - pos: 39.5,5.5
-      parent: 31
-      type: Transform
-  - uid: 9589
-    components:
-    - rot: 1.5707963267948966 rad
-      pos: 14.5,6.5
-      parent: 31
-      type: Transform
-  - uid: 9598
-    components:
-    - rot: 3.141592653589793 rad
-      pos: 4.5,5.5
-      parent: 31
-      type: Transform
-  - uid: 9602
-    components:
-    - pos: 10.5,-1.5
-      parent: 31
-      type: Transform
-  - uid: 9603
-    components:
-    - rot: 3.141592653589793 rad
-      pos: 10.5,-9.5
-      parent: 31
-      type: Transform
-  - uid: 9604
-    components:
-    - rot: -1.5707963267948966 rad
-      pos: 14.5,-9.5
-      parent: 31
-      type: Transform
-  - uid: 9607
-    components:
-    - rot: 1.5707963267948966 rad
-      pos: 1.5,-0.5
-      parent: 31
-      type: Transform
-  - uid: 9610
-    components:
-    - rot: 3.141592653589793 rad
-      pos: 1.5,-2.5
-      parent: 31
-      type: Transform
-  - uid: 9630
-    components:
-    - rot: 1.5707963267948966 rad
-      pos: -5.5,-15.5
-      parent: 31
-      type: Transform
-  - uid: 9643
-    components:
-    - rot: 3.141592653589793 rad
-      pos: 16.5,5.5
-      parent: 31
-      type: Transform
-  - uid: 9644
-    components:
-    - pos: 16.5,6.5
-      parent: 31
-      type: Transform
-  - uid: 9646
-    components:
-    - pos: 15.5,5.5
-      parent: 31
-      type: Transform
-  - uid: 9656
-    components:
-    - rot: 1.5707963267948966 rad
-      pos: 13.5,10.5
-      parent: 31
-      type: Transform
-  - uid: 9657
-    components:
-    - pos: 18.5,10.5
-      parent: 31
-      type: Transform
-  - uid: 9659
-    components:
-    - rot: -1.5707963267948966 rad
-      pos: 2.5,-0.5
-      parent: 31
-      type: Transform
-  - uid: 9680
-    components:
-    - rot: -1.5707963267948966 rad
-      pos: 4.5,-2.5
-      parent: 31
-      type: Transform
-  - uid: 9826
-    components:
-    - rot: -1.5707963267948966 rad
-      pos: 2.5,-15.5
-      parent: 31
-      type: Transform
-  - uid: 9846
-    components:
-    - rot: 3.141592653589793 rad
-      pos: 2.5,20.5
-      parent: 31
-      type: Transform
-  - uid: 9848
-    components:
-    - pos: 3.5,20.5
-      parent: 31
-      type: Transform
-  - uid: 9850
-    components:
-    - rot: 1.5707963267948966 rad
-      pos: 2.5,19.5
-      parent: 31
-      type: Transform
-  - uid: 9852
-    components:
-    - rot: 3.141592653589793 rad
-      pos: 3.5,21.5
-      parent: 31
-      type: Transform
-  - uid: 9855
-    components:
-    - rot: -1.5707963267948966 rad
-      pos: 5.5,18.5
-      parent: 31
-      type: Transform
-  - uid: 9856
-    components:
-    - pos: 4.5,19.5
-      parent: 31
-      type: Transform
-  - uid: 9857
-    components:
-    - pos: 5.5,21.5
-      parent: 31
-      type: Transform
   - uid: 10147
     components:
     - pos: 49.5,-29.5
@@ -31469,23 +31315,6 @@ entities:
       pos: 18.5,-11.5
       parent: 31
       type: Transform
-  - uid: 10197
-    components:
-    - pos: 18.5,-9.5
-      parent: 31
-      type: Transform
-  - uid: 10200
-    components:
-    - rot: 1.5707963267948966 rad
-      pos: 15.5,-9.5
-      parent: 31
-      type: Transform
-  - uid: 10201
-    components:
-    - rot: -1.5707963267948966 rad
-      pos: 15.5,-10.5
-      parent: 31
-      type: Transform
   - uid: 10206
     components:
     - rot: 1.5707963267948966 rad
@@ -31535,10 +31364,16 @@ entities:
       pos: 3.5,-11.5
       parent: 31
       type: Transform
-  - uid: 5101
+  - uid: 4149
     components:
-    - rot: 3.141592653589793 rad
-      pos: 12.5,-0.5
+    - rot: -1.5707963267948966 rad
+      pos: -5.5,3.5
+      parent: 31
+      type: Transform
+  - uid: 7265
+    components:
+    - rot: -1.5707963267948966 rad
+      pos: 7.5,4.5
       parent: 31
       type: Transform
   - uid: 7434
@@ -31553,11 +31388,6 @@ entities:
       pos: 24.5,4.5
       parent: 31
       type: Transform
-  - uid: 9845
-    components:
-    - pos: 3.5,17.5
-      parent: 31
-      type: Transform
 - proto: DisposalJunctionFlipped
   entities:
   - uid: 25
@@ -31589,11 +31419,6 @@ entities:
       pos: -27.5,-10.5
       parent: 31
       type: Transform
-  - uid: 245
-    components:
-    - pos: 3.5,11.5
-      parent: 31
-      type: Transform
   - uid: 313
     components:
     - rot: -1.5707963267948966 rad
@@ -31612,30 +31437,23 @@ entities:
       pos: -11.5,3.5
       parent: 31
       type: Transform
-- proto: DisposalPipe
-  entities:
-  - uid: 56
-    components:
-    - rot: 1.5707963267948966 rad
-      pos: 23.5,4.5
-      parent: 31
-      type: Transform
-  - uid: 117
+  - uid: 1026
     components:
-    - rot: -1.5707963267948966 rad
-      pos: 13.5,3.5
+    - pos: 3.5,17.5
       parent: 31
       type: Transform
-  - uid: 160
+  - uid: 3946
     components:
     - rot: 3.141592653589793 rad
-      pos: 2.5,15.5
+      pos: 12.5,1.5
       parent: 31
       type: Transform
-  - uid: 167
+- proto: DisposalPipe
+  entities:
+  - uid: 56
     components:
-    - rot: 3.141592653589793 rad
-      pos: 4.5,12.5
+    - rot: 1.5707963267948966 rad
+      pos: 23.5,4.5
       parent: 31
       type: Transform
   - uid: 169
@@ -31719,60 +31537,12 @@ entities:
       pos: -17.5,-16.5
       parent: 31
       type: Transform
-  - uid: 198
-    components:
-    - rot: 1.5707963705062866 rad
-      pos: 0.5,17.5
-      parent: 31
-      type: Transform
-  - uid: 199
-    components:
-    - rot: 1.5707963705062866 rad
-      pos: -0.5,17.5
-      parent: 31
-      type: Transform
-  - uid: 200
-    components:
-    - rot: 1.5707963705062866 rad
-      pos: -1.5,17.5
-      parent: 31
-      type: Transform
-  - uid: 201
-    components:
-    - rot: 1.5707963705062866 rad
-      pos: -2.5,17.5
-      parent: 31
-      type: Transform
-  - uid: 202
-    components:
-    - rot: 1.5707963705062866 rad
-      pos: -3.5,17.5
-      parent: 31
-      type: Transform
-  - uid: 203
-    components:
-    - rot: 1.5707963705062866 rad
-      pos: -4.5,17.5
-      parent: 31
-      type: Transform
   - uid: 206
     components:
     - rot: 3.141592697301183 rad
       pos: -17.5,-17.5
       parent: 31
       type: Transform
-  - uid: 207
-    components:
-    - rot: 4.71238902409608 rad
-      pos: 4.5,11.5
-      parent: 31
-      type: Transform
-  - uid: 208
-    components:
-    - rot: 4.71238902409608 rad
-      pos: 5.5,11.5
-      parent: 31
-      type: Transform
   - uid: 211
     components:
     - rot: 3.141592697301183 rad
@@ -31916,105 +31686,9 @@ entities:
       pos: 2.5,3.5
       parent: 31
       type: Transform
-  - uid: 247
-    components:
-    - rot: 3.141592653589793 rad
-      pos: 4.5,13.5
-      parent: 31
-      type: Transform
-  - uid: 248
-    components:
-    - rot: 3.141592653589793 rad
-      pos: 4.5,14.5
-      parent: 31
-      type: Transform
-  - uid: 250
-    components:
-    - rot: 3.141592653589793 rad
-      pos: 2.5,13.5
-      parent: 31
-      type: Transform
-  - uid: 251
-    components:
-    - rot: 3.141592653589793 rad
-      pos: 2.5,3.5
-      parent: 31
-      type: Transform
-  - uid: 252
-    components:
-    - rot: 3.141592653589793 rad
-      pos: 2.5,12.5
-      parent: 31
-      type: Transform
-  - uid: 253
-    components:
-    - rot: 1.5707963267948966 rad
-      pos: 10.5,3.5
-      parent: 31
-      type: Transform
-  - uid: 254
-    components:
-    - rot: 1.5707963267948966 rad
-      pos: 11.5,3.5
-      parent: 31
-      type: Transform
-  - uid: 256
-    components:
-    - rot: 1.5707963705062866 rad
-      pos: 1.5,17.5
-      parent: 31
-      type: Transform
-  - uid: 257
-    components:
-    - rot: 3.141592653589793 rad
-      pos: 2.5,16.5
-      parent: 31
-      type: Transform
-  - uid: 258
-    components:
-    - rot: 3.141592653589793 rad
-      pos: 2.5,14.5
-      parent: 31
-      type: Transform
-  - uid: 259
-    components:
-    - rot: 3.141592653589793 rad
-      pos: 2.5,10.5
-      parent: 31
-      type: Transform
-  - uid: 260
-    components:
-    - pos: 2.5,21.5
-      parent: 31
-      type: Transform
-  - uid: 261
-    components:
-    - pos: 2.5,22.5
-      parent: 31
-      type: Transform
-  - uid: 262
-    components:
-    - pos: 2.5,23.5
-      parent: 31
-      type: Transform
-  - uid: 263
-    components:
-    - pos: 2.5,24.5
-      parent: 31
-      type: Transform
-  - uid: 264
-    components:
-    - pos: 2.5,25.5
-      parent: 31
-      type: Transform
   - uid: 265
     components:
-    - pos: 2.5,26.5
-      parent: 31
-      type: Transform
-  - uid: 266
-    components:
-    - pos: 2.5,27.5
+    - pos: 3.5,27.5
       parent: 31
       type: Transform
   - uid: 269
@@ -32169,8 +31843,7 @@ entities:
       type: Transform
   - uid: 301
     components:
-    - rot: 3.141592697301183 rad
-      pos: 12.5,1.5
+    - pos: -5.5,7.5
       parent: 31
       type: Transform
   - uid: 302
@@ -32185,34 +31858,10 @@ entities:
       pos: 13.5,-0.5
       parent: 31
       type: Transform
-  - uid: 308
-    components:
-    - rot: 4.71238902409608 rad
-      pos: 5.5,3.5
-      parent: 31
-      type: Transform
-  - uid: 309
-    components:
-    - rot: 4.71238902409608 rad
-      pos: 6.5,3.5
-      parent: 31
-      type: Transform
-  - uid: 310
-    components:
-    - rot: 4.71238902409608 rad
-      pos: 7.5,3.5
-      parent: 31
-      type: Transform
   - uid: 311
     components:
-    - rot: 4.71238902409608 rad
-      pos: 8.5,3.5
-      parent: 31
-      type: Transform
-  - uid: 312
-    components:
-    - rot: 4.71238902409608 rad
-      pos: 9.5,3.5
+    - rot: -1.5707963267948966 rad
+      pos: 6.5,17.5
       parent: 31
       type: Transform
   - uid: 314
@@ -32375,12 +32024,6 @@ entities:
       pos: -6.5,3.5
       parent: 31
       type: Transform
-  - uid: 354
-    components:
-    - rot: 4.71238902409608 rad
-      pos: -5.5,3.5
-      parent: 31
-      type: Transform
   - uid: 355
     components:
     - rot: 4.71238902409608 rad
@@ -32649,16 +32292,16 @@ entities:
       pos: -24.5,-10.5
       parent: 31
       type: Transform
-  - uid: 577
+  - uid: 624
     components:
-    - rot: 3.141592653589793 rad
-      pos: 2.5,9.5
+    - rot: 1.5707963267948966 rad
+      pos: 16.5,-10.5
       parent: 31
       type: Transform
   - uid: 758
     components:
-    - rot: 3.141592653589793 rad
-      pos: 12.5,-1.5
+    - rot: 1.5707963267948966 rad
+      pos: 15.5,-10.5
       parent: 31
       type: Transform
   - uid: 841
@@ -32723,8 +32366,37 @@ entities:
       type: Transform
   - uid: 1011
     components:
-    - rot: 3.141592653589793 rad
-      pos: 12.5,-2.5
+    - pos: -5.5,14.5
+      parent: 31
+      type: Transform
+  - uid: 1062
+    components:
+    - pos: 7.5,5.5
+      parent: 31
+      type: Transform
+  - uid: 1101
+    components:
+    - pos: 7.5,6.5
+      parent: 31
+      type: Transform
+  - uid: 1221
+    components:
+    - pos: 7.5,7.5
+      parent: 31
+      type: Transform
+  - uid: 1362
+    components:
+    - pos: 7.5,8.5
+      parent: 31
+      type: Transform
+  - uid: 1375
+    components:
+    - pos: 7.5,10.5
+      parent: 31
+      type: Transform
+  - uid: 1601
+    components:
+    - pos: -5.5,15.5
       parent: 31
       type: Transform
   - uid: 1770
@@ -32732,6 +32404,11 @@ entities:
     - pos: -23.5,-14.5
       parent: 31
       type: Transform
+  - uid: 1796
+    components:
+    - pos: -5.5,16.5
+      parent: 31
+      type: Transform
   - uid: 2014
     components:
     - rot: 3.141592653589793 rad
@@ -32744,12 +32421,51 @@ entities:
       pos: 3.5,-12.5
       parent: 31
       type: Transform
+  - uid: 2143
+    components:
+    - rot: -1.5707963267948966 rad
+      pos: 7.5,17.5
+      parent: 31
+      type: Transform
+  - uid: 2160
+    components:
+    - pos: 3.5,21.5
+      parent: 31
+      type: Transform
+  - uid: 2527
+    components:
+    - rot: -1.5707963267948966 rad
+      pos: 4.5,17.5
+      parent: 31
+      type: Transform
   - uid: 3377
     components:
     - rot: 1.5707963267948966 rad
       pos: 25.5,4.5
       parent: 31
       type: Transform
+  - uid: 3868
+    components:
+    - rot: -1.5707963267948966 rad
+      pos: 5.5,17.5
+      parent: 31
+      type: Transform
+  - uid: 3877
+    components:
+    - pos: 3.5,20.5
+      parent: 31
+      type: Transform
+  - uid: 3939
+    components:
+    - rot: 1.5707963267948966 rad
+      pos: 2.5,28.5
+      parent: 31
+      type: Transform
+  - uid: 4211
+    components:
+    - pos: -5.5,9.5
+      parent: 31
+      type: Transform
   - uid: 4703
     components:
     - rot: 3.141592653589793 rad
@@ -32845,129 +32561,123 @@ entities:
     - pos: 3.5,-25.5
       parent: 31
       type: Transform
-  - uid: 5099
+  - uid: 4878
     components:
-    - rot: 3.141592653589793 rad
-      pos: 14.5,-1.5
+    - pos: -5.5,8.5
       parent: 31
       type: Transform
-  - uid: 7129
+  - uid: 5085
     components:
-    - rot: 3.141592653589793 rad
-      pos: -11.5,-21.5
+    - pos: -5.5,11.5
       parent: 31
       type: Transform
-  - uid: 7143
+  - uid: 5099
     components:
     - rot: 3.141592653589793 rad
-      pos: -11.5,-20.5
+      pos: 14.5,-1.5
       parent: 31
       type: Transform
-  - uid: 7175
+  - uid: 5101
     components:
-    - rot: 3.141592653589793 rad
-      pos: -11.5,-23.5
+    - pos: -5.5,12.5
       parent: 31
       type: Transform
-  - uid: 7268
+  - uid: 5144
     components:
-    - rot: 3.141592653589793 rad
-      pos: -11.5,-24.5
+    - pos: -5.5,10.5
       parent: 31
       type: Transform
-  - uid: 7962
+  - uid: 5219
     components:
-    - pos: 29.5,5.5
+    - pos: -5.5,13.5
       parent: 31
       type: Transform
-  - uid: 8317
+  - uid: 5232
     components:
-    - pos: -10.5,-18.5
+    - pos: -5.5,6.5
       parent: 31
       type: Transform
-  - uid: 8442
+  - uid: 5234
     components:
-    - rot: -1.5707963267948966 rad
-      pos: 0.5,3.5
+    - pos: -5.5,4.5
       parent: 31
       type: Transform
-  - uid: 8446
+  - uid: 5235
     components:
-    - rot: 3.141592653589793 rad
-      pos: -7.5,2.5
+    - pos: -5.5,5.5
       parent: 31
       type: Transform
-  - uid: 9050
+  - uid: 7129
     components:
-    - rot: 1.5707963267948966 rad
-      pos: 0.5,4.5
+    - rot: 3.141592653589793 rad
+      pos: -11.5,-21.5
       parent: 31
       type: Transform
-  - uid: 9051
+  - uid: 7143
     components:
     - rot: 3.141592653589793 rad
-      pos: 4.5,7.5
+      pos: -11.5,-20.5
       parent: 31
       type: Transform
-  - uid: 9053
+  - uid: 7175
     components:
-    - rot: 1.5707963267948966 rad
-      pos: -1.5,4.5
+    - rot: 3.141592653589793 rad
+      pos: -11.5,-23.5
       parent: 31
       type: Transform
-  - uid: 9054
+  - uid: 7268
     components:
-    - rot: 1.5707963267948966 rad
-      pos: -0.5,4.5
+    - rot: 3.141592653589793 rad
+      pos: -11.5,-24.5
       parent: 31
       type: Transform
-  - uid: 9115
+  - uid: 7421
     components:
     - rot: 1.5707963267948966 rad
-      pos: -2.5,4.5
+      pos: 17.5,-10.5
       parent: 31
       type: Transform
-  - uid: 9116
+  - uid: 7451
     components:
-    - rot: 1.5707963267948966 rad
-      pos: -3.5,4.5
+    - pos: 7.5,9.5
       parent: 31
       type: Transform
-  - uid: 9148
+  - uid: 7452
     components:
     - rot: 3.141592653589793 rad
-      pos: -4.5,5.5
+      pos: 3.5,11.5
       parent: 31
       type: Transform
-  - uid: 9171
+  - uid: 7962
     components:
-    - pos: -4.5,6.5
+    - pos: 29.5,5.5
       parent: 31
       type: Transform
-  - uid: 9190
+  - uid: 8317
     components:
-    - pos: -4.5,7.5
+    - pos: -10.5,-18.5
       parent: 31
       type: Transform
-  - uid: 9191
+  - uid: 8442
     components:
-    - pos: -4.5,8.5
+    - rot: -1.5707963267948966 rad
+      pos: 0.5,3.5
       parent: 31
       type: Transform
-  - uid: 9192
+  - uid: 8446
     components:
-    - pos: -4.5,10.5
+    - rot: 3.141592653589793 rad
+      pos: -7.5,2.5
       parent: 31
       type: Transform
-  - uid: 9198
+  - uid: 9171
     components:
-    - pos: -4.5,11.5
+    - pos: -4.5,6.5
       parent: 31
       type: Transform
-  - uid: 9220
+  - uid: 9198
     components:
-    - rot: 1.5707963267948966 rad
-      pos: 1.5,4.5
+    - pos: -4.5,11.5
       parent: 31
       type: Transform
   - uid: 9221
@@ -32976,36 +32686,6 @@ entities:
       pos: -4.5,9.5
       parent: 31
       type: Transform
-  - uid: 9224
-    components:
-    - rot: 3.141592653589793 rad
-      pos: 4.5,6.5
-      parent: 31
-      type: Transform
-  - uid: 9225
-    components:
-    - rot: 3.141592653589793 rad
-      pos: 4.5,8.5
-      parent: 31
-      type: Transform
-  - uid: 9226
-    components:
-    - rot: 3.141592653589793 rad
-      pos: 4.5,10.5
-      parent: 31
-      type: Transform
-  - uid: 9227
-    components:
-    - rot: 3.141592653589793 rad
-      pos: 4.5,9.5
-      parent: 31
-      type: Transform
-  - uid: 9228
-    components:
-    - rot: 3.141592653589793 rad
-      pos: 4.5,11.5
-      parent: 31
-      type: Transform
   - uid: 9229
     components:
     - rot: 3.141592653589793 rad
@@ -33048,42 +32728,6 @@ entities:
       pos: 3.5,14.5
       parent: 31
       type: Transform
-  - uid: 9514
-    components:
-    - rot: 3.141592653589793 rad
-      pos: 4.5,16.5
-      parent: 31
-      type: Transform
-  - uid: 9515
-    components:
-    - rot: 1.5707963267948966 rad
-      pos: 5.5,17.5
-      parent: 31
-      type: Transform
-  - uid: 9516
-    components:
-    - rot: 3.141592653589793 rad
-      pos: 2.5,5.5
-      parent: 31
-      type: Transform
-  - uid: 9517
-    components:
-    - rot: 3.141592653589793 rad
-      pos: 2.5,11.5
-      parent: 31
-      type: Transform
-  - uid: 9518
-    components:
-    - rot: 3.141592653589793 rad
-      pos: 2.5,8.5
-      parent: 31
-      type: Transform
-  - uid: 9519
-    components:
-    - rot: 3.141592653589793 rad
-      pos: 2.5,7.5
-      parent: 31
-      type: Transform
   - uid: 9520
     components:
     - pos: 3.5,22.5
@@ -33109,542 +32753,39 @@ entities:
     - pos: 3.5,26.5
       parent: 31
       type: Transform
-  - uid: 9525
-    components:
-    - pos: 3.5,27.5
-      parent: 31
-      type: Transform
-  - uid: 9526
-    components:
-    - rot: -1.5707963267948966 rad
-      pos: 2.5,29.5
-      parent: 31
-      type: Transform
-  - uid: 9527
-    components:
-    - pos: 3.5,28.5
-      parent: 31
-      type: Transform
-  - uid: 9529
-    components:
-    - rot: -1.5707963267948966 rad
-      pos: 1.5,29.5
-      parent: 31
-      type: Transform
-  - uid: 9532
-    components:
-    - rot: -1.5707963267948966 rad
-      pos: 6.5,17.5
-      parent: 31
-      type: Transform
-  - uid: 9533
-    components:
-    - rot: -1.5707963267948966 rad
-      pos: 7.5,17.5
-      parent: 31
-      type: Transform
-  - uid: 9535
-    components:
-    - rot: 3.141592653589793 rad
-      pos: 4.5,15.5
-      parent: 31
-      type: Transform
-  - uid: 9538
-    components:
-    - rot: 3.141592653589793 rad
-      pos: 14.5,-8.5
-      parent: 31
-      type: Transform
-  - uid: 9539
-    components:
-    - rot: 1.5707963267948966 rad
-      pos: 13.5,-9.5
-      parent: 31
-      type: Transform
-  - uid: 9540
-    components:
-    - rot: 1.5707963267948966 rad
-      pos: 12.5,-9.5
-      parent: 31
-      type: Transform
-  - uid: 9541
-    components:
-    - rot: 1.5707963267948966 rad
-      pos: 11.5,-9.5
-      parent: 31
-      type: Transform
-  - uid: 9542
-    components:
-    - pos: 10.5,-8.5
-      parent: 31
-      type: Transform
-  - uid: 9543
-    components:
-    - pos: 10.5,-7.5
-      parent: 31
-      type: Transform
   - uid: 9544
     components:
     - pos: 10.5,-6.5
       parent: 31
       type: Transform
-  - uid: 9545
-    components:
-    - pos: 10.5,-5.5
-      parent: 31
-      type: Transform
-  - uid: 9546
-    components:
-    - pos: 10.5,-4.5
-      parent: 31
-      type: Transform
-  - uid: 9547
-    components:
-    - pos: 10.5,-3.5
-      parent: 31
-      type: Transform
-  - uid: 9548
-    components:
-    - pos: 10.5,-2.5
-      parent: 31
-      type: Transform
-  - uid: 9549
-    components:
-    - rot: -1.5707963267948966 rad
-      pos: 9.5,-1.5
-      parent: 31
-      type: Transform
-  - uid: 9550
-    components:
-    - rot: -1.5707963267948966 rad
-      pos: 8.5,-1.5
-      parent: 31
-      type: Transform
-  - uid: 9551
-    components:
-    - rot: -1.5707963267948966 rad
-      pos: 7.5,-1.5
-      parent: 31
-      type: Transform
-  - uid: 9552
-    components:
-    - rot: -1.5707963267948966 rad
-      pos: 6.5,-1.5
-      parent: 31
-      type: Transform
-  - uid: 9553
-    components:
-    - rot: -1.5707963267948966 rad
-      pos: 5.5,-1.5
-      parent: 31
-      type: Transform
-  - uid: 9554
-    components:
-    - rot: 3.141592653589793 rad
-      pos: 4.5,-0.5
-      parent: 31
-      type: Transform
-  - uid: 9555
-    components:
-    - rot: 3.141592653589793 rad
-      pos: 4.5,0.5
-      parent: 31
-      type: Transform
-  - uid: 9556
-    components:
-    - rot: 3.141592653589793 rad
-      pos: 4.5,1.5
-      parent: 31
-      type: Transform
-  - uid: 9557
-    components:
-    - rot: 3.141592653589793 rad
-      pos: 4.5,2.5
-      parent: 31
-      type: Transform
   - uid: 9559
     components:
     - rot: -1.5707963267948966 rad
       pos: 5.5,4.5
       parent: 31
       type: Transform
-  - uid: 9560
-    components:
-    - rot: -1.5707963267948966 rad
-      pos: 5.5,5.5
-      parent: 31
-      type: Transform
-  - uid: 9563
-    components:
-    - pos: 39.5,4.5
-      parent: 31
-      type: Transform
-  - uid: 9564
-    components:
-    - pos: 39.5,3.5
-      parent: 31
-      type: Transform
-  - uid: 9565
-    components:
-    - rot: -1.5707963267948966 rad
-      pos: 38.5,5.5
-      parent: 31
-      type: Transform
-  - uid: 9566
-    components:
-    - rot: -1.5707963267948966 rad
-      pos: 37.5,5.5
-      parent: 31
-      type: Transform
-  - uid: 9567
-    components:
-    - rot: -1.5707963267948966 rad
-      pos: 36.5,5.5
-      parent: 31
-      type: Transform
-  - uid: 9568
-    components:
-    - rot: -1.5707963267948966 rad
-      pos: 35.5,5.5
-      parent: 31
-      type: Transform
-  - uid: 9569
-    components:
-    - rot: -1.5707963267948966 rad
-      pos: 34.5,5.5
-      parent: 31
-      type: Transform
-  - uid: 9570
-    components:
-    - rot: -1.5707963267948966 rad
-      pos: 33.5,5.5
-      parent: 31
-      type: Transform
-  - uid: 9571
-    components:
-    - rot: -1.5707963267948966 rad
-      pos: 32.5,5.5
-      parent: 31
-      type: Transform
-  - uid: 9572
-    components:
-    - rot: -1.5707963267948966 rad
-      pos: 31.5,5.5
-      parent: 31
-      type: Transform
-  - uid: 9573
-    components:
-    - rot: -1.5707963267948966 rad
-      pos: 30.5,5.5
-      parent: 31
-      type: Transform
-  - uid: 9574
-    components:
-    - rot: -1.5707963267948966 rad
-      pos: 29.5,5.5
-      parent: 31
-      type: Transform
-  - uid: 9575
-    components:
-    - rot: -1.5707963267948966 rad
-      pos: 28.5,5.5
-      parent: 31
-      type: Transform
-  - uid: 9576
-    components:
-    - rot: -1.5707963267948966 rad
-      pos: 27.5,5.5
-      parent: 31
-      type: Transform
-  - uid: 9577
-    components:
-    - rot: -1.5707963267948966 rad
-      pos: 26.5,5.5
-      parent: 31
-      type: Transform
-  - uid: 9578
-    components:
-    - rot: -1.5707963267948966 rad
-      pos: 25.5,5.5
-      parent: 31
-      type: Transform
-  - uid: 9579
-    components:
-    - rot: -1.5707963267948966 rad
-      pos: 24.5,5.5
-      parent: 31
-      type: Transform
-  - uid: 9580
-    components:
-    - rot: -1.5707963267948966 rad
-      pos: 20.5,5.5
-      parent: 31
-      type: Transform
-  - uid: 9581
-    components:
-    - rot: -1.5707963267948966 rad
-      pos: 23.5,5.5
-      parent: 31
-      type: Transform
-  - uid: 9582
-    components:
-    - rot: -1.5707963267948966 rad
-      pos: 22.5,5.5
-      parent: 31
-      type: Transform
-  - uid: 9583
-    components:
-    - rot: -1.5707963267948966 rad
-      pos: 21.5,5.5
-      parent: 31
-      type: Transform
-  - uid: 9584
-    components:
-    - rot: -1.5707963267948966 rad
-      pos: 19.5,5.5
-      parent: 31
-      type: Transform
-  - uid: 9585
-    components:
-    - rot: -1.5707963267948966 rad
-      pos: 18.5,5.5
-      parent: 31
-      type: Transform
-  - uid: 9586
-    components:
-    - rot: -1.5707963267948966 rad
-      pos: 17.5,5.5
-      parent: 31
-      type: Transform
   - uid: 9588
     components:
     - pos: 12.5,3.5
       parent: 31
       type: Transform
-  - uid: 9591
-    components:
-    - rot: -1.5707963267948966 rad
-      pos: 12.5,5.5
-      parent: 31
-      type: Transform
-  - uid: 9592
-    components:
-    - rot: -1.5707963267948966 rad
-      pos: 11.5,5.5
-      parent: 31
-      type: Transform
-  - uid: 9593
-    components:
-    - rot: -1.5707963267948966 rad
-      pos: 10.5,5.5
-      parent: 31
-      type: Transform
-  - uid: 9594
-    components:
-    - rot: -1.5707963267948966 rad
-      pos: 9.5,5.5
-      parent: 31
-      type: Transform
-  - uid: 9595
-    components:
-    - rot: -1.5707963267948966 rad
-      pos: 8.5,5.5
-      parent: 31
-      type: Transform
-  - uid: 9596
-    components:
-    - rot: -1.5707963267948966 rad
-      pos: 7.5,5.5
-      parent: 31
-      type: Transform
-  - uid: 9597
-    components:
-    - rot: -1.5707963267948966 rad
-      pos: 6.5,5.5
-      parent: 31
-      type: Transform
   - uid: 9599
     components:
     - rot: -1.5707963267948966 rad
       pos: 4.5,4.5
       parent: 31
       type: Transform
-  - uid: 9609
-    components:
-    - pos: 2.5,-8.5
-      parent: 31
-      type: Transform
-  - uid: 9611
-    components:
-    - pos: 2.5,-3.5
-      parent: 31
-      type: Transform
-  - uid: 9612
-    components:
-    - pos: 2.5,-5.5
-      parent: 31
-      type: Transform
-  - uid: 9613
-    components:
-    - pos: 2.5,-4.5
-      parent: 31
-      type: Transform
-  - uid: 9614
-    components:
-    - pos: 2.5,-6.5
-      parent: 31
-      type: Transform
-  - uid: 9615
-    components:
-    - pos: 2.5,-7.5
-      parent: 31
-      type: Transform
-  - uid: 9616
-    components:
-    - pos: 2.5,-14.5
-      parent: 31
-      type: Transform
-  - uid: 9617
-    components:
-    - rot: 1.5707963267948966 rad
-      pos: -4.5,-15.5
-      parent: 31
-      type: Transform
-  - uid: 9618
-    components:
-    - pos: 2.5,-11.5
-      parent: 31
-      type: Transform
-  - uid: 9619
-    components:
-    - rot: -1.5707963267948966 rad
-      pos: -3.5,-15.5
-      parent: 31
-      type: Transform
-  - uid: 9620
-    components:
-    - rot: -1.5707963267948966 rad
-      pos: -2.5,-15.5
-      parent: 31
-      type: Transform
-  - uid: 9621
-    components:
-    - rot: -1.5707963267948966 rad
-      pos: -1.5,-15.5
-      parent: 31
-      type: Transform
-  - uid: 9622
-    components:
-    - rot: -1.5707963267948966 rad
-      pos: -0.5,-15.5
-      parent: 31
-      type: Transform
-  - uid: 9623
-    components:
-    - rot: -1.5707963267948966 rad
-      pos: 0.5,-15.5
-      parent: 31
-      type: Transform
-  - uid: 9624
-    components:
-    - rot: -1.5707963267948966 rad
-      pos: 1.5,-15.5
-      parent: 31
-      type: Transform
-  - uid: 9625
-    components:
-    - pos: 2.5,-13.5
-      parent: 31
-      type: Transform
-  - uid: 9626
-    components:
-    - pos: 2.5,-12.5
-      parent: 31
-      type: Transform
-  - uid: 9627
-    components:
-    - pos: 2.5,-10.5
-      parent: 31
-      type: Transform
-  - uid: 9628
-    components:
-    - pos: 2.5,-9.5
-      parent: 31
-      type: Transform
-  - uid: 9629
-    components:
-    - rot: 1.5707963267948966 rad
-      pos: 3.5,-2.5
-      parent: 31
-      type: Transform
   - uid: 9633
     components:
     - rot: 1.5707963267948966 rad
       pos: 17.5,10.5
       parent: 31
       type: Transform
-  - uid: 9634
-    components:
-    - rot: 1.5707963267948966 rad
-      pos: 16.5,10.5
-      parent: 31
-      type: Transform
-  - uid: 9635
-    components:
-    - rot: 1.5707963267948966 rad
-      pos: 15.5,10.5
-      parent: 31
-      type: Transform
-  - uid: 9636
-    components:
-    - rot: 1.5707963267948966 rad
-      pos: 14.5,10.5
-      parent: 31
-      type: Transform
-  - uid: 9637
-    components:
-    - pos: 13.5,9.5
-      parent: 31
-      type: Transform
   - uid: 9638
     components:
     - pos: 13.5,8.5
       parent: 31
       type: Transform
-  - uid: 9639
-    components:
-    - pos: 13.5,7.5
-      parent: 31
-      type: Transform
-  - uid: 9640
-    components:
-    - pos: 13.5,6.5
-      parent: 31
-      type: Transform
-  - uid: 9642
-    components:
-    - rot: -1.5707963267948966 rad
-      pos: 15.5,6.5
-      parent: 31
-      type: Transform
-  - uid: 9645
-    components:
-    - rot: 3.141592653589793 rad
-      pos: 15.5,4.5
-      parent: 31
-      type: Transform
-  - uid: 9647
-    components:
-    - rot: 1.5707963267948966 rad
-      pos: 12.5,3.5
-      parent: 31
-      type: Transform
-  - uid: 9648
-    components:
-    - rot: -1.5707963267948966 rad
-      pos: 14.5,3.5
-      parent: 31
-      type: Transform
   - uid: 9649
     components:
     - rot: -1.5707963267948966 rad
@@ -33675,138 +32816,12 @@ entities:
       pos: 8.5,4.5
       parent: 31
       type: Transform
-  - uid: 9654
-    components:
-    - rot: -1.5707963267948966 rad
-      pos: 7.5,4.5
-      parent: 31
-      type: Transform
   - uid: 9655
     components:
     - rot: -1.5707963267948966 rad
       pos: 6.5,4.5
       parent: 31
       type: Transform
-  - uid: 9660
-    components:
-    - rot: 3.141592653589793 rad
-      pos: 2.5,0.5
-      parent: 31
-      type: Transform
-  - uid: 9661
-    components:
-    - rot: 3.141592653589793 rad
-      pos: 2.5,1.5
-      parent: 31
-      type: Transform
-  - uid: 9662
-    components:
-    - rot: 3.141592653589793 rad
-      pos: 2.5,2.5
-      parent: 31
-      type: Transform
-  - uid: 9663
-    components:
-    - rot: 3.141592653589793 rad
-      pos: 2.5,6.5
-      parent: 31
-      type: Transform
-  - uid: 9666
-    components:
-    - rot: 1.5707963267948966 rad
-      pos: -12.5,-1.5
-      parent: 31
-      type: Transform
-  - uid: 9667
-    components:
-    - rot: 1.5707963267948966 rad
-      pos: -11.5,-1.5
-      parent: 31
-      type: Transform
-  - uid: 9668
-    components:
-    - rot: 1.5707963267948966 rad
-      pos: -10.5,-1.5
-      parent: 31
-      type: Transform
-  - uid: 9669
-    components:
-    - rot: 1.5707963267948966 rad
-      pos: -8.5,-1.5
-      parent: 31
-      type: Transform
-  - uid: 9670
-    components:
-    - rot: 1.5707963267948966 rad
-      pos: -9.5,-1.5
-      parent: 31
-      type: Transform
-  - uid: 9671
-    components:
-    - rot: 1.5707963267948966 rad
-      pos: -7.5,-1.5
-      parent: 31
-      type: Transform
-  - uid: 9672
-    components:
-    - rot: 1.5707963267948966 rad
-      pos: -6.5,-1.5
-      parent: 31
-      type: Transform
-  - uid: 9673
-    components:
-    - rot: 1.5707963267948966 rad
-      pos: -5.5,-1.5
-      parent: 31
-      type: Transform
-  - uid: 9674
-    components:
-    - rot: 1.5707963267948966 rad
-      pos: -4.5,-1.5
-      parent: 31
-      type: Transform
-  - uid: 9675
-    components:
-    - rot: 1.5707963267948966 rad
-      pos: -3.5,-1.5
-      parent: 31
-      type: Transform
-  - uid: 9676
-    components:
-    - rot: 1.5707963267948966 rad
-      pos: -2.5,-1.5
-      parent: 31
-      type: Transform
-  - uid: 9677
-    components:
-    - rot: 1.5707963267948966 rad
-      pos: -1.5,-1.5
-      parent: 31
-      type: Transform
-  - uid: 9678
-    components:
-    - rot: 1.5707963267948966 rad
-      pos: -0.5,-1.5
-      parent: 31
-      type: Transform
-  - uid: 9679
-    components:
-    - rot: 1.5707963267948966 rad
-      pos: 0.5,-1.5
-      parent: 31
-      type: Transform
-  - uid: 9843
-    components:
-    - rot: 3.141592653589793 rad
-      pos: 2.5,17.5
-      parent: 31
-      type: Transform
-  - uid: 9844
-    components:
-    - rot: 1.5707963267948966 rad
-      pos: 2.5,17.5
-      parent: 31
-      type: Transform
   - uid: 9847
     components:
     - rot: 3.141592653589793 rad
@@ -33819,34 +32834,6 @@ entities:
       pos: 3.5,19.5
       parent: 31
       type: Transform
-  - uid: 9851
-    components:
-    - rot: 1.5707963267948966 rad
-      pos: 3.5,19.5
-      parent: 31
-      type: Transform
-  - uid: 9853
-    components:
-    - rot: 3.141592653589793 rad
-      pos: 2.5,18.5
-      parent: 31
-      type: Transform
-  - uid: 9858
-    components:
-    - pos: 5.5,20.5
-      parent: 31
-      type: Transform
-  - uid: 9859
-    components:
-    - pos: 5.5,19.5
-      parent: 31
-      type: Transform
-  - uid: 9860
-    components:
-    - rot: -1.5707963267948966 rad
-      pos: 4.5,21.5
-      parent: 31
-      type: Transform
   - uid: 10148
     components:
     - rot: -1.5707963267948966 rad
@@ -34067,24 +33054,6 @@ entities:
       pos: 19.5,-12.5
       parent: 31
       type: Transform
-  - uid: 10196
-    components:
-    - rot: 3.141592653589793 rad
-      pos: 18.5,-10.5
-      parent: 31
-      type: Transform
-  - uid: 10198
-    components:
-    - rot: -1.5707963267948966 rad
-      pos: 17.5,-9.5
-      parent: 31
-      type: Transform
-  - uid: 10199
-    components:
-    - rot: -1.5707963267948966 rad
-      pos: 16.5,-9.5
-      parent: 31
-      type: Transform
   - uid: 10202
     components:
     - rot: -1.5707963267948966 rad
@@ -34163,77 +33132,6 @@ entities:
       pos: -35.5,14.5
       parent: 31
       type: Transform
-- proto: DisposalRouterFlipped
-  entities:
-  - uid: 9590
-    components:
-    - rot: 1.5707963267948966 rad
-      pos: 14.5,5.5
-      parent: 31
-      type: Transform
-    - tags:
-      - engineering
-      type: DisposalRouter
-  - uid: 9601
-    components:
-    - pos: 4.5,-1.5
-      parent: 31
-      type: Transform
-    - tags:
-      - medical
-      type: DisposalRouter
-  - uid: 9606
-    components:
-    - rot: 3.141592653589793 rad
-      pos: 1.5,-1.5
-      parent: 31
-      type: Transform
-    - tags:
-      - kitchen
-      type: DisposalRouter
-  - uid: 9608
-    components:
-    - rot: -1.5707963267948966 rad
-      pos: 2.5,-2.5
-      parent: 31
-      type: Transform
-    - tags:
-      - science
-      type: DisposalRouter
-  - uid: 9641
-    components:
-    - rot: 1.5707963267948966 rad
-      pos: 13.5,5.5
-      parent: 31
-      type: Transform
-    - tags:
-      - cargo
-      type: DisposalRouter
-  - uid: 9664
-    components:
-    - pos: 4.5,17.5
-      parent: 31
-      type: Transform
-    - tags:
-      - hop
-      type: DisposalRouter
-  - uid: 9665
-    components:
-    - rot: 3.141592653589793 rad
-      pos: 2.5,4.5
-      parent: 31
-      type: Transform
-    - tags:
-      - security
-      type: DisposalRouter
-  - uid: 9854
-    components:
-    - pos: 4.5,18.5
-      parent: 31
-      type: Transform
-    - tags:
-      - bridge
-      type: DisposalRouter
 - proto: DisposalTrunk
   entities:
   - uid: 178
@@ -34248,18 +33146,6 @@ entities:
       pos: -17.5,-22.5
       parent: 31
       type: Transform
-  - uid: 204
-    components:
-    - rot: 1.5707963705062866 rad
-      pos: -5.5,17.5
-      parent: 31
-      type: Transform
-  - uid: 209
-    components:
-    - rot: 4.71238902409608 rad
-      pos: 6.5,11.5
-      parent: 31
-      type: Transform
   - uid: 215
     components:
     - pos: 24.5,8.5
@@ -34293,6 +33179,12 @@ entities:
     - pos: -22.5,6.5
       parent: 31
       type: Transform
+  - uid: 769
+    components:
+    - rot: 1.5707963267948966 rad
+      pos: 11.5,1.5
+      parent: 31
+      type: Transform
   - uid: 837
     components:
     - pos: -29.5,11.5
@@ -34304,10 +33196,10 @@ entities:
       pos: -5.5,-14.5
       parent: 31
       type: Transform
-  - uid: 1101
+  - uid: 1474
     components:
-    - rot: 3.141592653589793 rad
-      pos: 12.5,-3.5
+    - rot: 1.5707963267948966 rad
+      pos: 6.5,11.5
       parent: 31
       type: Transform
   - uid: 1769
@@ -34339,6 +33231,17 @@ entities:
       pos: 14.5,-2.5
       parent: 31
       type: Transform
+  - uid: 5223
+    components:
+    - rot: 3.141592653589793 rad
+      pos: 8.5,16.5
+      parent: 31
+      type: Transform
+  - uid: 5233
+    components:
+    - pos: -5.5,17.5
+      parent: 31
+      type: Transform
   - uid: 7152
     components:
     - rot: 3.141592653589793 rad
@@ -34356,58 +33259,11 @@ entities:
       pos: -8.5,1.5
       parent: 31
       type: Transform
-  - uid: 9203
-    components:
-    - rot: 1.5707963267948966 rad
-      pos: -5.5,12.5
-      parent: 31
-      type: Transform
   - uid: 9339
     components:
     - pos: -34.5,6.5
       parent: 31
       type: Transform
-  - uid: 9528
-    components:
-    - rot: 1.5707963267948966 rad
-      pos: 0.5,29.5
-      parent: 31
-      type: Transform
-  - uid: 9600
-    components:
-    - rot: 3.141592653589793 rad
-      pos: 39.5,2.5
-      parent: 31
-      type: Transform
-  - uid: 9605
-    components:
-    - pos: 14.5,-7.5
-      parent: 31
-      type: Transform
-  - uid: 9631
-    components:
-    - rot: 3.141592653589793 rad
-      pos: -5.5,-16.5
-      parent: 31
-      type: Transform
-  - uid: 9632
-    components:
-    - rot: 3.141592653589793 rad
-      pos: 18.5,9.5
-      parent: 31
-      type: Transform
-  - uid: 9681
-    components:
-    - rot: 1.5707963267948966 rad
-      pos: -13.5,-1.5
-      parent: 31
-      type: Transform
-  - uid: 9871
-    components:
-    - rot: 3.141592653589793 rad
-      pos: 8.5,16.5
-      parent: 31
-      type: Transform
   - uid: 10146
     components:
     - rot: 3.141592653589793 rad
@@ -34507,9 +33363,9 @@ entities:
     - pos: 6.5,-30.5
       parent: 31
       type: Transform
-  - uid: 4806
+  - uid: 5226
     components:
-    - pos: 12.5,-3.5
+    - pos: 8.5,16.5
       parent: 31
       type: Transform
   - uid: 7156
@@ -34522,6 +33378,11 @@ entities:
     - pos: -8.5,1.5
       parent: 31
       type: Transform
+  - uid: 9050
+    components:
+    - pos: 11.5,1.5
+      parent: 31
+      type: Transform
   - uid: 9343
     components:
     - pos: -34.5,6.5
@@ -34583,6 +33444,12 @@ entities:
       type: Transform
 - proto: DonkpocketBoxSpawner
   entities:
+  - uid: 7439
+    components:
+    - rot: 3.141592653589793 rad
+      pos: -0.5,-29.5
+      parent: 31
+      type: Transform
   - uid: 8044
     components:
     - pos: 18.5,-24.5
@@ -34602,12 +33469,12 @@ entities:
       type: Transform
   - uid: 4269
     components:
-    - pos: 29.349113,-3.3351836
+    - pos: 29.27434,-1.3043437
       parent: 31
       type: Transform
   - uid: 4284
     components:
-    - pos: 29.552238,-3.3351836
+    - pos: 29.614664,-1.306627
       parent: 31
       type: Transform
 - proto: DoubleEmergencyOxygenTankFilled
@@ -34626,11 +33493,6 @@ entities:
       type: Transform
 - proto: DrinkDetFlask
   entities:
-  - uid: 3946
-    components:
-    - pos: -21.398678,17.611397
-      parent: 31
-      type: Transform
   - uid: 7855
     components:
     - flags: InContainer
@@ -34675,15 +33537,28 @@ entities:
     - pos: 16.50716,16.62439
       parent: 31
       type: Transform
-    - nextAttack: 567.8969667
-      type: MeleeWeapon
-    - nextSound: 568.0969667
-      type: EmitSoundOnCollide
+- proto: DrinkWaterCup
+  entities:
+  - uid: 5227
+    components:
+    - pos: -1.7425596,-29.65949
+      parent: 31
+      type: Transform
+  - uid: 7457
+    components:
+    - pos: -1.5863096,-29.331366
+      parent: 31
+      type: Transform
+  - uid: 7578
+    components:
+    - pos: -1.2894346,-29.62824
+      parent: 31
+      type: Transform
 - proto: DrinkWhiskeyBottleFull
   entities:
-  - uid: 8316
+  - uid: 7459
     components:
-    - pos: -21.814821,17.627611
+    - pos: -23.675486,16.461733
       parent: 31
       type: Transform
 - proto: DrinkWineGlass
@@ -34693,28 +33568,16 @@ entities:
     - pos: -37.43196,16.613255
       parent: 31
       type: Transform
-    - nextAttack: 533.1623405
-      type: MeleeWeapon
-    - nextSound: 533.3623405
-      type: EmitSoundOnCollide
   - uid: 10281
     components:
     - pos: -37.83474,16.613255
       parent: 31
       type: Transform
-    - nextAttack: 534.7761319
-      type: MeleeWeapon
-    - nextSound: 534.9761319
-      type: EmitSoundOnCollide
   - uid: 10282
     components:
     - pos: -37.640297,16.613255
       parent: 31
       type: Transform
-    - nextAttack: 536.8447975
-      type: MeleeWeapon
-    - nextSound: 537.0447975
-      type: EmitSoundOnCollide
 - proto: Dropper
   entities:
   - uid: 5090
@@ -34741,6 +33604,12 @@ entities:
       type: Transform
 - proto: EmergencyLight
   entities:
+  - uid: 309
+    components:
+    - rot: 1.5707963267948966 rad
+      pos: -40.5,5.5
+      parent: 31
+      type: Transform
   - uid: 585
     components:
     - rot: -1.5707963267948966 rad
@@ -34867,6 +33736,21 @@ entities:
     - enabled: True
       type: AmbientSound
     - type: ActiveEmergencyLight
+  - uid: 5354
+    components:
+    - pos: 23.5,5.5
+      parent: 31
+      type: Transform
+  - uid: 7249
+    components:
+    - pos: -14.5,5.5
+      parent: 31
+      type: Transform
+  - uid: 7254
+    components:
+    - pos: 3.5,32.5
+      parent: 31
+      type: Transform
   - uid: 8839
     components:
     - pos: -4.5,1.5
@@ -34927,31 +33811,23 @@ entities:
     - pos: 67.5,9.5
       parent: 31
       type: Transform
-    - nextFire: 453.6629608
-      type: Gun
   - uid: 10117
     components:
     - pos: 75.5,9.5
       parent: 31
       type: Transform
-    - nextFire: 454.7313124
-      type: Gun
   - uid: 10119
     components:
     - rot: 3.141592653589793 rad
       pos: 75.5,-4.5
       parent: 31
       type: Transform
-    - nextFire: 456.2821853
-      type: Gun
   - uid: 10120
     components:
     - rot: 3.141592653589793 rad
       pos: 67.5,-4.5
       parent: 31
       type: Transform
-    - nextFire: 461.8481225
-      type: Gun
 - proto: EncryptionKeyCargo
   entities:
   - uid: 10233
@@ -34960,8 +33836,6 @@ entities:
       type: MetaData
     - parent: 10232
       type: Transform
-    - nextSound: 2023.0413306
-      type: EmitSoundOnCollide
     - canCollide: False
       type: Physics
 - proto: EncryptionKeyCommand
@@ -34972,8 +33846,6 @@ entities:
       type: MetaData
     - parent: 10228
       type: Transform
-    - nextSound: 2024.5591582
-      type: EmitSoundOnCollide
     - canCollide: False
       type: Physics
 - proto: EncryptionKeyCommon
@@ -34984,8 +33856,6 @@ entities:
       type: MetaData
     - parent: 10242
       type: Transform
-    - nextSound: 2031.8065709
-      type: EmitSoundOnCollide
     - canCollide: False
       type: Physics
 - proto: EncryptionKeyEngineering
@@ -34996,8 +33866,6 @@ entities:
       type: MetaData
     - parent: 10234
       type: Transform
-    - nextSound: 2027.1831055
-      type: EmitSoundOnCollide
     - canCollide: False
       type: Physics
 - proto: EncryptionKeyMedical
@@ -35008,8 +33876,6 @@ entities:
       type: MetaData
     - parent: 10236
       type: Transform
-    - nextSound: 2034.4552865
-      type: EmitSoundOnCollide
     - canCollide: False
       type: Physics
 - proto: EncryptionKeyScience
@@ -35020,8 +33886,6 @@ entities:
       type: MetaData
     - parent: 10238
       type: Transform
-    - nextSound: 2038.7837013
-      type: EmitSoundOnCollide
     - canCollide: False
       type: Physics
 - proto: EncryptionKeySecurity
@@ -35032,8 +33896,6 @@ entities:
       type: MetaData
     - parent: 10230
       type: Transform
-    - nextSound: 2041.7650724
-      type: EmitSoundOnCollide
     - canCollide: False
       type: Physics
 - proto: EncryptionKeyService
@@ -35044,8 +33906,6 @@ entities:
       type: MetaData
     - parent: 10240
       type: Transform
-    - nextSound: 2043.6234557
-      type: EmitSoundOnCollide
     - canCollide: False
       type: Physics
 - proto: ExosuitFabricator
@@ -35243,13 +34103,6 @@ entities:
       type: Transform
     - name: hop's office
       type: FaxMachine
-  - uid: 9689
-    components:
-    - pos: -0.5,-30.5
-      parent: 31
-      type: Transform
-    - name: lawyer's office
-      type: FaxMachine
 - proto: FigureSpawner
   entities:
   - uid: 4782
@@ -35308,7 +34161,6 @@ entities:
       type: Transform
     - devices:
       - 8954
-      - 8955
       - 8956
       - 852
       - 1027
@@ -35328,6 +34180,7 @@ entities:
       - 576
       - 1330
       - 1167
+      - 7460
       type: DeviceList
   - uid: 9993
     components:
@@ -35730,12 +34583,12 @@ entities:
       type: Transform
   - uid: 4298
     components:
-    - pos: 29.333488,-3.5539336
+    - pos: 29.352465,-1.4202437
       parent: 31
       type: Transform
   - uid: 4324
     components:
-    - pos: 29.567863,-3.5851836
+    - pos: 29.633715,-1.4827437
       parent: 31
       type: Transform
 - proto: FirelockGlass
@@ -35926,6 +34779,12 @@ entities:
     - pos: 38.5,-8.5
       parent: 31
       type: Transform
+  - uid: 7460
+    components:
+    - rot: 1.5707963267948966 rad
+      pos: 1.5,4.5
+      parent: 31
+      type: Transform
   - uid: 8810
     components:
     - pos: 2.5,29.5
@@ -35986,14 +34845,6 @@ entities:
     - pos: 1.5,3.5
       parent: 31
       type: Transform
-  - uid: 8955
-    components:
-    - pos: 1.5,4.5
-      parent: 31
-      type: Transform
-    - SecondsUntilStateChange: -1070.0962
-      state: Closing
-      type: Door
   - uid: 8956
     components:
     - pos: 1.5,5.5
@@ -36223,6 +35074,13 @@ entities:
       type: Transform
 - proto: FloorDrain
   entities:
+  - uid: 262
+    components:
+    - pos: 15.5,-17.5
+      parent: 31
+      type: Transform
+    - fixtures: {}
+      type: Fixtures
   - uid: 9108
     components:
     - pos: 17.5,-0.5
@@ -36435,15 +35293,11 @@ entities:
     - pos: -36.80648,16.60943
       parent: 31
       type: Transform
-    - nextSound: 802.4837102
-      type: EmitSoundOnCollide
   - uid: 10298
     components:
     - pos: -35.93148,16.60943
       parent: 31
       type: Transform
-    - nextSound: 804.282885
-      type: EmitSoundOnCollide
 - proto: FoodBurgerRobot
   entities:
   - uid: 9783
@@ -36458,8 +35312,6 @@ entities:
     - pos: -35.67703,19.598257
       parent: 31
       type: Transform
-    - nextSound: 719.9134896
-      type: EmitSoundOnCollide
   - uid: 8441
     components:
     - pos: -14.835613,-0.50339985
@@ -36472,13 +35324,11 @@ entities:
     - pos: -35.464256,19.606548
       parent: 31
       type: Transform
-    - nextSound: 720.9248128
-      type: EmitSoundOnCollide
 - proto: FoodDonutChocolate
   entities:
-  - uid: 9133
+  - uid: 7461
     components:
-    - pos: -2.1903043,7.789385
+    - pos: -2.2249928,7.7370577
       parent: 31
       type: Transform
 - proto: FoodMeat
@@ -36531,11 +35381,11 @@ entities:
     - pos: -19.668661,-9.268147
       parent: 31
       type: Transform
-- proto: FoodPizzaMeatSlice
+- proto: FoodPizzaArnoldSlice
   entities:
-  - uid: 7632
+  - uid: 9053
     components:
-    - pos: -29.510086,17.675573
+    - pos: -29.477003,17.566315
       parent: 31
       type: Transform
 - proto: FoodPizzaPineapple
@@ -36545,13 +35395,6 @@ entities:
     - pos: -35.517406,-25.152033
       parent: 31
       type: Transform
-- proto: FoodPizzaSassysageSlice
-  entities:
-  - uid: 7631
-    components:
-    - pos: -31.541336,16.738073
-      parent: 31
-      type: Transform
 - proto: FoodSoupElectron
   entities:
   - uid: 8433
@@ -36941,6 +35784,14 @@ entities:
       type: Transform
     - color: '#0055CCFF'
       type: AtmosPipeColor
+  - uid: 329
+    components:
+    - rot: -1.5707963267948966 rad
+      pos: 2.5,-29.5
+      parent: 31
+      type: Transform
+    - color: '#990000FF'
+      type: AtmosPipeColor
   - uid: 667
     components:
     - pos: 45.5,23.5
@@ -37235,14 +36086,6 @@ entities:
       type: AtmosPipeColor
     - enabled: True
       type: AmbientSound
-  - uid: 5705
-    components:
-    - rot: -1.5707963267948966 rad
-      pos: 2.5,-29.5
-      parent: 31
-      type: Transform
-    - color: '#990000FF'
-      type: AtmosPipeColor
   - uid: 5752
     components:
     - rot: 1.5707963267948966 rad
@@ -37625,10 +36468,26 @@ entities:
       type: Transform
     - color: '#0055CCFF'
       type: AtmosPipeColor
-  - uid: 7457
+  - uid: 7400
     components:
     - rot: -1.5707963267948966 rad
-      pos: 4.5,-30.5
+      pos: 0.5,-30.5
+      parent: 31
+      type: Transform
+    - color: '#990000FF'
+      type: AtmosPipeColor
+  - uid: 7412
+    components:
+    - rot: 1.5707963267948966 rad
+      pos: 0.5,-29.5
+      parent: 31
+      type: Transform
+    - color: '#990000FF'
+      type: AtmosPipeColor
+  - uid: 7466
+    components:
+    - rot: -1.5707963267948966 rad
+      pos: 4.5,-29.5
       parent: 31
       type: Transform
     - color: '#0055CCFF'
@@ -38009,6 +36868,14 @@ entities:
       type: Transform
     - enabled: True
       type: AmbientSound
+  - uid: 608
+    components:
+    - rot: -1.5707963267948966 rad
+      pos: 1.5,-29.5
+      parent: 31
+      type: Transform
+    - color: '#990000FF'
+      type: AtmosPipeColor
   - uid: 715
     components:
     - pos: 37.5,19.5
@@ -38269,6 +37136,14 @@ entities:
       type: AtmosPipeColor
     - enabled: True
       type: AmbientSound
+  - uid: 1590
+    components:
+    - rot: 3.141592653589793 rad
+      pos: 4.5,11.5
+      parent: 31
+      type: Transform
+    - color: '#0055CCFF'
+      type: AtmosPipeColor
   - uid: 1716
     components:
     - rot: 1.5707963267948966 rad
@@ -38332,6 +37207,14 @@ entities:
       type: Transform
     - enabled: True
       type: AmbientSound
+  - uid: 1888
+    components:
+    - rot: -1.5707963267948966 rad
+      pos: -3.5,-30.5
+      parent: 31
+      type: Transform
+    - color: '#0055CCFF'
+      type: AtmosPipeColor
   - uid: 2312
     components:
     - pos: -17.5,-27.5
@@ -41843,14 +40726,6 @@ entities:
       type: Transform
     - color: '#0055CCFF'
       type: AtmosPipeColor
-  - uid: 5837
-    components:
-    - rot: 3.141592653589793 rad
-      pos: 4.5,11.5
-      parent: 31
-      type: Transform
-    - color: '#0055CCFF'
-      type: AtmosPipeColor
   - uid: 5838
     components:
     - rot: 3.141592653589793 rad
@@ -44661,6 +43536,14 @@ entities:
       type: Transform
     - color: '#990000FF'
       type: AtmosPipeColor
+  - uid: 7267
+    components:
+    - rot: -1.5707963267948966 rad
+      pos: -2.5,-30.5
+      parent: 31
+      type: Transform
+    - color: '#0055CCFF'
+      type: AtmosPipeColor
   - uid: 7383
     components:
     - rot: 3.141592653589793 rad
@@ -44717,52 +43600,10 @@ entities:
       type: Transform
     - color: '#0055CCFF'
       type: AtmosPipeColor
-  - uid: 7452
-    components:
-    - rot: -1.5707963267948966 rad
-      pos: 1.5,-29.5
-      parent: 31
-      type: Transform
-    - color: '#990000FF'
-      type: AtmosPipeColor
-  - uid: 7453
-    components:
-    - rot: -1.5707963267948966 rad
-      pos: 0.5,-29.5
-      parent: 31
-      type: Transform
-    - color: '#990000FF'
-      type: AtmosPipeColor
-  - uid: 7458
-    components:
-    - rot: -1.5707963267948966 rad
-      pos: 3.5,-30.5
-      parent: 31
-      type: Transform
-    - color: '#0055CCFF'
-      type: AtmosPipeColor
-  - uid: 7459
-    components:
-    - rot: -1.5707963267948966 rad
-      pos: 2.5,-30.5
-      parent: 31
-      type: Transform
-    - color: '#0055CCFF'
-      type: AtmosPipeColor
-  - uid: 7460
-    components:
-    - rot: -1.5707963267948966 rad
-      pos: 1.5,-30.5
-      parent: 31
-      type: Transform
-    - color: '#0055CCFF'
-      type: AtmosPipeColor
-    - enabled: True
-      type: AmbientSound
-  - uid: 7461
+  - uid: 7468
     components:
     - rot: -1.5707963267948966 rad
-      pos: 0.5,-30.5
+      pos: -4.5,-30.5
       parent: 31
       type: Transform
     - color: '#0055CCFF'
@@ -45517,13 +44358,6 @@ entities:
       type: Transform
     - color: '#0055CCFF'
       type: AtmosPipeColor
-  - uid: 9804
-    components:
-    - pos: -5.5,-30.5
-      parent: 31
-      type: Transform
-    - color: '#0055CCFF'
-      type: AtmosPipeColor
   - uid: 9809
     components:
     - rot: -1.5707963267948966 rad
@@ -45645,6 +44479,14 @@ entities:
       type: Transform
     - color: '#0055CCFF'
       type: AtmosPipeColor
+  - uid: 577
+    components:
+    - rot: 1.5707963267948966 rad
+      pos: 2.5,-28.5
+      parent: 31
+      type: Transform
+    - color: '#990000FF'
+      type: AtmosPipeColor
   - uid: 616
     components:
     - rot: 1.5707963267948966 rad
@@ -45752,14 +44594,6 @@ entities:
       type: Transform
     - color: '#990000FF'
       type: AtmosPipeColor
-  - uid: 5354
-    components:
-    - rot: 1.5707963267948966 rad
-      pos: 2.5,-28.5
-      parent: 31
-      type: Transform
-    - color: '#990000FF'
-      type: AtmosPipeColor
   - uid: 5377
     components:
     - rot: 1.5707963267948966 rad
@@ -46464,25 +45298,25 @@ entities:
       type: Transform
     - color: '#0055CCFF'
       type: AtmosPipeColor
-  - uid: 7271
+  - uid: 7270
     components:
-    - pos: -32.5,5.5
+    - rot: 1.5707963267948966 rad
+      pos: -5.5,-30.5
       parent: 31
       type: Transform
     - color: '#0055CCFF'
       type: AtmosPipeColor
-  - uid: 7392
+  - uid: 7271
     components:
-    - rot: 1.5707963267948966 rad
-      pos: -16.5,-20.5
+    - pos: -32.5,5.5
       parent: 31
       type: Transform
     - color: '#0055CCFF'
       type: AtmosPipeColor
-  - uid: 7455
+  - uid: 7392
     components:
-    - rot: -1.5707963267948966 rad
-      pos: 4.5,-29.5
+    - rot: 1.5707963267948966 rad
+      pos: -16.5,-20.5
       parent: 31
       type: Transform
     - color: '#0055CCFF'
@@ -47462,20 +46296,20 @@ entities:
       type: AmbientSound
     - color: '#0055CCFF'
       type: AtmosPipeColor
-  - uid: 7456
+  - uid: 7408
     components:
-    - rot: 1.5707963267948966 rad
-      pos: 3.5,-29.5
+    - rot: -1.5707963267948966 rad
+      pos: -1.5,-30.5
       parent: 31
       type: Transform
     - enabled: False
       type: AmbientSound
     - color: '#0055CCFF'
       type: AtmosPipeColor
-  - uid: 7462
+  - uid: 7456
     components:
     - rot: 1.5707963267948966 rad
-      pos: -0.5,-30.5
+      pos: 3.5,-29.5
       parent: 31
       type: Transform
     - enabled: False
@@ -48163,10 +46997,10 @@ entities:
       type: Transform
     - enabled: False
       type: AmbientSound
-  - uid: 7454
+  - uid: 7469
     components:
     - rot: 1.5707963267948966 rad
-      pos: -0.5,-29.5
+      pos: -0.5,-30.5
       parent: 31
       type: Transform
     - enabled: False
@@ -48283,11 +47117,6 @@ entities:
       type: Transform
     - color: '#990000FF'
       type: AtmosPipeColor
-  - uid: 7400
-    components:
-    - pos: -17.5,-28.5
-      parent: 31
-      type: Transform
 - proto: Gauze
   entities:
   - uid: 4181
@@ -48295,15 +47124,18 @@ entities:
     - pos: 6.5456867,-11.337304
       parent: 31
       type: Transform
-- proto: GeneratorPlasma
-  entities:
-  - uid: 8951
+  - uid: 7455
     components:
-    - pos: -32.5,17.5
+    - pos: 11.456925,-3.7697382
       parent: 31
       type: Transform
 - proto: GeneratorUranium
   entities:
+  - uid: 202
+    components:
+    - pos: -7.5,27.5
+      parent: 31
+      type: Transform
   - uid: 4541
     components:
     - pos: 46.5,1.5
@@ -48321,15 +47153,11 @@ entities:
     - pos: 50.568665,-26.975147
       parent: 31
       type: Transform
-    - nextSound: 1012.278316
-      type: EmitSoundOnCollide
   - uid: 10142
     components:
     - pos: 50.638107,-27.06774
       parent: 31
       type: Transform
-    - nextSound: 1013.310633
-      type: EmitSoundOnCollide
 - proto: GravityGenerator
   entities:
   - uid: 888
@@ -48380,6 +47208,16 @@ entities:
       pos: -4.5,12.5
       parent: 31
       type: Transform
+  - uid: 255
+    components:
+    - pos: 11.5,-6.5
+      parent: 31
+      type: Transform
+  - uid: 261
+    components:
+    - pos: 8.5,-5.5
+      parent: 31
+      type: Transform
   - uid: 338
     components:
     - pos: -8.5,6.5
@@ -49470,31 +48308,6 @@ entities:
     - pos: -10.5,13.5
       parent: 31
       type: Transform
-  - uid: 5219
-    components:
-    - pos: -30.5,18.5
-      parent: 31
-      type: Transform
-  - uid: 5220
-    components:
-    - pos: -31.5,18.5
-      parent: 31
-      type: Transform
-  - uid: 5221
-    components:
-    - pos: -32.5,18.5
-      parent: 31
-      type: Transform
-  - uid: 5223
-    components:
-    - pos: -33.5,17.5
-      parent: 31
-      type: Transform
-  - uid: 5224
-    components:
-    - pos: -33.5,16.5
-      parent: 31
-      type: Transform
   - uid: 5244
     components:
     - pos: -39.5,21.5
@@ -49863,11 +48676,6 @@ entities:
     - pos: 51.5,-31.5
       parent: 31
       type: Transform
-  - uid: 6959
-    components:
-    - pos: -33.5,18.5
-      parent: 31
-      type: Transform
   - uid: 6961
     components:
     - pos: 47.5,-31.5
@@ -50065,6 +48873,11 @@ entities:
       pos: -2.5,-32.5
       parent: 31
       type: Transform
+  - uid: 7472
+    components:
+    - pos: -31.5,19.5
+      parent: 31
+      type: Transform
   - uid: 7547
     components:
     - pos: 34.5,26.5
@@ -50075,9 +48888,10 @@ entities:
     - pos: -28.5,-14.5
       parent: 31
       type: Transform
-  - uid: 7578
+  - uid: 7628
     components:
-    - pos: 11.5,-6.5
+    - rot: -1.5707963267948966 rad
+      pos: -3.5,-29.5
       parent: 31
       type: Transform
   - uid: 7672
@@ -50232,6 +49046,11 @@ entities:
       pos: 31.5,-24.5
       parent: 31
       type: Transform
+  - uid: 8222
+    components:
+    - pos: -32.5,19.5
+      parent: 31
+      type: Transform
   - uid: 8293
     components:
     - pos: 50.5,-31.5
@@ -50657,6 +49476,12 @@ entities:
     - pos: -39.5,-3.5
       parent: 31
       type: Transform
+  - uid: 9203
+    components:
+    - rot: -1.5707963267948966 rad
+      pos: 1.5,-30.5
+      parent: 31
+      type: Transform
   - uid: 9208
     components:
     - pos: -36.5,-12.5
@@ -51548,6 +50373,11 @@ entities:
       type: Transform
 - proto: HospitalCurtainsOpen
   entities:
+  - uid: 252
+    components:
+    - pos: 8.5,-4.5
+      parent: 31
+      type: Transform
   - uid: 6587
     components:
     - pos: 8.5,-8.5
@@ -51608,10 +50438,6 @@ entities:
     - pos: 49.403038,-27.102642
       parent: 31
       type: Transform
-    - nextAttack: 975.4293798
-      type: MeleeWeapon
-    - nextSound: 975.6293798
-      type: EmitSoundOnCollide
 - proto: HydroponicsToolHatchet
   entities:
   - uid: 1142
@@ -51624,10 +50450,6 @@ entities:
     - pos: 49.310444,-27.079494
       parent: 31
       type: Transform
-    - nextAttack: 985.1830197
-      type: MeleeWeapon
-    - nextSound: 985.3830197
-      type: EmitSoundOnCollide
 - proto: HydroponicsToolMiniHoe
   entities:
   - uid: 1055
@@ -51645,10 +50467,6 @@ entities:
     - pos: 49.356743,-27.044771
       parent: 31
       type: Transform
-    - nextAttack: 973.0798719
-      type: MeleeWeapon
-    - nextSound: 973.2798719
-      type: EmitSoundOnCollide
 - proto: HydroponicsToolScythe
   entities:
   - uid: 4130
@@ -51661,10 +50479,6 @@ entities:
     - pos: 49.356743,-27.12579
       parent: 31
       type: Transform
-    - nextAttack: 977.1127711
-      type: MeleeWeapon
-    - nextSound: 977.3127711
-      type: EmitSoundOnCollide
 - proto: HydroponicsToolSpade
   entities:
   - uid: 4131
@@ -51682,10 +50496,6 @@ entities:
     - pos: 49.43776,-26.998476
       parent: 31
       type: Transform
-    - nextAttack: 980.2630961
-      type: MeleeWeapon
-    - nextSound: 980.4630961
-      type: EmitSoundOnCollide
 - proto: hydroponicsTray
   entities:
   - uid: 775
@@ -51961,12 +50771,6 @@ entities:
     - pos: -6.5,6.5
       parent: 31
       type: Transform
-  - uid: 9363
-    components:
-    - rot: 3.141592653589793 rad
-      pos: -21.5,15.5
-      parent: 31
-      type: Transform
   - uid: 9839
     components:
     - pos: -14.5,15.5
@@ -51983,12 +50787,6 @@ entities:
     - pos: -8.5,22.5
       parent: 31
       type: Transform
-  - uid: 9886
-    components:
-    - rot: 1.5707963267948966 rad
-      pos: 1.5,-30.5
-      parent: 31
-      type: Transform
 - proto: IntercomService
   entities:
   - uid: 910
@@ -52061,9 +50859,9 @@ entities:
       type: Transform
 - proto: JetpackBlueFilled
   entities:
-  - uid: 1590
+  - uid: 8219
     components:
-    - pos: 29.435102,-4.3374166
+    - pos: 35.333374,-3.561453
       parent: 31
       type: Transform
 - proto: JetpackMini
@@ -52090,6 +50888,11 @@ entities:
     - pos: -14.5,-1.5
       parent: 31
       type: Transform
+  - uid: 7467
+    components:
+    - pos: -2.5,-29.5
+      parent: 31
+      type: Transform
   - uid: 10273
     components:
     - pos: -36.5,19.5
@@ -52170,11 +50973,6 @@ entities:
     - pos: -7.462167,20.657312
       parent: 31
       type: Transform
-  - uid: 6695
-    components:
-    - pos: -0.4371283,-29.28531
-      parent: 31
-      type: Transform
   - uid: 7372
     components:
     - pos: -4.4252543,-22.444613
@@ -52372,13 +51170,6 @@ entities:
     - pos: 22.5,-15.5
       parent: 31
       type: Transform
-- proto: LockerDetectiveFilled
-  entities:
-  - uid: 7420
-    components:
-    - pos: -22.5,17.5
-      parent: 31
-      type: Transform
 - proto: LockerEngineerFilled
   entities:
   - uid: 548
@@ -52483,6 +51274,13 @@ entities:
     - pos: -0.5,14.5
       parent: 31
       type: Transform
+- proto: LockerParamedicFilled
+  entities:
+  - uid: 7489
+    components:
+    - pos: 24.5,-7.5
+      parent: 31
+      type: Transform
 - proto: LockerQuarterMasterFilled
   entities:
   - uid: 1772
@@ -52583,32 +51381,24 @@ entities:
       pos: -5.5,-29.5
       parent: 31
       type: Transform
-    - nextFire: 308.712205
-      type: Gun
   - uid: 4216
     components:
     - rot: -1.5707963267948966 rad
       pos: -4.5,-29.5
       parent: 31
       type: Transform
-    - nextFire: 308.413516
-      type: Gun
   - uid: 4221
     components:
     - rot: -1.5707963267948966 rad
       pos: -4.5,-28.5
       parent: 31
       type: Transform
-    - nextFire: 308.1165487
-      type: Gun
   - uid: 5211
     components:
     - rot: -1.5707963267948966 rad
       pos: -5.5,-28.5
       parent: 31
       type: Transform
-    - nextFire: 307.5451245
-      type: Gun
 - proto: MachineArtifactAnalyzer
   entities:
   - uid: 8320
@@ -52645,71 +51435,11 @@ entities:
     - pos: -8.471462,20.3102
       parent: 31
       type: Transform
-    - nextSound: 634.5700115
-      type: EmitSoundOnCollide
   - uid: 10124
     components:
     - pos: -8.471462,20.4352
       parent: 31
       type: Transform
-    - nextSound: 636.4224295
-      type: EmitSoundOnCollide
-- proto: MailingUnit
-  entities:
-  - uid: 769
-    components:
-    - pos: -5.5,-16.5
-      parent: 31
-      type: Transform
-    - tag: science
-      type: MailingUnit
-  - uid: 9531
-    components:
-    - pos: 0.5,29.5
-      parent: 31
-      type: Transform
-    - tag: bridge
-      type: MailingUnit
-  - uid: 9536
-    components:
-    - pos: 8.5,16.5
-      parent: 31
-      type: Transform
-    - tag: hop
-      type: MailingUnit
-  - uid: 9537
-    components:
-    - pos: 14.5,-7.5
-      parent: 31
-      type: Transform
-    - tag: medical
-      type: MailingUnit
-  - uid: 9561
-    components:
-    - pos: 39.5,2.5
-      parent: 31
-      type: Transform
-    - tag: engineering
-      type: MailingUnit
-  - uid: 9658
-    components:
-    - pos: 18.5,9.5
-      parent: 31
-      type: Transform
-    - tag: cargo
-      type: MailingUnit
-  - uid: 9682
-    components:
-    - pos: -13.5,-1.5
-      parent: 31
-      type: Transform
-    - tag: kitchen
-      type: MailingUnit
-  - uid: 9733
-    components:
-    - pos: -5.5,12.5
-      parent: 31
-      type: Transform
 - proto: MaintenanceFluffSpawner
   entities:
   - uid: 113
@@ -52826,6 +51556,11 @@ entities:
       type: Transform
 - proto: MedicalBed
   entities:
+  - uid: 267
+    components:
+    - pos: 7.5,-5.5
+      parent: 31
+      type: Transform
   - uid: 630
     components:
     - pos: 7.5,-11.5
@@ -53075,8 +51810,6 @@ entities:
       type: Transform
     - lastUseAttempt: 79.9984802
       type: NetworkConfigurator
-    - nextSound: 80.1984802
-      type: EmitSoundOnCollide
   - uid: 9954
     components:
     - pos: -17.476542,-20.465784
@@ -53084,8 +51817,6 @@ entities:
       type: Transform
     - lastUseAttempt: 80.4505596
       type: NetworkConfigurator
-    - nextSound: 80.6505595
-      type: EmitSoundOnCollide
   - uid: 10011
     components:
     - pos: -17.24043,-20.479673
@@ -53093,8 +51824,6 @@ entities:
       type: Transform
     - lastUseAttempt: 81.0471843
       type: NetworkConfigurator
-    - nextSound: 81.2471843
-      type: EmitSoundOnCollide
 - proto: NitrogenCanister
   entities:
   - uid: 98
@@ -53136,6 +51865,13 @@ entities:
     - pos: -13.5,-11.5
       parent: 31
       type: Transform
+- proto: Ointment
+  entities:
+  - uid: 5705
+    components:
+    - pos: 11.72255,-4.519738
+      parent: 31
+      type: Transform
 - proto: Omnitool
   entities:
   - uid: 9055
@@ -53349,13 +52085,6 @@ entities:
     - pos: 9.5,18.5
       parent: 31
       type: Transform
-- proto: PaperBin5
-  entities:
-  - uid: 7408
-    components:
-    - pos: -2.5,-31.5
-      parent: 31
-      type: Transform
 - proto: PaperOffice
   entities:
   - uid: 10271
@@ -53382,8 +52111,6 @@ entities:
         Blue Light: There is no body inside the Morgue Unit.
 
       type: Paper
-    - nextSound: 2435.7410471
-      type: EmitSoundOnCollide
 - proto: ParchisBoard
   entities:
   - uid: 2501
@@ -53676,19 +52403,11 @@ entities:
     - pos: 40.48451,11.613793
       parent: 31
       type: Transform
-    - nextAttack: 518.148924
-      type: MeleeWeapon
-    - nextSound: 518.348924
-      type: EmitSoundOnCollide
   - uid: 10122
     components:
     - pos: 40.48451,11.613793
       parent: 31
       type: Transform
-    - nextAttack: 519.4321698
-      type: MeleeWeapon
-    - nextSound: 519.6321698
-      type: EmitSoundOnCollide
 - proto: PlasticFlapsAirtightClear
   entities:
   - uid: 547
@@ -53737,9 +52456,9 @@ entities:
       type: Transform
 - proto: PlushieLizard
   entities:
-  - uid: 7259
+  - uid: 308
     components:
-    - pos: 6.585726,-4.312074
+    - pos: 11.4413,-1.4572383
       parent: 31
       type: Transform
   - uid: 8715
@@ -53752,6 +52471,13 @@ entities:
     - pos: -32.58532,-31.483488
       parent: 31
       type: Transform
+- proto: PlushieNar
+  entities:
+  - uid: 9054
+    components:
+    - pos: -31.954416,20.500435
+      parent: 31
+      type: Transform
 - proto: PlushieSharkBlue
   entities:
   - uid: 5218
@@ -53940,11 +52666,6 @@ entities:
     - pos: 5.5,26.5
       parent: 31
       type: Transform
-  - uid: 7490
-    components:
-    - pos: -3.5,-29.5
-      parent: 31
-      type: Transform
   - uid: 7803
     components:
     - pos: 0.5,19.5
@@ -53975,6 +52696,12 @@ entities:
     - pos: 43.5,-26.5
       parent: 31
       type: Transform
+  - uid: 9192
+    components:
+    - rot: -1.5707963267948966 rad
+      pos: -3.5,-31.5
+      parent: 31
+      type: Transform
 - proto: PosterLegitNoERP
   entities:
   - uid: 7808
@@ -54116,14 +52843,6 @@ entities:
     - containers:
         stash: !type:ContainerSlot {}
       type: ContainerContainer
-  - uid: 7232
-    components:
-    - pos: 6.5,-3.5
-      parent: 31
-      type: Transform
-    - containers:
-        stash: !type:ContainerSlot {}
-      type: ContainerContainer
   - uid: 7290
     components:
     - pos: 6.5,1.5
@@ -54192,9 +52911,9 @@ entities:
       type: ContainerContainer
 - proto: PottedPlantRD
   entities:
-  - uid: 4313
+  - uid: 7630
     components:
-    - pos: -5.5,-24.5
+    - pos: -2.5,-16.5
       parent: 31
       type: Transform
 - proto: PowerCellHigh
@@ -54204,15 +52923,11 @@ entities:
     - pos: -7.559543,-32.25025
       parent: 31
       type: Transform
-    - nextSound: 246.1457412
-      type: EmitSoundOnCollide
   - uid: 9342
     components:
     - pos: -7.559543,-32.37525
       parent: 31
       type: Transform
-    - nextSound: 247.4127353
-      type: EmitSoundOnCollide
 - proto: PowerCellRecharger
   entities:
   - uid: 1395
@@ -54234,6 +52949,11 @@ entities:
     - pos: -6.5,-32.5
       parent: 31
       type: Transform
+  - uid: 6607
+    components:
+    - pos: 11.5,-2.5
+      parent: 31
+      type: Transform
   - uid: 9119
     components:
     - pos: 14.5,12.5
@@ -54241,6 +52961,26 @@ entities:
       type: Transform
     - canCollide: False
       type: Physics
+  - uid: 9519
+    components:
+    - pos: -9.5,16.5
+      parent: 31
+      type: Transform
+  - uid: 9525
+    components:
+    - pos: -0.5,-29.5
+      parent: 31
+      type: Transform
+  - uid: 9526
+    components:
+    - pos: -0.5,-13.5
+      parent: 31
+      type: Transform
+  - uid: 9528
+    components:
+    - pos: 34.5,0.5
+      parent: 31
+      type: Transform
 - proto: Poweredlight
   entities:
   - uid: 41
@@ -54256,6 +52996,8 @@ entities:
     - pos: -34.5,19.5
       parent: 31
       type: Transform
+    - enabled: False
+      type: AmbientSound
   - uid: 139
     components:
     - rot: 1.5707963267948966 rad
@@ -54923,14 +53665,6 @@ entities:
       type: Transform
     - powerLoad: 0
       type: ApcPowerReceiver
-  - uid: 1362
-    components:
-    - rot: 1.5707963267948966 rad
-      pos: 6.5,-3.5
-      parent: 31
-      type: Transform
-    - powerLoad: 0
-      type: ApcPowerReceiver
   - uid: 1366
     components:
     - rot: -1.5707963267948966 rad
@@ -55503,6 +54237,13 @@ entities:
       type: Transform
     - powerLoad: 0
       type: ApcPowerReceiver
+  - uid: 7232
+    components:
+    - pos: 6.5,-4.5
+      parent: 31
+      type: Transform
+    - enabled: False
+      type: AmbientSound
   - uid: 7359
     components:
     - rot: 3.141592653589793 rad
@@ -55518,6 +54259,14 @@ entities:
       type: Transform
     - powerLoad: 0
       type: ApcPowerReceiver
+  - uid: 7631
+    components:
+    - rot: 3.141592653589793 rad
+      pos: 8.5,-2.5
+      parent: 31
+      type: Transform
+    - enabled: False
+      type: AmbientSound
   - uid: 7653
     components:
     - pos: 6.5,-7.5
@@ -55592,13 +54341,6 @@ entities:
       type: Transform
     - powerLoad: 0
       type: ApcPowerReceiver
-  - uid: 8271
-    components:
-    - pos: 38.5,-23.5
-      parent: 31
-      type: Transform
-    - powerLoad: 0
-      type: ApcPowerReceiver
   - uid: 8272
     components:
     - rot: -1.5707963267948966 rad
@@ -55835,14 +54577,6 @@ entities:
       type: Transform
     - powerLoad: 0
       type: ApcPowerReceiver
-  - uid: 1221
-    components:
-    - rot: -1.5707963267948966 rad
-      pos: 23.5,-0.5
-      parent: 31
-      type: Transform
-    - powerLoad: 0
-      type: ApcPowerReceiver
   - uid: 1246
     components:
     - rot: 1.5707963267948966 rad
@@ -55979,13 +54713,6 @@ entities:
       type: Transform
     - powerLoad: 0
       type: ApcPowerReceiver
-  - uid: 3868
-    components:
-    - pos: 25.5,-1.5
-      parent: 31
-      type: Transform
-    - powerLoad: 0
-      type: ApcPowerReceiver
   - uid: 3871
     components:
     - rot: -1.5707963267948966 rad
@@ -56016,13 +54743,6 @@ entities:
       type: Transform
     - powerLoad: 0
       type: ApcPowerReceiver
-  - uid: 3877
-    components:
-    - pos: 30.5,-6.5
-      parent: 31
-      type: Transform
-    - powerLoad: 0
-      type: ApcPowerReceiver
   - uid: 3879
     components:
     - pos: 35.5,-6.5
@@ -56069,13 +54789,6 @@ entities:
       type: Transform
     - powerLoad: 0
       type: ApcPowerReceiver
-  - uid: 3939
-    components:
-    - pos: 25.5,-20.5
-      parent: 31
-      type: Transform
-    - powerLoad: 0
-      type: ApcPowerReceiver
   - uid: 3940
     components:
     - pos: 22.5,-9.5
@@ -56160,13 +54873,6 @@ entities:
       type: Transform
     - powerLoad: 0
       type: ApcPowerReceiver
-  - uid: 4709
-    components:
-    - pos: 28.5,13.5
-      parent: 31
-      type: Transform
-    - powerLoad: 0
-      type: ApcPowerReceiver
   - uid: 4826
     components:
     - pos: -25.5,-10.5
@@ -56259,14 +54965,6 @@ entities:
       type: Transform
     - powerLoad: 0
       type: ApcPowerReceiver
-  - uid: 5235
-    components:
-    - rot: 3.141592653589793 rad
-      pos: -30.5,16.5
-      parent: 31
-      type: Transform
-    - powerLoad: 0
-      type: ApcPowerReceiver
   - uid: 5291
     components:
     - rot: -1.5707963267948966 rad
@@ -56318,13 +55016,17 @@ entities:
       type: Transform
     - powerLoad: 0
       type: ApcPowerReceiver
-  - uid: 7412
+  - uid: 7811
     components:
-    - pos: -22.5,17.5
+    - rot: -1.5707963267948966 rad
+      pos: 23.5,-0.5
+      parent: 31
+      type: Transform
+  - uid: 7909
+    components:
+    - pos: 28.5,13.5
       parent: 31
       type: Transform
-    - powerLoad: 0
-      type: ApcPowerReceiver
   - uid: 8526
     components:
     - rot: -1.5707963267948966 rad
@@ -56377,6 +55079,12 @@ entities:
       type: Transform
     - powerLoad: 0
       type: ApcPowerReceiver
+  - uid: 9148
+    components:
+    - rot: -1.5707963267948966 rad
+      pos: -31.5,17.5
+      parent: 31
+      type: Transform
   - uid: 9248
     components:
     - pos: -42.5,0.5
@@ -56448,6 +55156,11 @@ entities:
       type: Transform
 - proto: PoweredSmallLightEmpty
   entities:
+  - uid: 8209
+    components:
+    - pos: -22.5,17.5
+      parent: 31
+      type: Transform
   - uid: 9367
     components:
     - rot: -1.5707963267948966 rad
@@ -56461,9 +55174,9 @@ entities:
       type: Transform
 - proto: Protolathe
   entities:
-  - uid: 874
+  - uid: 1042
     components:
-    - pos: 29.5,-1.5
+    - pos: -3.5,-12.5
       parent: 31
       type: Transform
     - materialWhiteList:
@@ -56473,20 +55186,18 @@ entities:
       - Wood
       - Gold
       type: MaterialStorage
-  - uid: 1042
+  - uid: 9051
     components:
-    - pos: -3.5,-12.5
+    - pos: 48.5,3.5
       parent: 31
       type: Transform
-    - materialWhiteList:
-      - Steel
-      - Glass
-      - Plastic
-      - Wood
-      - Gold
-      type: MaterialStorage
 - proto: Rack
   entities:
+  - uid: 117
+    components:
+    - pos: 29.5,-1.5
+      parent: 31
+      type: Transform
   - uid: 1352
     components:
     - pos: 43.5,13.5
@@ -56512,21 +55223,11 @@ entities:
     - pos: 10.5,10.5
       parent: 31
       type: Transform
-  - uid: 4149
-    components:
-    - pos: 29.5,-4.5
-      parent: 31
-      type: Transform
   - uid: 4224
     components:
     - pos: -20.5,7.5
       parent: 31
       type: Transform
-  - uid: 4285
-    components:
-    - pos: 29.5,-3.5
-      parent: 31
-      type: Transform
   - uid: 4542
     components:
     - pos: 59.5,6.5
@@ -56612,6 +55313,11 @@ entities:
     - pos: 45.5,5.5
       parent: 31
       type: Transform
+  - uid: 9225
+    components:
+    - pos: 35.5,-3.5
+      parent: 31
+      type: Transform
   - uid: 9861
     components:
     - pos: 10.5,-19.5
@@ -57165,7 +55871,7 @@ entities:
       pos: 26.5,20.5
       parent: 31
       type: Transform
-  - uid: 125
+  - uid: 254
     components:
     - pos: 11.5,-6.5
       parent: 31
@@ -57916,6 +56622,12 @@ entities:
     - pos: 12.5,-32.5
       parent: 31
       type: Transform
+  - uid: 4836
+    components:
+    - rot: -1.5707963267948966 rad
+      pos: -3.5,-29.5
+      parent: 31
+      type: Transform
   - uid: 4849
     components:
     - pos: 2.5,-31.5
@@ -57982,21 +56694,6 @@ entities:
     - pos: -2.5,6.5
       parent: 31
       type: Transform
-  - uid: 5226
-    components:
-    - pos: -32.5,18.5
-      parent: 31
-      type: Transform
-  - uid: 5227
-    components:
-    - pos: -31.5,18.5
-      parent: 31
-      type: Transform
-  - uid: 5228
-    components:
-    - pos: -30.5,18.5
-      parent: 31
-      type: Transform
   - uid: 5229
     components:
     - pos: -29.5,18.5
@@ -58361,6 +57058,11 @@ entities:
       pos: -2.5,-32.5
       parent: 31
       type: Transform
+  - uid: 7473
+    components:
+    - pos: -31.5,19.5
+      parent: 31
+      type: Transform
   - uid: 7544
     components:
     - pos: -26.5,-14.5
@@ -58452,6 +57154,11 @@ entities:
     - pos: -39.5,-8.5
       parent: 31
       type: Transform
+  - uid: 8221
+    components:
+    - pos: -32.5,19.5
+      parent: 31
+      type: Transform
   - uid: 8370
     components:
     - pos: -38.5,-10.5
@@ -58633,6 +57340,12 @@ entities:
     - pos: -39.5,-3.5
       parent: 31
       type: Transform
+  - uid: 9220
+    components:
+    - rot: -1.5707963267948966 rad
+      pos: 1.5,-30.5
+      parent: 31
+      type: Transform
   - uid: 9255
     components:
     - pos: -27.5,-16.5
@@ -58668,6 +57381,11 @@ entities:
     - pos: -25.5,-23.5
       parent: 31
       type: Transform
+  - uid: 9363
+    components:
+    - pos: 5.5,-5.5
+      parent: 31
+      type: Transform
   - uid: 9379
     components:
     - pos: -43.5,7.5
@@ -58723,6 +57441,11 @@ entities:
     - pos: -14.5,-30.5
       parent: 31
       type: Transform
+  - uid: 9514
+    components:
+    - pos: 5.5,-4.5
+      parent: 31
+      type: Transform
   - uid: 9715
     components:
     - pos: -40.5,18.5
@@ -58825,9 +57548,9 @@ entities:
       type: Transform
 - proto: ResearchAndDevelopmentServer
   entities:
-  - uid: 1062
+  - uid: 8223
     components:
-    - pos: -8.5,-23.5
+    - pos: -9.5,-23.5
       parent: 31
       type: Transform
 - proto: RevolverCapGun
@@ -59110,12 +57833,13 @@ entities:
       pos: 5.5,-10.5
       parent: 31
       type: Transform
+    - links:
+      - 8232
+      type: DeviceLinkSink
     - inputs:
         Open: []
         Close: []
-        Toggle:
-        - port: Pressed
-          uid: 9123
+        Toggle: []
       type: SignalReceiver
   - uid: 2137
     components:
@@ -59123,12 +57847,13 @@ entities:
       pos: 5.5,-11.5
       parent: 31
       type: Transform
+    - links:
+      - 8232
+      type: DeviceLinkSink
     - inputs:
         Open: []
         Close: []
-        Toggle:
-        - port: Pressed
-          uid: 9123
+        Toggle: []
       type: SignalReceiver
   - uid: 2138
     components:
@@ -59136,12 +57861,13 @@ entities:
       pos: 5.5,-8.5
       parent: 31
       type: Transform
+    - links:
+      - 8224
+      type: DeviceLinkSink
     - inputs:
         Open: []
         Close: []
-        Toggle:
-        - port: Pressed
-          uid: 2141
+        Toggle: []
       type: SignalReceiver
   - uid: 4693
     components:
@@ -59182,6 +57908,15 @@ entities:
         - port: Pressed
           uid: 4526
       type: SignalReceiver
+  - uid: 7629
+    components:
+    - rot: -1.5707963267948966 rad
+      pos: 5.5,-5.5
+      parent: 31
+      type: Transform
+    - links:
+      - 9115
+      type: DeviceLinkSink
   - uid: 8767
     components:
     - pos: -16.5,7.5
@@ -59255,33 +57990,31 @@ entities:
         - port: Pressed
           uid: 8774
       type: SignalReceiver
+  - uid: 9116
+    components:
+    - rot: -1.5707963267948966 rad
+      pos: 5.5,-4.5
+      parent: 31
+      type: Transform
+    - links:
+      - 9115
+      type: DeviceLinkSink
   - uid: 9122
     components:
     - rot: -1.5707963267948966 rad
       pos: 5.5,-7.5
       parent: 31
       type: Transform
+    - links:
+      - 8224
+      type: DeviceLinkSink
     - inputs:
         Open: []
         Close: []
-        Toggle:
-        - port: Pressed
-          uid: 2141
+        Toggle: []
       type: SignalReceiver
 - proto: SignalButton
   entities:
-  - uid: 2141
-    components:
-    - pos: 6.5,-9.5
-      parent: 31
-      type: Transform
-    - outputs:
-        Pressed:
-        - port: Toggle
-          uid: 2138
-        - port: Toggle
-          uid: 9122
-      type: SignalTransmitter
   - uid: 2515
     components:
     - pos: 16.5,13.5
@@ -59311,18 +58044,6 @@ entities:
     - pos: 49.5,18.5
       parent: 31
       type: Transform
-  - uid: 7249
-    components:
-    - pos: -15.5,-23.5
-      parent: 31
-      type: Transform
-    - outputs:
-        Pressed:
-        - port: Toggle
-          uid: 2309
-        - port: Toggle
-          uid: 2308
-      type: SignalTransmitter
   - uid: 7551
     components:
     - pos: -26.5,-13.5
@@ -59371,18 +58092,16 @@ entities:
         - port: Toggle
           uid: 8770
       type: SignalTransmitter
-  - uid: 9123
+- proto: SignalControlledValve
+  entities:
+  - uid: 7470
     components:
-    - pos: 6.5,-12.5
+    - pos: -17.5,-28.5
       parent: 31
       type: Transform
-    - outputs:
-        Pressed:
-        - port: Toggle
-          uid: 1475
-        - port: Toggle
-          uid: 2137
-      type: SignalTransmitter
+    - links:
+      - 8850
+      type: DeviceLinkSink
 - proto: SignalSwitch
   entities:
   - uid: 1084
@@ -59550,6 +58269,103 @@ entities:
         - 10054
         - 10045
       type: DeviceLinkSource
+  - uid: 8224
+    components:
+    - pos: 6.5,-9.5
+      parent: 31
+      type: Transform
+    - linkedPorts:
+        2138:
+        - On: Open
+        - Off: Close
+        9122:
+        - On: Open
+        - Off: Close
+      registeredSinks:
+        On:
+        - 2138
+        - 9122
+        Off:
+        - 2138
+        - 9122
+      type: DeviceLinkSource
+  - uid: 8225
+    components:
+    - pos: -15.5,-23.5
+      parent: 31
+      type: Transform
+    - linkedPorts:
+        2309:
+        - On: Open
+        - Off: Close
+        2308:
+        - On: Open
+        - Off: Close
+      registeredSinks:
+        On:
+        - 2309
+        - 2308
+        Off:
+        - 2309
+        - 2308
+      type: DeviceLinkSource
+  - uid: 8232
+    components:
+    - pos: 6.5,-12.5
+      parent: 31
+      type: Transform
+    - linkedPorts:
+        1475:
+        - On: Open
+        - Off: Close
+        2137:
+        - On: Open
+        - Off: Close
+      registeredSinks:
+        On:
+        - 1475
+        - 2137
+        Off:
+        - 1475
+        - 2137
+      type: DeviceLinkSource
+  - uid: 8850
+    components:
+    - rot: 3.141592653589793 rad
+      pos: -16.5,-27.5
+      parent: 31
+      type: Transform
+    - linkedPorts:
+        7470:
+        - On: Open
+        - Off: Close
+      registeredSinks:
+        On:
+        - 7470
+        Off:
+        - 7470
+      type: DeviceLinkSource
+    - type: ItemCooldown
+  - uid: 9115
+    components:
+    - pos: 6.5,-6.5
+      parent: 31
+      type: Transform
+    - linkedPorts:
+        7629:
+        - On: Open
+        - Off: Close
+        9116:
+        - On: Open
+        - Off: Close
+      registeredSinks:
+        On:
+        - 7629
+        - 9116
+        Off:
+        - 7629
+        - 9116
+      type: DeviceLinkSource
 - proto: SignArmory
   entities:
   - uid: 1523
@@ -59675,6 +58491,12 @@ entities:
       type: Transform
 - proto: SignDirectionalChapel
   entities:
+  - uid: 8239
+    components:
+    - rot: 3.141592653589793 rad
+      pos: -34.5,11.5
+      parent: 31
+      type: Transform
   - uid: 8917
     components:
     - rot: -1.5707963267948966 rad
@@ -59724,10 +58546,10 @@ entities:
       pos: -27.5,2.5
       parent: 31
       type: Transform
-  - uid: 6995
+  - uid: 7477
     components:
-    - rot: 3.141592653589793 rad
-      pos: -34.5,11.5
+    - rot: -1.5707963267948966 rad
+      pos: -33.5,16.5
       parent: 31
       type: Transform
   - uid: 7684
@@ -59869,18 +58691,6 @@ entities:
     - pos: 5.5,-22.5
       parent: 31
       type: Transform
-- proto: SignMagneticsMed
-  entities:
-  - uid: 5144
-    components:
-    - pos: 23.5,19.5
-      parent: 31
-      type: Transform
-  - uid: 7944
-    components:
-    - pos: 19.5,19.5
-      parent: 31
-      type: Transform
 - proto: SignMedical
   entities:
   - uid: 4151
@@ -60841,9 +59651,9 @@ entities:
       type: Transform
 - proto: SpawnPointChaplain
   entities:
-  - uid: 10221
+  - uid: 8295
     components:
-    - pos: -37.5,17.5
+    - pos: -32.5,17.5
       parent: 31
       type: Transform
 - proto: SpawnPointChef
@@ -60886,13 +59696,6 @@ entities:
     - pos: -19.5,-8.5
       parent: 31
       type: Transform
-- proto: SpawnPointDetective
-  entities:
-  - uid: 7422
-    components:
-    - pos: -22.5,16.5
-      parent: 31
-      type: Transform
 - proto: SpawnPointHeadOfPersonnel
   entities:
   - uid: 7147
@@ -60933,9 +59736,14 @@ entities:
       type: Transform
 - proto: SpawnPointLawyer
   entities:
-  - uid: 7489
+  - uid: 5220
     components:
-    - pos: -1.5,-30.5
+    - pos: -4.5,10.5
+      parent: 31
+      type: Transform
+  - uid: 7422
+    components:
+    - pos: -5.5,10.5
       parent: 31
       type: Transform
 - proto: SpawnPointLibrarian
@@ -60990,6 +59798,13 @@ entities:
     - pos: 3.5,4.5
       parent: 31
       type: Transform
+- proto: SpawnPointParamedic
+  entities:
+  - uid: 256
+    components:
+    - pos: 24.5,-5.5
+      parent: 31
+      type: Transform
 - proto: SpawnPointQuartermaster
   entities:
   - uid: 6241
@@ -61122,13 +59937,6 @@ entities:
     - pos: -0.5,8.5
       parent: 31
       type: Transform
-- proto: SpawnPointZookeeper
-  entities:
-  - uid: 8295
-    components:
-    - pos: 50.5,-24.5
-      parent: 31
-      type: Transform
 - proto: SpawnVehicleJanicart
   entities:
   - uid: 9118
@@ -61180,6 +59988,25 @@ entities:
     - pos: 13.1994,-13.460948
       parent: 31
       type: Transform
+- proto: StationMap
+  entities:
+  - uid: 5837
+    components:
+    - rot: 1.5707963267948966 rad
+      pos: 1.5,0.5
+      parent: 31
+      type: Transform
+  - uid: 7259
+    components:
+    - pos: 23.5,6.5
+      parent: 31
+      type: Transform
+  - uid: 8849
+    components:
+    - rot: -1.5707963267948966 rad
+      pos: -34.5,-9.5
+      parent: 31
+      type: Transform
 - proto: Stool
   entities:
   - uid: 1355
@@ -61194,12 +60021,6 @@ entities:
       pos: -24.5,-2.5
       parent: 31
       type: Transform
-  - uid: 4209
-    components:
-    - rot: -1.5707963267948966 rad
-      pos: -23.5,16.5
-      parent: 31
-      type: Transform
   - uid: 4641
     components:
     - rot: -1.5707963267948966 rad
@@ -61428,26 +60249,26 @@ entities:
       type: Transform
 - proto: SuitStorageCMO
   entities:
-  - uid: 9134
+  - uid: 263
     components:
-    - pos: 24.5,-15.5
+    - pos: 21.5,-15.5
       parent: 31
       type: Transform
 - proto: SuitStorageEngi
   entities:
-  - uid: 986
+  - uid: 257
     components:
-    - pos: 31.5,-4.5
+    - pos: 29.5,-2.5
       parent: 31
       type: Transform
-  - uid: 1601
+  - uid: 259
     components:
-    - pos: 32.5,-4.5
+    - pos: 29.5,-3.5
       parent: 31
       type: Transform
-  - uid: 4878
+  - uid: 8218
     components:
-    - pos: 30.5,-4.5
+    - pos: 29.5,-4.5
       parent: 31
       type: Transform
 - proto: SuitStorageEVA
@@ -61991,9 +60812,12 @@ entities:
   entities:
   - uid: 3040
     components:
-    - pos: 28.5,9.5
+    - anchored: False
+      pos: 28.5,10.5
       parent: 31
       type: Transform
+    - bodyType: Dynamic
+      type: Physics
 - proto: SurveillanceCameraScience
   entities:
   - uid: 4557
@@ -62342,6 +61166,18 @@ entities:
       pos: -6.5,13.5
       parent: 31
       type: Transform
+  - uid: 4209
+    components:
+    - rot: -1.5707963267948966 rad
+      pos: -0.5,-29.5
+      parent: 31
+      type: Transform
+  - uid: 4313
+    components:
+    - rot: -1.5707963267948966 rad
+      pos: -2.5,-29.5
+      parent: 31
+      type: Transform
   - uid: 4466
     components:
     - pos: 18.5,7.5
@@ -62462,29 +61298,30 @@ entities:
     - pos: -17.5,-9.5
       parent: 31
       type: Transform
-  - uid: 7563
+  - uid: 7454
     components:
-    - pos: -15.5,-12.5
+    - pos: 6.5,-5.5
       parent: 31
       type: Transform
-  - uid: 7564
+  - uid: 7481
     components:
-    - pos: -15.5,-11.5
+    - rot: -1.5707963267948966 rad
+      pos: -1.5,-29.5
       parent: 31
       type: Transform
-  - uid: 7565
+  - uid: 7563
     components:
-    - pos: -15.5,-10.5
+    - pos: -15.5,-12.5
       parent: 31
       type: Transform
-  - uid: 7625
+  - uid: 7564
     components:
-    - pos: -29.5,17.5
+    - pos: -15.5,-11.5
       parent: 31
       type: Transform
-  - uid: 7626
+  - uid: 7565
     components:
-    - pos: -31.5,16.5
+    - pos: -15.5,-10.5
       parent: 31
       type: Transform
   - uid: 7815
@@ -62542,6 +61379,16 @@ entities:
     - pos: 44.5,-2.5
       parent: 31
       type: Transform
+  - uid: 9518
+    components:
+    - pos: -9.5,16.5
+      parent: 31
+      type: Transform
+  - uid: 9529
+    components:
+    - pos: 34.5,0.5
+      parent: 31
+      type: Transform
   - uid: 9786
     components:
     - pos: -4.5,-26.5
@@ -62894,6 +61741,11 @@ entities:
       type: Transform
 - proto: TableWood
   entities:
+  - uid: 248
+    components:
+    - pos: 12.5,-1.5
+      parent: 31
+      type: Transform
   - uid: 492
     components:
     - pos: -30.5,-1.5
@@ -63030,11 +61882,6 @@ entities:
     - pos: -24.5,-5.5
       parent: 31
       type: Transform
-  - uid: 4734
-    components:
-    - pos: 7.5,-4.5
-      parent: 31
-      type: Transform
   - uid: 4787
     components:
     - pos: 9.5,-28.5
@@ -63050,6 +61897,12 @@ entities:
     - pos: 6.5,24.5
       parent: 31
       type: Transform
+  - uid: 5228
+    components:
+    - rot: 1.5707963267948966 rad
+      pos: -1.5,-31.5
+      parent: 31
+      type: Transform
   - uid: 7146
     components:
     - pos: 7.5,24.5
@@ -63065,29 +61918,29 @@ entities:
     - pos: 12.5,-31.5
       parent: 31
       type: Transform
-  - uid: 7265
+  - uid: 7322
     components:
-    - pos: 6.5,-4.5
+    - pos: 11.5,-31.5
       parent: 31
       type: Transform
-  - uid: 7267
+  - uid: 7462
     components:
-    - pos: 8.5,-4.5
+    - pos: -29.5,17.5
       parent: 31
       type: Transform
-  - uid: 7322
+  - uid: 7632
     components:
-    - pos: 11.5,-31.5
+    - pos: 11.5,-3.5
       parent: 31
       type: Transform
-  - uid: 7470
+  - uid: 7633
     components:
-    - pos: -0.5,-30.5
+    - pos: 11.5,-1.5
       parent: 31
       type: Transform
-  - uid: 7471
+  - uid: 7822
     components:
-    - pos: -0.5,-29.5
+    - pos: 11.5,-4.5
       parent: 31
       type: Transform
   - uid: 7849
@@ -63100,6 +61953,11 @@ entities:
     - pos: 27.5,-25.5
       parent: 31
       type: Transform
+  - uid: 7908
+    components:
+    - pos: 11.5,-2.5
+      parent: 31
+      type: Transform
   - uid: 8708
     components:
     - pos: -35.5,-25.5
@@ -63389,28 +62247,16 @@ entities:
     - pos: 6.4733424,10.140543
       parent: 31
       type: Transform
-    - nextAttack: 231.4258723
-      type: MeleeWeapon
-    - nextSound: 231.6258723
-      type: EmitSoundOnCollide
   - uid: 7116
     components:
     - pos: 6.4755855,10.362613
       parent: 31
       type: Transform
-    - nextAttack: 221.3963429
-      type: MeleeWeapon
-    - nextSound: 221.5963429
-      type: EmitSoundOnCollide
   - uid: 8302
     components:
     - pos: 6.4755855,10.669922
       parent: 31
       type: Transform
-    - nextAttack: 227.611488
-      type: MeleeWeapon
-    - nextSound: 227.811488
-      type: EmitSoundOnCollide
 - proto: ToyAmongPequeno
   entities:
   - uid: 9685
@@ -63664,8 +62510,6 @@ entities:
     - pos: -37.5,19.5
       parent: 31
       type: Transform
-    - nextEmpEject: 591.4953222
-      type: VendingMachine
   - uid: 970
     components:
     - flags: SessionSpecific
@@ -63709,15 +62553,13 @@ entities:
       type: Transform
 - proto: VendingMachineChapel
   entities:
-  - uid: 10215
+  - uid: 260
     components:
     - flags: SessionSpecific
       type: MetaData
-    - pos: -38.5,19.5
+    - pos: -31.5,18.5
       parent: 31
       type: Transform
-    - nextEmpEject: 1393.4447948
-      type: VendingMachine
 - proto: VendingMachineChefDrobe
   entities:
   - uid: 3986
@@ -63743,8 +62585,6 @@ entities:
     - pos: -34.5,18.5
       parent: 31
       type: Transform
-    - nextEmpEject: 693.8277624
-      type: VendingMachine
 - proto: VendingMachineChemDrobe
   entities:
   - uid: 578
@@ -63893,15 +62733,6 @@ entities:
     - pos: -38.5,-4.5
       parent: 31
       type: Transform
-- proto: VendingMachineDetDrobe
-  entities:
-  - uid: 7421
-    components:
-    - flags: SessionSpecific
-      type: MetaData
-    - pos: -23.5,17.5
-      parent: 31
-      type: Transform
 - proto: VendingMachineDinnerware
   entities:
   - uid: 990
@@ -63912,15 +62743,13 @@ entities:
     - pos: -13.5,1.5
       parent: 31
       type: Transform
-  - uid: 9714
+  - uid: 9133
     components:
     - flags: SessionSpecific
       type: MetaData
-    - pos: -34.5,17.5
+    - pos: -38.5,19.5
       parent: 31
       type: Transform
-    - nextEmpEject: 695.2935506
-      type: VendingMachine
 - proto: VendingMachineDiscount
   entities:
   - uid: 760
@@ -63984,15 +62813,6 @@ entities:
     - pos: -19.5,10.5
       parent: 31
       type: Transform
-- proto: VendingMachineLawDrobe
-  entities:
-  - uid: 7463
-    components:
-    - flags: SessionSpecific
-      type: MetaData
-    - pos: -2.5,-29.5
-      parent: 31
-      type: Transform
 - proto: VendingMachineMedical
   entities:
   - uid: 1148
@@ -64016,8 +62836,6 @@ entities:
     - pos: 0.5,14.5
       parent: 31
       type: Transform
-    - nextEmpEject: 580.2296122
-      type: VendingMachine
 - proto: VendingMachineMediDrobe
   entities:
   - uid: 1143
@@ -64036,15 +62854,6 @@ entities:
     - pos: -15.5,-8.5
       parent: 31
       type: Transform
-- proto: VendingMachineRoboDrobe
-  entities:
-  - uid: 9827
-    components:
-    - flags: SessionSpecific
-      type: MetaData
-    - pos: -4.5,-30.5
-      parent: 31
-      type: Transform
 - proto: VendingMachineSalvage
   entities:
   - uid: 7568
@@ -64100,8 +62909,6 @@ entities:
     - pos: -15.5,8.5
       parent: 31
       type: Transform
-    - nextEmpEject: 653.8877052
-      type: VendingMachine
 - proto: VendingMachineSmartFridge
   entities:
   - uid: 735
@@ -64226,12 +63033,6 @@ entities:
     - pos: 11.5,25.5
       parent: 31
       type: Transform
-  - uid: 9724
-    components:
-    - rot: 1.5707963267948966 rad
-      pos: -24.5,16.5
-      parent: 31
-      type: Transform
 - proto: WallReinforced
   entities:
   - uid: 30
@@ -64424,6 +63225,11 @@ entities:
     - pos: 39.5,-6.5
       parent: 31
       type: Transform
+  - uid: 698
+    components:
+    - pos: 29.5,11.5
+      parent: 31
+      type: Transform
   - uid: 706
     components:
     - pos: 10.5,-32.5
@@ -66085,11 +64891,6 @@ entities:
     - pos: 42.5,0.5
       parent: 31
       type: Transform
-  - uid: 2054
-    components:
-    - pos: -33.5,15.5
-      parent: 31
-      type: Transform
   - uid: 2101
     components:
     - pos: 29.5,-5.5
@@ -66685,11 +65486,6 @@ entities:
     - pos: 47.5,14.5
       parent: 31
       type: Transform
-  - uid: 3123
-    components:
-    - pos: 28.5,10.5
-      parent: 31
-      type: Transform
   - uid: 3130
     components:
     - pos: 26.5,11.5
@@ -67070,16 +65866,6 @@ entities:
     - pos: 1.5,-28.5
       parent: 31
       type: Transform
-  - uid: 4835
-    components:
-    - pos: -3.5,-29.5
-      parent: 31
-      type: Transform
-  - uid: 4836
-    components:
-    - pos: 1.5,-30.5
-      parent: 31
-      type: Transform
   - uid: 4837
     components:
     - pos: 1.5,-31.5
@@ -67632,11 +66418,6 @@ entities:
     - pos: 37.5,8.5
       parent: 31
       type: Transform
-  - uid: 6607
-    components:
-    - pos: 29.5,12.5
-      parent: 31
-      type: Transform
   - uid: 6608
     components:
     - pos: 29.5,13.5
@@ -67872,11 +66653,6 @@ entities:
     - pos: -18.5,-30.5
       parent: 31
       type: Transform
-  - uid: 7439
-    components:
-    - pos: -3.5,-30.5
-      parent: 31
-      type: Transform
   - uid: 7440
     components:
     - pos: -3.5,-31.5
@@ -67892,6 +66668,11 @@ entities:
     - pos: -3.5,-32.5
       parent: 31
       type: Transform
+  - uid: 7475
+    components:
+    - pos: -30.5,19.5
+      parent: 31
+      type: Transform
   - uid: 7485
     components:
     - rot: 1.5707963267948966 rad
@@ -68118,6 +66899,11 @@ entities:
     - pos: 39.5,-15.5
       parent: 31
       type: Transform
+  - uid: 8220
+    components:
+    - pos: -30.5,18.5
+      parent: 31
+      type: Transform
   - uid: 8452
     components:
     - pos: -25.5,-25.5
@@ -68554,6 +67340,11 @@ entities:
     - pos: -24.5,-30.5
       parent: 31
       type: Transform
+  - uid: 9527
+    components:
+    - pos: 28.5,11.5
+      parent: 31
+      type: Transform
   - uid: 9705
     components:
     - rot: 3.141592653589793 rad
@@ -68734,6 +67525,17 @@ entities:
       pos: -31.5,1.5
       parent: 31
       type: Transform
+  - uid: 251
+    components:
+    - pos: -33.5,16.5
+      parent: 31
+      type: Transform
+  - uid: 253
+    components:
+    - rot: -1.5707963267948966 rad
+      pos: 6.5,-3.5
+      parent: 31
+      type: Transform
   - uid: 343
     components:
     - rot: 1.5707963267948966 rad
@@ -69375,11 +68177,6 @@ entities:
     - pos: -34.5,11.5
       parent: 31
       type: Transform
-  - uid: 1796
-    components:
-    - pos: -31.5,15.5
-      parent: 31
-      type: Transform
   - uid: 1811
     components:
     - pos: -17.5,2.5
@@ -70726,11 +69523,27 @@ entities:
     - pos: -19.5,-6.5
       parent: 31
       type: Transform
+  - uid: 7463
+    components:
+    - pos: -33.5,18.5
+      parent: 31
+      type: Transform
+  - uid: 7478
+    components:
+    - pos: -30.5,17.5
+      parent: 31
+      type: Transform
   - uid: 7558
     components:
     - pos: 15.5,13.5
       parent: 31
       type: Transform
+  - uid: 7626
+    components:
+    - rot: -1.5707963267948966 rad
+      pos: 7.5,-3.5
+      parent: 31
+      type: Transform
   - uid: 7952
     components:
     - pos: 23.5,-20.5
@@ -70788,11 +69601,32 @@ entities:
     - pos: 16.5,-13.5
       parent: 31
       type: Transform
+  - uid: 9123
+    components:
+    - rot: -1.5707963267948966 rad
+      pos: 8.5,-3.5
+      parent: 31
+      type: Transform
   - uid: 9169
     components:
     - pos: -38.5,-2.5
       parent: 31
       type: Transform
+  - uid: 9191
+    components:
+    - pos: -33.5,15.5
+      parent: 31
+      type: Transform
+  - uid: 9224
+    components:
+    - pos: -31.5,15.5
+      parent: 31
+      type: Transform
+  - uid: 9228
+    components:
+    - pos: -30.5,16.5
+      parent: 31
+      type: Transform
   - uid: 9252
     components:
     - pos: -21.5,-17.5
@@ -70962,6 +69796,11 @@ entities:
       type: Transform
 - proto: WardrobeChapelFilled
   entities:
+  - uid: 9515
+    components:
+    - pos: -32.5,18.5
+      parent: 31
+      type: Transform
   - uid: 10214
     components:
     - pos: -39.5,19.5
@@ -71208,6 +70047,13 @@ entities:
       type: Transform
     - location: observatory
       type: WarpPoint
+  - uid: 8316
+    components:
+    - pos: -36.5,15.5
+      parent: 31
+      type: Transform
+    - location: chapel
+      type: WarpPoint
   - uid: 9344
     components:
     - pos: -36.5,-8.5
@@ -71241,6 +70087,11 @@ entities:
     - pos: 1.5,16.5
       parent: 31
       type: Transform
+  - uid: 5231
+    components:
+    - pos: 0.5,-31.5
+      parent: 31
+      type: Transform
   - uid: 9097
     components:
     - pos: -1.5,31.5
@@ -71258,15 +70109,11 @@ entities:
     - pos: 49.376537,-26.384869
       parent: 31
       type: Transform
-    - nextSound: 1033.463258
-      type: EmitSoundOnCollide
   - uid: 10144
     components:
     - pos: 49.376537,-26.384869
       parent: 31
       type: Transform
-    - nextSound: 1034.2956043
-      type: EmitSoundOnCollide
 - proto: WaterTankFull
   entities:
   - uid: 1162
@@ -71274,11 +70121,6 @@ entities:
     - pos: 27.5,-2.5
       parent: 31
       type: Transform
-  - uid: 1375
-    components:
-    - pos: 35.5,-3.5
-      parent: 31
-      type: Transform
   - uid: 7573
     components:
     - pos: -17.5,-11.5
@@ -71415,10 +70257,6 @@ entities:
     - pos: -8.457573,20.768534
       parent: 31
       type: Transform
-    - nextFire: 632.0701977
-      type: Gun
-    - nextSound: 632.2701977
-      type: EmitSoundOnCollide
 - proto: WeaponWaterBlaster
   entities:
   - uid: 8127
@@ -71569,6 +70407,20 @@ entities:
     - pos: -39.5,16.5
       parent: 31
       type: Transform
+- proto: WindoorChemistryLocked
+  entities:
+  - uid: 9226
+    components:
+    - rot: 3.141592653589793 rad
+      pos: 15.5,-3.5
+      parent: 31
+      type: Transform
+  - uid: 9227
+    components:
+    - rot: 1.5707963267948966 rad
+      pos: 13.5,-0.5
+      parent: 31
+      type: Transform
 - proto: WindoorCommandLocked
   entities:
   - uid: 5058
@@ -71651,20 +70503,6 @@ entities:
       pos: -15.5,0.5
       parent: 31
       type: Transform
-- proto: WindoorMedicalLocked
-  entities:
-  - uid: 3883
-    components:
-    - rot: 3.141592653589793 rad
-      pos: 15.5,-3.5
-      parent: 31
-      type: Transform
-  - uid: 5085
-    components:
-    - rot: 1.5707963267948966 rad
-      pos: 13.5,-0.5
-      parent: 31
-      type: Transform
 - proto: WindoorScienceLocked
   entities:
   - uid: 5057
@@ -71712,6 +70550,12 @@ entities:
       type: Transform
 - proto: Window
   entities:
+  - uid: 264
+    components:
+    - rot: -1.5707963267948966 rad
+      pos: 8.5,-7.5
+      parent: 31
+      type: Transform
   - uid: 668
     components:
     - pos: 17.5,-18.5
@@ -71740,11 +70584,6 @@ entities:
       pos: -3.5,2.5
       parent: 31
       type: Transform
-  - uid: 1026
-    components:
-    - pos: -33.5,18.5
-      parent: 31
-      type: Transform
   - uid: 1190
     components:
     - pos: -18.5,2.5
@@ -71785,11 +70624,6 @@ entities:
     - pos: -2.5,-18.5
       parent: 31
       type: Transform
-  - uid: 1474
-    components:
-    - pos: 5.5,-5.5
-      parent: 31
-      type: Transform
   - uid: 1497
     components:
     - pos: 7.5,2.5
@@ -71815,11 +70649,6 @@ entities:
     - pos: 11.5,2.5
       parent: 31
       type: Transform
-  - uid: 2143
-    components:
-    - pos: 5.5,-4.5
-      parent: 31
-      type: Transform
   - uid: 2197
     components:
     - pos: 20.5,-5.5
@@ -71831,24 +70660,15 @@ entities:
       pos: -2.5,2.5
       parent: 31
       type: Transform
-  - uid: 5225
-    components:
-    - pos: -33.5,17.5
-      parent: 31
-      type: Transform
-  - uid: 6512
-    components:
-    - pos: -33.5,16.5
-      parent: 31
-      type: Transform
   - uid: 7596
     components:
     - pos: 8.5,-11.5
       parent: 31
       type: Transform
-  - uid: 7822
+  - uid: 9517
     components:
-    - pos: 8.5,-7.5
+    - rot: -1.5707963267948966 rad
+      pos: 8.5,-5.5
       parent: 31
       type: Transform
 - proto: WindowDirectional
@@ -72040,19 +70860,11 @@ entities:
     - pos: -5.431781,-26.414207
       parent: 31
       type: Transform
-    - nextAttack: 340.6832329
-      type: MeleeWeapon
-    - nextSound: 340.8832329
-      type: EmitSoundOnCollide
   - uid: 71
     components:
     - pos: -5.431781,-26.414207
       parent: 31
       type: Transform
-    - nextAttack: 341.4502656
-      type: MeleeWeapon
-    - nextSound: 341.6502656
-      type: EmitSoundOnCollide
   - uid: 2212
     components:
     - pos: 7.5431976,-17.433199
@@ -72063,55 +70875,31 @@ entities:
     - pos: -5.431781,-26.414207
       parent: 31
       type: Transform
-    - nextAttack: 340.3505112
-      type: MeleeWeapon
-    - nextSound: 340.5505112
-      type: EmitSoundOnCollide
   - uid: 9719
     components:
     - pos: -5.431781,-26.414207
       parent: 31
       type: Transform
-    - nextAttack: 341.6519107
-      type: MeleeWeapon
-    - nextSound: 341.8519107
-      type: EmitSoundOnCollide
   - uid: 9720
     components:
     - pos: -5.431781,-26.414207
       parent: 31
       type: Transform
-    - nextAttack: 341.9933034
-      type: MeleeWeapon
-    - nextSound: 342.1933034
-      type: EmitSoundOnCollide
   - uid: 9776
     components:
     - pos: -5.431781,-26.414207
       parent: 31
       type: Transform
-    - nextAttack: 341.0858256
-      type: MeleeWeapon
-    - nextSound: 341.2858256
-      type: EmitSoundOnCollide
   - uid: 9784
     components:
     - pos: -5.431781,-26.414207
       parent: 31
       type: Transform
-    - nextAttack: 339.5461661
-      type: MeleeWeapon
-    - nextSound: 339.7461661
-      type: EmitSoundOnCollide
   - uid: 9785
     components:
     - pos: -5.431781,-26.414207
       parent: 31
       type: Transform
-    - nextAttack: 339.9493737
-      type: MeleeWeapon
-    - nextSound: 340.1493737
-      type: EmitSoundOnCollide
 - proto: YellowOxygenTankFilled
   entities:
   - uid: 4626
diff --git a/Resources/Prototypes/Maps/saltern.yml b/Resources/Prototypes/Maps/saltern.yml
index 1c5cb50d2ea1b6241f62d8e6008d065c92ca916a..7301c274a305213818cc60c954644b351b04845c 100644 (file)
--- a/Resources/Prototypes/Maps/saltern.yml
+++ b/Resources/Prototypes/Maps/saltern.yml
@@ -45,6 +45,4 @@
         MedicalIntern: [ 2, 2 ]
         ServiceWorker: [ 2, 2 ]
         SecurityCadet: [ 2, 2 ]
-        Detective: [ 1, 1 ]
         Warden: [ 1, 1 ]
-        Zookeeper: [1, 1]
Форк Space Station 14 с переводами на русский