Merge branch 'master' of https://github.com/space-syndicate/space-sta…

…tion-14 into upstream0208

.github/workflows/publish.yml

@@ -23,6 +23,25 @@ jobs:
     - uses: actions/[email protected]
       with:
         submodules: 'recursive'
+
+    # Corvax-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 [email protected]:corvax-nexus/secrets.git Secrets
+        cp -R Secrets/Resources/Prototypes Resources/Prototypes/CorvaxSecrets
+        cp -R Secrets/Resources/ServerPrototypes Resources/Prototypes/CorvaxSecretsServer
+        cp -R Secrets/Resources/Locale Resources/Locale/ru-RU/corvax-secrets
+        cp -R Secrets/Resources/Textures Resources/Textures/CorvaxSecrets
+    # Corvax-Secrets-End
+
     - name: Setup .NET Core
       uses: actions/[email protected]
       with:

Resources/Locale/ru-RU/ss14-ru/prototypes/corvax/entities/objects/misc/tiles.ftl

@@ -1,36 +1,36 @@
-ent-FloorTileItemWoodParquet = tiles-wood-parquet
+ent-FloorTileItemWoodParquet = деревянный паркет
     .desc = { ent-FloorTileItemBase.desc }
-ent-FloorTileItemWoodBlack = tiles-wood-black
+ent-FloorTileItemWoodBlack = деревянный чёрный пол
     .desc = { ent-FloorTileItemBase.desc }
-ent-FloorTileItemWoodDark = tiles-wood-dark
+ent-FloorTileItemWoodDark = деревянный тёмный пол
     .desc = { ent-FloorTileItemBase.desc }
-ent-FloorTileItemWoodLight = tiles-wood-light
+ent-FloorTileItemWoodLight = деревянный светлый пол
     .desc = { ent-FloorTileItemBase.desc }
-ent-FloorTileItemWoodRed = tiles-wood-red
+ent-FloorTileItemWoodRed = деревянный красный пол
     .desc = { ent-FloorTileItemBase.desc }
-ent-FloorTileItemWoodLargeBlack = large black wood floor
+ent-FloorTileItemWoodLargeBlack = большой деревянный чёрный пол
     .desc = { ent-FloorTileItemBase.desc }
-ent-FloorTileItemWoodLargeDark = large dark wood floor
+ent-FloorTileItemWoodLargeDark = большой деревянный тёмный пол
     .desc = { ent-FloorTileItemBase.desc }
-ent-FloorTileItemWoodLargeLight = large light wood floor
+ent-FloorTileItemWoodLargeLight = большой деревянный светлый пол
     .desc = { ent-FloorTileItemBase.desc }
-ent-FloorTileItemWoodLargeRed = large red wood floor
+ent-FloorTileItemWoodLargeRed = большой деревянный красный пол
     .desc = { ent-FloorTileItemBase.desc }
-ent-FloorTileItemWoodParquetBlack = parquet black wood floor
+ent-FloorTileItemWoodParquetBlack = чёрный деревянный паркет
     .desc = { ent-FloorTileItemBase.desc }
-ent-FloorTileItemWoodParquetDark = parquet dark wood floor
+ent-FloorTileItemWoodParquetDark = тёмный деревянный паркет
     .desc = { ent-FloorTileItemBase.desc }
-ent-FloorTileItemWoodParquetLight = parquet light wood floor
+ent-FloorTileItemWoodParquetLight = светлый деревянный паркет
     .desc = { ent-FloorTileItemBase.desc }
-ent-FloorTileItemWoodParquetRed = parquet red wood floor
+ent-FloorTileItemWoodParquetRed = красный деревянный паркет
     .desc = { ent-FloorTileItemBase.desc }
-ent-FloorTileItemWoodChess = chess wood floor
+ent-FloorTileItemWoodChess = деревянный шахматный пол
     .desc = { ent-FloorTileItemBase.desc }
-ent-FloorTileItemWoodChessBlack = chess black wood floor
+ent-FloorTileItemWoodChessBlack = чёрный деревянный шахматный пол
     .desc = { ent-FloorTileItemBase.desc }
-ent-FloorTileItemWoodChessDark = chess dark wood floor
+ent-FloorTileItemWoodChessDark = тёмный деревянный шахматный пол
     .desc = { ent-FloorTileItemBase.desc }
-ent-FloorTileItemWoodChessLight = chess light wood floor
+ent-FloorTileItemWoodChessLight = светлый деревянный шахматный пол
     .desc = { ent-FloorTileItemBase.desc }
-ent-FloorTileItemWoodChessRed = chess red wood floor
+ent-FloorTileItemWoodChessRed = красный деревянный шахматный пол
     .desc = { ent-FloorTileItemBase.desc }