Merge branch 'master' into Vendors

.github/workflows/changelog.yml

@@ -35,14 +35,14 @@ jobs:
 
       - name: Install Dependencies
         run: |
-          cd "Tools/changelog"
+          cd "Tools/changelogs"
           npm install
         shell: bash
         continue-on-error: true
 
       - name: Generate Changelog
         run: |
-          cd "Tools/changelog"
+          cd "Tools/changelogs"
           node changelog.js
         shell: bash
         continue-on-error: true

.github/workflows/prtitlecase.yml

@@ -0,0 +1,34 @@
+name: PR Title Case
+on:
+  pull_request_target:
+    types: [opened, edited, synchronize]
+
+env:
+  GITHUB_TOKEN: ${{ secrets.BOT_TOKEN }}
+  PR_NUMBER: ${{ github.event.pull_request.number }}
+
+jobs:
+  prtitlecase:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout Master
+        uses: actions/checkout@v3
+        with:
+          token: ${{ secrets.BOT_TOKEN }}
+
+      - name: Setup Node
+        uses: actions/setup-node@v3
+        with:
+          node-version: 18.x
+
+      - name: Install Dependencies
+        run: |
+          cd "Tools/prtitlecase"
+          npm install
+        shell: bash
+
+      - name: Change Title
+        run: |
+          cd "Tools/prtitlecase"
+          node index.js
+        shell: bash

BuildChecker/BuildChecker.csproj

@@ -14,8 +14,6 @@ https://docs.microsoft.com/en-us/visualstudio/msbuild/msbuild
 -->
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <Python>python3</Python>
-    <Python Condition="'$(OS)'=='Windows_NT' Or '$(OS)'=='Windows'">py -3</Python>
     <ProjectGuid>{C899FCA4-7037-4E49-ABC2-44DE72487110}</ProjectGuid>
     <TargetFrameworkMoniker>.NETFramework, Version=v4.7.2</TargetFrameworkMoniker>
     <RestorePackages>false</RestorePackages>
@@ -39,7 +37,7 @@ https://docs.microsoft.com/en-us/visualstudio/msbuild/msbuild
     <OutputPath>bin\DebugOpt\</OutputPath>
   </PropertyGroup>
   <Target Name="Build">
-    <Exec Command="$(Python) git_helper.py" CustomErrorRegularExpression="^Error" />
+    <Exec Command="git submodule update --init --recursive"/>
   </Target>
   <Target Name="Rebuild" DependsOnTargets="Build" />
   <Target Name="Clean">

Content.Client/Entry/EntryPoint.cs

@@ -124,6 +124,7 @@ public override void Init()
             _prototypeManager.RegisterIgnore("wireLayout");
             _prototypeManager.RegisterIgnore("alertLevels");
             _prototypeManager.RegisterIgnore("nukeopsRole");
+            _prototypeManager.RegisterIgnore("stationGoal");
 
             _componentFactory.GenerateNetIds();
             _adminManager.Initialize();

Content.Client/Gameplay/GameplayState.cs

@@ -93,17 +93,17 @@ private void LoadMainScreen()
             var screenTypeString = _configurationManager.GetCVar(CCVars.UILayout);
             if (!Enum.TryParse(screenTypeString, out ScreenType screenType))
             {
-                screenType = default;
+                screenType = ScreenType.Separated;
             }
 
             switch (screenType)
             {
-                case ScreenType.Default:
-                    _uiManager.LoadScreen<DefaultGameScreen>();
-                    break;
                 case ScreenType.Separated:
                     _uiManager.LoadScreen<SeparatedChatGameScreen>();
                     break;
+                case ScreenType.Overlay:
+                    _uiManager.LoadScreen<OverlayChatGameScreen>();
+                    break;
             }
 
             _loadController.LoadScreen();

Content.Client/Input/ContentContexts.cs

@@ -55,6 +55,7 @@ public static void SetupContexts(IInputContextContainer contexts)
             human.AddFunction(ContentKeyFunctions.UseItemInHand);
             human.AddFunction(ContentKeyFunctions.AltUseItemInHand);
             human.AddFunction(ContentKeyFunctions.OpenCharacterMenu);
+            human.AddFunction(ContentKeyFunctions.OpenLanguageMenu);
             human.AddFunction(ContentKeyFunctions.ActivateItemInWorld);
             human.AddFunction(ContentKeyFunctions.ThrowItemInHand);
             human.AddFunction(ContentKeyFunctions.AltActivateItemInWorld);

Content.Client/Language/LanguageMenuWindow.xaml

@@ -0,0 +1,18 @@
+<DefaultWindow xmlns="https://spacestation14.io"
+               xmlns:ui="clr-namespace:Content.Client.UserInterface.Controls"
+               Title="{Loc language-menu-window-title}"
+               SetSize="300 300">
+    <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>
+        </PanelContainer>
+
+        <ui:HLine></ui:HLine>
+
+        <ScrollContainer HorizontalExpand="True" VerticalExpand="True" HScrollEnabled="False" VScrollEnabled="True" MinHeight="50">
+            <BoxContainer Name="OptionsList" Access="Public" HorizontalExpand="True" SeparationOverride="2" Orientation="Vertical">
+                <!-- The rest here is generated programmatically -->
+            </BoxContainer>
+        </ScrollContainer>
+    </BoxContainer>
+</DefaultWindow>

Content.Client/Language/LanguageMenuWindow.xaml.cs

@@ -0,0 +1,134 @@
+using Content.Client.Language.Systems;
+using Content.Shared.Language;
+using Content.Shared.Language.Systems;
+using Robust.Client.AutoGenerated;
+using Robust.Client.UserInterface.Controls;
+using Robust.Client.UserInterface.CustomControls;
+using Robust.Client.UserInterface.XAML;
+using Robust.Shared.Console;
+using Robust.Shared.Utility;
+using Serilog;
+using static Content.Shared.Language.Systems.SharedLanguageSystem;
+
+namespace Content.Client.Language;
+
+[GenerateTypedNameReferences]
+public sealed partial class LanguageMenuWindow : DefaultWindow
+{
+    private readonly LanguageSystem _clientLanguageSystem;
+    private readonly List<EntryState> _entries = new();
+
+
+    public LanguageMenuWindow()
+    {
+        RobustXamlLoader.Load(this);
+        _clientLanguageSystem = IoCManager.Resolve<IEntitySystemManager>().GetEntitySystem<LanguageSystem>();
+    }
+
+    protected override void Opened()
+    {
+        // Refresh the window when it gets opened.
+        // This actually causes two refreshes: one immediately, and one after the server sends a state message.
+        UpdateState(_clientLanguageSystem.CurrentLanguage, _clientLanguageSystem.SpokenLanguages);
+        _clientLanguageSystem.RequestStateUpdate();
+    }
+
+
+    public void UpdateState(string currentLanguage, List<string> spokenLanguages)
+    {
+        var langName = Loc.GetString($"language-{currentLanguage}-name");
+        CurrentLanguageLabel.Text = Loc.GetString("language-menu-current-language", ("language", langName));
+
+        OptionsList.RemoveAllChildren();
+        _entries.Clear();
+
+        foreach (var language in spokenLanguages)
+        {
+            AddLanguageEntry(language);
+        }
+
+        // Disable the button for the currently chosen language
+        foreach (var entry in _entries)
+        {
+            if (entry.button != null)
+                entry.button.Disabled = entry.language == currentLanguage;
+        }
+    }
+
+    private void AddLanguageEntry(string language)
+    {
+        var proto = _clientLanguageSystem.GetLanguagePrototype(language);
+        var state = new EntryState { language = language };
+
+        var container = new BoxContainer { Orientation = BoxContainer.LayoutOrientation.Vertical };
+
+        #region Header
+        var header = new BoxContainer
+        {
+            Orientation = BoxContainer.LayoutOrientation.Horizontal,
+            HorizontalExpand = true,
+            SeparationOverride = 2
+        };
+
+        var name = new Label
+        {
+            Text = proto?.Name ?? Loc.GetString("generic-error"),
+            MinWidth = 50,
+            HorizontalExpand = true
+        };
+
+        var button = new Button { Text = "Choose" };
+        button.OnPressed += _ => OnLanguageChosen(language);
+        state.button = button;
+
+        header.AddChild(name);
+        header.AddChild(button);
+
+        container.AddChild(header);
+        #endregion
+
+        #region Collapsible description
+        var body = new CollapsibleBody
+        {
+            HorizontalExpand = true,
+            Margin = new Thickness(4f, 4f)
+        };
+
+        var description = new RichTextLabel { HorizontalExpand = true };
+        description.SetMessage(proto?.Description ?? Loc.GetString("generic-error"));
+        body.AddChild(description);
+
+        var collapser = new Collapsible(Loc.GetString("language-menu-description-header"), body)
+        {
+            Orientation = BoxContainer.LayoutOrientation.Vertical,
+            HorizontalExpand = true
+        };
+
+        container.AddChild(collapser);
+        #endregion
+
+        // Before adding, wrap the new container in a PanelContainer to give it a distinct look
+        var wrapper = new PanelContainer();
+        wrapper.StyleClasses.Add("PdaBorderRect");
+
+        wrapper.AddChild(container);
+        OptionsList.AddChild(wrapper);
+
+        _entries.Add(state);
+    }
+
+
+    private void OnLanguageChosen(string id)
+    {
+        var proto = _clientLanguageSystem.GetLanguagePrototype(id);
+        if (proto != null)
+            _clientLanguageSystem.RequestSetLanguage(proto);
+    }
+
+
+    private struct EntryState
+    {
+        public string language;
+        public Button? button;
+    }
+}