diff --git a/Resources/Maps/submarine.yml b/Resources/Maps/submarine.yml
index 86d7424f46b..624eb4ea1fb 100644
--- a/Resources/Maps/submarine.yml
+++ b/Resources/Maps/submarine.yml
@@ -515,7 +515,7 @@ entities:
           version: 6
         -1,5:
           ind: -1,5
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAATgAAAAAAegAAAAAATgAAAAAAegAAAAAATgAAAAAAeQAAAAAAAAAAAAAAAAAAAAAATgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAATgAAAAAAegAAAAAATgAAAAAAegAAAAAATgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAATgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAATgAAAAAAegAAAAAATgAAAAAAegAAAAAATgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAATgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAATgAAAAAAegAAAAAATgAAAAAAegAAAAAATgAAAAAAeQAAAAAAAAAAAAAAeQAAAAAATgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAATgAAAAAAegAAAAAATgAAAAAAegAAAAAATgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAATgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAATgAAAAAAegAAAAAATgAAAAAAegAAAAAATgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAATgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
           version: 6
         0,5:
           ind: 0,5
@@ -20233,19 +20233,6 @@ entities:
     - type: Transform
       pos: -67.5,33.5
       parent: 2
-- proto: AlwaysPoweredLightColoredRed
-  entities:
-  - uid: 4888
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -28.5,45.5
-      parent: 2
-  - uid: 28968
-    components:
-    - type: Transform
-      pos: -20.5,48.5
-      parent: 2
 - proto: AmeController
   entities:
   - uid: 18616
@@ -111183,7 +111170,7 @@ entities:
       pos: -34.5,7.5
       parent: 2
     - type: Door
-      secondsUntilStateChange: -29872.84
+      secondsUntilStateChange: -30472.742
       state: Closing
   - uid: 24108
     components:
@@ -111317,7 +111304,7 @@ entities:
       pos: -34.5,-36.5
       parent: 2
     - type: Door
-      secondsUntilStateChange: -94085.625
+      secondsUntilStateChange: -94685.52
   - uid: 25327
     components:
     - type: Transform
@@ -160295,7 +160282,7 @@ entities:
       pos: 12.5,14.5
       parent: 2
     - type: Door
-      secondsUntilStateChange: -61059.59
+      secondsUntilStateChange: -61659.492
   - uid: 1457
     components:
     - type: Transform
@@ -160579,7 +160566,7 @@ entities:
       pos: -13.5,4.5
       parent: 2
     - type: Door
-      secondsUntilStateChange: -103129.77
+      secondsUntilStateChange: -103729.67
   - uid: 8381
     components:
     - type: Transform
@@ -168657,6 +168644,12 @@ entities:
       rot: 3.141592653589793 rad
       pos: -35.5,-44.5
       parent: 2
+  - uid: 10512
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -47.5,-49.5
+      parent: 2
   - uid: 12955
     components:
     - type: Transform
@@ -169481,8 +169474,8 @@ entities:
   - uid: 18166
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -6.5,-41.5
+      rot: 3.141592653589793 rad
+      pos: 82.5,70.5
       parent: 2
   - uid: 18167
     components:
@@ -169692,6 +169685,11 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -49.5,49.5
       parent: 2
+  - uid: 19926
+    components:
+    - type: Transform
+      pos: -6.5,-40.5
+      parent: 2
   - uid: 20970
     components:
     - type: Transform
@@ -170588,16 +170586,11 @@ entities:
     - type: Transform
       pos: -49.5,-40.5
       parent: 2
-  - uid: 31681
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -49.5,-49.5
-      parent: 2
   - uid: 31889
     components:
     - type: Transform
-      pos: -17.5,-48.5
+      rot: 3.141592653589793 rad
+      pos: 84.5,70.5
       parent: 2
   - uid: 32142
     components:
@@ -170630,7 +170623,8 @@ entities:
   - uid: 32467
     components:
     - type: Transform
-      pos: 83.5,72.5
+      rot: 1.5707963267948966 rad
+      pos: 89.5,56.5
       parent: 2
   - uid: 32684
     components:
@@ -170693,6 +170687,36 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -25.5,73.5
       parent: 2
+  - uid: 28968
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 13.5,80.5
+      parent: 2
+  - uid: 31681
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -10.5,80.5
+      parent: 2
+  - uid: 32654
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -1.5,80.5
+      parent: 2
+  - uid: 34042
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 4.5,80.5
+      parent: 2
+  - uid: 34043
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 80.5,-11.5
+      parent: 2
 - proto: PoweredLightColoredBlack
   entities:
   - uid: 8258
@@ -170707,6 +170731,17 @@ entities:
     - type: Transform
       pos: -74.5,-2.5
       parent: 2
+  - uid: 4888
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -28.5,45.5
+      parent: 2
+  - uid: 9796
+    components:
+    - type: Transform
+      pos: -20.5,48.5
+      parent: 2
   - uid: 29802
     components:
     - type: Transform
@@ -170741,15 +170776,10 @@ entities:
       parent: 2
 - proto: PoweredLightPostSmall
   entities:
-  - uid: 9796
-    components:
-    - type: Transform
-      pos: -89.5,-33.5
-      parent: 2
   - uid: 9797
     components:
     - type: Transform
-      pos: -90.5,-50.5
+      pos: -17.5,-50.5
       parent: 2
   - uid: 10448
     components:
@@ -170761,11 +170791,6 @@ entities:
     - type: Transform
       pos: -90.5,-59.5
       parent: 2
-  - uid: 10512
-    components:
-    - type: Transform
-      pos: -72.5,-33.5
-      parent: 2
   - uid: 10513
     components:
     - type: Transform
@@ -170886,26 +170911,11 @@ entities:
     - type: Transform
       pos: -79.5,69.5
       parent: 2
-  - uid: 35075
-    components:
-    - type: Transform
-      pos: 55.5,-46.5
-      parent: 2
-  - uid: 35076
-    components:
-    - type: Transform
-      pos: 64.5,-83.5
-      parent: 2
   - uid: 35077
     components:
     - type: Transform
       pos: 55.5,-56.5
       parent: 2
-  - uid: 35078
-    components:
-    - type: Transform
-      pos: 55.5,-66.5
-      parent: 2
   - uid: 35079
     components:
     - type: Transform
@@ -170957,12 +170967,6 @@ entities:
     - type: Transform
       pos: 84.5,56.5
       parent: 2
-  - uid: 32654
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 90.5,55.5
-      parent: 2
   - uid: 35793
     components:
     - type: Transform