diff --git a/Resources/Maps/shoukou.yml b/Resources/Maps/shoukou.yml
index 42208f49cb..cde0ce9590 100644
--- a/Resources/Maps/shoukou.yml
+++ b/Resources/Maps/shoukou.yml
@@ -6733,7 +6733,7 @@ entities:
       pos: 18.5,-7.5
       parent: 2
     - type: Door
-      secondsUntilStateChange: -166720.36
+      secondsUntilStateChange: -167812.6
       state: Opening
     - type: DeviceLinkSource
       lastSignals:
@@ -35919,7 +35919,7 @@ entities:
       pos: 31.5,-36.5
       parent: 2
     - type: Door
-      secondsUntilStateChange: -911.7778
+      secondsUntilStateChange: -2004.0092
       state: Closing
   - uid: 5409
     components:
@@ -35944,13 +35944,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -29.5,4.5
       parent: 2
-- proto: CyberPen
-  entities:
-  - uid: 15550
-    components:
-    - type: Transform
-      pos: 38.60041,-12.841616
-      parent: 2
 - proto: CyborgEndoskeleton
   entities:
   - uid: 5410
@@ -39798,7 +39791,7 @@ entities:
   - uid: 6038
     components:
     - type: Transform
-      pos: -8.266013,-29.266947
+      pos: -8.720007,-29.222837
       parent: 2
 - proto: DrinkWaterCup
   entities:
@@ -71816,7 +71809,7 @@ entities:
   - uid: 14928
     components:
     - type: Transform
-      pos: 72.5058,-23.445868
+      pos: 72.70667,-23.536297
       parent: 2
 - proto: PlushieLamp
   entities:
@@ -81955,12 +81948,12 @@ entities:
   - uid: 11962
     components:
     - type: Transform
-      pos: -34.5,-37.5
+      pos: -45.5,-30.5
       parent: 2
-  - uid: 11963
+  - uid: 12127
     components:
     - type: Transform
-      pos: -34.5,-36.5
+      pos: -47.5,-27.5
       parent: 2
 - proto: SpawnPointBartender
   entities:
@@ -82326,67 +82319,67 @@ entities:
       parent: 2
 - proto: SpawnPointMedicalDoctor
   entities:
-  - uid: 12022
-    components:
-    - type: Transform
-      pos: 3.5,-33.5
-      parent: 2
   - uid: 12023
     components:
     - type: Transform
-      pos: 3.5,-32.5
+      pos: 5.5,-26.5
       parent: 2
   - uid: 12024
     components:
     - type: Transform
-      pos: 6.5,-33.5
+      pos: -0.5,-40.5
       parent: 2
   - uid: 12025
     components:
     - type: Transform
-      pos: 6.5,-32.5
+      pos: 0.5,-31.5
       parent: 2
   - uid: 12026
     components:
     - type: Transform
-      pos: 5.5,-33.5
+      pos: -0.5,-36.5
       parent: 2
   - uid: 12027
     components:
     - type: Transform
-      pos: 4.5,-33.5
+      pos: 5.5,-33.5
       parent: 2
   - uid: 12028
     components:
     - type: Transform
-      pos: 4.5,-32.5
+      pos: 10.5,-41.5
       parent: 2
   - uid: 12029
     components:
     - type: Transform
-      pos: 5.5,-32.5
+      pos: 7.5,-41.5
       parent: 2
-- proto: SpawnPointMedicalIntern
-  entities:
   - uid: 12030
     components:
     - type: Transform
-      pos: 6.5,-34.5
+      pos: 10.5,-36.5
       parent: 2
+- proto: SpawnPointMedicalIntern
+  entities:
   - uid: 12031
-    components:
-    - type: Transform
-      pos: 6.5,-35.5
-      parent: 2
-  - uid: 12032
     components:
     - type: Transform
       pos: 3.5,-34.5
       parent: 2
+  - uid: 12032
+    components:
+    - type: Transform
+      pos: 4.5,-31.5
+      parent: 2
   - uid: 12033
     components:
     - type: Transform
-      pos: 3.5,-35.5
+      pos: 3.5,-38.5
+      parent: 2
+  - uid: 12122
+    components:
+    - type: Transform
+      pos: 6.5,-37.5
       parent: 2
 - proto: SpawnPointMime
   entities:
@@ -82866,52 +82859,52 @@ entities:
       parent: 2
 - proto: SpawnPointStationEngineer
   entities:
-  - uid: 12122
+  - uid: 11963
     components:
     - type: Transform
-      pos: -30.5,-37.5
+      pos: -45.5,-27.5
       parent: 2
-  - uid: 12123
+  - uid: 12022
     components:
     - type: Transform
-      pos: -30.5,-38.5
-      parent: 2
-  - uid: 12124
-    components:
-    - type: Transform
-      pos: -30.5,-39.5
-      parent: 2
-  - uid: 12125
-    components:
-    - type: Transform
-      pos: -30.5,-36.5
-      parent: 2
-  - uid: 12126
-    components:
-    - type: Transform
-      pos: -30.5,-35.5
-      parent: 2
-- proto: SpawnPointTechnicalAssistant
-  entities:
-  - uid: 12127
-    components:
-    - type: Transform
-      pos: -32.5,-40.5
+      pos: -46.5,-26.5
       parent: 2
   - uid: 12128
     components:
     - type: Transform
-      pos: -34.5,-40.5
+      pos: -40.5,-27.5
       parent: 2
   - uid: 12129
     components:
     - type: Transform
-      pos: -34.5,-38.5
+      pos: -36.5,-27.5
       parent: 2
   - uid: 12130
     components:
     - type: Transform
-      pos: -34.5,-39.5
+      pos: -32.5,-30.5
+      parent: 2
+- proto: SpawnPointTechnicalAssistant
+  entities:
+  - uid: 12123
+    components:
+    - type: Transform
+      pos: -29.5,-34.5
+      parent: 2
+  - uid: 12124
+    components:
+    - type: Transform
+      pos: -29.5,-30.5
+      parent: 2
+  - uid: 12125
+    components:
+    - type: Transform
+      pos: -38.5,-27.5
+      parent: 2
+  - uid: 12126
+    components:
+    - type: Transform
+      pos: -39.5,-30.5
       parent: 2
 - proto: SpawnPointWarden
   entities: