Merge branch 'master' into refactor/languages

Signed-off-by: Mnemotechnican <[email protected]>
Simple-Station · Jun 21, 2024 · fe43060 · fe43060
2 parents 31d82fb + 287f33c
commit fe43060
Show file tree

Hide file tree

Showing 243 changed files with 3,297 additions and 1,581 deletions.
diff --git a/.github/workflows/changelog.yml b/.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

diff --git a/.github/workflows/prtitlecase.yml b/.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
diff --git a/BuildChecker/BuildChecker.csproj b/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">

diff --git a/BuildChecker/git_helper.py b/BuildChecker/git_helper.py
diff --git a/BuildChecker/hooks/post-checkout b/BuildChecker/hooks/post-checkout
diff --git a/BuildChecker/hooks/post-merge b/BuildChecker/hooks/post-merge
diff --git a/Content.Client/Entry/EntryPoint.cs b/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();

diff --git a/Content.Client/Gameplay/GameplayState.cs b/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();

diff --git a/Content.Client/Preferences/UI/HumanoidProfileEditor.xaml b/Content.Client/Preferences/UI/HumanoidProfileEditor.xaml
@@ -142,18 +142,29 @@
                         <BoxContainer Name="CAntagList" Orientation="Vertical" />
                     </ScrollContainer>
                 </BoxContainer>
-                <BoxContainer Orientation="Vertical" Margin="10">
+                <BoxContainer Name="CTraitsTab" Orientation="Vertical" Margin="10">
                     <!-- Traits -->
-                    <ScrollContainer VerticalExpand="True">
-                        <BoxContainer Name="CTraitsList" Orientation="Vertical" />
-                    </ScrollContainer>
+                    <Label Name="TraitPointsLabel" HorizontalAlignment="Stretch" Align="Center" />
+                    <ProgressBar Name="TraitPointsBar" MaxValue="1" Value="1" MaxHeight="8" Margin="0 5" />
+
+                    <Button Name="TraitsShowUnusableButton"
+                            Text="{Loc 'humanoid-profile-editor-traits-show-unusable-button'}"
+                            ToolTip="{Loc 'humanoid-profile-editor-traits-show-unusable-button-tooltip'}"
+                            ToggleMode="True"
+                            Margin="0 0 0 5" />
+
+                    <TabContainer Name="CTraitsTabs" VerticalExpand="True" />
                 </BoxContainer>
                 <BoxContainer Name="CLoadoutsTab" Orientation="Vertical" Margin="10">
                     <!-- Loadouts -->
                     <Label Name="LoadoutPointsLabel" HorizontalAlignment="Stretch" Align="Center" />
                     <ProgressBar Name="LoadoutPointsBar" MaxValue="1" Value="1" MaxHeight="8" Margin="0 5" />
 
-                    <Button Name="CHideShowUnusableButton" Text="{Loc 'humanoid-profile-editor-loadouts-show-unusable-button'}" ToolTip="{Loc 'humanoid-profile-editor-loadouts-show-unusable-button-tooltip'}" ToggleMode="True" Margin="0 0 0 5" />
+                    <Button Name="LoadoutsShowUnusableButton"
+                            Text="{Loc 'humanoid-profile-editor-loadouts-show-unusable-button'}"
+                            ToolTip="{Loc 'humanoid-profile-editor-loadouts-show-unusable-button-tooltip'}"
+                            ToggleMode="True"
+                            Margin="0 0 0 5" />
 
                     <TabContainer Name="CLoadoutsTabs" VerticalExpand="True" />
                 </BoxContainer>