merge upstream/master w conflicts

Author: tgstation-ci[bot]

.github/workflows/codeowner_reviews.yml

@@ -14,16 +14,9 @@ jobs:
       # Checks-out your repository under $GITHUB_WORKSPACE, so the job can access it
       - uses: actions/checkout@v6
 
-      #Parse the Codeowner file on non draft PRs
-      - name: CodeOwnersParser
-        if: github.event.pull_request.draft == false
-        id: CodeOwnersParser
-        uses: tgstation/CodeOwnersParser@v1
-
-      #Request reviews
+     #Request reviews
       - name: Request reviews
-        if: steps.CodeOwnersParser.outputs.owners != ''
-        uses: tgstation/RequestReviewFromUser@v1
+        if: github.event.pull_request.draft == false
+        uses: tgstation/code-reviewers@main
         with:
-          separator: " "
-          users: ${{ steps.CodeOwnersParser.outputs.owners }}
+          token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/run_integration_tests.yml

@@ -27,7 +27,7 @@ jobs:
     # For example, `Run Tests (runtimestation; 515)`.
     name: Run Tests (${{ inputs.major && format('{0}.{1}; ', inputs.major, inputs.minor) || '' }}${{ inputs.map }}; ${{ inputs.max_required_byond_client }})
     runs-on: ubuntu-24.04
-    timeout-minutes: 15
+    timeout-minutes: 55
     steps:
       - uses: actions/checkout@v6
       - name: Restore BYOND from Cache
@@ -38,7 +38,7 @@ jobs:
       - name: Download build outputs
         uses: actions/download-artifact@v8
         with:
-          name: build-artifact-${{ inputs.major || env.BYOND_MAJOR }}-${{ inputs.minor || env.BYOND_MINOR}}
+          name: build-artifact-${{ inputs.major || env.BYOND_MAJOR }}-${{ inputs.minor || env.BYOND_MINOR }}
           path: ./
       - name: Setup database
         env:
@@ -65,7 +65,7 @@ jobs:
         if: always()
         uses: actions/upload-artifact@v7
         with:
-          name: test_artifacts_${{ inputs.map }}_${{ inputs.major }}_${{ inputs.minor }}
+          name: test_artifacts_${{ inputs.map }}_${{ inputs.major || env.BYOND_MAJOR }}_${{ inputs.minor || env.BYOND_MINOR }}
           path: data/screenshots_new/
           retention-days: 1
       - name: On test fail, write a step summary

_maps/map_files/debug/runtimestation.dmm

@@ -62,9 +62,9 @@
 /turf/open/floor/iron,
 /area/station/engineering/main)
 "aq" = (
-/obj/machinery/camera/directional/north,
 /obj/machinery/computer/monitor,
 /obj/structure/cable,
+/obj/machinery/camera/autoname/directional/north,
 /turf/open/floor/iron,
 /area/station/engineering/main)
 "av" = (
@@ -286,13 +286,13 @@
 /turf/closed/wall/r_wall,
 /area/station/maintenance/aft)
 "bM" = (
-/obj/machinery/camera/directional/north,
 /obj/structure/table,
 /obj/item/construction/rld,
 /obj/item/construction/rcd/arcd,
 /obj/effect/turf_decal/tile/blue/half/contrasted{
 	dir = 4
 	},
+/obj/machinery/camera/autoname/directional/north,
 /turf/open/floor/iron,
 /area/station/command/bridge)
 "bO" = (
@@ -304,10 +304,10 @@
 /turf/open/floor/iron/dark,
 /area/station/medical/chemistry)
 "bR" = (
-/obj/machinery/camera/directional/north,
 /obj/machinery/power/apc/auto_name/directional/north,
 /obj/structure/cable,
 /obj/machinery/chem_heater/debug,
+/obj/machinery/camera/autoname/directional/north,
 /turf/open/floor/iron/dark,
 /area/station/medical/chemistry)
 "bS" = (
@@ -323,8 +323,8 @@
 /area/station/security/brig)
 "bV" = (
 /obj/effect/turf_decal/stripes/line,
-/obj/machinery/camera/directional/north,
 /obj/machinery/status_display/evac/directional/north,
+/obj/machinery/camera/autoname/directional/north,
 /turf/open/floor/iron,
 /area/station/construction)
 "bY" = (
@@ -642,11 +642,11 @@
 /area/station/security/brig)
 "dS" = (
 /obj/machinery/atmospherics/components/tank/air,
-/obj/machinery/camera/directional/north,
+/obj/machinery/camera/autoname/directional/north,
 /turf/open/floor/plating,
 /area/station/engineering/atmos)
 "dT" = (
-/obj/machinery/camera/directional/north,
+/obj/machinery/camera/autoname/directional/north,
 /turf/open/floor/iron/dark,
 /area/station/engineering/gravity_generator)
 "dV" = (
@@ -1040,7 +1040,7 @@
 /turf/closed/wall/r_wall,
 /area/station/hallway/secondary/exit/departure_lounge)
 "gn" = (
-/obj/machinery/camera/directional/north,
+/obj/machinery/camera/autoname/directional/north,
 /turf/open/floor/iron,
 /area/station/security/brig)
 "gv" = (
@@ -1061,7 +1061,7 @@
 /turf/open/floor/iron,
 /area/station/hallway/secondary/exit/departure_lounge)
 "gE" = (
-/obj/machinery/camera/directional/north,
+/obj/machinery/camera/autoname/directional/north,
 /turf/open/floor/iron,
 /area/station/hallway/secondary/entry)
 "gF" = (
@@ -1081,7 +1081,7 @@
 /area/station/cargo/storage)
 "gI" = (
 /obj/machinery/light/directional/north,
-/obj/machinery/camera/directional/north,
+/obj/machinery/camera/autoname/directional/north,
 /turf/open/floor/iron,
 /area/station/hallway/secondary/entry)
 "gJ" = (
@@ -1181,7 +1181,7 @@
 	dir = 4
 	},
 /obj/structure/extinguisher_cabinet/directional/north,
-/obj/machinery/camera/directional/north,
+/obj/machinery/camera/autoname/directional/north,
 /turf/open/floor/iron/white/corner{
 	dir = 1
 	},
@@ -1317,13 +1317,13 @@
 /area/station/commons/storage/primary)
 "pZ" = (
 /obj/machinery/light/directional/north,
-/obj/machinery/camera/directional/north,
 /obj/effect/turf_decal/plaque{
 	icon_state = "L11"
 	},
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /obj/structure/cable,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/camera/autoname/directional/north,
 /turf/open/floor/iron,
 /area/station/commons/storage/primary)
 "qb" = (
@@ -2034,10 +2034,10 @@
 /turf/open/floor/iron,
 /area/station/construction)
 "Hc" = (
-/obj/machinery/camera/directional/north,
 /obj/effect/turf_decal/tile/blue/half/contrasted{
 	dir = 1
 	},
+/obj/machinery/camera/autoname/directional/north,
 /turf/open/floor/iron,
 /area/station/hallway/primary/central)
 "Hg" = (
@@ -2057,7 +2057,7 @@
 /turf/open/floor/iron,
 /area/station/science)
 "Ih" = (
-/obj/machinery/camera/directional/north,
+/obj/machinery/camera/autoname/directional/north,
 /turf/open/floor/iron,
 /area/station/hallway/secondary/exit/departure_lounge)
 "Ir" = (

_maps/runtimestation_minimal.json

@@ -15,7 +15,7 @@
 		"/datum/unit_test/traitor",
 		"/datum/unit_test/atmospherics_sanity",
 		"/datum/unit_test/maptest_mapload_space_verification",
-		"/datum/unit_test/modify_fantasy_variable",
-		"/datum/unit_test/create_and_destroy"
-	]
+		"/datum/unit_test/modify_fantasy_variable"
+	],
+	"is_unit_test_map": true
 }

_maps/shuttles/infiltrator_basic.dmm

@@ -19,9 +19,9 @@
 /area/shuttle/syndicate/hallway)
 "ae" = (
 /obj/effect/spawner/structure/window/reinforced/plasma/plastitanium,
-/obj/machinery/door/poddoor/shutters{
-	id = "syndieshutters";
-	name = "Blast Shutters"
+/obj/machinery/door/poddoor/shutters/syndicate{
+	name = "Blast Shutters";
+	id = "syndieshutters"
 	},
 /turf/open/floor/plating,
 /area/shuttle/syndicate/bridge)
@@ -191,10 +191,6 @@
 	},
 /area/shuttle/syndicate/airlock)
 "aY" = (
-/obj/machinery/door/poddoor{
-	id = "smindicate";
-	name = "Outer Blast Door"
-	},
 /obj/docking_port/mobile/infiltrator,
 /obj/structure/fans/tiny,
 /obj/machinery/button/door/directional/north{
@@ -205,6 +201,11 @@
 /obj/effect/turf_decal/siding/thinplating_new/dark{
 	dir = 8
 	},
+/obj/machinery/door/poddoor/shutters/syndicate/indestructible{
+	id = "smindicate";
+	name = "Outer Blast Door";
+	dir = 4
+	},
 /turf/open/floor/plating,
 /area/shuttle/syndicate/airlock)
 "aZ" = (
@@ -601,9 +602,7 @@
 /obj/item/storage/box/zipties,
 /obj/machinery/computer/security/telescreen/entertainment/directional/west,
 /obj/structure/table/reinforced/plastitaniumglass,
-/turf/open/floor/iron/dark/smooth_corner{
-	dir = 2
-	},
+/turf/open/floor/iron/dark/smooth_corner,
 /area/shuttle/syndicate/airlock)
 "iE" = (
 /obj/structure/closet/syndicate/nuclear,