Merge branch 'master' into adt_icon

AdventureTimeSS14 · Aug 7, 2024 · dfdc3ad · dfdc3ad
2 parents 3cedb66 + d65b910
commit dfdc3ad
Show file tree

Hide file tree

Showing 664 changed files with 41,021 additions and 27,902 deletions.
diff --git a/.github/workflows/publish.yml b/.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:

diff --git a/Content.Client/ADT/Language/LanguageMenuUIController.cs b/Content.Client/ADT/Language/LanguageMenuUIController.cs
diff --git a/Content.Client/ADT/Language/LanguageMenuWindow.xaml.cs b/Content.Client/ADT/Language/LanguageMenuWindow.xaml.cs
diff --git a/Content.Client/ADT/Language/LanguageSystem.cs b/Content.Client/ADT/Language/LanguageSystem.cs
@@ -0,0 +1,7 @@
+using Content.Shared.ADT.Language;
+
+namespace Content.Client.ADT.Language;
+
+public sealed partial class LanguageSystem : SharedLanguageSystem
+{
+}
diff --git a/Content.Client/ADT/Language/Systems/LanguageSystem.cs b/Content.Client/ADT/Language/Systems/LanguageSystem.cs
diff --git a/Content.Client/ADT/Language/Systems/TranslatorImplanterSystem.cs b/Content.Client/ADT/Language/Systems/TranslatorImplanterSystem.cs
diff --git a/Content.Client/ADT/Language/TranslatorImplantSystem.cs b/Content.Client/ADT/Language/TranslatorImplantSystem.cs
@@ -0,0 +1,8 @@
+using Content.Shared.Implants;
+
+namespace Content.Client.ADT.Implants;
+
+public sealed class TranslatorImplantSystem : SharedTranslatorImplantSystem
+{
+
+}
diff --git a/...ient/ADT/Language/LanguageMenuWindow.xaml → ...t/ADT/Language/UI/LanguageMenuWindow.xaml b/...ient/ADT/Language/LanguageMenuWindow.xaml → ...t/ADT/Language/UI/LanguageMenuWindow.xaml
@@ -1,7 +1,8 @@
-<DefaultWindow xmlns="https://spacestation14.io"
+<!--Original window taken from https://github.com/new-frontiers-14/frontier-station-14/pull/671-->
+<DefaultWindow xmlns="https://spacestation14.io"
                xmlns:ui="clr-namespace:Content.Client.UserInterface.Controls"
                Title="a"
-               SetSize="300 200">
+               SetSize="400 450">
     <BoxContainer Orientation="Vertical" SeparationOverride="4" MinWidth="150">
         <PanelContainer Name="CurrentLanguageContainer" Access="Public" StyleClasses="PdaBorderRect">
             <Label Name="CurrentLanguageLabel" Access="Public" Text="Current Language:" HorizontalExpand="True"></Label>