Merge pull request #43 from Corvax-Frontier/maps_mersen

Больше шаттлов, вырезка медицины, и многое другое
Corvax-Frontier · Sep 28, 2024 · 43a73e7 · 43a73e7
2 parents 7b15b11 + 72c9286
commit 43a73e7
Show file tree

Hide file tree

Showing 34 changed files with 96,435 additions and 2,752 deletions.
diff --git a/Resources/Maps/Corvax/Bluespace/kontra.yml b/Resources/Maps/Corvax/Bluespace/kontra.yml
diff --git a/Resources/Maps/Corvax/Bluespace/sindi.yml b/Resources/Maps/Corvax/Bluespace/sindi.yml
diff --git a/Resources/Maps/Corvax/Outpost/corvaxFrontier.yml b/Resources/Maps/Corvax/Outpost/corvaxFrontier.yml
@@ -6992,7 +6992,7 @@ entities:
       pos: 38.5,-20.5
       parent: 1
     - type: Door
-      secondsUntilStateChange: -71883.02
+      secondsUntilStateChange: -72008.805
       state: Opening
     - type: DeviceLinkSource
       lastSignals:
@@ -7003,7 +7003,7 @@ entities:
       pos: 38.5,-19.5
       parent: 1
     - type: Door
-      secondsUntilStateChange: -71883.234
+      secondsUntilStateChange: -72009.016
       state: Opening
     - type: DeviceLinkSource
       lastSignals:
@@ -7014,7 +7014,7 @@ entities:
       pos: 38.5,-18.5
       parent: 1
     - type: Door
-      secondsUntilStateChange: -71883.47
+      secondsUntilStateChange: -72009.25
       state: Opening
     - type: DeviceLinkSource
       lastSignals:
@@ -7070,7 +7070,7 @@ entities:
       pos: 22.5,52.5
       parent: 1
     - type: Door
-      secondsUntilStateChange: -71298.54
+      secondsUntilStateChange: -71424.32
       state: Opening
     - type: DeviceLinkSource
       lastSignals:
@@ -7081,7 +7081,7 @@ entities:
       pos: 23.5,52.5
       parent: 1
     - type: Door
-      secondsUntilStateChange: -71297.86
+      secondsUntilStateChange: -71423.64
       state: Opening
     - type: DeviceLinkSource
       lastSignals:
@@ -7092,7 +7092,7 @@ entities:
       pos: 24.5,52.5
       parent: 1
     - type: Door
-      secondsUntilStateChange: -71298.375
+      secondsUntilStateChange: -71424.16
       state: Opening
     - type: DeviceLinkSource
       lastSignals:
@@ -7256,7 +7256,7 @@ entities:
       pos: 27.5,53.5
       parent: 1
     - type: Door
-      secondsUntilStateChange: -71300.44
+      secondsUntilStateChange: -71426.22
       state: Opening
     - type: DeviceLinkSource
       lastSignals:
@@ -7268,7 +7268,7 @@ entities:
       pos: 27.5,54.5
       parent: 1
     - type: Door
-      secondsUntilStateChange: -71300.2
+      secondsUntilStateChange: -71425.984
       state: Opening
     - type: DeviceLinkSource
       lastSignals:
@@ -7280,7 +7280,7 @@ entities:
       pos: 27.5,55.5
       parent: 1
     - type: Door
-      secondsUntilStateChange: -71299.97
+      secondsUntilStateChange: -71425.75
       state: Opening
     - type: DeviceLinkSource
       lastSignals:
@@ -7292,7 +7292,7 @@ entities:
       pos: 24.5,58.5
       parent: 1
     - type: Door
-      secondsUntilStateChange: -71303.7
+      secondsUntilStateChange: -71429.484
       state: Opening
     - type: DeviceLinkSource
       lastSignals:
@@ -7304,7 +7304,7 @@ entities:
       pos: 23.5,58.5
       parent: 1
     - type: Door
-      secondsUntilStateChange: -71302.77
+      secondsUntilStateChange: -71428.555
       state: Opening
     - type: DeviceLinkSource
       lastSignals:
@@ -7316,7 +7316,7 @@ entities:
       pos: 22.5,58.5
       parent: 1
     - type: Door
-      secondsUntilStateChange: -71303.49
+      secondsUntilStateChange: -71429.27
       state: Opening
     - type: DeviceLinkSource
       lastSignals:
@@ -7328,7 +7328,7 @@ entities:
       pos: 19.5,54.5
       parent: 1
     - type: Door
-      secondsUntilStateChange: -71299.24
+      secondsUntilStateChange: -71425.02
       state: Opening
     - type: DeviceLinkSource
       lastSignals:
@@ -7340,7 +7340,7 @@ entities:
       pos: 19.5,53.5
       parent: 1
     - type: Door
-      secondsUntilStateChange: -71299.02
+      secondsUntilStateChange: -71424.805
       state: Opening
     - type: DeviceLinkSource
       lastSignals:
@@ -7352,7 +7352,7 @@ entities:
       pos: 19.5,55.5
       parent: 1
     - type: Door
-      secondsUntilStateChange: -71299.45
+      secondsUntilStateChange: -71425.234
       state: Opening
     - type: DeviceLinkSource
       lastSignals:
@@ -7418,7 +7418,7 @@ entities:
       pos: -26.5,55.5
       parent: 1
     - type: Door
-      secondsUntilStateChange: -79120.67
+      secondsUntilStateChange: -79246.45
       state: Opening
     - type: DeviceLinkSource
       lastSignals:
@@ -7430,7 +7430,7 @@ entities:
       pos: -26.5,54.5
       parent: 1
     - type: Door
-      secondsUntilStateChange: -79121.9
+      secondsUntilStateChange: -79247.68
       state: Opening
     - type: DeviceLinkSource
       lastSignals:
@@ -7442,7 +7442,7 @@ entities:
       pos: -26.5,53.5
       parent: 1
     - type: Door
-      secondsUntilStateChange: -79122.1
+      secondsUntilStateChange: -79247.88
       state: Opening
     - type: DeviceLinkSource
       lastSignals:
@@ -14990,6 +14990,11 @@ entities:
     - type: Transform
       pos: -12.5,-11.5
       parent: 1
+  - uid: 350
+    components:
+    - type: Transform
+      pos: 9.5,11.5
+      parent: 1
   - uid: 907
     components:
     - type: Transform
@@ -16080,11 +16085,6 @@ entities:
     - type: Transform
       pos: 9.5,10.5
       parent: 1
-  - uid: 1355
-    components:
-    - type: Transform
-      pos: 9.5,11.5
-      parent: 1
   - uid: 1356
     components:
     - type: Transform
@@ -38835,15 +38835,15 @@ entities:
       pos: 17.5,22.5
       parent: 1
     - type: Door
-      secondsUntilStateChange: -163562.78
+      secondsUntilStateChange: -163688.56
       state: Opening
   - uid: 3184
     components:
     - type: Transform
       pos: 19.5,22.5
       parent: 1
     - type: Door
-      secondsUntilStateChange: -163563.16
+      secondsUntilStateChange: -163688.94
       state: Opening
   - uid: 3185
     components:
@@ -38856,31 +38856,31 @@ entities:
       pos: 20.5,18.5
       parent: 1
     - type: Door
-      secondsUntilStateChange: -163563.88
+      secondsUntilStateChange: -163689.66
       state: Opening
   - uid: 3187
     components:
     - type: Transform
       pos: 12.5,22.5
       parent: 1
     - type: Door
-      secondsUntilStateChange: -165028.84
+      secondsUntilStateChange: -165154.62
       state: Opening
   - uid: 3188
     components:
     - type: Transform
       pos: 14.5,22.5
       parent: 1
     - type: Door
-      secondsUntilStateChange: -165028.39
+      secondsUntilStateChange: -165154.17
       state: Opening
   - uid: 3191
     components:
     - type: Transform
       pos: -4.5,-10.5
       parent: 1
     - type: Door
-      secondsUntilStateChange: -85313.72
+      secondsUntilStateChange: -85439.5
       state: Opening
   - uid: 3212
     components:
@@ -39264,25 +39264,6 @@ entities:
     - type: Transform
       pos: 15.5,13.5
       parent: 1
-- proto: LockerMedicineFilled
-  entities:
-  - uid: 3207
-    components:
-    - type: Transform
-      pos: 9.5,11.5
-      parent: 1
-  - uid: 3208
-    components:
-    - type: Transform
-      pos: 8.5,11.5
-      parent: 1
-- proto: LockerParamedicFilledHardsuit
-  entities:
-  - uid: 3382
-    components:
-    - type: Transform
-      pos: 7.5,11.5
-      parent: 1
 - proto: LockerSecurityFilled
   entities:
   - uid: 5057
@@ -39515,53 +39496,6 @@ entities:
     - type: Transform
       pos: 12.5,20.5
       parent: 1
-- proto: MedkitBruteFilled
-  entities:
-  - uid: 3223
-    components:
-    - type: Transform
-      pos: 4.32409,12.80433
-      parent: 1
-- proto: MedkitBurnFilled
-  entities:
-  - uid: 3224
-    components:
-    - type: Transform
-      pos: 4.35534,13.391379
-      parent: 1
-- proto: MedkitFilled
-  entities:
-  - uid: 3225
-    components:
-    - type: Transform
-      pos: 14.841072,21.82725
-      parent: 1
-  - uid: 3226
-    components:
-    - type: Transform
-      pos: 4.339715,12.507455
-      parent: 1
-- proto: MedkitOxygenFilled
-  entities:
-  - uid: 3227
-    components:
-    - type: Transform
-      pos: 14.851385,21.488949
-      parent: 1
-- proto: MedkitRadiationFilled
-  entities:
-  - uid: 3228
-    components:
-    - type: Transform
-      pos: 4.339715,13.703879
-      parent: 1
-- proto: MedkitToxinFilled
-  entities:
-  - uid: 3229
-    components:
-    - type: Transform
-      pos: 4.339715,13.110129
-      parent: 1
 - proto: MopBucket
   entities:
   - uid: 3230
@@ -44794,7 +44728,6 @@ entities:
     - type: Transform
       pos: 4.5,-28.5
       parent: 1
-
 - proto: SurveillanceCameraCommand
   entities:
   - uid: 5883
@@ -46043,18 +45976,6 @@ entities:
     - type: Transform
       pos: 17.5,-12.5
       parent: 1
-- proto: VendingMachineCiviMedPlus
-  entities:
-  - uid: 3819
-    components:
-    - type: Transform
-      pos: 8.5,13.5
-      parent: 1
-  - uid: 3820
-    components:
-    - type: Transform
-      pos: 4.5,22.5
-      parent: 1
 - proto: VendingMachineMedicalFlatpack
   entities:
   - uid: 3257
@@ -51053,7 +50974,7 @@ entities:
       lastSignals:
         DoorStatus: True
     - type: Door
-      secondsUntilStateChange: -107343.05
+      secondsUntilStateChange: -107468.83
       state: Opening
   - uid: 4539
     components: