Merge remote-tracking branch 'refs/remotes/real-ee/master' into feat/…

…floof-upstream-merge-2024-09-05 # Conflicts: # .github/workflows/changelog.yml # Resources/Prototypes/Catalog/VendingMachines/Inventories/robodrobe.yml # Resources/Prototypes/Loadouts/Jobs/science.yml # Resources/Prototypes/Loadouts/hands.yml # Resources/Prototypes/Loadouts/shoes.yml # Resources/Prototypes/Traits/physical.yml # Tools/actions_changelogs_since_last_run.py
Fansana · Sep 8, 2024 · bb9e777 · bb9e777
2 parents b01674a + 0ab7da1
commit bb9e777
Show file tree

Hide file tree

Showing 124 changed files with 5,082 additions and 2,112 deletions.
diff --git a/.github/workflows/changelog.yml b/.github/workflows/changelog.yml
@@ -16,41 +16,40 @@ jobs:
     permissions:
       contents: write
     steps:
-      - name: Checkout Master
-        uses: actions/checkout@v3
-        with:
-          token: ${{ secrets.BOT_TOKEN }}
-          ref: "${{ vars.CHANGELOG_BRANCH }}"
+    - name: Checkout Master
+      uses: actions/checkout@v3
+      with:
+        token: ${{ secrets.BOT_TOKEN }}
+        ref: ${{ vars.CHANGELOG_BRANCH }}
 
-      - name: Setup Git
-        run: |
-          git config --global user.name "${{ vars.CHANGELOG_USER }}"
-          git config --global user.email "${{ vars.CHANGELOG_EMAIL }}"
-        shell: bash
+    - name: Setup Git
+      run: |
+        git config --global user.name "${{ vars.CHANGELOG_USER }}"
+        git config --global user.email "${{ vars.CHANGELOG_EMAIL }}"
+      shell: bash
 
-      - name: Setup Node
-        uses: actions/setup-node@v3
-        with:
-          node-version: 18.x
+    - name: Setup Node
+      uses: actions/setup-node@v3
+      with:
+        node-version: 18.x
 
-      - name: Install Dependencies
-        run: |
-          cd "Tools/changelogs"
-          npm install
-        shell: bash
-        continue-on-error: true
+    - name: Install Dependencies
+      run: |
+        cd "Tools/changelogs"
+        npm install
+      shell: bash
 
-      - name: Generate Changelog
-        run: |
-          cd "Tools/changelogs"
-          node changelog.js
-        shell: bash
-        continue-on-error: true
+    - name: Generate Changelog
+      run: |
+        cd "Tools/changelogs"
+        node changelog.js
+      shell: bash
 
-      - name: Commit Changelog
-        run: |
-          git add *.yml
-          git commit -m "${{ vars.CHANGELOG_MESSAGE }} (#${{ env.PR_NUMBER }})"
-          git push
-        shell: bash
-        continue-on-error: true
+    - name: Commit Changelog
+      run: |
+        git pull origin master
+        git add *.yml
+        git commit -m "${{ vars.CHANGELOG_MESSAGE }} (#${{ env.PR_NUMBER }})"
+        git push
+      shell: bash
+      continue-on-error: true
diff --git a/.github/workflows/discord-changelog.yml b/.github/workflows/discord-changelog.yml
@@ -0,0 +1,24 @@
+name: Discord Changelog
+
+on:
+  workflow_dispatch:
+  schedule:
+  - cron: '0 6 * * *'
+
+jobs:
+  publish_changelog:
+    runs-on: ubuntu-latest
+    steps:
+
+    - name: checkout
+      uses: actions/checkout@v3
+      with:
+        ref: master
+
+    - name: Publish changelog
+      run: Tools/actions_changelogs_since_last_run.py
+      env:
+        CHANGELOG_DIR: ${{ vars.CHANGELOG_DIR }}
+        CHANGELOG_WEBHOOK: ${{ secrets.CHANGELOG_WEBHOOK }}
+        GITHUB_TOKEN: ${{ secrets.BOT_TOKEN }}
+    continue-on-error: true
diff --git a/Content.Client/Administration/UI/AdminUIHelpers.cs b/Content.Client/Administration/UI/AdminUIHelpers.cs
@@ -50,7 +50,7 @@ public static bool TryConfirm(Button button, Dictionary<Button, ConfirmationData
             button.Text = data.OriginalText;
         }, data.Cancellation.Token);
 
-        button.ModulateSelfOverride = StyleNano.ButtonColorCautionDefault;
+        button.ModulateSelfOverride = StyleNano.ButtonColorDangerDefault;
         button.Text = Loc.GetString("admin-player-actions-confirm");
         return false;
     }

diff --git a/Content.Client/Changelog/ChangelogButton.cs b/Content.Client/Changelog/ChangelogButton.cs
@@ -36,12 +36,12 @@ private void UpdateStuff()
             if (_changelogManager.NewChangelogEntries)
             {
                 Text = Loc.GetString("changelog-button-new-entries");
-                StyleClasses.Add(StyleBase.ButtonCaution);
+                StyleClasses.Add(StyleBase.ButtonDanger);
             }
             else
             {
                 Text = Loc.GetString("changelog-button");
-                StyleClasses.Remove(StyleBase.ButtonCaution);
+                StyleClasses.Remove(StyleBase.ButtonDanger);
             }
         }
     }

diff --git a/Content.Client/FlavorText/FlavorText.xaml b/Content.Client/FlavorText/FlavorText.xaml
@@ -1,4 +1,4 @@
-<Control Name="CFlavorText" xmlns="https://spacestation14.io">
+<Control Name="CFlavorText" HorizontalExpand="True" xmlns="https://spacestation14.io">
     <BoxContainer Orientation="Vertical" HorizontalExpand="True">
         <TextEdit Name="CFlavorTextInput" Access="Public" MinSize="220 100" Margin="10" HorizontalExpand="True" VerticalExpand="True" />
     </BoxContainer>

diff --git a/Content.Client/Gateway/UI/GatewayWindow.xaml.cs b/Content.Client/Gateway/UI/GatewayWindow.xaml.cs
@@ -155,7 +155,7 @@ public void UpdateState(GatewayBoundUserInterfaceState state)
 
             if (Pressable())
             {
-                openButton.AddStyleClass(StyleBase.ButtonCaution);
+                openButton.AddStyleClass(StyleBase.ButtonDanger);
             }
 
             var buttonContainer = new BoxContainer()

diff --git a/Content.Client/LateJoin/LateJoinGui.cs b/Content.Client/LateJoin/LateJoinGui.cs
@@ -266,9 +266,10 @@ private void RebuildUI()
                                 prototype.Requirements ?? new(),
                                 prototype,
                                 (HumanoidCharacterProfile) (_prefs.Preferences?.SelectedCharacter
-                                    ?? HumanoidCharacterProfile.DefaultWithSpecies()),
+                                                            ?? HumanoidCharacterProfile.DefaultWithSpecies()),
                                 _jobRequirements.GetRawPlayTimeTrackers(),
                                 _jobRequirements.IsWhitelisted(),
+                                prototype,
                                 _entityManager,
                                 _prototypeManager,
                                 _configManager,

diff --git a/Content.Client/Options/UI/Tabs/KeyRebindTab.xaml.cs b/Content.Client/Options/UI/Tabs/KeyRebindTab.xaml.cs
@@ -480,7 +480,7 @@ public KeyControl(KeyRebindTab parent, BoundKeyFunction function)
 
                 BindButton1 = new BindButton(parent, this, StyleBase.ButtonOpenRight);
                 BindButton2 = new BindButton(parent, this, StyleBase.ButtonOpenLeft);
-                ResetButton = new Button { Text = Loc.GetString("ui-options-bind-reset"), StyleClasses = { StyleBase.ButtonCaution } };
+                ResetButton = new Button { Text = Loc.GetString("ui-options-bind-reset"), StyleClasses = { StyleBase.ButtonDanger } };
 
                 var hBox = new BoxContainer
                 {

diff --git a/Content.Client/Preferences/UI/AntagPreferenceSelector.cs b/Content.Client/Preferences/UI/AntagPreferenceSelector.cs
@@ -47,6 +47,7 @@ public AntagPreferenceSelector(AntagPrototype proto, JobPrototype highJob) : bas
                 (HumanoidCharacterProfile) (prefs.Preferences?.SelectedCharacter ?? HumanoidCharacterProfile.DefaultWithSpecies()),
                 requirements.GetRawPlayTimeTrackers(),
                 requirements.IsWhitelisted(),
+                proto,
                 entMan,
                 protoMan,
                 configMan,

diff --git a/Content.Client/Preferences/UI/CharacterSetupGui.xaml.cs b/Content.Client/Preferences/UI/CharacterSetupGui.xaml.cs
@@ -213,7 +213,7 @@ public CharacterPickerButton(
                     Text = Loc.GetString("character-setup-gui-character-picker-button-confirm-delete-button"),
                     Visible = false,
                 };
-                confirmDeleteButton.ModulateSelfOverride = StyleNano.ButtonColorCautionDefault;
+                confirmDeleteButton.ModulateSelfOverride = StyleNano.ButtonColorDangerDefault;
                 confirmDeleteButton.OnPressed += _ =>
                 {
                     Parent?.RemoveChild(this);

diff --git a/Content.Client/Preferences/UI/HumanoidProfileEditor.xaml b/Content.Client/Preferences/UI/HumanoidProfileEditor.xaml
@@ -3,6 +3,7 @@
     xmlns:prefUi="clr-namespace:Content.Client.Preferences.UI"
     xmlns:humanoid="clr-namespace:Content.Client.Humanoid"
     xmlns:cc="clr-namespace:Content.Client.Administration.UI.CustomControls"
+    xmlns:ui="clr-namespace:Content.Client.UserInterface.Controls"
     HorizontalExpand="True">
     <!-- Left side -->
     <BoxContainer Orientation="Vertical" Margin="10 10 10 10" HorizontalExpand="True">
@@ -45,12 +46,12 @@
             </BoxContainer>
         </BoxContainer>
         <Control MinHeight="10" />
-        <!-- tabContainer -->
-        <TabContainer Name="CTabContainer" VerticalExpand="True">
-            <BoxContainer Orientation="Vertical">
-                <ScrollContainer VerticalExpand="True">
-                    <!-- appearanceList -->
-                    <BoxContainer Orientation="Vertical">
+        <!-- TabContainer -->
+        <ui:NeoTabContainer Name="CTabContainer" VerticalExpand="True" HScrollEnabled="False" VScrollEnabled="False">
+            <BoxContainer Name="CAppearance" HorizontalExpand="True" Orientation="Vertical">
+                <!-- appearanceList -->
+                <ScrollContainer HorizontalExpand="True" HScrollEnabled="True" VerticalExpand="True" VScrollEnabled="True">
+                    <BoxContainer HorizontalExpand="True" Orientation="Vertical">
                         <BoxContainer Margin="10" Orientation="Vertical" HorizontalExpand="True">
                             <!-- Species -->
                             <BoxContainer HorizontalExpand="True">
@@ -108,7 +109,7 @@
                                 <Control HorizontalExpand="True"/>
                                 <OptionButton Name="CSpawnPriorityButton" HorizontalAlignment="Right" />
                             </BoxContainer>
-							<!-- Height -->
+						    <!-- Height -->
                             <BoxContainer HorizontalExpand="True">
                                 <Label Name="CHeightLabel" MinWidth="110" />
                                 <Slider Name="CHeightSlider" MinValue="0.5" Value="1" MaxValue="1.5" HorizontalExpand="True" Margin="5 0 5 0" />
@@ -144,52 +145,76 @@
                     </BoxContainer>
                 </ScrollContainer>
             </BoxContainer>
-            <BoxContainer Orientation="Vertical">
+            <BoxContainer Name="CJobs" HorizontalExpand="True">
                 <!-- Jobs -->
-                <OptionButton Name="CPreferenceUnavailableButton" />
-                <ScrollContainer VerticalExpand="True">
-                    <BoxContainer Name="CJobList" Orientation="Vertical" />
+                <ScrollContainer HorizontalExpand="True" HScrollEnabled="True" VerticalExpand="True" VScrollEnabled="True">
+                    <BoxContainer HorizontalExpand="True" Orientation="Vertical">
+                        <OptionButton Name="CPreferenceUnavailableButton" StyleClasses="OpenBoth" />
+                        <BoxContainer Name="CJobList" Orientation="Vertical" />
+                    </BoxContainer>
                 </ScrollContainer>
-            </BoxContainer>
-            <BoxContainer Orientation="Vertical" Margin="10">
+                </BoxContainer>
+            <BoxContainer Name="CAntags" HorizontalExpand="True" Orientation="Vertical" Margin="10">
                 <!-- Antags -->
-                <ScrollContainer VerticalExpand="True">
+                <ScrollContainer HorizontalExpand="True" HScrollEnabled="True" VerticalExpand="True" VScrollEnabled="True">
                     <BoxContainer Name="CAntagList" Orientation="Vertical" />
                 </ScrollContainer>
             </BoxContainer>
-            <BoxContainer Name="CTraitsTab" Orientation="Vertical" Margin="10">
+            <BoxContainer Name="CTraitsTab" HorizontalExpand="True" Orientation="Vertical" Margin="10">
                 <!-- Traits -->
                 <Label Name="TraitPointsLabel" HorizontalAlignment="Stretch" Align="Center" />
                 <ProgressBar Name="TraitPointsBar" MaxValue="1" Value="1" MaxHeight="8" Margin="0 5" />
 
-                <Button Name="TraitsShowUnusableButton"
+                <BoxContainer HorizontalExpand="True" Margin="0 0 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" />
+                        HorizontalAlignment="Stretch"
+                        HorizontalExpand="True"
+                        StyleClasses="OpenRight" />
+                    <Button
+                        Name="TraitsRemoveUnusableButton"
+                        Text="You shouldn't see this"
+                        ToolTip="{Loc 'humanoid-profile-editor-traits-remove-unusable-button-tooltip'}"
+                        HorizontalAlignment="Stretch"
+                        HorizontalExpand="True"
+                        StyleClasses="OpenLeft" />
+                </BoxContainer>
 
-                <TabContainer Name="CTraitsTabs" VerticalExpand="True" />
+                <ui:NeoTabContainer Name="CTraitsTabs" VerticalExpand="True" SeparatorMargin="0" />
             </BoxContainer>
-            <BoxContainer Name="CLoadoutsTab" Orientation="Vertical" Margin="10">
+            <BoxContainer Name="CLoadoutsTab" HorizontalExpand="True" 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="LoadoutsShowUnusableButton"
+                <BoxContainer HorizontalExpand="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" />
+                        HorizontalAlignment="Stretch"
+                        HorizontalExpand="True"
+                        StyleClasses="OpenRight" />
+                    <Button
+                        Name="LoadoutsRemoveUnusableButton"
+                        Text="You shouldn't see this"
+                        ToolTip="{Loc 'humanoid-profile-editor-loadouts-remove-unusable-button-tooltip'}"
+                        HorizontalAlignment="Stretch"
+                        HorizontalExpand="True"
+                        StyleClasses="OpenLeft" />
+                </BoxContainer>
 
-                <TabContainer Name="CLoadoutsTabs" VerticalExpand="True" />
+                <ui:NeoTabContainer Name="CLoadoutsTabs" VerticalExpand="True" SeparatorMargin="0" />
             </BoxContainer>
-            <BoxContainer Name="CMarkingsTab" Orientation="Vertical" Margin="10">
+            <BoxContainer Name="CMarkingsTab" HorizontalExpand="True" Orientation="Vertical" Margin="10">
                 <!-- Markings -->
-                <ScrollContainer VerticalExpand="True">
-                    <humanoid:MarkingPicker Name="CMarkings" IgnoreCategories="Hair,FacialHair" />
-                </ScrollContainer>
+                <humanoid:MarkingPicker Name="CMarkings" IgnoreCategories="Hair,FacialHair" />
             </BoxContainer>
-        </TabContainer>
+        </ui:NeoTabContainer>
     </BoxContainer>
     <!-- Right side -->
     <BoxContainer Orientation="Vertical" VerticalExpand="True" VerticalAlignment="Center">