Merge remote-tracking branch 'upstream/master' into Suits

.github/workflows/changelog.yml

@@ -0,0 +1,53 @@
+name: PR Changelogs
+on:
+  pull_request_target:
+    types: [closed]
+
+env:
+  GITHUB_TOKEN: ${{ secrets.BOT_TOKEN }}
+  CHANGELOG_DIR: Resources/Changelog/Changelog.yml
+  PR_NUMBER: ${{ github.event.number }}
+
+jobs:
+  changelog:
+    runs-on: ubuntu-latest
+    if: github.event.pull_request.merged == true
+    permissions:
+      contents: write
+    steps:
+      - name: Checkout Master
+        uses: actions/checkout@v3
+        with:
+          token: ${{ secrets.BOT_TOKEN }}
+          ref: master
+
+      - 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: Install Dependencies
+        run: |
+          cd "Tools/changelog"
+          npm install
+        shell: bash
+
+      - name: Generate Changelog
+        run: |
+          cd "Tools/changelog"
+          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

.github/workflows/publish-changelog.yml

@@ -0,0 +1,24 @@
+name: Publish Changelog
+
+on:
+  workflow_dispatch:
+  schedule:
+    - cron: '0 10 * * *'
+
+jobs:
+ publish_changelog:
+    runs-on: ubuntu-latest
+    steps:
+
+    - name: checkout
+      uses: actions/checkout@v3
+      with:
+        token: ${{secrets.GITHUB_TOKEN}}
+        ref: master
+
+    - name: Publish changelog
+      run: Tools/actions_changelogs_since_last_run.py
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        DISCORD_WEBHOOK_URL: ${{ secrets.CHANGELOG_DISCORD_WEBHOOK }}
+    continue-on-error: true

.github/workflows/publish.yml

@@ -60,11 +60,11 @@ jobs:
         key: ${{ secrets.CENTCOMM_WIZARDS_BUILDS_PUSH_KEY }}
         script: /home/wizards-build-push/push.ps1 ${{ github.sha }}
 
-    - name: Publish changelog (Discord)
-      run: Tools/actions_changelogs_since_last_run.py
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        DISCORD_WEBHOOK_URL: ${{ secrets.CHANGELOG_DISCORD_WEBHOOK }}
+    #- name: Publish changelog (Discord)
+    #  run: Tools/actions_changelogs_since_last_run.py
+    # env:
+    #    GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+    #    DISCORD_WEBHOOK_URL: ${{ secrets.CHANGELOG_DISCORD_WEBHOOK }}
 
     - name: Publish changelog (RSS)
       run: Tools/actions_changelog_rss.py

.vscode/tasks.json

@@ -11,7 +11,6 @@
                 "build",
                 "/property:GenerateFullPaths=true", // Ask dotnet build to generate full paths for file names.
                 "/consoleloggerparameters:NoSummary" // Do not generate summary otherwise it leads to duplicate errors in Problems panel
-
             ],
             "group": {
                 "kind": "build",

Content.Shared/CCVar/CCVars.cs

@@ -310,7 +310,7 @@ public static readonly CVarDef<bool>
         /// How many times per second artifacts when the round is over.
         /// If set to 0, they won't activate (on a timer) when the round ends.
         /// </summary>
-        public static readonly CVarDef<float> ArtifactRoundEndTimer = CVarDef.Create("game.artifact_round_end_timer", 0.5f, CVar.NOTIFY | CVar.REPLICATED);
+        public static readonly CVarDef<float> ArtifactRoundEndTimer = CVarDef.Create("game.artifact_round_end_timer", 0f, CVar.NOTIFY | CVar.REPLICATED);
 
         /*
          * Discord