From b760ff2175e32a27183c111f3710734777e8f345 Mon Sep 17 00:00:00 2001
From: Unkn0wn_Gh0st <shadowstalkermll@gmail.com>
Date: Thu, 26 Dec 2024 13:43:42 -0600
Subject: [PATCH] Patches and what not

---
 Resources/Maps/shoukou.yml            | 33 ++++++++++++++++-----------
 Resources/Prototypes/Maps/shoukou.yml |  1 -
 2 files changed, 20 insertions(+), 14 deletions(-)

diff --git a/Resources/Maps/shoukou.yml b/Resources/Maps/shoukou.yml
index f34bb93c8b4..6804a4d8f97 100644
--- a/Resources/Maps/shoukou.yml
+++ b/Resources/Maps/shoukou.yml
@@ -3341,13 +3341,13 @@ entities:
             2: 3
           -10,-10:
             0: 63232
-            6: 14
+            4: 14
           -10,-12:
             0: 14
             3: 3584
           -10,-11:
-            4: 14
-            5: 3584
+            5: 14
+            6: 3584
           -10,-13:
             0: 61166
           -9,-13:
@@ -4144,9 +4144,9 @@ entities:
           temperature: 293.15
           moles:
           - 0
+          - 6666.982
           - 0
           - 0
-          - 6666.982
           - 0
           - 0
           - 0
@@ -4158,10 +4158,10 @@ entities:
         - volume: 2500
           temperature: 293.15
           moles:
-          - 6666.982
           - 0
           - 0
           - 0
+          - 6666.982
           - 0
           - 0
           - 0
@@ -4173,7 +4173,6 @@ entities:
         - volume: 2500
           temperature: 293.15
           moles:
-          - 0
           - 6666.982
           - 0
           - 0
@@ -4185,6 +4184,7 @@ entities:
           - 0
           - 0
           - 0
+          - 0
         chunkSize: 4
     - type: OccluderTree
     - type: Shuttle
@@ -6930,7 +6930,7 @@ entities:
       pos: 18.5,-7.5
       parent: 2
     - type: Door
-      secondsUntilStateChange: -215705.31
+      secondsUntilStateChange: -216175.17
       state: Opening
     - type: DeviceLinkSource
       lastSignals:
@@ -37181,7 +37181,7 @@ entities:
       pos: 31.5,-36.5
       parent: 2
     - type: Door
-      secondsUntilStateChange: -49896.758
+      secondsUntilStateChange: -50366.625
       state: Closing
   - uid: 5409
     components:
@@ -70189,13 +70189,20 @@ entities:
     - type: Transform
       pos: 63.5,-27.5
       parent: 2
-- proto: HolopadCargoBayLongRange
+- proto: HolopadCargoBay
   entities:
-  - uid: 15918
+  - uid: 15994
     components:
     - type: Transform
       pos: -10.5,-34.5
       parent: 2
+- proto: HolopadCargoBayLongRange
+  entities:
+  - uid: 15917
+    components:
+    - type: Transform
+      pos: -18.5,-41.5
+      parent: 2
 - proto: HolopadCargoFront
   entities:
   - uid: 15933
@@ -70212,17 +70219,17 @@ entities:
       parent: 2
 - proto: HolopadCommandBridge
   entities:
-  - uid: 15917
+  - uid: 15918
     components:
     - type: Transform
-      pos: 45.5,-32.5
+      pos: 44.5,-32.5
       parent: 2
 - proto: HolopadCommandBridgeLongRange
   entities:
   - uid: 15985
     components:
     - type: Transform
-      pos: 44.5,-32.5
+      pos: 44.5,-36.5
       parent: 2
 - proto: HolopadCommandCaptain
   entities:
diff --git a/Resources/Prototypes/Maps/shoukou.yml b/Resources/Prototypes/Maps/shoukou.yml
index 33ad0ff818a..3a2e507e2f5 100644
--- a/Resources/Prototypes/Maps/shoukou.yml
+++ b/Resources/Prototypes/Maps/shoukou.yml
@@ -69,7 +69,6 @@
             SalvageSpecialist: [ 2, 4 ]
             Courier: [ 1, 2 ]
             CargoTechnician: [ 2, 3 ]
-            CargoAssistant: [ 2, 3 ]
           #Silicon
             StationAi: [ 1, 1 ]
             Borg: [ 2, 2 ]