Merge branch 'master' into space-wizards_space-station-14_26309_2024-…

…04-22

.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/DeltaV/CartridgeLoader/Cartridges/CrimeAssistUi.cs

@@ -18,15 +18,6 @@ public override Control GetUIFragmentRoot()
     public override void Setup(BoundUserInterface userInterface, EntityUid? fragmentOwner)
     {
         _fragment = new CrimeAssistUiFragment();
-
-        _fragment.OnSync += _ => SendSyncMessage(userInterface);
-    }
-
-    private void SendSyncMessage(BoundUserInterface userInterface)
-    {
-        var syncMessage = new CrimeAssistSyncMessageEvent();
-        var message = new CartridgeUiMessage(syncMessage);
-        userInterface.SendMessage(message);
     }
 
     public override void UpdateState(BoundUserInterfaceState state)

Content.Client/DeltaV/CartridgeLoader/Cartridges/CrimeAssistUiFragment.xaml.cs

@@ -1,7 +1,6 @@
 using Content.Client.Message;
 using Content.Shared.DeltaV.CartridgeLoader.Cartridges;
 using Robust.Client.AutoGenerated;
-using Robust.Client.ResourceManagement;
 using Robust.Client.UserInterface.Controls;
 using Robust.Client.UserInterface.XAML;
 using Robust.Shared.Prototypes;
@@ -13,9 +12,7 @@ namespace Content.Client.DeltaV.CartridgeLoader.Cartridges;
 public sealed partial class CrimeAssistUiFragment : BoxContainer
 {
     [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
-    [Dependency] private readonly IResourceCache _resourceCache = default!;
 
-    public event Action<bool>? OnSync;
     private CrimeAssistPage _currentPage;
     private List<CrimeAssistPage>? _pages;
 

Content.Client/DeltaV/CartridgeLoader/Cartridges/SecWatchEntryControl.xaml

@@ -0,0 +1,19 @@
+<BoxContainer xmlns="https://spacestation14.io"
+        xmlns:cartridges="clr-namespace:Content.Client.DeltaV.CartridgeLoader.Cartridges"
+        xmlns:customControls="clr-namespace:Content.Client.Administration.UI.CustomControls"
+        HorizontalExpand="True"
+        VerticalExpand="True"
+        Margin="5">
+    <!-- All labels populated in constructor -->
+    <BoxContainer Orientation="Horizontal" HorizontalAlignment="Left">
+        <BoxContainer Orientation="Vertical">
+            <Label Name="Status"/>
+            <Label Text="{Loc 'criminal-records-console-reason'}"/>
+        </BoxContainer>
+        <customControls:VSeparator StyleClasses="LowDivider" Margin="8 0"/>
+        <BoxContainer Orientation="Vertical">
+            <Label Name="Title"/>
+	        <Label Name="Reason"/>
+        </BoxContainer>
+    </BoxContainer>
+</BoxContainer>

Content.Client/DeltaV/CartridgeLoader/Cartridges/SecWatchEntryControl.xaml.cs

@@ -0,0 +1,21 @@
+using Content.Shared.CartridgeLoader.Cartridges;
+using Robust.Client.AutoGenerated;
+using Robust.Client.UserInterface;
+using Robust.Client.UserInterface.Controls;
+using Robust.Client.UserInterface.XAML;
+
+namespace Content.Client.DeltaV.CartridgeLoader.Cartridges;
+
+[GenerateTypedNameReferences]
+public sealed partial class SecWatchEntryControl : BoxContainer
+{
+    public SecWatchEntryControl(SecWatchEntry entry)
+    {
+        RobustXamlLoader.Load(this);
+
+        Status.Text = Loc.GetString($"criminal-records-status-{entry.Status.ToString().ToLower()}");
+        Title.Text = Loc.GetString("sec-watch-entry", ("name", entry.Name), ("job", entry.Job));
+
+        Reason.Text = entry.Reason ?? Loc.GetString("sec-watch-no-reason");
+    }
+}

Content.Client/DeltaV/CartridgeLoader/Cartridges/SecWatchUi.cs

@@ -0,0 +1,27 @@
+using Content.Client.UserInterface.Fragments;
+using Content.Shared.CartridgeLoader;
+using Content.Shared.CartridgeLoader.Cartridges;
+using Robust.Client.UserInterface;
+
+namespace Content.Client.DeltaV.CartridgeLoader.Cartridges;
+
+public sealed partial class SecWatchUi : UIFragment
+{
+    private SecWatchUiFragment? _fragment;
+
+    public override Control GetUIFragmentRoot()
+    {
+        return _fragment!;
+    }
+
+    public override void Setup(BoundUserInterface ui, EntityUid? owner)
+    {
+        _fragment = new SecWatchUiFragment();
+    }
+
+    public override void UpdateState(BoundUserInterfaceState state)
+    {
+        if (state is SecWatchUiState cast)
+            _fragment?.UpdateState(cast);
+    }
+}

Content.Client/DeltaV/CartridgeLoader/Cartridges/SecWatchUiFragment.xaml

@@ -0,0 +1,13 @@
+<cartridges:SecWatchUiFragment xmlns="https://spacestation14.io"
+        xmlns:cartridges="clr-namespace:Content.Client.DeltaV.CartridgeLoader.Cartridges"
+        Margin="5"
+        VerticalExpand="True">
+    <BoxContainer Orientation="Vertical" HorizontalExpand="True" VerticalExpand="True">
+        <Label Text="{Loc 'sec-watch-title'}" HorizontalExpand="True" HorizontalAlignment="Center"/>
+        <Label Name="NoEntries" Text="{Loc 'sec-watch-no-entries'}" HorizontalExpand="True" HorizontalAlignment="Center" Visible="False"/>
+        <ScrollContainer HorizontalExpand="True" VerticalExpand="True">
+            <!-- Populated when state received -->
+            <BoxContainer Name="Entries" Orientation="Vertical" VerticalAlignment="Top"/>
+        </ScrollContainer>
+    </BoxContainer>
+</cartridges:SecWatchUiFragment>

Content.Client/DeltaV/CartridgeLoader/Cartridges/SecWatchUiFragment.xaml.cs

@@ -0,0 +1,25 @@
+using Content.Shared.CartridgeLoader.Cartridges;
+using Robust.Client.AutoGenerated;
+using Robust.Client.UserInterface.Controls;
+using Robust.Client.UserInterface.XAML;
+
+namespace Content.Client.DeltaV.CartridgeLoader.Cartridges;
+
+[GenerateTypedNameReferences]
+public sealed partial class SecWatchUiFragment : BoxContainer
+{
+    public SecWatchUiFragment()
+    {
+        RobustXamlLoader.Load(this);
+    }
+
+    public void UpdateState(SecWatchUiState state)
+    {
+        NoEntries.Visible = state.Entries.Count == 0;
+        Entries.RemoveAllChildren();
+        foreach (var entry in state.Entries)
+        {
+            Entries.AddChild(new SecWatchEntryControl(entry));
+        }
+    }
+}

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();