diff --git a/.github/workflows/build-map-renderer.yml b/.github/workflows/build-map-renderer.yml index c1790feadb..69387d6691 100644 --- a/.github/workflows/build-map-renderer.yml +++ b/.github/workflows/build-map-renderer.yml @@ -10,7 +10,7 @@ on: jobs: build: - if: github.actor != 'PJBot' && github.event.pull_request.draft == false && github.actor != 'DeltaV-Bot' && github.actor != 'SimpleStation14' + if: github.actor != 'PJBot' && github.event.pull_request.draft == false && github.actor != 'DeltaV-Bot' && github.actor != 'SimpleStation14' && github.actor != 'Lost-Paradise-Bot' strategy: matrix: os: [ubuntu-latest] diff --git a/.github/workflows/build-test-debug.yml b/.github/workflows/build-test-debug.yml index bb0624e3ba..32757b862a 100644 --- a/.github/workflows/build-test-debug.yml +++ b/.github/workflows/build-test-debug.yml @@ -10,7 +10,7 @@ on: jobs: build: - if: github.actor != 'PJBot' && github.event.pull_request.draft == false && github.actor != 'DeltaV-Bot' && github.actor != 'SimpleStation14' + if: github.actor != 'PJBot' && github.event.pull_request.draft == false && github.actor != 'DeltaV-Bot' && github.actor != 'SimpleStation14' && github.actor != 'Lost-Paradise-Bot' strategy: matrix: os: [ubuntu-latest] diff --git a/.github/workflows/changelog.yml b/.github/workflows/changelog.yml index 58506eb11c..79cfdd83cd 100644 --- a/.github/workflows/changelog.yml +++ b/.github/workflows/changelog.yml @@ -5,10 +5,9 @@ on: types: [closed] env: - BOT_TOKEN: ${{ secrets.BOT_TOKEN }} - CHANGELOG_DIR: Resources/Changelog/ChangelogLPP.yml + GITHUB_TOKEN: ${{ secrets.BOT_TOKEN }} + CHANGELOG_DIR: ${{ vars.CHANGELOG_DIR }} PR_NUMBER: ${{ github.event.number }} - CHANGELOG_DISCORD_WEBHOOK: ${{ secrets.CHANGELOG_DISCORD_WEBHOOK }} jobs: changelog: @@ -21,7 +20,7 @@ jobs: uses: actions/checkout@v3 with: token: ${{ secrets.BOT_TOKEN }} - ref: master + ref: ${{ vars.CHANGELOG_BRANCH }} - name: Setup Git run: | diff --git a/.github/workflows/publish-changelog.yml b/.github/workflows/discord-changelog.yml similarity index 64% rename from .github/workflows/publish-changelog.yml rename to .github/workflows/discord-changelog.yml index 5e2433745f..39fac81269 100644 --- a/.github/workflows/publish-changelog.yml +++ b/.github/workflows/discord-changelog.yml @@ -1,4 +1,4 @@ -name: Publish Changelog +name: Discord Changelog on: workflow_dispatch: @@ -13,12 +13,12 @@ jobs: - name: checkout uses: actions/checkout@v3 with: - token: ${{secrets.BOT_TOKEN}} ref: master - name: Publish changelog run: Tools/actions_changelogs_since_last_run.py env: - BOT_TOKEN: ${{ secrets.BOT_TOKEN }} - CHANGELOG_DISCORD_WEBHOOK: ${{ secrets.CHANGELOG_DISCORD_WEBHOOK }} + CHANGELOG_DIR: ${{ vars.CHANGELOG_DIR }} + CHANGELOG_WEBHOOK: ${{ secrets.CHANGELOG_WEBHOOK }} + GITHUB_TOKEN: ${{ secrets.BOT_TOKEN }} continue-on-error: true diff --git a/.github/workflows/labeler-pr.yml b/.github/workflows/labeler-pr.yml index 1d55bc3c28..7197eec0bf 100644 --- a/.github/workflows/labeler-pr.yml +++ b/.github/workflows/labeler-pr.yml @@ -5,7 +5,7 @@ on: jobs: labeler: - if: github.actor != 'PJBot' && github.actor != 'DeltaV-Bot' && github.actor != 'SimpleStation14' + if: github.actor != 'PJBot' && github.actor != 'DeltaV-Bot' && github.actor != 'SimpleStation14' && github.actor != 'Lost-Paradise-Bot' runs-on: ubuntu-latest steps: - uses: actions/labeler@v3 diff --git a/.github/workflows/publish-lostparadise.yml b/.github/workflows/publish-lostparadise.yml index 6dfc9df63f..f9d6777bd8 100644 --- a/.github/workflows/publish-lostparadise.yml +++ b/.github/workflows/publish-lostparadise.yml @@ -39,7 +39,7 @@ jobs: run: dotnet build Content.Packaging --configuration Release --no-restore /m - name: Package server - run: dotnet run --project Content.Packaging server --platform linux-x64 + run: dotnet run --project Content.Packaging server --platform linux-x64 --platform win-x64 - name: Package client run: dotnet run --project Content.Packaging client --no-wipe-release diff --git a/.github/workflows/test-packaging.yml b/.github/workflows/test-packaging.yml index 5a560391ec..332b9055dd 100644 --- a/.github/workflows/test-packaging.yml +++ b/.github/workflows/test-packaging.yml @@ -29,7 +29,7 @@ on: jobs: build: name: Test Packaging - if: github.actor != 'PJBot' && github.actor != 'PJBot' && github.event.pull_request.draft == false + if: github.actor != 'PJBot' && github.event.pull_request.draft == false && github.actor != 'Lost-Paradise-Bot' runs-on: ubuntu-latest steps: diff --git a/.github/workflows/test-secrets1.yml b/.github/workflows/test-secrets1.yml new file mode 100644 index 0000000000..6954c8c846 --- /dev/null +++ b/.github/workflows/test-secrets1.yml @@ -0,0 +1,43 @@ +name: YAML Linter Secrets + +on: + push: + branches: [ master, staging, trying ] + merge_group: + pull_request: + types: [ opened, reopened, synchronize, ready_for_review ] + +jobs: + build: + name: YAML Linter Secrets + if: github.actor != 'PJBot' && github.event.pull_request.draft == false && github.actor != 'DeltaV-Bot' && github.actor != 'SimpleStation14' && github.actor != 'Lost-Paradise-Bot' + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v3.6.0 + - name: Setup submodule + run: | + git submodule update --init --recursive + - name: Download parts + run: | + git clone ${{ secrets.HUB_SEC_TOKEN }} + mv Secrets/_PrivateResources/_Private Resources/Prototypes/ + mv Secrets/_PrivateResources/PERSONAL Resources/Textures/ + mv Secrets/_PrivateShared Content.Shared/_PrivateShared + mv Secrets/_PrivateServer Content.Server/_PrivateServer + mv Secrets/_PrivateClient Content.Client/_PrivateClient + - name: Pull engine updates + uses: space-wizards/submodule-dependency@v0.1.5 + - name: Update Engine Submodules + run: | + cd RobustToolbox/ + git submodule update --init --recursive + - name: Setup .NET Core + uses: actions/setup-dotnet@v3.2.0 + with: + dotnet-version: 8.0.100 + - name: Install dependencies + run: dotnet restore + - name: Build + run: dotnet build --configuration Release --no-restore /p:WarningsAsErrors= /m + - name: Run Linter + run: dotnet run --project Content.YAMLLinter/Content.YAMLLinter.csproj --no-build diff --git a/.github/workflows/test-secrets2.yml b/.github/workflows/test-secrets2.yml new file mode 100644 index 0000000000..cc6eb8c943 --- /dev/null +++ b/.github/workflows/test-secrets2.yml @@ -0,0 +1,75 @@ +name: Test Packaging Secrets + +on: + push: + branches: [ master, staging, trying ] + paths: + - '**.cs' + - '**.csproj' + - '**.sln' + - '**.git**' + - '**.yml' + # no docs on which one of these is supposed to work, so + # why not just do both + - 'RobustToolbox' + - 'RobustToolbox/**' + merge_group: + pull_request: + types: [ opened, reopened, synchronize, ready_for_review ] + branches: [ master ] + paths: + - '**.cs' + - '**.csproj' + - '**.sln' + - '**.git**' + - '**.yml' + - 'RobustToolbox' + - 'RobustToolbox/**' + +jobs: + build: + name: Test Packaging Secrets + if: github.actor != 'PJBot' && github.event.pull_request.draft == false && github.actor != 'Lost-Paradise-Bot' + runs-on: ubuntu-latest + + steps: + - name: Checkout Master + uses: actions/checkout@v3.6.0 + + - name: Setup Submodule + run: | + git submodule update --init --recursive + + - name: Download parts + run: | + git clone ${{ secrets.HUB_SEC_TOKEN }} + mv Secrets/_PrivateResources/_Private Resources/Prototypes/ + mv Secrets/_PrivateResources/PERSONAL Resources/Textures/ + mv Secrets/_PrivateShared Content.Shared/_PrivateShared + mv Secrets/_PrivateServer Content.Server/_PrivateServer + mv Secrets/_PrivateClient Content.Client/_PrivateClient + + - name: Pull engine updates + uses: space-wizards/submodule-dependency@v0.1.5 + + - name: Update Engine Submodules + run: | + cd RobustToolbox/ + git submodule update --init --recursive + + - name: Setup .NET Core + uses: actions/setup-dotnet@v3.2.0 + with: + dotnet-version: 8.0.100 + + - name: Install dependencies + run: dotnet restore + + - name: Build Packaging + run: dotnet build Content.Packaging --configuration Release --no-restore /m + + - name: Package server + run: dotnet run --project Content.Packaging server --platform win-x64 --platform linux-x64 --platform osx-x64 --platform linux-arm64 + + - name: Package client + run: dotnet run --project Content.Packaging client --no-wipe-release diff --git a/.github/workflows/test-secrets3.yml b/.github/workflows/test-secrets3.yml new file mode 100644 index 0000000000..0ece1e06ff --- /dev/null +++ b/.github/workflows/test-secrets3.yml @@ -0,0 +1,71 @@ +name: Build & Test Debug Secrets + +on: + push: + branches: [ master, staging, trying ] + merge_group: + pull_request: + types: [ opened, reopened, synchronize, ready_for_review ] + branches: [ master ] + +jobs: + build: + if: github.actor != 'PJBot' && github.event.pull_request.draft == false && github.actor != 'DeltaV-Bot' && github.actor != 'SimpleStation14' && github.actor != 'Lost-Paradise-Bot' + strategy: + matrix: + os: [ubuntu-latest] + + runs-on: ${{ matrix.os }} + + steps: + - name: Checkout Master + uses: actions/checkout@v3.6.0 + + - name: Setup Submodule + run: | + git submodule update --init --recursive + + - name: Download parts + run: | + git clone ${{ secrets.HUB_SEC_TOKEN }} + mv Secrets/_PrivateResources/_Private Resources/Prototypes/ + mv Secrets/_PrivateResources/PERSONAL Resources/Textures/ + mv Secrets/_PrivateShared Content.Shared/_PrivateShared + mv Secrets/_PrivateServer Content.Server/_PrivateServer + mv Secrets/_PrivateClient Content.Client/_PrivateClient + + - name: Pull engine updates + uses: space-wizards/submodule-dependency@v0.1.5 + + - name: Update Engine Submodules + run: | + cd RobustToolbox/ + git submodule update --init --recursive + + - name: Setup .NET Core + uses: actions/setup-dotnet@v3.2.0 + with: + dotnet-version: 8.0.100 + + - name: Install dependencies + run: dotnet restore + + - name: Build Project + run: dotnet build --configuration DebugOpt --no-restore /p:WarningsAsErrors=nullable /m + + - name: Run Content.Tests + run: dotnet test --no-build --configuration DebugOpt Content.Tests/Content.Tests.csproj -- NUnit.ConsoleOut=0 + + - name: Run Content.IntegrationTests + shell: pwsh + run: | + $env:DOTNET_gcServer=1 + dotnet test --no-build --configuration DebugOpt Content.IntegrationTests/Content.IntegrationTests.csproj -- NUnit.ConsoleOut=0 NUnit.MapWarningTo=Failed + ci-success: + name: Build & Test Debug + needs: + - build + runs-on: ubuntu-latest + steps: + - name: CI succeeded + run: exit 0 diff --git a/.github/workflows/validate-rgas.yml b/.github/workflows/validate-rgas.yml index 72ce39ceff..29785fcca7 100644 --- a/.github/workflows/validate-rgas.yml +++ b/.github/workflows/validate-rgas.yml @@ -9,7 +9,7 @@ on: jobs: yaml-schema-validation: name: YAML RGA schema validator - if: github.actor != 'PJBot' && github.event.pull_request.draft == false && github.actor != 'DeltaV-Bot' && github.actor != 'SimpleStation14' + if: github.actor != 'PJBot' && github.event.pull_request.draft == false && github.actor != 'DeltaV-Bot' && github.actor != 'SimpleStation14' && github.actor != 'Lost-Paradise-Bot' runs-on: ubuntu-latest steps: - uses: actions/checkout@v3.6.0 diff --git a/.github/workflows/validate_mapfiles.yml b/.github/workflows/validate_mapfiles.yml index 190ee97d8f..ca0c267fa4 100644 --- a/.github/workflows/validate_mapfiles.yml +++ b/.github/workflows/validate_mapfiles.yml @@ -9,7 +9,7 @@ on: jobs: yaml-schema-validation: name: YAML map schema validator - if: github.actor != 'PJBot' && github.event.pull_request.draft == false && github.actor != 'DeltaV-Bot' && github.actor != 'SimpleStation14' + if: github.actor != 'PJBot' && github.event.pull_request.draft == false && github.actor != 'DeltaV-Bot' && github.actor != 'SimpleStation14' && github.actor != 'Lost-Paradise-Bot' runs-on: ubuntu-latest steps: - uses: actions/checkout@v3.6.0 diff --git a/.github/workflows/yaml-linter.yml b/.github/workflows/yaml-linter.yml index 8660ccc040..0f656b8472 100644 --- a/.github/workflows/yaml-linter.yml +++ b/.github/workflows/yaml-linter.yml @@ -10,7 +10,7 @@ on: jobs: build: name: YAML Linter - if: github.actor != 'PJBot' && github.event.pull_request.draft == false && github.actor != 'DeltaV-Bot' && github.actor != 'SimpleStation14' + if: github.actor != 'PJBot' && github.event.pull_request.draft == false && github.actor != 'DeltaV-Bot' && github.actor != 'SimpleStation14' && github.actor != 'Lost-Paradise-Bot' runs-on: ubuntu-latest steps: - uses: actions/checkout@v3.6.0 diff --git a/Content.Client/Administration/UI/AdminUIHelpers.cs b/Content.Client/Administration/UI/AdminUIHelpers.cs index 89ab33e931..7fa8172891 100644 --- 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 + diff --git a/Content.Client/Gateway/UI/GatewayWindow.xaml.cs b/Content.Client/Gateway/UI/GatewayWindow.xaml.cs index 889dd6e175..b3e1333a7a 100644 --- 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 index 92e1ee2aaf..1351aa9e86 100644 --- 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 index 13e456985a..3d8ae50748 100644 --- a/Content.Client/Options/UI/Tabs/KeyRebindTab.xaml.cs +++ b/Content.Client/Options/UI/Tabs/KeyRebindTab.xaml.cs @@ -478,7 +478,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 index 4a339d3f65..f4975a6090 100644 --- 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 index 359dfbb7d9..1e6fb1889e 100644 --- a/Content.Client/Preferences/UI/CharacterSetupGui.xaml.cs +++ b/Content.Client/Preferences/UI/CharacterSetupGui.xaml.cs @@ -231,7 +231,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 index 173e44a797..865e7a9339 100644 --- 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"> @@ -45,12 +46,12 @@ - - - - - - + + + + + + @@ -108,7 +109,7 @@ - + - + - - - + + + + + - - + + - + - +