merge upstream/master w conflicts

Author: tgstation-ci[bot]

.github/CODEOWNERS

@@ -8,4 +8,223 @@
 
 # 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/__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
+
+/code/_onclick/hud/ @LemonInTheDark @SmArtKar
+/code/__DEFINES/layers.dm @LemonInTheDark @SmArtKar
+
+# 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/gbp.toml

@@ -24,3 +24,4 @@ reset_label = "GBP: Reset"
 "Sprites" = 3
 "Unit Tests" = 6
 "Wallening Revert Recovery" = 10
+"Tools" = 12

.github/workflows/auto_changelog.yml

@@ -16,7 +16,7 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v7
         with:
-          ref: ${{ github.base_ref }}
+          ref: ${{ github.event.repository.default_branch }}
 
       - name: Generate App Token
         id: app-token-generation

.github/workflows/codeowner_reviews.yml

@@ -7,6 +7,7 @@ on:
 
 jobs:
   assign-users:
+    if: github.event.pull_request.draft == false
     runs-on: ubuntu-24.04
     timeout-minutes: 5
 
@@ -16,7 +17,6 @@ jobs:
 
      #Request reviews
       - name: Request reviews
-        if: github.event.pull_request.draft == false
         uses: tgstation/code-reviewers@main
         with:
           token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/gbp.yml

@@ -14,7 +14,7 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v7
         with:
-          ref: ${{ github.base_ref }}
+          ref: ${{ github.event.repository.default_branch }}
       - name: Run Auto Labeler
         uses: actions/github-script@v9
         with:
@@ -44,7 +44,7 @@ jobs:
         if: steps.value_holder.outputs.ACTIONS_ENABLED
         uses: actions/checkout@v7
         with:
-          ref: ${{ github.base_ref }}
+          ref: ${{ github.event.repository.default_branch }}
       - name: Setup git
         if: steps.value_holder.outputs.ACTIONS_ENABLED
         run: |

.github/workflows/generate_documentation.yml

@@ -15,7 +15,7 @@ jobs:
     steps:
       - uses: actions/checkout@v7
       - name: Setup cache
-        uses: actions/cache@v5
+        uses: actions/cache@v6
         with:
           path: ~/SpacemanDMM
           key: ${{ runner.os }}-spacemandmm-${{ secrets.CACHE_PURGE_KEY }}

.github/workflows/run_linters.yml

@@ -11,7 +11,7 @@ jobs:
     steps:
       - uses: actions/checkout@v7
       - name: Restore SpacemanDMM cache
-        uses: actions/cache@v5
+        uses: actions/cache@v6
         with:
           path: ~/SpacemanDMM
           key: ${{ runner.os }}-spacemandmm-${{ hashFiles('dependencies.sh') }}
@@ -20,21 +20,21 @@ jobs:
       - name: Setup Bun
         uses: ./.github/actions/setup_bun
       - name: Restore Bootstrap cache
-        uses: actions/cache@v5
+        uses: actions/cache@v6
         with:
           path: tools/bootstrap/.cache
           key: ${{ runner.os }}-bootstrap-${{ hashFiles('/tools/requirements.txt') }}
           restore-keys: |
             ${{ runner.os }}-bootstrap-
       - name: Restore Rust cache
-        uses: actions/cache@v5
+        uses: actions/cache@v6
         with:
           path: ~/.cargo
           key: ${{ runner.os }}-rust-${{ hashFiles('/tools/ci/ci_dependencies.sh')}}
           restore-keys: |
             ${{ runner.os }}-rust-
       - name: Restore Cutter cache
-        uses: actions/cache@v5
+        uses: actions/cache@v6
         with:
           path: tools/icon_cutter/cache
           key: ${{ runner.os }}-cutter-${{ hashFiles('dependencies.sh') }}

_maps/RandomRuins/AnywhereRuins/shoe_factory.dmm

@@ -264,8 +264,9 @@
 /obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{
 	cycle_id = "shoe_factory_entrance"
 	},
-/obj/effect/mapping_helpers/airlock_note_placer,
-/obj/item/paper/fluff/ruins/shoe_factory/osha_shutdown,
+/obj/effect/mapping_helpers/airlock_note_placer{
+	note_path = /obj/item/paper/fluff/ruins/shoe_factory/osha_shutdown
+	},
 /turf/open/floor/iron{
 	baseturfs = /turf/open/misc/asteroid/basalt/lava_land_surface
 	},
@@ -823,8 +824,9 @@
 	cycle_id = "shoe_factory_entrance"
 	},
 /obj/machinery/door/airlock/external/ruin,
-/obj/effect/mapping_helpers/airlock_note_placer,
-/obj/item/paper/fluff/ruins/shoe_factory/osha_shutdown,
+/obj/effect/mapping_helpers/airlock_note_placer{
+	note_path = /obj/item/paper/fluff/ruins/shoe_factory/osha_shutdown
+	},
 /turf/open/floor/iron{
 	baseturfs = /turf/open/misc/asteroid/basalt/lava_land_surface
 	},

_maps/_basemap.dm

@@ -22,6 +22,7 @@
 		#include "map_files\tramstation\tramstation.dmm"
 		#include "map_files\CatwalkStation\CatwalkStation_2023.dmm"
 		#include "map_files\NebulaStation\NebulaStation.dmm"
+<<<<<<< HEAD
 		#include "map_files\wawastation\wawastation.dmm"
 
 		// MASSMETA EDIT BEGIN - Compiling our modular maps too!
@@ -30,6 +31,9 @@
 		#include "map_files\bearcat\bearcat.dmm"
 		// MASSMETA EDIT END
 
+=======
+		#include "map_files\KiloStation\KiloStation.dmm"
+>>>>>>> upstream/master
 	#endif
 	#ifdef ALL_TEMPLATES
 		#include "templates.dm"

_maps/kilostation.json

@@ -14,13 +14,25 @@
 			"Linkage": "Cross"
 		}
 	],
+<<<<<<< HEAD
 	"ignored_unit_tests": ["/datum/unit_test/create_and_destroy"],
+=======
+>>>>>>> upstream/master
 	"job_changes": {
 		"Cook": {
 			"additional_cqc_areas": ["/area/station/service/bar/atrium"]
 		},
 		"Captain": {
 			"special_charter": "asteroid"
+<<<<<<< HEAD
 		}
 	}
 }
+=======
+		},
+		"Chaplain": {
+			"has_monastery": 1
+		}
+	}
+}
+>>>>>>> upstream/master