Merge branch 'master' into kobalt

AdventureTimeSS14 · Aug 8, 2024 · 89f9d9e · 89f9d9e
2 parents e456039 + ec65ab9
commit 89f9d9e
Show file tree

Hide file tree

Showing 1,719 changed files with 113,518 additions and 91,118 deletions.
diff --git a/.github/labeler.yml b/.github/labeler.yml
@@ -13,9 +13,13 @@
 - changed-files:
   - any-glob-to-any-file: '**/*.xaml*'
 
+"Changes: Shaders":
+- changed-files:
+  - any-glob-to-any-file: '**/*.swsl'
+
 "Changes: Localization":
 - changed-files:
-  - any-glob-to-any-file: 'Resources/Locale/**/*.ftl'
+  - any-glob-to-any-file: '**/*.ftl'
 
 "No C#":
 - changed-files:

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>