cherry pick 5

Corvax-Frontier · Jan 14, 2025 · 22b79a3 · 22b79a3
1 parent 068e2d1
commit 22b79a3
Show file tree

Hide file tree

Showing 43 changed files with 197,142 additions and 18,487 deletions.
diff --git a/Resources/Maps/Corvax/Bluespace/bloodmoon.yml b/Resources/Maps/Corvax/Bluespace/bloodmoon.yml
diff --git a/Resources/Maps/Corvax/Bluespace/cache.yml b/Resources/Maps/Corvax/Bluespace/cache.yml
diff --git a/Resources/Maps/Corvax/Bluespace/cave.yml b/Resources/Maps/Corvax/Bluespace/cave.yml
diff --git a/Resources/Maps/Corvax/Bluespace/corvaxFrontier.yml b/Resources/Maps/Corvax/Bluespace/corvaxFrontier.yml
diff --git a/Resources/Maps/Corvax/Bluespace/datacarrier.yml b/Resources/Maps/Corvax/Bluespace/datacarrier.yml
diff --git a/Resources/Maps/Corvax/Bluespace/mcevent.yml b/Resources/Maps/Corvax/Bluespace/mcevent.yml
diff --git a/Resources/Maps/Corvax/Bluespace/syndieftlintercept.yml b/Resources/Maps/Corvax/Bluespace/syndieftlintercept.yml
diff --git a/Resources/Maps/Corvax/Bluespace/vault.yml b/Resources/Maps/Corvax/Bluespace/vault.yml
diff --git a/Resources/Maps/Corvax/Bluespace/vaultsmall.yml b/Resources/Maps/Corvax/Bluespace/vaultsmall.yml
diff --git a/Resources/Maps/Corvax/Bluespace/wizardprobealt.yml b/Resources/Maps/Corvax/Bluespace/wizardprobealt.yml
diff --git a/Resources/Maps/Corvax/Outpost/corvaxFrontier.yml b/Resources/Maps/Corvax/Outpost/corvaxFrontier.yml
diff --git a/Resources/Maps/Corvax/POI/Bar.yml b/Resources/Maps/Corvax/POI/Bar.yml
diff --git a/Resources/Maps/Corvax/POI/Bunkeralfa.yml b/Resources/Maps/Corvax/POI/Bunkeralfa.yml
diff --git a/Resources/Maps/Corvax/POI/Epsilon.yml b/Resources/Maps/Corvax/POI/Epsilon.yml
diff --git a/Resources/Maps/Corvax/POI/Hospital.yml b/Resources/Maps/Corvax/POI/Hospital.yml
diff --git a/Resources/Maps/Corvax/POI/Lab.yml b/Resources/Maps/Corvax/POI/Lab.yml
diff --git a/Resources/Maps/Corvax/POI/Oblomok.yml b/Resources/Maps/Corvax/POI/Oblomok.yml
diff --git a/Resources/Maps/Corvax/Shuttles/Medical/Konserva.yml b/Resources/Maps/Corvax/Shuttles/Medical/Konserva.yml
diff --git a/Resources/Maps/Corvax/Shuttles/Nfsd/Dakota.yml b/Resources/Maps/Corvax/Shuttles/Nfsd/Dakota.yml
diff --git a/Resources/Maps/Corvax/Shuttles/Nfsd/Gast.yml b/Resources/Maps/Corvax/Shuttles/Nfsd/Gast.yml
diff --git a/Resources/Maps/Corvax/Shuttles/Nfsd/Orion.yml b/Resources/Maps/Corvax/Shuttles/Nfsd/Orion.yml
diff --git a/Resources/Maps/Corvax/Shuttles/Nfsd/hammer.yml b/Resources/Maps/Corvax/Shuttles/Nfsd/hammer.yml
@@ -1258,14 +1258,14 @@ entities:
           showEnts: False
           occludes: True
           ents:
-          - 106
-          - 104
-          - 101
-          - 100
-          - 102
-          - 103
-          - 105
           - 99
+          - 105
+          - 103
+          - 102
+          - 100
+          - 101
+          - 104
+          - 106
 - proto: ClothingBeltUtilityFilled
   entities:
   - uid: 99
@@ -1284,9 +1284,9 @@ entities:
     - type: Physics
       canCollide: False
     - type: InsideEntityStorage
-- proto: ComputerTabletopAdvancedRadar
+- proto: ComputerTabletopRadar
   entities:
-  - uid: 282
+  - uid: 92
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
@@ -2192,7 +2192,7 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -3.5,0.5
       parent: 1
-- proto: WarpPointShip
+- proto: WarpPoint
   entities:
   - uid: 212
     components: