Merge remote-tracking branch 'upstream/master' into development

space-exodus · Aug 1, 2024 · 613b0ac · 613b0ac
2 parents e031716 + 22175da
commit 613b0ac
Show file tree

Hide file tree

Showing 21 changed files with 63,182 additions and 60,762 deletions.
diff --git a/.github/workflows/publish-publish.yml b/.github/workflows/publish-publish.yml
@@ -58,6 +58,7 @@ jobs:
         PUBLISH_TOKEN: ${{ secrets.PUBLISH_TOKEN }}
         ARTIFACT_ID: ${{ steps.artifact-upload-step.outputs.artifact-id }}
         GITHUB_REPOSITORY: ${{ vars.GITHUB_REPOSITORY }}
+        FORK_ID: exodus-main
 
 #    - name: Publish changelog (Discord)
 #      run: Tools/actions_changelogs_since_last_run.py

diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -20,6 +20,24 @@ jobs:
     - uses: actions/checkout@v3.6.0
       with:
         submodules: 'recursive'
+
+    # Exodus-Secrets-Start
+    - name: Setup secrets
+      env:
+        SSH_KEY: ${{ secrets.SECRETS_PRIVATE_KEY }}
+      if: ${{ env.SSH_KEY != '' }}
+      run: |
+        mkdir ~/.ssh
+        echo "${{ secrets.SECRETS_PRIVATE_KEY }}" > ~/.ssh/id_rsa
+        chmod 600 ~/.ssh/id_rsa
+        echo "HOST *" > ~/.ssh/config
+        echo "StrictHostKeyChecking no" >> ~/.ssh/config
+        git clone git@github.com:space-exodus/secrets.git Secrets
+        cp -R Secrets/Resources/Prototypes Resources/Prototypes/ExodusSecrets
+        cp -R Secrets/Resources/Locale Resources/Locale/ru-RU/exodus-secrets
+        cp -R Secrets/Resources/Textures Resources/Textures/ExodusSecrets
+    # Exodus-Secrets-End
+
     - name: Setup .NET Core
       uses: actions/setup-dotnet@v3.2.0
       with:
@@ -58,6 +76,7 @@ jobs:
         PUBLISH_TOKEN: ${{ secrets.PUBLISH_TOKEN }}
         ARTIFACT_ID: ${{ steps.artifact-upload-step.outputs.artifact-id }}
         GITHUB_REPOSITORY: ${{ vars.GITHUB_REPOSITORY }}
+        FORK_ID: exodus-secret
 
     #    - name: Publish changelog (Discord)
     #      run: Tools/actions_changelogs_since_last_run.py

diff --git a/Resources/Maps/corvax_delta.yml b/Resources/Maps/corvax_delta.yml
diff --git a/Resources/Maps/corvax_frame.yml b/Resources/Maps/corvax_frame.yml
diff --git a/Resources/Prototypes/Corvax/Maps/Pools/corvax.yml b/Resources/Prototypes/Corvax/Maps/Pools/corvax.yml
@@ -4,15 +4,11 @@
     - CorvaxDelta
     - CorvaxAvrite
     - CorvaxSilly
-    - CorvaxOutpost
     - CorvaxAstra
     - CorvaxMaus
-    - CorvaxIshimura
     - CorvaxPaper
     - CorvaxPilgrim
-    - CorvaxSplit
     - CorvaxTerra
-    - CorvaxFrame
     - CorvaxPearl
     - Box
     - Train
diff --git a/Resources/Prototypes/Corvax/Maps/Pools/default.yml b/Resources/Prototypes/Corvax/Maps/Pools/default.yml
@@ -4,15 +4,11 @@
   - CorvaxDelta
   - CorvaxAvrite
   - CorvaxSilly
-  - CorvaxOutpost
   - CorvaxAstra
   - CorvaxMaus
-  - CorvaxIshimura
   - CorvaxPaper
   - CorvaxPilgrim
-  - CorvaxSplit
   - CorvaxTerra
-  - CorvaxFrame
   - CorvaxPearl
   - Atlas
   - Bagel
@@ -27,5 +23,4 @@
   - Origin
   - Saltern
   - Packed
-  - Reach
   - Train
diff --git a/Resources/Prototypes/Corvax/Maps/astra.yml b/Resources/Prototypes/Corvax/Maps/astra.yml
@@ -4,7 +4,7 @@
   mapPath: /Maps/corvax_astra.yml
   maxRandomOffset: 0
   randomRotation: false
-  minPlayers: 40
+  minPlayers: 55
   stations:
     Astra:
       stationProto: StandardNanotrasenStation

diff --git a/Resources/Prototypes/Corvax/Maps/frame.yml b/Resources/Prototypes/Corvax/Maps/frame.yml
@@ -48,14 +48,15 @@
         - type: StationJobs
           availableJobs:
             # service
-            Passenger: [ -1, -1 ]
             Clown: [ 1, 1 ]
             # engineering
             ChiefEngineer: [ 1, 1 ]
             AtmosphericTechnician: [ 1, 1 ]
-            StationEngineer: [ 3, 3 ]
+            StationEngineer: [ 3, 6 ]
+            TechnicalAssistant: [ -1, -1 ]
             # medical
             Paramedic: [ 1, 1 ]
+            MedicalIntern: [ 0, 1 ]
             # science
             Scientist: [ 1, 2 ]
             Borg: [ 1, 1 ]

diff --git a/Resources/Prototypes/Corvax/lobbyscreens.yml b/Resources/Prototypes/Corvax/lobbyscreens.yml
@@ -185,3 +185,7 @@
 - type: lobbyBackground
   id: EngineersVsZombies
   background: /Textures/Corvax/LobbyScreens/engineers-vs-zombies.png
+
+- type: lobbyBackground
+  id: SillyIsland
+  background: /Textures/Corvax/LobbyScreens/silly-island.png
diff --git a/Resources/Prototypes/Loadouts/loadout_groups.yml b/Resources/Prototypes/Loadouts/loadout_groups.yml
@@ -34,6 +34,7 @@
   - ClothingNeckMainPin
   - ClothingNeckNebulaPin
   - ClothingNeckNovaPin
+  - ClothingNeckSolarisPin
   - ClothingNeckWhiteListPin
   # Corvax-Loadouts-End
 - type: loadoutGroup

diff --git a/Resources/Textures/Corvax/LobbyScreens/attributions.yml b/Resources/Textures/Corvax/LobbyScreens/attributions.yml
@@ -187,3 +187,8 @@
   license: "CC-BY-SA-3.0"
   copyright: "limemint on discord"
   source: "https://discord.com/channels/919301044784226385/1073603532898435183/1253009500944859227"
+
+- files: ["silly-island.png"]
+  license: "CC-BY-NC-SA-4.0"
+  copyright: "alexsandr_the_great2(1165521026579451935) on discord"
+  source: "https://discord.com/channels/919301044784226385/1073603532898435183/1261290085287071914" 
diff --git a/Resources/Textures/Corvax/LobbyScreens/clownspider.png b/Resources/Textures/Corvax/LobbyScreens/clownspider.png
diff --git a/Resources/Textures/Corvax/LobbyScreens/silly-island.png b/Resources/Textures/Corvax/LobbyScreens/silly-island.png
diff --git a/Resources/Textures/Corvax/LobbyScreens/silly-island.png.yml b/Resources/Textures/Corvax/LobbyScreens/silly-island.png.yml
@@ -0,0 +1,2 @@
+sample:
+  filter: false
diff --git a/Resources/Textures/Decals/Overlays/greyscale.rsi/pavement_vertical.png b/Resources/Textures/Decals/Overlays/greyscale.rsi/pavement_vertical.png
diff --git a/Resources/Textures/Decals/Overlays/greyscale.rsi/pavement_vertical_checker_a.png b/Resources/Textures/Decals/Overlays/greyscale.rsi/pavement_vertical_checker_a.png
diff --git a/Resources/Textures/Decals/Overlays/greyscale.rsi/pavement_vertical_checker_b.png b/Resources/Textures/Decals/Overlays/greyscale.rsi/pavement_vertical_checker_b.png
diff --git a/Resources/Textures/Tiles/dark_pavement_vertical.png b/Resources/Textures/Tiles/dark_pavement_vertical.png
diff --git a/Resources/Textures/Tiles/steel_pavement_vertical.png b/Resources/Textures/Tiles/steel_pavement_vertical.png
diff --git a/Resources/Textures/Tiles/white_pavement_vertical.png b/Resources/Textures/Tiles/white_pavement_vertical.png
diff --git a/Tools/publish_github_artifact.py b/Tools/publish_github_artifact.py
@@ -9,13 +9,13 @@
 ARTIFACT_ID = os.environ["ARTIFACT_ID"]
 GITHUB_REPOSITORY = os.environ["GITHUB_REPOSITORY"]
 VERSION = os.environ['GITHUB_SHA']
+FORK_ID = os.environ['FORK_ID']
 
 #
 # CONFIGURATION PARAMETERS
 # Forks should change these to publish to their own infrastructure.
 #
 ROBUST_CDN_URL = "https://cdn2.space-exodus.com/"
-FORK_ID = "exodus-main"
 
 def main():
     print("Fetching artifact URL from API...")