Merge remote-tracking branch 'upstream' into Gives-Farragus-maints-mo…

…re-submaps
ParadiseSS13 · Jan 3, 2025 · ced87a9 · ced87a9
2 parents 2c505b2 + 2582b3c
commit ced87a9
Show file tree

Hide file tree

Showing 646 changed files with 13,128 additions and 7,935 deletions.
diff --git a/.github/workflows/build_rust.yml b/.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

diff --git a/.github/workflows/ci.yml b/.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

diff --git a/_build_dependencies.sh b/_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

diff --git a/_maps/__MAP_DEFINES.dm b/_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"

diff --git a/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_greed.dmm b/_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
 	},

diff --git a/_maps/map_files/RandomRuins/SpaceRuins/debris1.dmm b/_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" = (

diff --git a/_maps/map_files/RandomRuins/SpaceRuins/debris3.dmm b/_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" = (

diff --git a/_maps/map_files/RandomRuins/SpaceRuins/derelict5.dmm b/_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" = (

diff --git a/_maps/map_files/RandomRuins/SpaceRuins/meatpackers.dmm b/_maps/map_files/RandomRuins/SpaceRuins/meatpackers.dmm
@@ -19,11 +19,7 @@
 /turf/simulated/floor/engine,
 /area/ruin/unpowered/bmp_ship/delta)
 "af" = (
-/obj/machinery/porta_turret{
-	installation = /obj/item/gun/energy/gun;
-	lethal = 1;
-	name = "ship defense turret"
-	},
+/obj/machinery/porta_turret/meatpacker_ship,
 /turf/simulated/floor/engine,
 /area/ruin/unpowered/bmp_ship/delta)
 "ag" = (
@@ -1827,12 +1823,7 @@
 /turf/simulated/floor/plasteel,
 /area/ruin/unpowered/bmp_ship/aft)
 "go" = (
-/obj/machinery/porta_turret{
-	check_synth = 1;
-	installation = /obj/item/gun/energy/gun;
-	lethal = 1;
-	name = "ship defense turret"
-	},
+/obj/machinery/porta_turret/meatpacker_ship,
 /turf/simulated/floor/engine,
 /area/ruin/unpowered/bmp_ship/fore)
 "gp" = (
@@ -2118,12 +2109,7 @@
 /turf/simulated/floor/engine,
 /area/ruin/unpowered/bmp_ship/aft)
 "hp" = (
-/obj/machinery/porta_turret{
-	check_synth = 1;
-	installation = /obj/item/gun/energy/gun;
-	lethal = 1;
-	name = "ship defense turret"
-	},
+/obj/machinery/porta_turret/meatpacker_ship,
 /turf/simulated/floor/engine,
 /area/ruin/unpowered/bmp_ship/aft)
 "hq" = (

diff --git a/_maps/map_files/RandomRuins/SpaceRuins/moonoutpost19.dmm b/_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
 	},

diff --git a/_maps/map_files/RandomRuins/SpaceRuins/onehalf.dmm b/_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,

diff --git a/_maps/map_files/RandomRuins/SpaceRuins/spacebar.dmm b/_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,
@@ -323,7 +323,7 @@
 /area/ruin/space/powered/bar)
 "bn" = (
 /obj/effect/mapping_helpers/turfs/damage,
-/obj/item/stack/tile/mineral,
+/obj/item/stack/tile/plasteel,
 /turf/simulated/floor/plating,
 /area/ruin/space/powered/bar)
 "bo" = (
@@ -484,7 +484,7 @@
 /turf/simulated/floor/plating/asteroid/ancient,
 /area/space/nearstation)
 "pb" = (
-/obj/item/stack/tile/mineral,
+/obj/item/stack/tile/plasteel,
 /obj/machinery/door_control{
 	id = "SpaceBar";
 	name = "Public Shutters";
@@ -895,7 +895,7 @@
 /area/ruin/space/powered)
 "QU" = (
 /obj/effect/mapping_helpers/turfs/damage,
-/obj/item/stack/tile/mineral,
+/obj/item/stack/tile/plasteel,
 /turf/simulated/floor/plasteel{
 	icon_state = "dark"
 	},
@@ -949,7 +949,7 @@
 	},
 /area/ruin/space/powered/bar)
 "VR" = (
-/obj/item/stack/tile/mineral,
+/obj/item/stack/tile/plasteel,
 /turf/simulated/floor/plating,
 /area/ruin/space/powered/bar)
 "VU" = (

diff --git a/_maps/map_files/RandomRuins/SpaceRuins/syndie_space_base.dmm b/_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"

diff --git a/_maps/map_files/RandomRuins/SpaceRuins/syndiecakesfactory.dmm b/_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" = (

diff --git a/_maps/map_files/RandomRuins/SpaceRuins/ussp.dmm b/_maps/map_files/RandomRuins/SpaceRuins/ussp.dmm
@@ -3173,7 +3173,7 @@
 	},
 /area/ruin/space/derelict/crew_quarters)
 "iq" = (
-/obj/item/stack/tile,
+/obj/item/stack/tile/plasteel,
 /turf/template_noop,
 /area/space/nearstation)
 "ir" = (
@@ -5147,7 +5147,7 @@
 	},
 /area/ruin/space/derelict/arrival)
 "nM" = (
-/obj/item/stack/tile,
+/obj/item/stack/tile/plasteel,
 /turf/simulated/floor/plating/airless,
 /area/ruin/space/derelict/hallway/primary)
 "nN" = (
@@ -5344,7 +5344,7 @@
 	},
 /area/ruin/space/derelict/crew_quarters)
 "on" = (
-/obj/item/stack/tile,
+/obj/item/stack/tile/plasteel,
 /turf/template_noop,
 /area/ruin/space/derelict/arrival)
 "op" = (

diff --git a/_maps/map_files/generic/Lavaland.dmm b/_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" = (

diff --git a/_maps/map_files/generic/centcomm.dmm b/_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" = (