Merge remote-tracking branch 'upstream/master220' into rework2

_build_dependencies.sh

@@ -17,4 +17,4 @@ export RUSTG_VERSION=3.0.0-ss220
 export DMJIT_VERSION=v0.1.0
 
 # Python version for mapmerge and other tools
-export PYTHON_VERSION=3.7.9
+export PYTHON_VERSION=3.11.6

_maps/map_files/Delta/delta.dmm

@@ -11785,10 +11785,7 @@
 /area/civilian/vacantoffice)
 "bxn" = (
 /obj/structure/table/reinforced,
-/obj/machinery/computer/security/telescreen{
-	desc = "Used for watching the RD's goons from the safety of his office.";
-	name = "Research Monitor";
-	network = list("Research","Research Outpost","RD");
+/obj/machinery/computer/security/telescreen/research{
 	pixel_y = 2
 	},
 /turf/simulated/floor/plasteel{
@@ -13014,6 +13011,17 @@
 	pixel_y = -3
 	},
 /obj/effect/decal/warning_stripes/yellow/hollow,
+/obj/item/circuitboard/chem_dispenser{
+	pixel_x = 4;
+	pixel_y = 3
+	},
+/obj/item/circuitboard/chem_heater{
+	pixel_y = 5
+	},
+/obj/item/circuitboard/chem_master{
+	pixel_x = -4;
+	pixel_y = 8
+	},
 /turf/simulated/floor/plasteel{
 	dir = 8;
 	icon_state = "neutralfull"
@@ -15063,7 +15071,11 @@
 	pixel_x = -1;
 	pixel_y = 7
 	},
-/obj/item/gps/mining,
+/obj/item/gps{
+	icon_state = "gps-m";
+	desc = "A positioning system designed to keep an eye on your fellow workers.";
+	gpstag = "CARG0"
+	},
 /turf/simulated/floor/plasteel{
 	icon_state = "neutralfull"
 	},
@@ -27979,10 +27991,8 @@
 /area/maintenance/fpmaint)
 "cQv" = (
 /obj/structure/table/reinforced,
-/obj/machinery/computer/security/telescreen{
-	desc = "Used for watching the horrors within the test chamber.";
-	name = "Research Monitor";
-	network = list("TestChamber")
+/obj/machinery/computer/security/telescreen/test_chamber{
+	pixel_y = 2
 	},
 /turf/simulated/floor/plasteel{
 	dir = 8;
@@ -40718,12 +40728,8 @@
 	},
 /obj/item/twohanded/required/kirbyplants,
 /obj/effect/decal/warning_stripes/west,
-/obj/machinery/computer/security/telescreen{
-	desc = "Used for watching the singularity chamber.";
+/obj/machinery/computer/security/telescreen/singularity{
 	dir = 8;
-	layer = 4;
-	name = "Singularity Engine Telescreen";
-	network = list("Singularity");
 	pixel_x = -32
 	},
 /turf/simulated/floor/plasteel,
@@ -69161,12 +69167,12 @@
 	dir = 4
 	},
 /obj/effect/decal/warning_stripes/red/hollow,
-/obj/item/storage/box/beanbag,
-/obj/item/storage/box/beanbag{
+/obj/item/ammo_box/shotgun/beanbag,
+/obj/item/ammo_box/shotgun/beanbag{
 	pixel_x = -3;
 	pixel_y = 3
 	},
-/obj/item/storage/box/tranquilizer{
+/obj/item/ammo_box/shotgun/tranquilizer{
 	pixel_x = -6;
 	pixel_y = 6
 	},
@@ -71123,15 +71129,15 @@
 	c_tag = "HoS Bedroom";
 	network = list("SS13","Security")
 	},
-/obj/item/ammo_box/a357{
+/obj/item/ammo_box/speedloader/a357{
 	pixel_x = -9;
 	pixel_y = 9
 	},
-/obj/item/ammo_box/a357{
+/obj/item/ammo_box/speedloader/a357{
 	pixel_x = -4;
 	pixel_y = 4
 	},
-/obj/item/ammo_box/a357,
+/obj/item/ammo_box/speedloader/a357,
 /obj/item/clothing/accessory/holster,
 /obj/structure/safe{
 	known_by = list("hos")
@@ -86122,16 +86128,12 @@
 	},
 /area/security/warden)
 "oar" = (
-/obj/machinery/computer/security/telescreen{
-	desc = "Used to monitor interrogations.";
-	dir = 4;
-	layer = 4;
-	name = "Interrogation Monitor";
-	network = list("Interrogation");
-	req_access = list(63)
-	},
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/table/reinforced,
+/obj/machinery/computer/security/telescreen/prison{
+	pixel_y = 2;
+	network = list("Interrogation")
+	},
 /turf/simulated/floor/plasteel{
 	dir = 4;
 	icon_state = "red"
@@ -89195,8 +89197,7 @@
 	dir = 8
 	},
 /obj/machinery/light_switch{
-	pixel_x = -4;
-	pixel_y = -24
+	pixel_x = -26
 	},
 /turf/simulated/floor/plasteel,
 /area/toxins/mixing)
@@ -104257,10 +104258,7 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/structure/table/reinforced,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/machinery/computer/security/telescreen{
-	desc = "Used for watching the RD's goons from the safety of his office.";
-	name = "Research Monitor";
-	network = list("Research","Research Outpost","RD");
+/obj/machinery/computer/security/telescreen/research{
 	pixel_y = 2
 	},
 /turf/simulated/floor/plasteel{
@@ -118473,13 +118471,13 @@
 	dir = 4
 	},
 /obj/effect/decal/warning_stripes/red/hollow,
-/obj/item/storage/box/buck{
+/obj/item/ammo_box/shotgun/buck{
 	pixel_x = 3
 	},
-/obj/item/storage/box/buck{
+/obj/item/ammo_box/shotgun/buck{
 	pixel_y = 3
 	},
-/obj/item/storage/box/slug{
+/obj/item/ammo_box/shotgun{
 	pixel_x = -3;
 	pixel_y = 6
 	},
@@ -118804,12 +118802,8 @@
 "vsE" = (
 /obj/effect/decal/warning_stripes/west,
 /obj/structure/table/reinforced,
-/obj/machinery/computer/security/telescreen{
-	desc = "Used for watching the test chamber.";
-	dir = 4;
-	layer = 4;
-	name = "Test Chamber Telescreen";
-	network = list("Toxins")
+/obj/machinery/computer/security/telescreen/toxin_chamber{
+	pixel_y = 2
 	},
 /turf/simulated/floor/plasteel,
 /area/toxins/launch)

_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_ash_walker1.dmm

@@ -367,6 +367,7 @@
 /obj/structure/stone_tile{
 	dir = 4
 	},
+/obj/item/seeds/reishi,
 /turf/simulated/floor/plating/asteroid/basalt/lava_land_surface,
 /area/ruin/unpowered/ash_walkers)
 "bc" = (