Upd

.github/workflows/ci_suite.yml

@@ -13,14 +13,18 @@ on:
   merge_group:
     branches:
     - master
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 jobs:
   run_linters:
     if: ( !contains(github.event.head_commit.message, '[ci skip]') )
     name: Run Linters
     runs-on: ubuntu-22.04
-    concurrency:
-      group: run_linters-${{ github.head_ref || github.run_id }}
-      cancel-in-progress: true
+    timeout-minutes: 5
+
     steps:
       - uses: actions/checkout@v4
       - name: Restore SpacemanDMM cache
@@ -130,9 +134,8 @@ jobs:
     name: Compile Maps
     needs: [collect_data]
     runs-on: ubuntu-22.04
-    concurrency:
-      group: compile_all_maps-${{ github.head_ref || github.run_id }}
-      cancel-in-progress: true
+    timeout-minutes: 5
+
     steps:
       - uses: actions/checkout@v4
       - name: Restore BYOND cache
@@ -155,13 +158,12 @@ jobs:
     if: ( !contains(github.event.head_commit.message, '[ci skip]') )
     name: Collect data for other tasks
     runs-on: ubuntu-22.04
+    timeout-minutes: 5
     outputs:
       maps: ${{ steps.map_finder.outputs.maps }}
       alternate_tests: ${{ steps.alternate_test_finder.outputs.alternate_tests }}
       max_required_byond_client: ${{ steps.max_required_byond_client.outputs.max_required_byond_client }}
-    concurrency:
-      group: find_all_maps-${{ github.head_ref || github.run_id }}
-      cancel-in-progress: true
+
     steps:
       - uses: actions/checkout@v4
       - name: Find Maps
@@ -186,13 +188,12 @@ jobs:
     if: ( !contains(github.event.head_commit.message, '[ci skip]') )
     name: Integration Tests
     needs: [collect_data]
+
     strategy:
       fail-fast: false
       matrix:
         map: ${{ fromJSON(needs.collect_data.outputs.maps).paths }}
-    concurrency:
-      group: run_all_tests-${{ github.head_ref || github.run_id }}-${{ matrix.map }}
-      cancel-in-progress: true
+
     uses: ./.github/workflows/run_integration_tests.yml
     with:
       map: ${{ matrix.map }}
@@ -206,9 +207,7 @@ jobs:
       fail-fast: false
       matrix:
         setup: ${{ fromJSON(needs.collect_data.outputs.alternate_tests) }}
-    concurrency:
-      group: run_all_tests-${{ github.head_ref || github.run_id }}-${{ matrix.setup.major }}.${{ matrix.setup.minor }}-${{ matrix.setup.map }}
-      cancel-in-progress: true
+
     uses: ./.github/workflows/run_integration_tests.yml
     with:
       map: ${{ matrix.setup.map }}
@@ -221,13 +220,15 @@ jobs:
     name: Check Alternate Tests
     needs: [run_alternate_tests]
     runs-on: ubuntu-22.04
+    timeout-minutes: 5
     steps:
       - run: echo Alternate tests passed.
 
   compare_screenshots:
     if: ( !contains(github.event.head_commit.message, '[ci skip]') && (always() && (!failure() && !cancelled())) )
     needs: [run_all_tests, run_alternate_tests]
     name: Compare Screenshot Tests
+    timeout-minutes: 15
     runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@v4
@@ -266,9 +267,8 @@ jobs:
     name: Windows Build
     needs: [collect_data]
     runs-on: windows-latest
-    concurrency:
-      group: test_windows-${{ github.head_ref || github.run_id }}
-      cancel-in-progress: true
+    timeout-minutes: 5
+
     steps:
       - uses: actions/checkout@v4
       - name: Restore Yarn cache

.github/workflows/codeowner_reviews.yml

@@ -9,6 +9,7 @@ jobs:
   assign-users:
 
     runs-on: ubuntu-latest
+    timeout-minutes: 5
 
     steps:
       # Checks-out your repository under $GITHUB_WORKSPACE, so the job can access it

.github/workflows/run_integration_tests.yml

@@ -16,9 +16,11 @@ on:
       max_required_byond_client:
         required: true
         type: string
+
 jobs:
   run_integration_tests:
     runs-on: ubuntu-latest
+    timeout-minutes: 15
     services:
       mysql:
         image: mysql:latest

RUN_SERVER.cmd

@@ -0,0 +1,2 @@
+@echo off
+call "%~dp0\tools\build\build.bat" --wait-on-error server %*

_maps/RandomRuins/LavaRuins/lavaland_biodome_beach.dmm

@@ -278,7 +278,7 @@
 	dir = 4
 	},
 /turf/open/floor/iron{
-	icon = 'icons/misc/beach.dmi';
+	icon = 'icons/obj/fluff/beach.dmi';
 	icon_state = "sand"
 	},
 /area/ruin/powered/beach)
@@ -479,7 +479,7 @@
 	},
 /obj/effect/turf_decal/sand,
 /turf/open/floor/iron{
-	icon = 'icons/misc/beach.dmi';
+	icon = 'icons/obj/fluff/beach.dmi';
 	icon_state = "sand"
 	},
 /area/ruin/powered/beach)

_maps/RandomRuins/LavaRuins/lavaland_surface_ash_walker1.dmm

@@ -1228,7 +1228,7 @@
 /area/lavaland/surface/outdoors)
 "JD" = (
 /obj/effect/mapping_helpers/no_lava,
-/obj/structure/ore_container/gutlunch_trough,
+/obj/structure/ore_container/food_trough/gutlunch_trough,
 /turf/open/misc/asteroid/basalt/lava_land_surface,
 /area/lavaland/surface/outdoors)
 "Kg" = (

_maps/RandomRuins/SpaceRuins/gondolaasteroid.dmm

@@ -27,7 +27,7 @@
 /turf/open/floor/grass,
 /area/ruin/space/has_grav)
 "h" = (
-/mob/living/simple_animal/pet/gondola,
+/mob/living/basic/pet/gondola,
 /turf/open/floor/grass,
 /area/ruin/space/has_grav)
 "i" = (

_maps/RandomZLevels/SnowCabin.dmm

@@ -1147,7 +1147,7 @@
 /turf/open/indestructible/binary{
 	density = 1;
 	desc = "No, I am not going through this.";
-	icon = 'icons/misc/beach.dmi';
+	icon = 'icons/obj/fluff/beach.dmi';
 	icon_state = "water";
 	name = "dirty water"
 	},

_maps/_basemap.dm

@@ -13,6 +13,7 @@
 		#include "map_files\Mining\Lavaland.dmm"
 		#include "map_files\NorthStar\north_star.dmm"
 		#include "map_files\tramstation\tramstation.dmm"
+		#include "map_files\wawastation\wawastation.dmm"
 
 		#ifdef CIBUILDING
 			#include "templates.dm"

_maps/deathmatch/ragin_mages.dmm

@@ -47,7 +47,7 @@
 /area/deathmatch/teleport)
 "ct" = (
 /obj/structure/flora/bush/grassy/style_random,
-/mob/living/simple_animal/pet/gondola{
+/mob/living/basic/pet/gondola{
 	name = "Jommy";
 	faction = list("gondola", "Wizard")
 	},