Merge branch 'master' into texture

AdventureTimeSS14 · Jun 27, 2024 · 3915838 · 3915838
2 parents 741c743 + d1db5ef
commit 3915838
Show file tree

Hide file tree

Showing 306 changed files with 17,734 additions and 6,651 deletions.
diff --git a/.github/workflows/auto-cl-update-atd.yml b/.github/workflows/auto-cl-update-atd.yml
@@ -0,0 +1,69 @@
+name: Auto CL update
+
+on:
+  push:
+    branches:
+      - master
+
+permissions:
+  contents: write
+  pull-requests: write
+
+jobs:
+  post_merge_job:
+    name: Auto CL update
+    runs-on: ubuntu-latest
+
+    steps:
+    - name: Checkout repository
+      uses: actions/[email protected]
+
+    - name: Pull latest changes for update-changelog branch
+      run: |
+        git fetch origin
+        git checkout -b update-changelog || git checkout update-changelog
+
+    - name: Setup Python
+      uses: actions/setup-python@v3
+      with:
+        python-version: '3.x'
+
+    - name: Install requirements
+      run: pip install requests pyyaml
+
+    - name: Run post-merge script
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      run: python Tools/ATD/auto_cl.py "${{ env.GITHUB_TOKEN }}" "${{ github.repository }}"
+
+    - name: Configure Git
+      run: |
+        git config user.name "github-actions[bot]"
+        git config user.email "github-actions[bot]@users.noreply.github.com"
+
+    - name: Commit changes
+      id: commit-changes
+      run: |
+        git add .
+        git diff-index --quiet HEAD || git commit -m "Auto cl update"
+      continue-on-error: true
+
+    - name: Push changes to a new branch
+      if: steps.commit-changes.outcome == 'success'
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      run: |
+        git push https://x-access-token:${{ secrets.GITHUB_TOKEN }}@github.com/${{ github.repository }} update-changelog --force
+
+    - name: Create Pull Request
+      if: steps.commit-changes.outcome == 'success'
+      uses: peter-evans/create-pull-request@v4
+      with:
+        token: ${{ secrets.GITHUB_TOKEN }}
+        base: master
+        branch: update-changelog
+        commit-message: "Auto cl update"
+        title: "Auto CL update"
+        body: "No cl, no fun"
+        labels: "auto-update changelog"
+      continue-on-error: true
diff --git a/.github/workflows/labeler-untriaged.yml b/.github/workflows/labeler-untriaged.yml
@@ -9,5 +9,6 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions-ecosystem/action-add-labels@v1
+      if: join(github.event.issue.labels) == ''
       with:
         labels: "Status: Untriaged"
diff --git a/.github/workflows/update-wiki.yml b/.github/workflows/update-wiki.yml
@@ -1,92 +1,92 @@
-name: Update Wiki
+# name: Update Wiki
 
-on:
-  workflow_dispatch:
-  push:
-    branches: [ master, jsondump ]
-    paths:
-      - '.github/workflows/update-wiki.yml'
-      - 'Content.Shared/Chemistry/**.cs'
-      - 'Content.Server/Chemistry/**.cs'
-      - 'Content.Server/GuideGenerator/**.cs'
-      - 'Content.Server/Corvax/GuideGenerator/**.cs'
-      - 'Resources/Prototypes/Reagents/**.yml'
-      - 'Resources/Prototypes/Chemistry/**.yml'
-      - 'Resources/Prototypes/Recipes/Reactions/**.yml'
-      - 'RobustToolbox/'
+# on:
+#   workflow_dispatch:
+#   push:
+#     branches: [ master, jsondump ]
+#     paths:
+#       - '.github/workflows/update-wiki.yml'
+#       - 'Content.Shared/Chemistry/**.cs'
+#       - 'Content.Server/Chemistry/**.cs'
+#       - 'Content.Server/GuideGenerator/**.cs'
+#       - 'Content.Server/Corvax/GuideGenerator/**.cs'
+#       - 'Resources/Prototypes/Reagents/**.yml'
+#       - 'Resources/Prototypes/Chemistry/**.yml'
+#       - 'Resources/Prototypes/Recipes/Reactions/**.yml'
+#       - 'RobustToolbox/'
 
-jobs:
-  update-wiki:
-    name: Build and Publish JSON blobs to wiki
-    runs-on: ubuntu-latest
+# jobs:
+#   update-wiki:
+#     name: Build and Publish JSON blobs to wiki
+#     runs-on: ubuntu-latest
 
-    steps:
-    - name: Checkout Master
-      uses: actions/[email protected]
+#     steps:
+#     - name: Checkout Master
+#       uses: actions/[email protected]
 
-    - name: Setup Submodule
-      run: |
-        git submodule update --init --recursive
+#     - name: Setup Submodule
+#       run: |
+#         git submodule update --init --recursive
 
-    - name: Pull Engine Updates
-      uses: space-wizards/[email protected]
+#     - name: Pull Engine Updates
+#       uses: space-wizards/[email protected]
 
-    - name: Update Engine Submodules
-      run: |
-        cd RobustToolbox/
-        git submodule update --init --recursive
+#     - name: Update Engine Submodules
+#       run: |
+#         cd RobustToolbox/
+#         git submodule update --init --recursive
 
-    - name: Setup .NET Core
-      uses: actions/[email protected]
-      with:
-        dotnet-version: 7.0.x
+#     - name: Setup .NET Core
+#       uses: actions/[email protected]
+#       with:
+#         dotnet-version: 7.0.x
 
-    - name: Install Dependencies
-      run: dotnet restore
+#     - name: Install Dependencies
+#       run: dotnet restore
 
-    - name: Build Project
-      run: dotnet build --configuration Release --no-restore /p:WarningsAsErrors=nullable /m
+#     - name: Build Project
+#       run: dotnet build --configuration Release --no-restore /p:WarningsAsErrors=nullable /m
 
-    - name: Generate JSON blobs for prototypes
-      run: dotnet ./bin/Content.Server/Content.Server.dll --cvar autogen.destination_file=prototypes.json
-      continue-on-error: true
+#     - name: Generate JSON blobs for prototypes
+#       run: dotnet ./bin/Content.Server/Content.Server.dll --cvar autogen.destination_file=prototypes.json
+#       continue-on-error: true
 
-    - name: Upload chem_prototypes.json to wiki
-      uses: jtmullen/[email protected]
-      with:
-        wiki_text_file: ./bin/Content.Server/data/chem_prototypes.json
-        edit_summary: Update chem_prototypes.json via GitHub Actions
-        page_name: "${{ secrets.WIKI_PAGE_ROOT }}/chem_prototypes.json"
-        api_url: ${{ secrets.WIKI_ROOT_URL }}/api.php
-        username: ${{ secrets.WIKI_BOT_USER }}
-        password: ${{ secrets.WIKI_BOT_PASS }}
+#     - name: Upload chem_prototypes.json to wiki
+#       uses: jtmullen/[email protected]
+#       with:
+#         wiki_text_file: ./bin/Content.Server/data/chem_prototypes.json
+#         edit_summary: Update chem_prototypes.json via GitHub Actions
+#         page_name: "${{ secrets.WIKI_PAGE_ROOT }}/chem_prototypes.json"
+#         api_url: ${{ secrets.WIKI_ROOT_URL }}/api.php
+#         username: ${{ secrets.WIKI_BOT_USER }}
+#         password: ${{ secrets.WIKI_BOT_PASS }}
 
-    - name: Upload react_prototypes.json to wiki
-      uses: jtmullen/[email protected]
-      with:
-        wiki_text_file: ./bin/Content.Server/data/react_prototypes.json
-        edit_summary: Update react_prototypes.json via GitHub Actions
-        page_name: "${{ secrets.WIKI_PAGE_ROOT }}/react_prototypes.json"
-        api_url: ${{ secrets.WIKI_ROOT_URL }}/api.php
-        username: ${{ secrets.WIKI_BOT_USER }}
-        password: ${{ secrets.WIKI_BOT_PASS }}
+#     - name: Upload react_prototypes.json to wiki
+#       uses: jtmullen/[email protected]
+#       with:
+#         wiki_text_file: ./bin/Content.Server/data/react_prototypes.json
+#         edit_summary: Update react_prototypes.json via GitHub Actions
+#         page_name: "${{ secrets.WIKI_PAGE_ROOT }}/react_prototypes.json"
+#         api_url: ${{ secrets.WIKI_ROOT_URL }}/api.php
+#         username: ${{ secrets.WIKI_BOT_USER }}
+#         password: ${{ secrets.WIKI_BOT_PASS }}
 
-    - name: Upload entity_prototypes.json to wiki
-      uses: jtmullen/[email protected]
-      with:
-        wiki_text_file: ./bin/Content.Server/data/entity_prototypes.json
-        edit_summary: Update entity_prototypes.json via GitHub Actions
-        page_name: "${{ secrets.WIKI_PAGE_ROOT }}/entity_prototypes.json"
-        api_url: ${{ secrets.WIKI_ROOT_URL }}/api.php
-        username: ${{ secrets.WIKI_BOT_USER }}
-        password: ${{ secrets.WIKI_BOT_PASS }}
+#     - name: Upload entity_prototypes.json to wiki
+#       uses: jtmullen/[email protected]
+#       with:
+#         wiki_text_file: ./bin/Content.Server/data/entity_prototypes.json
+#         edit_summary: Update entity_prototypes.json via GitHub Actions
+#         page_name: "${{ secrets.WIKI_PAGE_ROOT }}/entity_prototypes.json"
+#         api_url: ${{ secrets.WIKI_ROOT_URL }}/api.php
+#         username: ${{ secrets.WIKI_BOT_USER }}
+#         password: ${{ secrets.WIKI_BOT_PASS }}
 
-    - name: Upload mealrecipes_prototypes.json to wiki
-      uses: jtmullen/[email protected]
-      with:
-        wiki_text_file: ./bin/Content.Server/data/mealrecipes_prototypes.json
-        edit_summary: Update mealrecipes_prototypes.json via GitHub Actions
-        page_name: "${{ secrets.WIKI_PAGE_ROOT }}/mealrecipes_prototypes.json"
-        api_url: ${{ secrets.WIKI_ROOT_URL }}/api.php
-        username: ${{ secrets.WIKI_BOT_USER }}
-        password: ${{ secrets.WIKI_BOT_PASS }}
+#     - name: Upload mealrecipes_prototypes.json to wiki
+#       uses: jtmullen/[email protected]
+#       with:
+#         wiki_text_file: ./bin/Content.Server/data/mealrecipes_prototypes.json
+#         edit_summary: Update mealrecipes_prototypes.json via GitHub Actions
+#         page_name: "${{ secrets.WIKI_PAGE_ROOT }}/mealrecipes_prototypes.json"
+#         api_url: ${{ secrets.WIKI_ROOT_URL }}/api.php
+#         username: ${{ secrets.WIKI_BOT_USER }}
+#         password: ${{ secrets.WIKI_BOT_PASS }}
diff --git a/.gitmodules b/.gitmodules
@@ -2,8 +2,3 @@
 	path = RobustToolbox
 	url = https://github.com/space-wizards/RobustToolbox.git
 	branch = master
-[submodule "Secrets"]
-	path = Secrets
-	url = [email protected]:corvax-project/secrets.git
-	branch = master
-	update = none
diff --git a/Content.Client/Administration/UI/CustomControls/PlayerListControl.xaml b/Content.Client/Administration/UI/CustomControls/PlayerListControl.xaml
@@ -5,7 +5,7 @@
     <LineEdit Name="FilterLineEdit"
               MinSize="100 0"
               HorizontalExpand="True"
-              PlaceHolder="{Loc Filter}"/>
+              PlaceHolder="{Loc player-list-filter}"/>
     <PanelContainer Name="BackgroundPanel"
                     VerticalExpand="True"
                     HorizontalExpand="True">

diff --git a/Content.Client/Administration/UI/Tabs/AdminTab/PlayerActionsWindow.xaml b/Content.Client/Administration/UI/Tabs/AdminTab/PlayerActionsWindow.xaml
@@ -4,7 +4,7 @@
     Title="{Loc admin-player-actions-window-title}" MinSize="425 272">
     <BoxContainer Orientation="Vertical">
         <BoxContainer Orientation="Horizontal">
-            <Label Text="{Loc Reason}" MinWidth="100" />
+            <Label Text="{Loc admin-player-actions-reason}" MinWidth="100" />
             <Control MinWidth="50" />
             <LineEdit Name="ReasonLine" MinWidth="100" HorizontalExpand="True" />
         </BoxContainer>

diff --git a/Content.Client/Administration/UI/Tabs/AdminTab/TeleportWindow.xaml b/Content.Client/Administration/UI/Tabs/AdminTab/TeleportWindow.xaml
@@ -1,9 +1,9 @@
 <DefaultWindow
     xmlns="https://spacestation14.io"
     xmlns:cc="clr-namespace:Content.Client.Administration.UI.CustomControls"
-    Title="{Loc Teleport}" MinSize="425 230">
+    Title="{Loc admin-ui-teleport}" MinSize="425 230">
     <BoxContainer Orientation="Vertical">
         <cc:PlayerListControl Name="PlayerList" />
-        <Button Name="SubmitButton" Text="{Loc Teleport}" />
+        <Button Name="SubmitButton" Text="{Loc admin-ui-teleport}" />
     </BoxContainer>
 </DefaultWindow>
diff --git a/Content.Client/Administration/UI/Tabs/AdminbusTab/LoadBlueprintsWindow.xaml b/Content.Client/Administration/UI/Tabs/AdminbusTab/LoadBlueprintsWindow.xaml
@@ -1,33 +1,33 @@
 <DefaultWindow
-    xmlns="https://spacestation14.io" Title="{Loc Load Blueprint}">
+    xmlns="https://spacestation14.io" Title="{Loc admin-ui-blueprint-load}">
     <BoxContainer Orientation="Vertical">
         <BoxContainer Orientation="Horizontal">
-            <Label Text="{Loc Map}" MinSize="100 0" />
+            <Label Text="{Loc admin-ui-blueprint-map}" MinSize="100 0" />
             <Control MinSize="50 0" />
             <OptionButton Name="MapOptions" MinSize="100 0" HorizontalExpand="True" />
         </BoxContainer>
         <BoxContainer Orientation="Horizontal">
-            <Label Text="{Loc Path}" MinSize="100 0" />
+            <Label Text="{Loc admin-ui-blueprint-path}" MinSize="100 0" />
             <Control MinSize="50 0" />
             <LineEdit Name="MapPath" MinSize="200 0" HorizontalExpand="True" Text="/Maps/" />
         </BoxContainer>
         <BoxContainer Orientation="Horizontal">
-            <Label Text="{Loc X}" MinSize="100 0" />
+            <Label Text="{Loc admin-ui-blueprint-x}" MinSize="100 0" />
             <Control MinSize="50 0" />
             <SpinBox Name="XCoordinate" MinSize="100 0" HorizontalExpand="True" />
         </BoxContainer>
         <BoxContainer Orientation="Horizontal">
-            <Label Text="{Loc Y}" MinSize="100 0" />
+            <Label Text="{Loc admin-ui-blueprint-y}" MinSize="100 0" />
             <Control MinSize="50 0" />
             <SpinBox Name="YCoordinate" MinSize="100 0" HorizontalExpand="True" />
         </BoxContainer>
         <BoxContainer Orientation="Horizontal">
-            <Label Text="{Loc Rotation}" MinSize="100 0" />
+            <Label Text="{Loc admin-ui-blueprint-rotation}" MinSize="100 0" />
             <Control MinSize="50 0" />
             <SpinBox Name="RotationSpin" MinSize="100 0" HorizontalExpand="True" />
         </BoxContainer>
-        <Button Name="SubmitButton" Text="{Loc Load Blueprint}" />
-        <Button Name="TeleportButton" Text="{Loc Teleport to}" />
-        <Button Name="ResetButton" Text="{Loc Reset to default}"></Button>
+        <Button Name="SubmitButton" Text="{Loc admin-ui-blueprint-load}" />
+        <Button Name="TeleportButton" Text="{Loc admin-ui-blueprint-teleport}" />
+        <Button Name="ResetButton" Text="{Loc admin-ui-blueprint-reset}"></Button>
     </BoxContainer>
 </DefaultWindow>
diff --git a/Content.Client/Administration/UI/Tabs/AtmosTab/AddAtmosWindow.xaml b/Content.Client/Administration/UI/Tabs/AtmosTab/AddAtmosWindow.xaml
@@ -1,11 +1,11 @@
 <DefaultWindow
-    xmlns="https://spacestation14.io" Title="{Loc Add Atmos}">
+    xmlns="https://spacestation14.io" Title="{Loc admin-ui-atmos-add}">
     <BoxContainer Orientation="Vertical">
         <BoxContainer Orientation="Horizontal">
-            <Label Text="{Loc Grid}" MinSize="100 0" />
+            <Label Text="{Loc admin-ui-atmos-grid}" MinSize="100 0" />
             <Control MinSize="50 0" />
             <OptionButton Name="GridOptions" MinSize="100 0" HorizontalExpand="True" />
         </BoxContainer>
-        <Button Name="SubmitButton" Text="{Loc Add Atmos}" />
+        <Button Name="SubmitButton" Text="{Loc admin-ui-atmos-add}" />
     </BoxContainer>
 </DefaultWindow>
diff --git a/Content.Client/Administration/UI/Tabs/AtmosTab/AddAtmosWindow.xaml.cs b/Content.Client/Administration/UI/Tabs/AtmosTab/AddAtmosWindow.xaml.cs
@@ -35,7 +35,7 @@ protected override void EnteredTree()
             while (query.MoveNext(out var uid, out var grid))
             {
                 _data.Add((uid, grid));
-                GridOptions.AddItem($"{uid} {(playerGrid == uid ? " (Current)" : "")}");
+                GridOptions.AddItem($"{uid} {(playerGrid == uid ? Loc.GetString($"admin-ui-atmos-grid-current") : "")}");
             }
 
             GridOptions.OnItemSelected += eventArgs => GridOptions.SelectId(eventArgs.Id);

diff --git a/Content.Client/Administration/UI/Tabs/AtmosTab/AddGasWindow.xaml b/Content.Client/Administration/UI/Tabs/AtmosTab/AddGasWindow.xaml
@@ -1,31 +1,31 @@
 <DefaultWindow
-    xmlns="https://spacestation14.io" Title="{Loc Add Gas}">
+    xmlns="https://spacestation14.io" Title="{Loc admin-ui-atmos-add-gas}">
     <BoxContainer Orientation="Vertical">
         <BoxContainer Orientation="Horizontal">
-            <Label Text="{Loc Grid}" MinSize="100 0" />
+            <Label Text="{Loc admin-ui-atmos-grid}" MinSize="100 0" />
             <Control MinSize="50 0" />
             <OptionButton Name="GridOptions" MinSize="100 0" HorizontalExpand="True" />
         </BoxContainer>
         <BoxContainer Orientation="Horizontal">
-            <Label Text="{Loc TileX}" MinSize="100 0" />
+            <Label Text="{Loc admin-ui-atmos-tile-x}" MinSize="100 0" />
             <Control MinSize="50 0" />
             <SpinBox Name="TileXSpin" MinSize="100 0" HorizontalExpand="True" />
         </BoxContainer>
         <BoxContainer Orientation="Horizontal">
-            <Label Text="{Loc TileY}" MinSize="100 0" />
+            <Label Text="{Loc admin-ui-atmos-tile-y}" MinSize="100 0" />
             <Control MinSize="50 0" />
             <SpinBox Name="TileYSpin" MinSize="100 0" HorizontalExpand="True" />
         </BoxContainer>
         <BoxContainer Orientation="Horizontal">
-            <Label Text="{Loc Gas}" MinSize="100 0" />
+            <Label Text="{Loc admin-ui-atmos-gas}" MinSize="100 0" />
             <Control MinSize="50 0" />
             <OptionButton Name="GasOptions" MinSize="100 0" HorizontalExpand="True" />
         </BoxContainer>
         <BoxContainer Orientation="Horizontal">
-            <Label Text="{Loc Amount}" MinSize="100 0" />
+            <Label Text="{Loc admin-ui-atmos-gas-amount}" MinSize="100 0" />
             <Control MinSize="50 0" />
             <SpinBox Name="AmountSpin" MinSize="100 0" HorizontalExpand="True" />
         </BoxContainer>
-        <Button Name="SubmitButton" Text="{Loc Add Gas}" />
+        <Button Name="SubmitButton" Text="{Loc admin-ui-atmos-add-gas}" />
     </BoxContainer>
 </DefaultWindow>