Merge remote-tracking branch 'upstream/master'

Author: SyncIt21

.github/CODEOWNERS

@@ -202,7 +202,7 @@
 
 # MULTIPLE OWNERS
 
-/SQL/ @Jordie0608 @scriptis
+/SQL/ @Jordie0608 @strandsofivy
 
 /_maps/ @EOBGames @Maurukas @MMMiracles @san7890 @ShizCalev
 
@@ -225,15 +225,15 @@
 
 /code/modules/surgery/ @ExcessiveUseOfCobblestone @Ryll-Ryll
 
-/tools/build/ @scriptis @stylemistake
-/tools/tgs_scripts/ @Cyberboss @scriptis
+/tools/build/ @strandsofivy @stylemistake
+/tools/tgs_scripts/ @Cyberboss @strandsofivy
 
 /code/modules/antagonists/heretic @Xander3359 @EnterTheJake
 
 # Host Hell
 
-/code/controllers/configuration/entries @scriptis
-/config/ @scriptis
+/code/controllers/configuration/entries @strandsofivy
+/config/ @strandsofivy
 
 # Expensive files that touching basically always cause performance problems
 ## Init times

.github/workflows/ci_suite.yml

@@ -33,20 +33,23 @@ jobs:
     uses: ./.github/workflows/collect_data.yml
 
   compile_all_maps:
+    if: needs.collect_data.outputs.game_changes == 'true'
     name: Compile Maps
     needs: collect_data
     uses: ./.github/workflows/compile_all_maps.yml
     with:
       max_required_byond_client: ${{ needs.collect_data.outputs.max_required_byond_client }}
 
   setup_build_artifacts:
+    if: needs.collect_data.outputs.game_changes == 'true'
     name: Setup build artifacts
     needs: collect_data
     uses: ./.github/workflows/setup_build_artifacts.yml
     with:
       build_versions: ${{ needs.collect_data.outputs.required_build_versions }}
 
   run_all_tests:
+    if: needs.collect_data.outputs.game_changes == 'true'
     name: Integration Tests
     needs: [collect_data, setup_build_artifacts]
     uses: ./.github/workflows/perform_regular_version_tests.yml
@@ -55,7 +58,7 @@ jobs:
       max_required_byond_client: ${{ needs.collect_data.outputs.max_required_byond_client }}
 
   run_alternate_tests:
-    if: needs.collect_data.outputs.alternate_tests != '[]'
+    if: (needs.collect_data.outputs.game_changes == 'true') && (needs.collect_data.outputs.alternate_tests != '[]')
     name: Alternate Tests
     needs: [collect_data, setup_build_artifacts]
     uses: ./.github/workflows/perform_alternate_version_tests.yml
@@ -86,4 +89,4 @@ jobs:
         uses: re-actors/alls-green@release/v1
         with:
           jobs: ${{ toJSON(needs) }}
-          allowed-skips: compare_screenshots
+          allowed-skips: compare_screenshots,compile_all_maps,run_all_tests,run_alternate_tests

.github/workflows/collect_data.yml

@@ -15,6 +15,9 @@ on:
       required_build_versions:
         description: "Build versions that need to be precompiled"
         value: ${{ jobs.collect_data.outputs.required_build_versions }}
+      game_changes:
+        description: "Whether game files were changed"
+        value: ${{ jobs.collect_data.outputs.game_changes }}
 
 jobs:
   collect_data:
@@ -25,6 +28,7 @@ jobs:
       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 }}
+      game_changes: ${{ steps.find_game_changes.outputs.all_changed_files != '' }}
 
     steps:
       - uses: actions/checkout@v6
@@ -66,3 +70,13 @@ jobs:
             ($alternate + $default) | map({major, minor}) | unique
           ')
           echo "required_build_versions=$REQUIRED_BUILD_VERSIONS" >> $GITHUB_OUTPUT
+
+      - name: Find game changes
+        id: find_game_changes
+        uses: tj-actions/changed-files@v47
+        with:
+          fetch_depth: 0
+          files_ignore: |
+            **/*.md
+            html/**
+            tgui/**

.vscode/settings.json

@@ -14,7 +14,7 @@
 		"editor.formatOnSave": true,
 		"editor.rulers": [80]
 	},
-	"[yaml][markdown][html][scss]": {
+	"[yaml][markdown][html][scss][github-actions-workflow]": {
 		"editor.defaultFormatter": "esbenp.prettier-vscode",
 		"editor.formatOnSave": true,
 		"editor.rulers": [80]

SQL/database_changelog.md

@@ -2,10 +2,10 @@ Any time you make a change to the schema files, remember to increment the databa
 
 Make sure to also update `DB_MAJOR_VERSION` and `DB_MINOR_VERSION`, which can be found in `code/__DEFINES/subsystem.dm`.
 
-The latest database version is 5.33; The query to update the schema revision table is:
+The latest database version is 5.34; The query to update the schema revision table is:
 
 ```sql
-INSERT INTO `schema_revision` (`major`, `minor`) VALUES (5, 33);
+INSERT INTO `schema_revision` (`major`, `minor`) VALUES (5, 34);
 ```
 
 or

_maps/RandomRuins/IceRuins/icemoon_underground_hermit.dmm

@@ -18,6 +18,7 @@
 /area/ruin/powered/hermit)
 "dY" = (
 /obj/structure/sink/directional/south,
+/obj/structure/glowshroom/single,
 /turf/open/floor/plating,
 /area/ruin/powered/hermit)
 "gr" = (
@@ -51,8 +52,7 @@
 /turf/closed/wall/mineral/wood,
 /area/icemoon/underground/explored)
 "oJ" = (
-/obj/structure/glowshroom/single,
-/turf/open/floor/plating,
+/turf/closed/wall,
 /area/ruin/powered/hermit)
 "ph" = (
 /turf/closed/mineral/snowmountain/icemoon/unscrapeable,

_maps/RandomRuins/SpaceRuins/garbagetruck2.dmm

@@ -666,7 +666,7 @@
 /turf/open/floor/catwalk_floor/iron,
 /area/ruin/space/has_grav/garbagetruck/medicalwaste)
 "XD" = (
-/obj/structure/sinkframe,
+/obj/item/wallframe/sinkframe,
 /obj/structure/broken_flooring/pile,
 /obj/effect/decal/cleanable/blood/gibs/old,
 /obj/item/rag{

_maps/RandomRuins/SpaceRuins/hauntedtradingpost.dmm

@@ -4068,9 +4068,7 @@
 	pixel_y = -2;
 	pixel_x = -8
 	},
-/obj/structure/sinkframe{
-	pixel_x = 2
-	},
+/obj/item/wallframe/sinkframe,
 /turf/open/floor/plating,
 /area/ruin/space/has_grav/hauntedtradingpost/maint)
 "Ju" = (

_maps/RandomZLevels/heretic.dmm

@@ -5809,9 +5809,6 @@
 /turf/open/misc/grass/jungle/station,
 /area/awaymission/beach/heretic)
 "EH" = (
-/obj/machinery/computer/shuttle/ferry/request{
-	dir = 4
-	},
 /turf/open/floor/pod/light,
 /area/awaymission/beach/heretic)
 "EI" = (