Merge branch 'master' of https://github.com/ApocryphaXIII/Apocrypha13 into special-fran

Author: FalloutFalcon

.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/1363778?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: "This PR has been inactive for long enough to be automatically marked as stale. This means it is at risk of being auto closed in ~7 days. Please address any outstanding review items and ensure your PR is finished - if both are true, and you have auto-staled anyway, you need to actively ask maintainers (by pinging them in the /tg/station Discord) to (re)review or merge your PR. If no maintainer responds to your request, you may wish to close this PR yourself while you seek maintainer comment, as you will later be able to reopen the PR yourself."
@@ -31,3 +35,39 @@ jobs:
           exempt-issue-labels: "RED LABEL"
           exempt-pr-labels: "RED LABEL,Good First PR"
           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/AnywhereRuins/golem_ship.dmm

@@ -217,7 +217,7 @@
 /area/ruin/powered/golem_ship)
 "ok" = (
 /obj/structure/table,
-/obj/item/stack/sticky_tape{
+/obj/item/stack/medical/wrap/sticky_tape{
 	pixel_y = 12;
 	pixel_x = 4
 	},

_maps/RandomRuins/LavaRuins/lavaland_surface_biodome_winter.dmm

@@ -14,8 +14,8 @@
 /area/ruin/powered/snow_biodome)
 "ad" = (
 /obj/structure/table,
-/obj/item/stack/medical/gauze,
-/obj/item/stack/medical/gauze,
+/obj/item/stack/medical/wrap/gauze,
+/obj/item/stack/medical/wrap/gauze,
 /obj/machinery/light/small/directional/north,
 /turf/open/floor/plating,
 /area/ruin/powered/snow_biodome)

_maps/RandomRuins/LavaRuins/lavaland_surface_elephant_graveyard.dmm

@@ -380,7 +380,7 @@
 /turf/open/misc/asteroid/basalt/wasteland,
 /area/ruin/unpowered/elephant_graveyard)
 "Cp" = (
-/obj/item/stack/medical/gauze/improvised,
+/obj/item/stack/medical/wrap/gauze/improvised,
 /obj/effect/decal/cleanable/dirt,
 /turf/open/misc/asteroid/basalt/wasteland,
 /area/ruin/unpowered/elephant_graveyard)

_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/RandomRuins/SpaceRuins/dangerous_research.dmm

@@ -1075,7 +1075,7 @@
 /area/ruin/space/has_grav/dangerous_research/lab)
 "oJ" = (
 /obj/item/stack/medical/bandage,
-/obj/item/stack/medical/gauze/twelve,
+/obj/item/stack/medical/wrap/gauze/twelve,
 /obj/item/reagent_containers/hypospray/medipen/blood_loss,
 /obj/effect/spawner/random/medical/injector,
 /obj/effect/turf_decal/tile/dark_red/anticorner{