diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index f43952d457d..a9c475e35ca 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -19,7 +19,7 @@ #/Resources/engineCommandPerms.yml @moonheart08 @Chief-Engineer #/Resources/clientCommandPerms.yml @moonheart08 @Chief-Engineer -#/Resources/Prototypes/Maps/ @Emisse +#/Resources/Prototypes/Maps/** @Emisse #/Resources/Prototypes/Body/ @DrSmugleaf # suffering #/Resources/Prototypes/Entities/Mobs/Player/ @DrSmugleaf diff --git a/.github/labeler.yml b/.github/labeler.yml index b2240bf6986..0d6bf9d7db0 100644 --- a/.github/labeler.yml +++ b/.github/labeler.yml @@ -50,6 +50,10 @@ - changed-files: - any-glob-to-any-file: '**/*.swsl' +"Audio": +- changed-files: + - any-glob-to-any-file: '**/*.ogg' + "No C#": - changed-files: - all-globs-to-all-files: "!**/*.cs" diff --git a/.github/mapchecker/whitelist.yml b/.github/mapchecker/whitelist.yml index f5a54e49894..49adaa457c7 100644 --- a/.github/mapchecker/whitelist.yml +++ b/.github/mapchecker/whitelist.yml @@ -6,17 +6,10 @@ Cove: true Lodge: true Trade: true -#Cove: -#- WallPlastitanium -#- HighSecDoor -#Lodge: -#- WallPlastitanium -#- HighSecDoor - # TECHNICAL DEBT BELOW. These ones were added to this list to ensure other PR's would not break upon merging. It is # the intention for this list to become empty in separate PR's. -#DartX: -#- HighSecDoor +Paladin: +- ShuttleGunDuster Rogue: - ShuttleGunFriendship Bottleneck: @@ -25,4 +18,4 @@ Watchdog: - WindoorSecureSecurityLocked - AirlockSecurityGlassLocked - ThrusterSecurity -- SmallGyroscopeSecurity \ No newline at end of file +- SmallGyroscopeSecurity diff --git a/.github/workflows/build-test-debug.yml b/.github/workflows/build-test-debug.yml index 57400747fe7..1d10d39f45e 100644 --- a/.github/workflows/build-test-debug.yml +++ b/.github/workflows/build-test-debug.yml @@ -7,9 +7,6 @@ on: pull_request: types: [ opened, reopened, synchronize, ready_for_review ] branches: [ master ] - pull_request_target: # Frontier: only run tests on C# changes - paths: # Frontier - - "**/*.cs" # Frontier jobs: build: @@ -50,11 +47,11 @@ jobs: - 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 --filter FullyQualifiedName!~ShipyardTest -- NUnit.ConsoleOut=0 NUnit.MapWarningTo=Failed + - name: Run Content.IntegrationTests + shell: pwsh + run: | + $env:DOTNET_gcServer=1 + dotnet test --no-build --configuration DebugOpt Content.IntegrationTests/Content.IntegrationTests.csproj --filter "FullyQualifiedName!~ShipyardTest" -- NUnit.ConsoleOut=0 NUnit.MapWarningTo=Failed ci-success: name: Build & Test Debug needs: diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 9b2bbb49d51..2ebce94a334 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -5,6 +5,7 @@ concurrency: on: workflow_dispatch: + # Frontier: re-enabled autopublish schedule: - cron: '0 10 * * *' diff --git a/.github/workflows/update-credits.yml b/.github/workflows/update-credits.yml index 5659ed66908..76e68ee1805 100644 --- a/.github/workflows/update-credits.yml +++ b/.github/workflows/update-credits.yml @@ -2,8 +2,8 @@ name: Update Contrib and Patreons in credits on: workflow_dispatch: - schedule: - - cron: 0 0 * * 0 + # schedule: # Frontier + # - cron: 0 0 * * 0 # Frontier jobs: get_credits: @@ -34,8 +34,22 @@ jobs: # Uncomment this and comment the other line if you do this. # https://github.com/stefanzweifel/git-auto-commit-action#push-to-protected-branches - - name: Commit new credit files - uses: stefanzweifel/git-auto-commit-action@v4 + #- name: Commit new credit files + # uses: stefanzweifel/git-auto-commit-action@v4 + # with: + # commit_message: Update Credits + # commit_author: PJBot + + # Taken from DeltaV, thank you mirrorcult, deltanedas. + # This will make a PR + - name: Set current date as env variable + run: echo "NOW=$(date +'%Y-%m-%dT%H-%M-%S')" >> $GITHUB_ENV + + - name: Create Pull Request + uses: peter-evans/create-pull-request@v5 with: - commit_message: Update Credits - commit_author: FrontierATC + commit-message: Update Credits + title: Update Credits + body: This is an automated Pull Request. This PR updates the github contributors in the credits section. + author: FrontierATC + branch: automated/credits-${{env.NOW}} diff --git a/Content.Client/Actions/ActionsSystem.cs b/Content.Client/Actions/ActionsSystem.cs index 26a22fa8b8d..7b13233bab5 100644 --- a/Content.Client/Actions/ActionsSystem.cs +++ b/Content.Client/Actions/ActionsSystem.cs @@ -51,6 +51,29 @@ public override void Initialize() SubscribeLocalEvent(OnEntityWorldTargetHandleState); } + public override void FrameUpdate(float frameTime) + { + base.FrameUpdate(frameTime); + + var worldActionQuery = EntityQueryEnumerator(); + while (worldActionQuery.MoveNext(out var uid, out var action)) + { + UpdateAction(uid, action); + } + + var instantActionQuery = EntityQueryEnumerator(); + while (instantActionQuery.MoveNext(out var uid, out var action)) + { + UpdateAction(uid, action); + } + + var entityActionQuery = EntityQueryEnumerator(); + while (entityActionQuery.MoveNext(out var uid, out var action)) + { + UpdateAction(uid, action); + } + } + private void OnInstantHandleState(EntityUid uid, InstantActionComponent component, ref ComponentHandleState args) { if (args.Current is not InstantActionComponentState state) @@ -95,6 +118,8 @@ private void BaseHandleState(EntityUid uid, BaseActionComponent component, Ba component.Icon = state.Icon; component.IconOn = state.IconOn; component.IconColor = state.IconColor; + component.OriginalIconColor = state.OriginalIconColor; + component.DisabledIconColor = state.DisabledIconColor; component.Keywords.Clear(); component.Keywords.UnionWith(state.Keywords); component.Enabled = state.Enabled; @@ -125,6 +150,8 @@ public override void UpdateAction(EntityUid? actionId, BaseActionComponent? acti if (!ResolveActionData(actionId, ref action)) return; + action.IconColor = action.Charges < 1 ? action.DisabledIconColor : action.OriginalIconColor; + base.UpdateAction(actionId, action); if (_playerManager.LocalEntity != action.AttachedEntity) return; diff --git a/Content.Client/Administration/UI/PlayerPanel/PlayerPanel.xaml b/Content.Client/Administration/UI/PlayerPanel/PlayerPanel.xaml index 8feec273b47..5b3b9f007ca 100644 --- a/Content.Client/Administration/UI/PlayerPanel/PlayerPanel.xaml +++ b/Content.Client/Administration/UI/PlayerPanel/PlayerPanel.xaml @@ -31,6 +31,7 @@ + +