Fix upstream

space-syndicate · Dec 25, 2024 · 96d19e9 · 96d19e9
1 parent 78143b1
commit 96d19e9
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 35 deletions.
diff --git a/Resources/Prototypes/Corvax/Procedural/biome_templates.yml b/Resources/Prototypes/Corvax/Procedural/biome_templates.yml
@@ -31,21 +31,8 @@
       allowedTiles:
         - FloorPlanetGrass
       entities:
-        - FloraTree01
-        - FloraTree02
-        - FloraTree03
-        - FloraTree04
-        - FloraTree05
-        - FloraTree06
-        - FloraTreeLarge01
-        - FloraTreeLarge02
-        - FloraTreeLarge03
-        - FloraTreeLarge04
-        - FloraTreeLarge05
-        - FloraTreeLarge06
-        - FloraRockSolid01
-        - FloraRockSolid02
-        - FloraRockSolid03
+        - FloraTree
+        - FloraTreeLarge
         - FloraTreeStump
     - !type:BiomeDecalLayer
       allowedTiles:
@@ -89,14 +76,7 @@
       allowedTiles:
         - FloorCaveDrought
       entities:
-        - FloraStalagmite1
-        - FloraStalagmite2
-        - FloraStalagmite3
-        - FloraStalagmite4
-        - FloraStalagmite5
-        - FloraRockSolid01
-        - FloraRockSolid02
-        - FloraRockSolid03
+        - FloraStalagmite
         - CrystalOrange
     - !type:BiomeEntityLayer
       allowedTiles:
@@ -118,9 +98,7 @@
       allowedTiles:
         - FloorAsteroidSand
       entities:
-        - FloraRockSolid01
-        - FloraRockSolid02
-        - FloraRockSolid03
+        - FloraRockSolid
         - CrystalOrange
         - CrystalGrey
     - !type:BiomeEntityLayer
@@ -367,11 +345,8 @@
       allowedTiles:
         - FloorSnow
       entities:
-        - FloraTreeConifer01
-        - FloraTreeConifer02
-        - FloraTreeConifer03
-        - FloraTreeSnow01
-        - FloraTreeSnow06
+        - FloraTreeConifer
+        - FloraTreeSnow
     # Snow rock formations
     - !type:BiomeEntityLayer
       allowedTiles:
@@ -608,4 +583,4 @@
       noise:
         seed: 0
         frequency: 0.02
-        fractalType: None
+        fractalType: None
diff --git a/Resources/Prototypes/Maps/gate.yml b/Resources/Prototypes/Maps/gate.yml
@@ -18,6 +18,7 @@
           availableJobs:
             #service
             Captain: [ 1, 1 ]
+            IAA: [ 1, 1 ] # Corvax-IAA
             HeadOfPersonnel: [ 1, 1 ]
             Bartender: [ 2, 2 ]
             Botanist: [ 3, 3 ]
@@ -50,7 +51,7 @@
             SecurityOfficer: [ 6, 6 ]
             Detective: [ 1, 1 ]
             SecurityCadet: [ 4, 4 ]
-            Lawyer: [ 2, 2 ]
+            #Lawyer: [ 2, 2 ] # Corvax-IAA
             #supply
             Quartermaster: [ 1, 1 ]
             SalvageSpecialist: [ 3, 3 ]
@@ -62,4 +63,4 @@
             Musician: [ 1, 1 ]
             #silicon
             StationAi: [ 1, 1 ]
-            Borg: [ 2, 2 ]
+            Borg: [ 2, 2 ]
diff --git a/Resources/Prototypes/Maps/loop.yml b/Resources/Prototypes/Maps/loop.yml
@@ -19,6 +19,7 @@
           availableJobs:
             #command
             Captain: [ 1, 1 ]
+            IAA: [ 1, 1 ] # Corvax-IAA
             #service
             HeadOfPersonnel: [ 1, 1 ]
             Bartender: [ 2, 2 ]
@@ -49,7 +50,7 @@
             SecurityOfficer: [ 5, 5 ]
             Detective: [ 1, 1 ]
             SecurityCadet: [ 4, 4 ]
-            Lawyer: [ 2, 2 ]
+            #Lawyer: [ 2, 2 ] # Corvax-IAA
             #supply
             Quartermaster: [ 1, 1 ]
             SalvageSpecialist: [ 3, 3 ]