merge upstream/master w conflicts

Author: tgstation-ci[bot]

.github/CODEOWNERS

@@ -8,4 +8,222 @@
 
 # to the same file or dir, add them to the end of under Multiple Owners
 
+<<<<<<< HEAD
 # SHOULD BE CLEAN, OK? JUST BECAUSE!
+=======
+# MAINTAINERS
+
+# Dominion/Cyberboss
+
+/.github/workflows/update_tgs_dmapi.yml @Cyberboss
+/.tgs.yml @Cyberboss
+/code/world.dm @Cyberboss
+/code/__DEFINES/tgs.config.dm @Cyberboss
+/code/__DEFINES/tgs.dm @Cyberboss
+/code/__DEFINES/_globals.dm @Cyberboss
+/code/__HELPERS/chat.dm @Cyberboss
+/code/__HELPERS/jatum.dm @Cyberboss
+/code/game/world.dm @Cyberboss
+/code/controllers/subsystem/atoms.dm @Cyberboss
+/code/controllers/globals.dm @Cyberboss
+/code/datums/helper_datums/getrev.dm @Cyberboss
+/code/modules/tgs/ @Cyberboss
+/code/ze_genesis_call/ @Cyberboss
+/tools/tgs_test/ @Cyberboss
+/tools/Tgstation.DiscordDiscussions/ @Cyberboss
+/tools/Tgstation.PRAnnouncer/ @Cyberboss
+
+# Tattle
+
+/code/__HELPERS/logging/ @dragomagol
+
+# Cobby
+
+/code/modules/reagents/ @ExcessiveUseOfCobblestone
+/code/modules/research/designs/medical_designs.dm @ExcessiveUseOfCobblestone
+/code/game/objects/items/storage/medkit.dm @ExcessiveUseOfCobblestone
+
+# Fikou
+
+/code/modules/awaymissions/ @Fikou
+/code/modules/mining/ @Fikou
+/code/modules/mod/ @Fikou
+/code/modules/mapfluff/ruins/lavalandruin_code/ @Fikou
+/code/modules/mapfluff/ruins/lavaland_ruin_code.dm @Fikou
+
+# JohnFulpWizard
+
+/code/modules/mob/living/simple_animal/bot/ @JohnFulpWillard
+/code/modules/modular_computers/ @JohnFulpWillard
+
+# Kylerace
+
+/code/__DEFINES/spatial_gridmap.dm @Kylerace
+/code/controllers/subsystem/spatial_gridmap.dm @Kylerace
+
+# LemonInTheDark
+
+/.github/guides/VISUALS.md @LemonInTheDark
+/code/_onclick/hud/ @LemonInTheDark
+/code/__DEFINES/layers.dm @LemonInTheDark
+/code/__DEFINES/MC.dm @LemonInTheDark
+/code/controllers/admin.dm @LemonInTheDark
+/code/controllers/failsafe.dm @LemonInTheDark
+/code/controllers/master.dm @LemonInTheDark
+/code/controllers/subsystem.dm @LemonInTheDark
+/code/controllers/subsystem/air.dm @LemonInTheDark
+/code/controllers/subsystem/timer.dm @LemonInTheDark
+
+# Mothblocks
+
+/.github/workflows/ @Mothblocks
+/code/game/gamemodes/ @Mothblocks
+/code/modules/autowiki/ @Mothblocks
+/code/modules/unit_tests/ @Mothblocks
+/code/modules/client/preferences/ @Mothblocks
+/code/modules/client/preferences.dm @Mothblocks
+/code/modules/client/preferences_menu.dm @Mothblocks
+/code/modules/client/preferences_savefile.dm @Mothblocks
+/tgui/packages/tgui/interfaces/PreferencesMenu/ @Mothblocks
+/tools/ezdb/ @Mothblocks
+/tools/maplint/source/ @Mothblocks
+/tools/pull_request_hooks/ @Mothblocks
+/tools/screenshot-test-comparison/ @Mothblocks
+/tools/test_merge_bot/ @Mothblocks
+
+# MrMelbert
+
+/code/modules/hydroponics/ @MrMelbert
+
+# necromanceranne
+
+/code/modules/uplink/ @necromanceranne
+
+# ninjanomnom
+
+/code/controllers/subsystem/dcs.dm @ninjanomnom
+/code/datums/signals.dm @ninjanomnom
+/code/datums/components/_component.dm @ninjanomnom
+/code/datums/elements/_element.dm @ninjanomnom
+/code/datums/greyscale/_greyscale_config.dm @ninjanomnom
+/code/datums/greyscale/json_reader.dm @ninjanomnom
+/code/datums/greyscale/layer.dm @ninjanomnom
+
+# Ryll-Ryll/Shaps
+
+/code/datums/wounds/ @Ryll-Ryll
+/code/datums/status_effects/wound_effects.dm @Ryll-Ryll
+/code/__DEFINES/wounds.dm @Ryll-Ryll
+
+# san7890
+
+/code/game/area/ @san7890
+/icons/area/ @san7890
+
+# SmArtKar
+
+/code/modules/projectiles/projectile.dm @SmArtKar
+
+# stylemistake
+
+/code/__DEFINES/chat.dm @stylemistake
+/code/__DEFINES/tgui.dm @stylemistake
+/code/controllers/subsystem/chat.dm @stylemistake
+/code/controllers/subsystem/ping.dm @stylemistake
+/code/controllers/subsystem/tgui.dm @stylemistake
+/code/modules/tgchat/ @stylemistake
+/code/modules/tgui/ @stylemistake
+/code/modules/tgui_panel/ @stylemistake
+/tgui/ @stylemistake
+
+# stylemistake (explicitly disowned)
+
+/tgui/packages/tgui/interfaces/
+/tgui/packages/tgui/styles/interfaces/
+/tgui/packages/tgui-panel/styles/tgchat/chat-dark.scss
+/tgui/packages/tgui-panel/styles/tgchat/chat-light.scss
+
+# SuperNovaa41
+
+/code/modules/forensics/ @SuperNovaa41
+/code/datums/mood.dm @SuperNovaa41
+
+# Time-Green
+
+/code/datums/bodypart_overlays @Time-Green
+/code/modules/antagonists/voidwalker @Time-Green
+/code/modules/lost_crew @Time-Green
+/code/modules/shuttle/shuttle_events @Time-Green
+
+# tralezab
+/code/__DEFINES/basic_mobs.dm @tralezab
+/code/datums/ai/ @tralezab
+/code/modules/religion/ @tralezab
+
+# Watermelon914
+
+/code/modules/wiremod/ @Watermelon914
+/code/modules/antagonists/traitor/ @Watermelon914
+/code/controllers/subsystem/tts.dm @Watermelon914
+
+# CONTRIBUTORS
+
+# grungussuss
+
+/sound/ @grungussuss
+
+# Jordie0608
+
+/code/controllers/subsystem/dbcore.dm @Jordie0608
+/tools/SQLAlertEmail/ @Jordie0608
+
+# loganuk
+
+/_maps/map_files/CatwalkStation/ @loganuk
+
+# NamelessFairy
+
+/code/modules/capture_the_flag/ @NamelessFairy
+/_maps/minigame/CTF/ @NamelessFairy
+
+# FalloutFalcon
+/code/__HELPERS/abstract_types.dm @FalloutFalcon
+/code/__HELPERS/random_items.dm @FalloutFalcon
+
+# MULTIPLE OWNERS
+
+/SQL/ @Jordie0608 @strandsofivy
+
+/_maps/ @EOBGames @Maurukas @MMMiracles @san7890 @ShizCalev
+
+/icons/ @Imaginos16 @Krysonism @Twaticus @Wallemations
+
+/code/__DEFINES/atmospherics/ @Ghilker @LemonInTheDark
+/code/modules/atmospherics/ @Ghilker @LemonInTheDark
+
+/code/modules/jobs/job_types/chief_medical_officer.dm @ExcessiveUseOfCobblestone @Ryll-Ryll
+/code/modules/jobs/job_types/medical_doctor.dm @ExcessiveUseOfCobblestone @Ryll-Ryll
+/code/modules/jobs/job_types/paramedic.dm @ExcessiveUseOfCobblestone @Ryll-Ryll
+
+/code/modules/mob/living/basic/ @Jacquerel @san7890 @tralezab
+
+/code/modules/surgery/ @ExcessiveUseOfCobblestone @Ryll-Ryll
+
+/tools/build/ @strandsofivy @stylemistake
+/tools/tgs_scripts/ @Cyberboss @strandsofivy
+
+/code/modules/antagonists/heretic @Xander3359 @EnterTheJake
+
+# Host Hell
+
+/code/controllers/configuration/entries @strandsofivy
+/config/ @strandsofivy
+
+# Expensive files that touching basically always cause performance problems
+## Init times
+**/*_EXPENSIVE.dm @Mothblocks @LemonInTheDark
+
+# SIC SEMPER TYRANNIS
+
+/code/modules/hydroponics/grown/citrus.dm @LemonInTheDark @optimumtact
+>>>>>>> upstream/master

.github/workflows/auto_changelog.yml

@@ -14,7 +14,7 @@ jobs:
     if: github.event.pull_request.merged == true
     steps:
       - name: Checkout
-        uses: actions/checkout@v6
+        uses: actions/checkout@v7
 
       - name: Generate App Token
         id: app-token-generation

.github/workflows/autowiki.yml

@@ -20,7 +20,7 @@ jobs:
           echo "SECRETS_ENABLED=$SECRET_EXISTS" >> $GITHUB_OUTPUT
       - name: Checkout
         if: steps.secrets_set.outputs.SECRETS_ENABLED
-        uses: actions/checkout@v6
+        uses: actions/checkout@v7
       - name: Install BYOND
         if: steps.secrets_set.outputs.SECRETS_ENABLED
         uses: ./.github/actions/restore_or_install_byond

.github/workflows/ci_suite.yml

@@ -52,6 +52,7 @@ jobs:
     uses: ./.github/workflows/perform_regular_version_tests.yml
     with:
       maps: ${{ needs.collect_data.outputs.maps }}
+      map_config: ${{ needs.collect_data.outputs.map_config }}
       max_required_byond_client: ${{ needs.collect_data.outputs.max_required_byond_client }}
 
   run_alternate_tests:

.github/workflows/codeowner_reviews.yml

@@ -12,7 +12,7 @@ jobs:
 
     steps:
       # Checks-out your repository under $GITHUB_WORKSPACE, so the job can access it
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v7
 
      #Request reviews
       - name: Request reviews

.github/workflows/collect_data.yml

@@ -6,6 +6,9 @@ on:
       maps:
         description: "The maps that were found"
         value: ${{ jobs.collect_data.outputs.maps }}
+      map_config:
+        description: "The map config file to use"
+        value: ${{ jobs.collect_data.outputs.map_config }}
       alternate_tests:
         description: "The alternate tests that were found"
         value: ${{ jobs.collect_data.outputs.alternate_tests }}
@@ -22,26 +25,38 @@ jobs:
     timeout-minutes: 5
     outputs:
       maps: ${{ steps.map_finder.outputs.maps }}
+      map_config: ${{ steps.map_finder.outputs.map_config }}
       alternate_tests: ${{ steps.alternate_test_finder.outputs.alternate_tests }}
       max_required_byond_client: ${{ steps.max_required_byond_client.outputs.max_required_byond_client }}
       required_build_versions: ${{ steps.setup_required_build_versions.outputs.required_build_versions }}
 
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v7
       - name: Find Maps
         id: map_finder
         run: |
           > maps_output.txt
+          > map_configs.txt
+
           for file in _maps/*.json; do
             if ! jq -e '.exclude_from_ci == true' "$file" >/dev/null 2>&1; then
-              echo "\"$(basename "$file" .json)\"" >> maps_output.txt
+              map_name=$(basename "$file" .json)
+
+              echo "\"$map_name\"" >> maps_output.txt
+              echo "map $map_name" >> map_configs.txt
+              echo "endmap" >> map_configs.txt
             else
               echo "Excluded: $file"
             fi
           done
+
           map_list=$(paste -sd, maps_output.txt)
           echo "Maps: $map_list"
           echo "maps={\"paths\":[$map_list]}" >> "$GITHUB_OUTPUT"
+
+          echo "map_config<<EOF" >> "$GITHUB_OUTPUT"
+          cat map_configs.txt >> "$GITHUB_OUTPUT"
+          echo "EOF" >> "$GITHUB_OUTPUT"
       - name: Find Alternate Tests
         id: alternate_test_finder
         run: |

.github/workflows/compare_screenshots.yml

@@ -8,7 +8,7 @@ jobs:
     timeout-minutes: 15
     runs-on: ubuntu-24.04
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v7
       - name: Setup directory
         run: mkdir -p artifacts
       # If we ever add more artifacts, this is going to break, but it'll be obvious.

.github/workflows/compile_all_maps.yml

@@ -14,7 +14,7 @@ jobs:
     timeout-minutes: 5
 
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v7
       - name: Setup Bun
         uses: ./.github/actions/setup_bun
       - name: Restore BYOND from Cache
@@ -35,7 +35,7 @@ jobs:
     timeout-minutes: 5
 
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v7
       - name: Setup Bun
         uses: ./.github/actions/setup_bun
       - name: Restore BYOND from Cache

.github/workflows/compile_changelogs.yml

@@ -35,7 +35,7 @@ jobs:
 
       - name: "Checkout"
         if: steps.value_holder.outputs.ACTIONS_ENABLED
-        uses: actions/checkout@v6
+        uses: actions/checkout@v7
         with:
           fetch-depth: 25
           persist-credentials: false

.github/workflows/discord_discussions.yml

@@ -34,7 +34,7 @@ jobs:
           dotnet-quality: ga
 
       - name: Checkout
-        uses: actions/checkout@v6
+        uses: actions/checkout@v7
 
       - name: Build Tgstation.DiscordDiscussions
         run: dotnet publish -c Release -o discord_discussions_bins tools/Tgstation.DiscordDiscussions/Tgstation.DiscordDiscussions.csproj