Merge branch 'master' into sec-mask

.github/workflows/build_rust.yml

@@ -13,7 +13,7 @@ jobs:
       (github.event.comment.author_association == 'MEMBER') ||
       (github.event.comment.author_association == 'OWNER'))
 
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     steps:
       - id: create_token
         uses: actions/create-github-app-token@v1
@@ -38,7 +38,7 @@ jobs:
       - name: PR Data
         run: |
           pr_json=$(curl -L -s --fail-with-body -H "Authorization: token ${{ github.token }}" ${{ github.event.issue.pull_request.url }})
-          if [ `jq -r '.maintainer_can_modify' <<<$pr_json` == "false" ] ; then
+          if [ `jq -r '.head.repo.id == .base.repo.id' <<<$pr_json` == "false" ] && [ `jq -r '.maintainer_can_modify' <<<$pr_json` == "false" ] ; then
             gh pr comment ${{ github.event.issue.html_url }} --body 'GitHub Actions can not push to the repository without "Allow edits and access to secrets by maintainers" checked.'
             echo "FAIL_NOTIFIED=true" >> "$GITHUB_ENV"
             exit 1

.github/workflows/ci.yml

@@ -104,7 +104,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
 	},

_maps/map_files/RandomRuins/SpaceRuins/debris1.dmm

@@ -43,7 +43,7 @@
 /turf/template_noop,
 /area/template_noop)
 "ao" = (
-/obj/random/tool,
+/obj/effect/spawner/random/engineering/tools,
 /turf/template_noop,
 /area/template_noop)
 "ap" = (
@@ -85,7 +85,7 @@
 /turf/simulated/floor/plating/airless,
 /area/template_noop)
 "aG" = (
-/obj/random/toolbox,
+/obj/effect/spawner/random/engineering/toolbox,
 /turf/simulated/floor/plating/burnt/airless,
 /area/template_noop)
 "aI" = (

_maps/map_files/RandomRuins/SpaceRuins/debris3.dmm

@@ -36,7 +36,7 @@
 /turf/template_noop,
 /area/template_noop)
 "k" = (
-/obj/random/plushie,
+/obj/effect/spawner/random/plushies,
 /turf/template_noop,
 /area/template_noop)
 "l" = (
@@ -83,7 +83,7 @@
 /turf/simulated/floor/plating/damaged/airless,
 /area/template_noop)
 "A" = (
-/obj/random/tool,
+/obj/effect/spawner/random/engineering/tools,
 /turf/template_noop,
 /area/template_noop)
 "B" = (
@@ -95,7 +95,7 @@
 /turf/template_noop,
 /area/template_noop)
 "F" = (
-/obj/random/tool,
+/obj/effect/spawner/random/engineering/tools,
 /turf/simulated/floor/plating/damaged/airless,
 /area/template_noop)
 "G" = (

_maps/map_files/RandomRuins/SpaceRuins/derelict5.dmm

@@ -172,7 +172,7 @@
 /area/ruin/space/unpowered)
 "xQ" = (
 /obj/structure/table,
-/obj/item/gun/projectile/revolver/russian,
+/obj/item/toy/russian_revolver,
 /turf/simulated/floor/plasteel,
 /area/ruin/space/unpowered)
 "yq" = (

_maps/map_files/RandomRuins/SpaceRuins/moonoutpost19.dmm

@@ -9964,7 +9964,7 @@
 	pixel_y = 7;
 	pixel_x = -3
 	},
-/obj/item/clothing/accessory/horrible{
+/obj/item/clothing/neck/tie/horrible{
 	pixel_y = -2;
 	pixel_x = 2
 	},

_maps/map_files/RandomRuins/SpaceRuins/onehalf.dmm

@@ -1127,7 +1127,7 @@
 	icon_state = "0-8"
 	},
 /obj/structure/closet/crate/medical,
-/obj/item/clothing/accessory/stethoscope,
+/obj/item/clothing/neck/stethoscope,
 /obj/item/healthanalyzer,
 /obj/item/reagent_containers/iv_bag/blood/o_minus,
 /obj/item/reagent_containers/iv_bag/blood/o_minus,

_maps/map_files/RandomRuins/SpaceRuins/spacebar.dmm

@@ -223,7 +223,7 @@
 	},
 /area/ruin/space/powered/bar)
 "aY" = (
-/obj/item/clothing/accessory/stethoscope,
+/obj/item/clothing/neck/stethoscope,
 /obj/item/stack/medical/bruise_pack/advanced,
 /obj/item/scalpel,
 /obj/structure/table,

_maps/map_files/RandomRuins/SpaceRuins/syndie_space_base.dmm

@@ -3435,7 +3435,7 @@
 	},
 /area/ruin/unpowered/syndicate_space_base/storage)
 "uy" = (
-/obj/item/clothing/accessory/stethoscope,
+/obj/item/clothing/neck/stethoscope,
 /turf/simulated/floor/plasteel{
 	dir = 4;
 	icon_state = "darkred"
@@ -7950,7 +7950,7 @@
 /obj/item/storage/belt/medical,
 /obj/item/crowbar,
 /obj/item/clothing/glasses/hud/health,
-/obj/item/clothing/accessory/stethoscope,
+/obj/item/clothing/neck/stethoscope,
 /obj/structure/table,
 /turf/simulated/floor/plasteel{
 	icon_state = "whiteblue"

_maps/map_files/RandomRuins/SpaceRuins/syndiecakesfactory.dmm

@@ -551,7 +551,7 @@
 /area/ruin/space/syndicakefactory)
 "uU" = (
 /obj/structure/rack,
-/obj/random/tool,
+/obj/effect/spawner/random/engineering/tools,
 /turf/simulated/floor/engine,
 /area/ruin/space/syndicakefactory)
 "vo" = (

_maps/map_files/generic/Lavaland.dmm

@@ -1416,7 +1416,7 @@
 /area/mine/outpost/hallway/west)
 "dU" = (
 /obj/structure/rack,
-/obj/random/tool,
+/obj/effect/spawner/random/engineering/tools,
 /turf/simulated/floor/plating,
 /area/mine/outpost/maintenance/south)
 "dV" = (

_maps/map_files/generic/centcomm.dmm

@@ -6403,8 +6403,7 @@
 /area/admin)
 "vJ" = (
 /obj/structure/table,
-/obj/random/toolbox,
-/obj/random/bomb_supply,
+/obj/effect/spawner/random/engineering/toolbox,
 /obj/machinery/syndicatebomb/badmin/clown,
 /turf/simulated/floor/plasteel/dark,
 /area/admin)
@@ -6602,7 +6601,6 @@
 "wx" = (
 /obj/structure/table,
 /obj/item/tank/internals/oxygen/yellow,
-/obj/random/bomb_supply,
 /obj/item/clothing/under/costume/rebeloutfit,
 /obj/item/clothing/suit/poncho/ponchoshame,
 /obj/item/clothing/head/sombrero/shamebrero,
@@ -6746,7 +6744,7 @@
 /area/admin)
 "wT" = (
 /obj/structure/table,
-/obj/random/tool,
+/obj/effect/spawner/random/engineering/tools,
 /obj/item/clothing/gloves/color/yellow,
 /obj/item/pinpointer/advpinpointer,
 /turf/simulated/floor/plasteel/dark,
@@ -12325,7 +12323,10 @@
 /area/centcom/control)
 "Rh" = (
 /obj/structure/table,
-/obj/random/powercell,
+/obj/item/stock_parts/cell,
+/obj/item/stock_parts/cell/high,
+/obj/item/stock_parts/cell/super,
+/obj/item/stock_parts/cell/hyper,
 /turf/simulated/floor/plasteel,
 /area/admin)
 "Ri" = (
@@ -12365,8 +12366,7 @@
 /area/centcom/evac)
 "Rn" = (
 /obj/structure/table,
-/obj/random/tool,
-/obj/random/bomb_supply,
+/obj/effect/spawner/random/engineering/tools,
 /turf/simulated/floor/plasteel,
 /area/admin)
 "Ro" = (
@@ -12824,8 +12824,6 @@
 /area/admin)
 "To" = (
 /obj/structure/table,
-/obj/random/technology_scanner,
-/obj/random/tech_supply,
 /turf/simulated/floor/plasteel,
 /area/admin)
 "Tp" = (
@@ -13609,7 +13607,6 @@
 "Wt" = (
 /obj/structure/table,
 /obj/item/clothing/gloves/color/yellow,
-/obj/random/bomb_supply,
 /turf/simulated/floor/plasteel,
 /area/admin)
 "Wu" = (

_maps/map_files/shuttles/emergency_shadow.dmm

@@ -154,7 +154,8 @@
 /obj/machinery/atmospherics/pipe/simple/hidden{
 	dir = 5
 	},
-/turf/simulated/floor/engine/plasma,
+/obj/structure/plasmafire_generator/shadow,
+/turf/simulated/floor/engine/airless,
 /area/shuttle/escape)
 "ge" = (
 /obj/structure/table/glass/reinforced/plastitanium,
@@ -230,9 +231,6 @@
 	},
 /turf/simulated/floor/catwalk,
 /area/shuttle/escape)
-"jR" = (
-/turf/simulated/floor/engine/o2,
-/area/shuttle/escape)
 "kx" = (
 /obj/structure/chair/comfy/shuttle,
 /turf/simulated/floor/mineral/plastitanium/red/brig,
@@ -354,7 +352,8 @@
 /obj/machinery/atmospherics/pipe/manifold/hidden{
 	dir = 4
 	},
-/turf/simulated/floor/engine/plasma,
+/obj/structure/plasmafire_generator/shadow,
+/turf/simulated/floor/engine/airless,
 /area/shuttle/escape)
 "pi" = (
 /obj/effect/turf_decal/stripes/white/line{
@@ -565,7 +564,8 @@
 	},
 /area/shuttle/escape)
 "zj" = (
-/turf/simulated/floor/engine/plasma,
+/obj/structure/plasmafire_generator/shadow,
+/turf/simulated/floor/engine/airless,
 /area/shuttle/escape)
 "zs" = (
 /obj/structure/reagent_dispensers/fueltank,
@@ -639,7 +639,8 @@
 /area/template_noop)
 "CD" = (
 /obj/machinery/igniter/shadow,
-/turf/simulated/floor/engine/plasma,
+/obj/structure/plasmafire_generator/shadow,
+/turf/simulated/floor/engine/airless,
 /area/shuttle/escape)
 "CK" = (
 /obj/structure/shuttle/engine/propulsion/burst{
@@ -680,7 +681,8 @@
 /area/shuttle/escape)
 "DY" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/universal,
-/turf/simulated/floor/engine/plasma,
+/obj/structure/plasmafire_generator/shadow,
+/turf/simulated/floor/engine/airless,
 /area/shuttle/escape)
 "DZ" = (
 /obj/effect/turf_decal/stripes/red/corner{
@@ -739,7 +741,8 @@
 	dir = 4;
 	invisibility = 99
 	},
-/turf/simulated/floor/engine/plasma,
+/obj/structure/plasmafire_generator/shadow,
+/turf/simulated/floor/engine/airless,
 /area/shuttle/escape)
 "Gx" = (
 /obj/structure/extinguisher_cabinet{
@@ -1151,7 +1154,8 @@
 	dir = 9
 	},
 /obj/machinery/atmospherics/meter,
-/turf/simulated/floor/engine/plasma,
+/obj/structure/plasmafire_generator/shadow,
+/turf/simulated/floor/engine/airless,
 /area/shuttle/escape)
 "Xp" = (
 /obj/structure/marker_beacon/dock_marker/collision,
@@ -1357,9 +1361,9 @@ Lv
 OL
 Bu
 tb
-jR
+zj
 CD
-jR
+zj
 cX
 wF
 cH