Upstream 14.03.26

.github/CODEOWNERS

@@ -1,9 +1,11 @@
 # This list auto requests reviews from the specified org members
+
 # when a PR that modifies the file in question is opened
+
 # This list is alphabetized by User -> Filename and separated into sections for Maintainers/Contributors KEEP IT THAT WAY
-# In the event that people are to be informed of changes
-# to the same file or dir, add them to the end of under Multiple Owners
 
+# In the event that people are to be informed of changes
 
+# to the same file or dir, add them to the end of under Multiple Owners
 
 # SHOULD BE CLEAN, OK? JUST BECAUSE!

.github/workflows/compare_screenshots.yml

@@ -13,7 +13,7 @@ jobs:
         run: mkdir -p artifacts
       # If we ever add more artifacts, this is going to break, but it'll be obvious.
       - name: Download screenshot tests
-        uses: actions/download-artifact@v7
+        uses: actions/download-artifact@v8
         with:
           path: artifacts
       - name: ls -R
@@ -34,7 +34,7 @@ jobs:
           echo ${{ github.event.pull_request.number }} > artifacts/screenshot_comparisons/pull_request_number.txt
       - name: Upload bad screenshots
         if: failure()
-        uses: actions/upload-artifact@v6
+        uses: actions/upload-artifact@v7
         with:
           name: bad-screenshots
           path: artifacts/screenshot_comparisons

.github/workflows/discord_pr_announce.yml

@@ -1,12 +1,11 @@
 name: "Discord PR Notification"
 on:
   pull_request_target:
-    types: [opened, closed, labeled]
+    types: [opened, closed]
 
 jobs:
   notify:
     runs-on: ubuntu-24.04
-    if: ${{ github.event.action != 'labeled' || github.event.label.name == 'Stale' }}
     steps:
       - name: "Check for DISCORD_WEBHOOK"
         id: secrets_set
@@ -20,13 +19,13 @@ jobs:
         uses: tgstation/discord-notify@v3
         if: >
           steps.secrets_set.outputs.SECRETS_ENABLED &&
-          (github.event.pull_request.merged == true || github.event.action == 'opened' || github.event.action == 'labeled') &&
+          (github.event.pull_request.merged == true || github.event.action == 'opened') &&
           github.event.pull_request.author_association != 'FIRST_TIMER' &&
           github.event.pull_request.author_association != 'FIRST_TIME_CONTRIBUTOR'
         with:
           webhook_url: ${{ secrets.DISCORD_WEBHOOK }}
           title: ${{ github.event.pull_request.user.login }} - ${{ github.event.pull_request.title }}
-          message: ${{ github.event.action != 'labeled' && 'GET_ACTION' || format('**Pull Request {0} automatically marked as stale.**', github.event.pull_request.number) }}
+          message: GET_ACTION
           include_image: false
           show_author: false
           avatar_url: https://avatars.githubusercontent.com/u/92191611?s=200&v=4

.github/workflows/run_integration_tests.yml

@@ -36,7 +36,7 @@ jobs:
           major: ${{ inputs.major }}
           minor: ${{ inputs.minor }}
       - name: Download build outputs
-        uses: actions/download-artifact@v7
+        uses: actions/download-artifact@v8
         with:
           name: build-artifact-${{ inputs.major || env.BYOND_MAJOR }}-${{ inputs.minor || env.BYOND_MINOR}}
           path: ./
@@ -63,7 +63,7 @@ jobs:
           bash tools/ci/run_server.sh ${{ inputs.map }}
       - name: Upload screenshot tests
         if: always()
-        uses: actions/upload-artifact@v6
+        uses: actions/upload-artifact@v7
         with:
           name: test_artifacts_${{ inputs.map }}_${{ inputs.major }}_${{ inputs.minor }}
           path: data/screenshots_new/

.github/workflows/setup_build_artifact.yml

@@ -35,7 +35,7 @@ jobs:
           bash tools/ci/copy_build_output.sh $OUTPUT_DIR
       - name: Upload artifact
         if: success()
-        uses: actions/upload-artifact@v6
+        uses: actions/upload-artifact@v7
         with:
           name: build-artifact-${{ inputs.major }}-${{ inputs.minor }}
           path: ${{ env.OUTPUT_DIR }}

.github/workflows/stale.yml

@@ -13,9 +13,13 @@ jobs:
       issues: write # for actions/stale to close stale issues
       pull-requests: write # for actions/stale to close stale PRs
     runs-on: ubuntu-24.04
+    outputs:
+      staled_prs: ${{ steps.filter-prs.outputs.result }}
 
     steps:
-      - uses: actions/stale@v10
+      - name: Mark stale issues and pull requests
+        uses: actions/stale@v10
+        id: stale
         with:
           repo-token: ${{ secrets.GITHUB_TOKEN }}
           stale-pr-message: "Этот PR был неактивен достаточно долго, чтобы быть автоматически помеченным как устаревший. Это означает, что он рискует быть автоматически закрытым через ~7 дней, пожалуйста, рассмотрите все нерешенные вопросы по проверке и убедитесь, что ваш PR завершен, если все это верно и вы все равно автоматически заблокированы, вам нужно активно спрашивать Мейнтейнеров, будет ли ваш PR вмержен. Как только вы выполните любое из предыдущих действий, вам следует попросить сопровождающего удалить устаревшую метку с вашего PR, чтобы сбросить устаревший таймер. Если вы чувствуете, что ни один из сопровождающих не ответит в течение этого времени, вы можете закрыть этот PR самостоятельно, пока будете запрашивать комментарий у мейнтейнера, так как тогда вы сможете снова открыть PR самостоятельно"
@@ -30,3 +34,39 @@ jobs:
           exempt-issue-labels: "RED LABEL"
           exempt-pr-labels: "RED LABEL,Неплохой Первый пулл-реквест"
           operations-per-run: 300
+      - name: Filter staled pull requests for announcement
+        id: filter-prs
+        uses: actions/github-script@v7
+        with:
+          script: |
+            return JSON.parse(context.job.steps.stale.outputs.staled-issues-prs).filter(issue => !!issue.pull_request)
+
+  announce:
+    runs-on: ubuntu-24.04
+    needs: stale
+    if: ${{ needs.stale.outputs.staled_prs != '[]' }}
+    strategy:
+     matrix:
+      pull_request: ${{ fromJSON(needs.stale.outputs.staled_prs) }}
+    steps:
+      - name: "Check for DISCORD_WEBHOOK"
+        id: secrets_set
+        env:
+          ENABLER_SECRET: ${{ secrets.DISCORD_WEBHOOK }}
+        run: |
+          unset SECRET_EXISTS
+          if [ -n "$ENABLER_SECRET" ]; then SECRET_EXISTS=true ; fi
+          echo "SECRETS_ENABLED=$SECRET_EXISTS" >> $GITHUB_OUTPUT
+      - name: Send Discord notification
+        uses: tgstation/discord-notify@v3
+        if: >
+          steps.secrets_set.outputs.SECRETS_ENABLED
+        with:
+          webhook_url: ${{ secrets.DISCORD_WEBHOOK }}
+          title: ${{ matrix.pull_request.user.login }} - ${{ matrix.pull_request.title }}
+          message: ${{ format('**Pull Request \#{0} automatically marked as stale.**', matrix.pull_request.number) }}
+          include_image: false
+          show_author: false
+          avatar_url: https://avatars.githubusercontent.com/u/1363778?s=200&v=4
+          username: GitHub
+          title_url: "${{ matrix.pull_request.html_url }}"

_maps/RandomRuins/SpaceRuins/caravanambush.dmm

@@ -212,7 +212,10 @@
 "fm" = (
 /obj/effect/turf_decal/bot_white,
 /obj/structure/closet/crate/secure/weapon,
-/obj/item/gun/ballistic/revolver/grenadelauncher/unrestricted,
+/obj/item/gun/ballistic/revolver/grenadelauncher/unrestricted/tear,
+/obj/item/ammo_box/a40mm/tear_gas,
+/obj/item/ammo_box/a40mm/tear_gas,
+/obj/item/disk/design_disk/tear_gas_40mm,
 /turf/open/floor/iron/dark/airless,
 /area/shuttle/ruin/caravan/freighter3)
 "fy" = (

_maps/shuttles/emergency_construction.dmm

@@ -9,7 +9,7 @@
 /obj/effect/turf_decal/stripes/line{
 	dir = 1
 	},
-/turf/open/floor/plating/airless,
+/turf/open/floor/plating,
 /area/shuttle/escape)
 "c" = (
 /turf/closed/wall/mineral/plastitanium,
@@ -22,7 +22,7 @@
 /obj/effect/turf_decal/stripes/line{
 	dir = 1
 	},
-/turf/open/floor/plating/airless,
+/turf/open/floor/plating,
 /area/shuttle/escape)
 "e" = (
 /turf/closed/wall/mineral/titanium/nodiagonal,