Merge branch 'master' into paratoberfest_blind_stalkers

Signed-off-by: Luc <[email protected]>

.github/PULL_REQUEST_TEMPLATE.md

@@ -28,7 +28,7 @@
 - [ ] I confirm that I either do not require [pre-approval](https://github.com/ParadiseSS13/Paradise/blob/master/docs/CODE_OF_CONDUCT.md#types-of-changes-that-need-approval) for this PR, or I have obtained such approval and have included a screenshot to demonstrate this below.
   <!-- Replace the box with [x] to mark as complete. -->
   <!-- Ensure there are no spaces between the x and the square brackets [] else this will not work properly. -->
-  <hr>
+<hr>
 
 ## Changelog
 

.github/workflows/build_rust.yml

@@ -72,7 +72,7 @@ jobs:
           rustup target add i686-pc-windows-gnu
           sudo dpkg --add-architecture i386
           sudo apt-get update
-          sudo apt-get install zlib1g-dev:i386 lib32gcc-11-dev mingw-w64 mingw-w64-i686-dev
+          sudo apt-get install zlib1g-dev:i386 lib32gcc-13-dev mingw-w64 mingw-w64-i686-dev
 
           # Build it.
           cargo build --release --target i686-unknown-linux-gnu

.github/workflows/ci.yml

@@ -57,6 +57,11 @@ jobs:
           python -m tools.ci.check_legacy_attack_chain
           python -m tools.maplint.source --github
 
+      - name: Setup .NET SDK
+        uses: actions/[email protected]
+        with:
+          dotnet-version: 9.x
+
       - name: Run DreamChecker
         shell: bash
         run: ~/dreamchecker 2>&1 | bash tools/ci/annotate_dm.sh
@@ -69,6 +74,10 @@ jobs:
       - name: Setup OD
         run: |
           bash tools/ci/setup_od.sh
+      - name: Setup .NET SDK
+        uses: actions/[email protected]
+        with:
+          dotnet-version: 9.x
       - name: Run OD
         run: |
           bash tools/ci/run_od.sh
@@ -104,7 +113,7 @@ jobs:
             '/datum/map/cerestation',
             '/datum/map/emeraldstation',
           ]
-        byondtype: ['STABLE']
+        byondtype: ['STABLE', 'BETA']
     services:
       mariadb:
         image: mariadb:latest

_build_dependencies.sh

@@ -8,9 +8,9 @@ export STABLE_BYOND_MAJOR=515
 # Stable Byond Minor
 export STABLE_BYOND_MINOR=1633
 # Beta Byond Major - Uncomment and update if beta cycle active
-#export BETA_BYOND_MAJOR=515
+export BETA_BYOND_MAJOR=516
 # Beta Byond Minor - Uncomment and update if beta cycle active
-#export BETA_BYOND_MINOR=1633
+export BETA_BYOND_MINOR=1648
 # Python version for mapmerge and other tools
 export PYTHON_VERSION=3.11.6
 # RUSTG version

_maps/__MAP_DEFINES.dm

@@ -29,6 +29,8 @@
 	#define SPAWN_RUINS "Spawn Ruins"
 	/// A level that can be navigated to through space, but for real this time.
 	#define REACHABLE_SPACE_ONLY "Reachable Space Only"
+	/// A level used for spawning map areas in tests
+	#define GAME_TEST_LEVEL "Game Test Level"
 
 // Level names
 	#define MAIN_STATION "Main Station"

_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_greed.dmm

@@ -14,7 +14,7 @@
 /area/ruin/powered/greed)
 "e" = (
 /obj/structure/table/wood/poker,
-/obj/item/gun/projectile/revolver/russian/soul,
+/obj/item/toy/russian_revolver/soul,
 /obj/machinery/light/small{
 	dir = 1
 	},