Merge remote-tracking branch 'upstream/master'

.github/workflows/ci_suite.yml

@@ -227,7 +227,7 @@ jobs:
 
   compare_screenshots:
     if: needs.collect_data.outputs.alternate_tests == '[]' || needs.run_alternate_tests.result == 'success'
-    needs: [ collect_data, run_all_tests, run_alternate_tests ]
+    needs: [ collect_data, run_alternate_tests ]
     name: Compare Screenshot Tests
     timeout-minutes: 15
     runs-on: ubuntu-22.04

_maps/RandomRuins/IceRuins/bubberstation/icemoon_surface_gas_bubber.dmm

@@ -169,23 +169,15 @@
 "gm" = (
 /obj/structure/window/reinforced/spawner/directional/west,
 /obj/structure/window/reinforced/spawner/directional/south,
-/obj/item/food/cornuto{
-	pixel_y = 4;
-	pixel_x = -3
-	},
-/obj/item/food/cornuto{
-	pixel_y = -5;
-	pixel_x = 2
-	},
-/obj/item/food/cornuto{
-	pixel_y = 5;
-	pixel_x = 6
-	},
-/obj/item/food/cornuto{
-	pixel_y = -5;
-	pixel_x = -3
-	},
 /obj/structure/closet/crate/freezer,
+/obj/item/food/vendor_tray_meal/sushi,
+/obj/item/food/vendor_tray_meal/sushi,
+/obj/item/food/vendor_tray_meal/sushi,
+/obj/item/food/vendor_tray_meal/sushi,
+/obj/item/food/vendor_tray_meal/sushi,
+/obj/item/food/nigiri_sushi,
+/obj/item/food/nigiri_sushi,
+/obj/item/food/nigiri_sushi,
 /turf/open/floor/iron/freezer{
 	baseturfs = /turf/open/misc/asteroid/basalt/lava_land_surface
 	},
@@ -355,10 +347,11 @@
 /area/icemoon/underground/unexplored)
 "lt" = (
 /obj/machinery/vending/dorms{
-	onstation = 0
+	density = 0;
+	pixel_y = -32
 	},
-/turf/closed/wall/r_wall{
-	baseturfs = /turf/open/floor/plating/lavaland_baseturf
+/turf/open/floor/iron{
+	baseturfs = /turf/open/misc/asteroid/basalt/lava_land_surface
 	},
 /area/ruin/powered/lizard_gas)
 "lK" = (
@@ -567,6 +560,22 @@
 	},
 /obj/structure/closet/crate/freezer,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/general/hidden/layer4,
+/obj/item/food/cornuto{
+	pixel_y = -5;
+	pixel_x = -3
+	},
+/obj/item/food/cornuto{
+	pixel_y = 4;
+	pixel_x = -3
+	},
+/obj/item/food/cornuto{
+	pixel_y = 5;
+	pixel_x = 6
+	},
+/obj/item/food/cornuto{
+	pixel_y = -5;
+	pixel_x = 2
+	},
 /turf/open/floor/iron/freezer{
 	baseturfs = /turf/open/misc/asteroid/basalt/lava_land_surface
 	},
@@ -649,17 +658,14 @@
 /obj/item/tank/internals/oxygen,
 /obj/item/clothing/mask/breath,
 /obj/item/pickaxe,
-/obj/item/gun/ballistic/rifle/boltaction/pipegun,
-/obj/item/ammo_casing/junk/hunter,
-/obj/item/ammo_casing/junk/hunter,
-/obj/item/ammo_casing/junk/hunter,
 /obj/item/storage/box/coffeepack/robusta,
 /obj/item/storage/box/coffeepack/robusta,
 /obj/item/flatpacked_machine,
 /obj/item/flatpacked_machine/ore_silo,
 /obj/item/flatpacked_machine/sustenance_machine,
 /obj/item/flatpacked_machine/organics_ration_printer,
 /obj/item/flatpacked_machine/macrowave,
+/obj/item/gun/energy/laser/musket,
 /turf/open/floor/iron/smooth{
 	baseturfs = /turf/open/misc/asteroid/basalt/lava_land_surface
 	},
@@ -1958,7 +1964,7 @@ qM
 qM
 Xn
 qM
-qM
+gv
 gv
 gv
 gv
@@ -1979,11 +1985,10 @@ Ji
 ed
 Ji
 ur
-qM
+ur
 qM
 HE
 Jv
-Py
 lt
 qM
 gv
@@ -1993,6 +1998,7 @@ gv
 gv
 gv
 gv
+gv
 "}
 (24,1,1) = {"
 gv
@@ -2006,13 +2012,13 @@ wN
 RW
 mE
 pO
-qM
+ur
 qM
 Kr
 kI
 ei
 qM
-qM
+gv
 gv
 gv
 gv
@@ -2033,13 +2039,13 @@ Md
 Ji
 Ji
 Ji
+ur
 qM
 qM
 qM
 qM
 qM
-qM
-qM
+gv
 gv
 gv
 gv

_maps/RandomRuins/LavaRuins/bubberstation/lavaland_surface_gas_bubber.dmm

@@ -45,6 +45,22 @@
 	},
 /obj/structure/closet/crate/freezer,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/general/hidden/layer4,
+/obj/item/food/cornuto{
+	pixel_y = -5;
+	pixel_x = -3
+	},
+/obj/item/food/cornuto{
+	pixel_y = 4;
+	pixel_x = -3
+	},
+/obj/item/food/cornuto{
+	pixel_y = 5;
+	pixel_x = 6
+	},
+/obj/item/food/cornuto{
+	pixel_y = -5;
+	pixel_x = 2
+	},
 /turf/open/floor/iron/freezer{
 	baseturfs = /turf/open/misc/asteroid/basalt/lava_land_surface
 	},
@@ -418,10 +434,11 @@
 /area/lavaland/surface/outdoors)
 "oT" = (
 /obj/machinery/vending/dorms{
-	onstation = 0
+	density = 0;
+	pixel_y = -32
 	},
-/turf/closed/wall/r_wall{
-	baseturfs = /turf/open/floor/plating/lavaland_baseturf
+/turf/open/floor/iron{
+	baseturfs = /turf/open/misc/asteroid/basalt/lava_land_surface
 	},
 /area/ruin/thelizardsgas_lavaland)
 "pp" = (
@@ -445,17 +462,14 @@
 /obj/item/tank/internals/oxygen,
 /obj/item/clothing/mask/breath,
 /obj/item/pickaxe,
-/obj/item/gun/ballistic/rifle/boltaction/pipegun,
-/obj/item/ammo_casing/junk/hunter,
-/obj/item/ammo_casing/junk/hunter,
-/obj/item/ammo_casing/junk/hunter,
 /obj/item/storage/box/coffeepack/robusta,
 /obj/item/storage/box/coffeepack/robusta,
 /obj/item/flatpacked_machine,
 /obj/item/flatpacked_machine/ore_silo,
 /obj/item/flatpacked_machine/sustenance_machine,
 /obj/item/flatpacked_machine/organics_ration_printer,
 /obj/item/flatpacked_machine/macrowave,
+/obj/item/gun/energy/laser/musket,
 /turf/open/floor/iron/smooth{
 	baseturfs = /turf/open/misc/asteroid/basalt/lava_land_surface
 	},
@@ -1313,23 +1327,15 @@
 "Zf" = (
 /obj/structure/window/reinforced/spawner/directional/west,
 /obj/structure/window/reinforced/spawner/directional/south,
-/obj/item/food/cornuto{
-	pixel_y = 4;
-	pixel_x = -3
-	},
-/obj/item/food/cornuto{
-	pixel_y = -5;
-	pixel_x = 2
-	},
-/obj/item/food/cornuto{
-	pixel_y = 5;
-	pixel_x = 6
-	},
-/obj/item/food/cornuto{
-	pixel_y = -5;
-	pixel_x = -3
-	},
 /obj/structure/closet/crate/freezer,
+/obj/item/food/vendor_tray_meal/sushi,
+/obj/item/food/vendor_tray_meal/sushi,
+/obj/item/food/vendor_tray_meal/sushi,
+/obj/item/food/vendor_tray_meal/sushi,
+/obj/item/food/vendor_tray_meal/sushi,
+/obj/item/food/nigiri_sushi,
+/obj/item/food/nigiri_sushi,
+/obj/item/food/nigiri_sushi,
 /turf/open/floor/iron/freezer{
 	baseturfs = /turf/open/misc/asteroid/basalt/lava_land_surface
 	},
@@ -1734,11 +1740,10 @@ DI
 DI
 DI
 DI
-FA
+DI
 FA
 cC
 Bb
-xW
 oT
 FA
 DI
@@ -1748,6 +1753,7 @@ DI
 DI
 DI
 DI
+DI
 "}
 (19,1,1) = {"
 DI
@@ -1757,13 +1763,13 @@ DI
 DI
 DI
 DI
-FA
+DI
 FA
 Bw
 Hd
 jB
 FA
-FA
+DI
 DI
 DI
 DI
@@ -1780,13 +1786,13 @@ DI
 DI
 DI
 DI
+DI
 FA
 FA
 FA
 FA
 FA
-FA
-FA
+DI
 DI
 DI
 DI