Merge pull request #212 from mersen-tyn/maps_mersen

Add shuttle Hercules and fix's Pot
Corvax-Frontier · May 26, 2024 · c19e2f2 · c19e2f2
2 parents 8a2acf5 + 32c15be
commit c19e2f2
Show file tree

Hide file tree

Showing 4 changed files with 3,169 additions and 45 deletions.
diff --git a/Resources/Maps/CorvaxFrontier/Shuttles/Pot.yml b/Resources/Maps/CorvaxFrontier/Shuttles/Pot.yml
@@ -19,10 +19,10 @@ entities:
       pos: -0.032076478,5.0928283
       parent: invalid
     - type: AutoDelete
-      delayToCheck: 60
-      delayToDelete: 2400
       distanceToCheck: 40
-      isHumanoidNear: true
+      delayToDelete: 2400
+      delayToCheck: 60
+      isHumanoidNear: True
     - type: MapGrid
       chunks:
         0,0:
@@ -410,6 +410,12 @@ entities:
       parent: 1
 - proto: AirlockExternal
   entities:
+  - uid: 49
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -4.5,-6.5
+      parent: 1
   - uid: 230
     components:
     - type: Transform
@@ -422,6 +428,12 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 9.5,-8.5
       parent: 1
+  - uid: 332
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 10.5,-6.5
+      parent: 1
 - proto: AirlockShuttle
   entities:
   - uid: 392
@@ -463,6 +475,12 @@ entities:
     - type: Transform
       pos: 1.5,-13.5
       parent: 1
+  - uid: 24
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 10.5,-6.5
+      parent: 1
   - uid: 110
     components:
     - type: Transform
@@ -499,6 +517,12 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 9.5,-8.5
       parent: 1
+  - uid: 331
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -4.5,-6.5
+      parent: 1
 - proto: BlastDoor
   entities:
   - uid: 114
@@ -1987,24 +2011,6 @@ entities:
     - type: DeviceLinkSink
       links:
       - 312
-  - uid: 331
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -4.5,-5.5
-      parent: 1
-    - type: DeviceLinkSink
-      links:
-      - 312
-  - uid: 332
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 10.5,-5.5
-      parent: 1
-    - type: DeviceLinkSink
-      links:
-      - 313
   - uid: 333
     components:
     - type: Transform
@@ -2270,9 +2276,6 @@ entities:
         330:
         - On: On
         - Off: Off
-        331:
-        - Off: Off
-        - On: On
         328:
         - On: Off
         - Off: On
@@ -2292,9 +2295,6 @@ entities:
         333:
         - Off: Off
         - On: On
-        332:
-        - Off: Off
-        - On: On
         329:
         - Off: On
         - On: Off
@@ -2318,6 +2318,13 @@ entities:
     - type: Transform
       pos: 3.5,-3.5
       parent: 1
+- proto: SpawnPointLatejoin
+  entities:
+  - uid: 395
+    components:
+    - type: Transform
+      pos: 2.5,-11.5
+      parent: 1
 - proto: SpawnPointPilot
   entities:
   - uid: 375
@@ -2589,11 +2596,6 @@ entities:
     - type: Transform
       pos: -3.5,-7.5
       parent: 1
-  - uid: 24
-    components:
-    - type: Transform
-      pos: -4.5,-6.5
-      parent: 1
   - uid: 25
     components:
     - type: Transform
@@ -2698,11 +2700,6 @@ entities:
     - type: Transform
       pos: 11.5,-6.5
       parent: 1
-  - uid: 49
-    components:
-    - type: Transform
-      pos: 10.5,-6.5
-      parent: 1
   - uid: 50
     components:
     - type: Transform
@@ -2940,11 +2937,4 @@ entities:
     - type: Transform
       pos: 3.5,-6.5
       parent: 1
-- proto: SpawnPointLatejoin
-  entities:
-  - uid: 395
-    components:
-    - type: Transform
-      pos: 2.5,-11.5
-      parent: 1
 ...