diff --git a/code/game/machinery/atmoalter/canister.dm b/code/game/machinery/atmoalter/canister.dm index de0d7975c3..a070ae9161 100644 --- a/code/game/machinery/atmoalter/canister.dm +++ b/code/game/machinery/atmoalter/canister.dm @@ -7,6 +7,8 @@ flags = CONDUCT w_class = ITEMSIZE_HUGE + layer = TABLE_LAYER // Above catwalks, hopefully below other things + var/valve_open = 0 var/release_pressure = ONE_ATMOSPHERE var/release_flow_rate = ATMOS_DEFAULT_VOLUME_PUMP //in L/s diff --git a/code/game/machinery/status_display.dm b/code/game/machinery/status_display.dm index e3a00abb4d..9a02fddfd2 100644 --- a/code/game/machinery/status_display.dm +++ b/code/game/machinery/status_display.dm @@ -12,8 +12,6 @@ /obj/machinery/status_display icon = 'icons/obj/status_display.dmi' icon_state = "frame" - plane = TURF_PLANE - layer = ABOVE_TURF_LAYER name = "status display" anchored = 1 density = 0 diff --git a/code/game/objects/structures/catwalk.dm b/code/game/objects/structures/catwalk.dm index d9f3340bdd..6d5a1cbe32 100644 --- a/code/game/objects/structures/catwalk.dm +++ b/code/game/objects/structures/catwalk.dm @@ -1,10 +1,11 @@ // Based on catwalk.dm from https://github.com/Endless-Horizon/CEV-Eris /obj/structure/catwalk - layer = TURF_LAYER + 0.5 - icon = 'icons/turf/catwalks.dmi' - icon_state = "catwalk" name = "catwalk" desc = "Cats really don't like these things." + plane = TURF_PLANE + layer = ABOVE_UTILITY + icon = 'icons/turf/catwalks.dmi' + icon_state = "catwalk" density = 0 var/health = 100 var/maxhealth = 100 diff --git a/code/game/objects/structures/grille.dm b/code/game/objects/structures/grille.dm index ee80999916..bed4a2bd6e 100644 --- a/code/game/objects/structures/grille.dm +++ b/code/game/objects/structures/grille.dm @@ -7,7 +7,7 @@ anchored = 1 flags = CONDUCT pressure_resistance = 5*ONE_ATMOSPHERE - layer = UNDER_JUNK_LAYER + layer = TABLE_LAYER explosion_resistance = 1 var/health = 10 var/destroyed = 0 diff --git a/code/game/objects/structures/signs.dm b/code/game/objects/structures/signs.dm index 5a031d18e2..c68becdab9 100644 --- a/code/game/objects/structures/signs.dm +++ b/code/game/objects/structures/signs.dm @@ -3,8 +3,7 @@ anchored = 1 opacity = 0 density = 0 - plane = TURF_PLANE - layer = ABOVE_TURF_LAYER + layer = UNDER_JUNK_LAYER w_class = ITEMSIZE_NORMAL /obj/structure/sign/ex_act(severity) diff --git a/code/modules/reagents/reagent_dispenser.dm b/code/modules/reagents/reagent_dispenser.dm index 45af53eb87..dc35852eed 100644 --- a/code/modules/reagents/reagent_dispenser.dm +++ b/code/modules/reagents/reagent_dispenser.dm @@ -6,7 +6,7 @@ icon = 'icons/obj/objects.dmi' icon_state = "watertank" plane = TURF_PLANE - layer = ABOVE_TURF_LAYER + layer = TABLE_LAYER // Above catwalks, hopefully below other things density = 1 anchored = 0 pressure_resistance = 2*ONE_ATMOSPHERE