Fixes spiderwebs, alien weeds, kudzu, and other stuff layering below catwalks and glass floors (#89893)

## About The Pull Request Vents/scrubbers look a bit weird as their pipes still go above catwalks/glass floors but I need my stuff from #89702 and it should be atomized from this PR. Closes #87022 Closes #88823 ## Changelog 🆑 fix: Fixed spiderwebs, alien weeds, kudzu, and other stuff layering below catwalks and glass floors /🆑
2025-12-10 01:34:01 +00:00 · 2025-03-12 09:55:47 +01:00
parent a9a3186a24
commit 0ac282f03f
12 changed files with 20 additions and 19 deletions
--- a/code/__DEFINES/layers.dm
+++ b/code/__DEFINES/layers.dm
@@ -149,13 +149,14 @@
 #define LATTICE_LAYER (8 + TOPDOWN_LAYER)
 #define DISPOSAL_PIPE_LAYER (9 + TOPDOWN_LAYER)
 #define WIRE_LAYER (10 + TOPDOWN_LAYER)
-#define GLASS_FLOOR_LAYER (11 + TOPDOWN_LAYER)
-#define TRAM_RAIL_LAYER (12 + TOPDOWN_LAYER)
-#define ABOVE_OPEN_TURF_LAYER (13 + TOPDOWN_LAYER)
+#define BELOW_CATWALK_LAYER (11 + TOPDOWN_LAYER)
+#define GLASS_FLOOR_LAYER (12 + TOPDOWN_LAYER)
 ///catwalk overlay of /turf/open/floor/plating/catwalk_floor
-#define CATWALK_LAYER (14 + TOPDOWN_LAYER)
-#define LOWER_RUNE_LAYER (15 + TOPDOWN_LAYER)
-#define RUNE_LAYER (16 + TOPDOWN_LAYER)
+#define CATWALK_LAYER (13 + TOPDOWN_LAYER)
+#define TRAM_RAIL_LAYER (14 + TOPDOWN_LAYER)
+#define ABOVE_OPEN_TURF_LAYER (15 + TOPDOWN_LAYER)
+#define LOWER_RUNE_LAYER (16 + TOPDOWN_LAYER)
+#define RUNE_LAYER (17 + TOPDOWN_LAYER)
 #define CLEANABLE_FLOOR_OBJECT_LAYER (21 + TOPDOWN_LAYER)

 //Placeholders in case the game plane and possibly other things between it and the floor plane are ever made into topdown planes
--- a/code/datums/elements/undertile.dm
+++ b/code/datums/elements/undertile.dm
@@ -51,7 +51,7 @@
 		if(PLANE_TO_TRUE(source.plane) != FLOOR_PLANE)
 			// We do this so that turfs that allow you to see what's underneath them don't have to be on the game plane (which causes ambient occlusion weirdness)
 			SET_PLANE_IMPLICIT(source, FLOOR_PLANE)
-			source.layer = ABOVE_OPEN_TURF_LAYER
+			source.layer = BELOW_CATWALK_LAYER

 		ADD_TRAIT(source, TRAIT_UNDERFLOOR, REF(src))

--- a/code/game/objects/effects/spiderwebs.dm
+++ b/code/game/objects/effects/spiderwebs.dm
@@ -32,8 +32,8 @@
 	take_damage(5, BURN, 0, 0)

 /obj/structure/spider/stickyweb
+	layer = ABOVE_OPEN_TURF_LAYER
 	plane = FLOOR_PLANE
-	layer = MID_TURF_LAYER
 	icon = 'icons/obj/smooth_structures/stickyweb.dmi'
 	base_icon_state = "stickyweb"
 	icon_state = "stickyweb-0"
@@ -248,8 +248,8 @@
 /obj/structure/spider/spikes
 	name = "web spikes"
 	desc = "Silk hardened into small yet deadly spikes."
+	layer = ABOVE_OPEN_TURF_LAYER
 	plane = FLOOR_PLANE
-	layer = MID_TURF_LAYER
 	icon = 'icons/obj/smooth_structures/stickyweb_spikes.dmi'
 	base_icon_state = "stickyweb_spikes"
 	icon_state = "stickyweb_spikes-0"
--- a/code/game/objects/items/devices/pressureplates.dm
+++ b/code/game/objects/items/devices/pressureplates.dm
@@ -7,8 +7,8 @@
 	lefthand_file = 'icons/mob/inhands/equipment/security_lefthand.dmi'
 	righthand_file = 'icons/mob/inhands/equipment/security_righthand.dmi'
 	icon_state = "pressureplate"
+	layer = ABOVE_OPEN_TURF_LAYER
 	plane = FLOOR_PLANE
-	layer = HIGH_TURF_LAYER
 	var/trigger_mob = TRUE
 	var/trigger_item = FALSE
 	var/specific_item = null
--- a/code/game/objects/structures/aliens.dm
+++ b/code/game/objects/structures/aliens.dm
@@ -133,7 +133,7 @@
 	desc = "A thick resin surface covers the floor."
 	anchored = TRUE
 	density = FALSE
-	layer = MID_TURF_LAYER
+	layer = ABOVE_OPEN_TURF_LAYER
 	plane = FLOOR_PLANE
 	icon = 'icons/obj/smooth_structures/alien/weeds1.dmi'
 	icon_state = "weeds1-0"
--- a/code/game/objects/structures/fluff.dm
+++ b/code/game/objects/structures/fluff.dm
@@ -87,7 +87,7 @@
 	icon = 'icons/obj/mining_zones/survival_pod.dmi'
 	icon_state = "fan_tiny"
 	plane = FLOOR_PLANE
-	layer = ABOVE_OPEN_TURF_LAYER
+	layer = BELOW_CATWALK_LAYER

 /**
 * A variety of statue in disrepair; parts are broken off and a gemstone is missing
--- a/code/modules/atmospherics/machinery/components/components_base.dm
+++ b/code/modules/atmospherics/machinery/components/components_base.dm
@@ -330,7 +330,7 @@
 	connect_nodes()

 /obj/machinery/atmospherics/components/update_layer()
-	layer = (showpipe ? initial(layer) : ABOVE_OPEN_TURF_LAYER) + (piping_layer - PIPING_LAYER_DEFAULT) * PIPING_LAYER_LCHANGE + (GLOB.pipe_colors_ordered[pipe_color] * 0.001)
+	layer = (showpipe ? initial(layer) : BELOW_CATWALK_LAYER) + (piping_layer - PIPING_LAYER_DEFAULT) * PIPING_LAYER_LCHANGE + (GLOB.pipe_colors_ordered[pipe_color] * 0.001)

 /**
 * Handles air relocation to the pipenet/environment
--- a/code/modules/atmospherics/machinery/pipes/bridge_pipe.dm
+++ b/code/modules/atmospherics/machinery/pipes/bridge_pipe.dm
@@ -30,4 +30,4 @@
 	. += center

 /obj/machinery/atmospherics/pipe/bridge_pipe/update_layer()
-	layer = (HAS_TRAIT(src, TRAIT_UNDERFLOOR) ? ABOVE_OPEN_TURF_LAYER + 1 : initial(layer))
+	layer = (HAS_TRAIT(src, TRAIT_UNDERFLOOR) ? BELOW_CATWALK_LAYER + 1 : initial(layer))
--- a/code/modules/atmospherics/machinery/pipes/layermanifold.dm
+++ b/code/modules/atmospherics/machinery/pipes/layermanifold.dm
@@ -41,7 +41,7 @@
 	nodes = list()

 /obj/machinery/atmospherics/pipe/layer_manifold/update_layer()
-	layer = (HAS_TRAIT(src, TRAIT_UNDERFLOOR) ? ABOVE_OPEN_TURF_LAYER : initial(layer)) + (PIPING_LAYER_MAX * PIPING_LAYER_LCHANGE) //This is above everything else.
+	layer = (HAS_TRAIT(src, TRAIT_UNDERFLOOR) ? BELOW_CATWALK_LAYER : initial(layer)) + (PIPING_LAYER_MAX * PIPING_LAYER_LCHANGE) //This is above everything else.

 /obj/machinery/atmospherics/pipe/layer_manifold/update_overlays()
 	. = ..()
--- a/code/modules/atmospherics/machinery/pipes/pipes.dm
+++ b/code/modules/atmospherics/machinery/pipes/pipes.dm
@@ -139,4 +139,4 @@
 		current_node.update_icon()

 /obj/machinery/atmospherics/pipe/update_layer()
-	layer = (HAS_TRAIT(src, TRAIT_UNDERFLOOR) ? ABOVE_OPEN_TURF_LAYER : initial(layer)) + (piping_layer - PIPING_LAYER_DEFAULT) * PIPING_LAYER_LCHANGE + (GLOB.pipe_colors_ordered[pipe_color] * 0.0001)
+	layer = (HAS_TRAIT(src, TRAIT_UNDERFLOOR) ? BELOW_CATWALK_LAYER : initial(layer)) + (piping_layer - PIPING_LAYER_DEFAULT) * PIPING_LAYER_LCHANGE + (GLOB.pipe_colors_ordered[pipe_color] * 0.0001)
--- a/code/modules/awaymissions/away_props.dm
+++ b/code/modules/awaymissions/away_props.dm
@@ -56,7 +56,7 @@
 	name = "pit grate"
 	icon = 'icons/obj/smooth_structures/lattice.dmi'
 	icon_state = "lattice-255"
-	layer = ABOVE_OPEN_TURF_LAYER
+	layer = BELOW_CATWALK_LAYER
 	plane = FLOOR_PLANE
 	anchored = TRUE
 	obj_flags = CAN_BE_HIT | BLOCK_Z_OUT_DOWN | BLOCK_Z_IN_UP
@@ -108,7 +108,7 @@

 /obj/structure/pitgrate/proc/reset_plane()
 	SET_PLANE_IMPLICIT(src, FLOOR_PLANE)
-	layer = ABOVE_OPEN_TURF_LAYER
+	layer = BELOW_CATWALK_LAYER

 /obj/structure/pitgrate/Destroy()
 	if(hidden)
--- a/code/modules/power/lighting/light.dm
+++ b/code/modules/power/lighting/light.dm
@@ -721,7 +721,7 @@
 	icon_state = "floor"
 	brightness = 4
 	light_angle = 360
-	layer = ABOVE_OPEN_TURF_LAYER
+	layer = BELOW_CATWALK_LAYER
 	plane = FLOOR_PLANE
 	light_type = /obj/item/light/bulb
 	fitting = "bulb"