Merge branch 'master' into tether-module-fix

.vscode/launch.json

@@ -1,18 +1,26 @@
 {
 	"version": "0.2.0",
 	"configurations": [
-	  {
+	{
 		"type": "byond",
 		"request": "launch",
 		"name": "Build & DS Debug",
 		"preLaunchTask": "dm: build - ${command:CurrentDME}",
 		"dmb": "${workspaceFolder}/${command:CurrentDMB}"
-	  },
-	  {
+	},
+	{
+		"type": "byond",
+		"request": "launch",
+		"name": "Build & DD Debug",
+		"preLaunchTask": "dm: build - ${command:CurrentDME}",
+		"dmb": "${workspaceFolder}/${command:CurrentDMB}",
+		"dreamDaemon": true
+	},
+	{
 		"type": "byond",
 		"request": "launch",
 		"name": "DS Debug",
 		"dmb": "${workspaceFolder}/${command:CurrentDMB}"
-	  }
+	}
 	]
-  }
+}

README.md

@@ -1,5 +1,5 @@
 > [!IMPORTANT]
-> July is a month of focus on "Quality releases", this means no new balance or feature PRs are permitted without prior approval.</br>
+> We are currently in a period of focus on "Quality releases", this means no new balance or feature PRs are permitted without prior approval.</br>
 > [For more info, see the following discord post on our public discord](https://discord.com/channels/145533722026967040/499000353312735233/1256632472196878337)
 
 <a href="#"><img src=".github/assets/paradise.png" alt="Paradise Station"></a>

_maps/map_files/RandomRuins/LavaRuins/lavaland_biodome_winter.dmm

@@ -102,7 +102,7 @@
 /area/ruin/powered/snow_cabin)
 "ax" = (
 /obj/structure/table/wood,
-/obj/item/food/snacks/beans,
+/obj/item/food/beans,
 /turf/simulated/floor/wood,
 /area/ruin/powered/snow_cabin)
 "ay" = (

_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_althland_excavation.dmm

@@ -665,7 +665,7 @@
 /area/lavaland/surface/outdoors)
 "ie" = (
 /obj/structure/table,
-/obj/item/food/snacks/badrecipe,
+/obj/item/food/badrecipe,
 /turf/simulated/floor/plating/lavaland_air,
 /area/ruin/unpowered/althland_excavation)
 "iv" = (
@@ -1088,8 +1088,8 @@
 "Cs" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/table_frame,
-/obj/item/food/snacks/badrecipe,
-/obj/item/food/snacks/badrecipe{
+/obj/item/food/badrecipe,
+/obj/item/food/badrecipe{
 	pixel_y = 14;
 	pixel_x = 14
 	},
@@ -1313,7 +1313,7 @@
 /area/lavaland/surface/outdoors)
 "OX" = (
 /obj/structure/table_frame,
-/obj/item/food/snacks/badrecipe,
+/obj/item/food/badrecipe,
 /turf/simulated/floor/plating/lavaland_air,
 /area/ruin/unpowered/althland_excavation)
 "Pe" = (

_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_envy.dmm

@@ -34,7 +34,7 @@
 /turf/simulated/floor/plating/burnt,
 /area/ruin/powered/envy)
 "g" = (
-/obj/effect/decal/cleanable/blood/tracks,
+/obj/effect/decal/cleanable/blood/tracks/mapped,
 /obj/structure/mirror{
 	broken = 1;
 	desc = "This mirror has been shattered. It looks like the bad luck energies spilling from it are taking immediate effect on your surroundings!";

_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_pizzaparty.dmm

@@ -36,7 +36,7 @@
 /turf/simulated/floor/wood/lavaland_air,
 /area/ruin/powered/pizza_party)
 "j" = (
-/obj/item/food/snacks/mushroompizzaslice,
+/obj/item/food/mushroompizzaslice,
 /obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor/plating/lavaland_air,
 /area/ruin/powered/pizza_party)
@@ -147,18 +147,18 @@
 /area/ruin/powered/pizza_party)
 "D" = (
 /obj/structure/table/wood,
-/obj/item/food/snacks/margheritapizzaslice,
+/obj/item/food/margheritapizzaslice,
 /obj/item/trash/plate,
 /turf/simulated/floor/wood/lavaland_air,
 /area/ruin/powered/pizza_party)
 "E" = (
 /obj/structure/table/wood,
-/obj/item/food/snacks/meatpizzaslice,
+/obj/item/food/meatpizzaslice,
 /turf/simulated/floor/wood/lavaland_air,
 /area/ruin/powered/pizza_party)
 "F" = (
 /obj/structure/table/wood,
-/obj/item/food/snacks/sliceable/birthdaycake,
+/obj/item/food/sliceable/birthdaycake,
 /turf/simulated/floor/wood/lavaland_air,
 /area/ruin/powered/pizza_party)
 "G" = (

_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_seed_vault.dmm

@@ -119,7 +119,7 @@
 /obj/effect/mapping_helpers/no_lava,
 /obj/effect/mob_spawn/human/corpse/seed_vault_diona,
 /obj/item/pickaxe/mini,
-/obj/item/food/snacks/grown/mushroom/glowshroom{
+/obj/item/food/grown/mushroom/glowshroom{
 	pixel_x = 8;
 	pixel_y = -8
 	},

_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_sloth.dmm

@@ -25,7 +25,7 @@
 /area/ruin/powered/sloth)
 "f" = (
 /obj/structure/table/wood,
-/obj/item/food/snacks/grown/citrus/orange,
+/obj/item/food/grown/citrus/orange,
 /turf/simulated/floor/sepia{
 	slowdown = 10
 	},

_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_survivalpod.dmm

@@ -86,7 +86,7 @@
 	},
 /obj/effect/decal/cleanable/blood,
 /obj/effect/decal/cleanable/blood/drip,
-/obj/effect/decal/cleanable/blood/tracks,
+/obj/effect/decal/cleanable/blood/tracks/mapped,
 /turf/simulated/floor/pod/dark,
 /area/ruin/powered)
 "r" = (
@@ -97,12 +97,12 @@
 /turf/simulated/floor/pod/dark,
 /area/ruin/powered)
 "s" = (
-/obj/effect/decal/cleanable/blood/tracks,
+/obj/effect/decal/cleanable/blood/tracks/mapped,
 /turf/simulated/floor/plating/asteroid/basalt/lava_land_surface,
 /area/lavaland/surface/outdoors)
 "t" = (
 /obj/machinery/door/airlock/survival_pod/glass,
-/obj/effect/decal/cleanable/blood/tracks,
+/obj/effect/decal/cleanable/blood/tracks/mapped,
 /obj/structure/fans/tiny,
 /turf/simulated/floor/pod/dark,
 /area/ruin/powered)
@@ -124,7 +124,7 @@
 /turf/simulated/floor/plating/asteroid/basalt/lava_land_surface,
 /area/lavaland/surface/outdoors)
 "y" = (
-/obj/effect/decal/cleanable/blood/tracks{
+/obj/effect/decal/cleanable/blood/tracks/mapped{
 	dir = 4
 	},
 /turf/simulated/floor/plating/asteroid/basalt/lava_land_surface,

_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_watcher_grave.dmm

@@ -34,7 +34,7 @@
 /obj/structure/stone_tile{
 	dir = 1
 	},
-/obj/item/food/snacks/egg/watcher,
+/obj/item/food/egg/watcher,
 /obj/effect/mapping_helpers/no_lava,
 /obj/effect/mapping_helpers/no_lava,
 /turf/simulated/floor/plating/asteroid/basalt/lava_land_surface,