Fix's Outpost Frontier and change shutlle's

Corvax-Frontier · Jul 7, 2024 · 7f985e2 · 7f985e2
1 parent 52c7c8a
commit 7f985e2
Show file tree

Hide file tree

Showing 20 changed files with 16,226 additions and 5,016 deletions.
diff --git a/Resources/Maps/CorvaxFrontier/Outpost/corvaxFrontier.yml b/Resources/Maps/CorvaxFrontier/Outpost/corvaxFrontier.yml
diff --git a/Resources/Maps/CorvaxFrontier/Shuttles/BlackMarket/QueenAnnesRevenge.yml b/Resources/Maps/CorvaxFrontier/Shuttles/BlackMarket/QueenAnnesRevenge.yml
diff --git a/Resources/Maps/CorvaxFrontier/Shuttles/BlackMarket/barnacle.yml b/Resources/Maps/CorvaxFrontier/Shuttles/BlackMarket/barnacle.yml
diff --git a/Resources/Maps/CorvaxFrontier/Shuttles/BlackMarket/bocakillo.yml b/Resources/Maps/CorvaxFrontier/Shuttles/BlackMarket/bocakillo.yml
diff --git a/Resources/Maps/CorvaxFrontier/Shuttles/BlackMarket/falcon.yml b/Resources/Maps/CorvaxFrontier/Shuttles/BlackMarket/falcon.yml
diff --git a/Resources/Maps/CorvaxFrontier/Shuttles/BlackMarket/schooner.yml b/Resources/Maps/CorvaxFrontier/Shuttles/BlackMarket/schooner.yml
diff --git a/Resources/Maps/CorvaxFrontier/Shuttles/Expedition/Sunset.yml b/Resources/Maps/CorvaxFrontier/Shuttles/Expedition/Sunset.yml
diff --git a/Resources/Maps/CorvaxFrontier/Shuttles/Expedition/zarya.yml b/Resources/Maps/CorvaxFrontier/Shuttles/Expedition/zarya.yml
@@ -2352,6 +2352,13 @@ entities:
       rot: 3.141592653589793 rad
       pos: 12.5,10.5
       parent: 2
+- proto: Autolathe
+  entities:
+  - uid: 994
+    components:
+    - type: Transform
+      pos: -5.5,7.5
+      parent: 2
 - proto: BarricadeBlock
   entities:
   - uid: 191
@@ -2499,6 +2506,18 @@ entities:
     - type: DeviceLinkSink
       links:
       - 1133
+- proto: BoxBeaker
+  entities:
+  - uid: 1158
+    components:
+    - type: Transform
+      pos: -7.6803064,-16.272043
+      parent: 2
+  - uid: 1161
+    components:
+    - type: Transform
+      pos: -7.2960873,-16.261017
+      parent: 2
 - proto: BoxBeanbag
   entities:
   - uid: 1740
@@ -2539,6 +2558,18 @@ entities:
     - type: Transform
       pos: 11.362995,4.549106
       parent: 2
+- proto: BoxSyringe
+  entities:
+  - uid: 1013
+    components:
+    - type: Transform
+      pos: -7.6646814,-16.600395
+      parent: 2
+  - uid: 1157
+    components:
+    - type: Transform
+      pos: -7.2584314,-16.600395
+      parent: 2
 - proto: BoxZiptie
   entities:
   - uid: 1734
@@ -4915,6 +4946,20 @@ entities:
       rot: 3.141592653589793 rad
       pos: 0.5,0.5
       parent: 2
+- proto: chem_master
+  entities:
+  - uid: 1239
+    components:
+    - type: Transform
+      pos: -8.5,-16.5
+      parent: 2
+- proto: CircuitImprinter
+  entities:
+  - uid: 993
+    components:
+    - type: Transform
+      pos: -5.5,8.5
+      parent: 2
 - proto: ClockworkGrille
   entities:
   - uid: 663
@@ -5110,6 +5155,13 @@ entities:
     - type: Transform
       pos: 9.5,11.5
       parent: 2
+- proto: ComputerAnalysisConsole
+  entities:
+  - uid: 1304
+    components:
+    - type: Transform
+      pos: -5.5,12.5
+      parent: 2
 - proto: ComputerBroken
   entities:
   - uid: 688
@@ -5130,6 +5182,14 @@ entities:
     - type: Transform
       pos: 6.5,12.5
       parent: 2
+- proto: ComputerResearchAndDevelopment
+  entities:
+  - uid: 690
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -11.5,5.5
+      parent: 2
 - proto: ComputerSalvageExpedition
   entities:
   - uid: 692
@@ -5153,20 +5213,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 1.5,3.5
       parent: 2
-- proto: ComputerTabletopBroken
-  entities:
-  - uid: 1158
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -10.5,-14.5
-      parent: 2
-  - uid: 1304
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -10.5,-13.5
-      parent: 2
 - proto: CrateGenericSteel
   entities:
   - uid: 1715
@@ -5574,7 +5620,7 @@ entities:
       pos: -3.5,-8.5
       parent: 2
     - type: Door
-      secondsUntilStateChange: -7464.3843
+      secondsUntilStateChange: -7906.6465
       state: Closing
   - uid: 749
     components:
@@ -5595,7 +5641,7 @@ entities:
       pos: 4.5,-6.5
       parent: 2
     - type: Door
-      secondsUntilStateChange: -8966.394
+      secondsUntilStateChange: -9408.656
       state: Closing
   - uid: 752
     components:
@@ -7776,6 +7822,13 @@ entities:
     - type: Transform
       pos: 0.5,-7.5
       parent: 2
+- proto: KitchenReagentGrinder
+  entities:
+  - uid: 1012
+    components:
+    - type: Transform
+      pos: -7.5,-13.5
+      parent: 2
 - proto: KukriKnife
   entities:
   - uid: 193
@@ -7799,23 +7852,6 @@ entities:
     - type: Transform
       pos: 5.5,-11.5
       parent: 2
-- proto: LockerMedical
-  entities:
-  - uid: 690
-    components:
-    - type: Transform
-      pos: -7.5,-15.5
-      parent: 2
-  - uid: 1013
-    components:
-    - type: Transform
-      pos: -4.5,-11.5
-      parent: 2
-  - uid: 1237
-    components:
-    - type: Transform
-      pos: -5.5,-10.5
-      parent: 2
 - proto: LockerMercenary
   entities:
   - uid: 1069
@@ -7888,9 +7924,9 @@ entities:
           showEnts: False
           occludes: True
           ent: null
-- proto: LockerParamedic
+- proto: LockerParamedicFilled
   entities:
-  - uid: 1249
+  - uid: 1728
     components:
     - type: Transform
       pos: -9.5,-13.5
@@ -7902,6 +7938,13 @@ entities:
     - type: Transform
       pos: 2.5,-12.5
       parent: 2
+- proto: LockerWallMedicalDoctorFilled
+  entities:
+  - uid: 1758
+    components:
+    - type: Transform
+      pos: -4.5,-10.5
+      parent: 2
 - proto: MachineAPE
   entities:
   - uid: 990
@@ -7911,35 +7954,29 @@ entities:
       parent: 2
     - type: ApcPowerReceiver
       powerLoad: 1
-- proto: MachineFrame
+- proto: MachineArtifactAnalyzer
   entities:
-  - uid: 208
-    components:
-    - type: Transform
-      pos: -5.5,12.5
-      parent: 2
-  - uid: 994
-    components:
-    - type: Transform
-      pos: -11.5,5.5
-      parent: 2
-  - uid: 1012
+  - uid: 1305
     components:
     - type: Transform
-      pos: -5.5,6.5
+      pos: 0.5,11.5
       parent: 2
+- proto: MachineCentrifuge
+  entities:
   - uid: 1236
     components:
     - type: Transform
-      pos: -5.5,7.5
+      pos: -10.5,-14.5
       parent: 2
-- proto: MachineFrameDestroyed
+- proto: MachineFlatpacker
   entities:
-  - uid: 985
+  - uid: 208
     components:
     - type: Transform
-      pos: -5.5,8.5
+      pos: -10.5,7.5
       parent: 2
+- proto: MachineFrameDestroyed
+  entities:
   - uid: 991
     components:
     - type: Transform
@@ -7950,31 +7987,11 @@ entities:
     - type: Transform
       pos: 3.5,4.5
       parent: 2
-  - uid: 993
-    components:
-    - type: Transform
-      pos: -11.5,4.5
-      parent: 2
   - uid: 1000
     components:
     - type: Transform
       pos: 6.5,-10.5
       parent: 2
-  - uid: 1161
-    components:
-    - type: Transform
-      pos: -8.5,-16.5
-      parent: 2
-  - uid: 1240
-    components:
-    - type: Transform
-      pos: -10.5,-16.5
-      parent: 2
-  - uid: 1305
-    components:
-    - type: Transform
-      pos: -9.5,-16.5
-      parent: 2
 - proto: Mattress
   entities:
   - uid: 1001
@@ -8004,17 +8021,17 @@ entities:
     - type: Transform
       pos: -3.5,-13.5
       parent: 2
-  - uid: 1239
+- proto: MedkitFilled
+  entities:
+  - uid: 1658
     components:
     - type: Transform
-      pos: -3.5,-15.5
+      pos: -10.621624,-13.427771
       parent: 2
-- proto: Medkit
-  entities:
-  - uid: 986
+  - uid: 1721
     components:
     - type: Transform
-      pos: -7.6391926,-10.50773
+      pos: -10.246624,-13.646672
       parent: 2
 - proto: Morgue
   entities:
@@ -8502,6 +8519,13 @@ entities:
       rot: 3.141592653589793 rad
       pos: 10.5,-4.5
       parent: 2
+- proto: Protolathe
+  entities:
+  - uid: 985
+    components:
+    - type: Transform
+      pos: -5.5,6.5
+      parent: 2
 - proto: Rack
   entities:
   - uid: 1025
@@ -8877,6 +8901,13 @@ entities:
     - type: Transform
       pos: 6.5,-11.5
       parent: 2
+- proto: ResearchAndDevelopmentServer
+  entities:
+  - uid: 986
+    components:
+    - type: Transform
+      pos: -11.5,4.5
+      parent: 2
 - proto: RiceBushel
   entities:
   - uid: 1766
@@ -9218,13 +9249,6 @@ entities:
     - type: Transform
       pos: 1.5603833,-7.5241213
       parent: 2
-- proto: SpawnDungeonLootKitsFirstAid
-  entities:
-  - uid: 1157
-    components:
-    - type: Transform
-      pos: -7.5076914,-13.463884
-      parent: 2
 - proto: SpawnDungeonLootMugs
   entities:
   - uid: 995
@@ -9676,6 +9700,13 @@ entities:
     - type: Transform
       pos: 8.5,-3.5
       parent: 2
+- proto: StasisBed
+  entities:
+  - uid: 1249
+    components:
+    - type: Transform
+      pos: -3.5,-15.5
+      parent: 2
 - proto: StoolBar
   entities:
   - uid: 699
@@ -10160,6 +10191,13 @@ entities:
     - type: Transform
       pos: 7.5,4.5
       parent: 2
+- proto: VendingMachineChemicals
+  entities:
+  - uid: 1240
+    components:
+    - type: Transform
+      pos: -9.5,-16.5
+      parent: 2
 - proto: VendingMachineClothing
   entities:
   - uid: 1302
@@ -10174,6 +10212,13 @@ entities:
     - type: Transform
       pos: 9.5,-9.5
       parent: 2
+- proto: VendingMachineMedical
+  entities:
+  - uid: 1237
+    components:
+    - type: Transform
+      pos: -8.5,-9.5
+      parent: 2
 - proto: VendingMachineTankDispenserEVA
   entities:
   - uid: 1241