From 92a3f862eff657df758b8d14e37c82771d9e8974 Mon Sep 17 00:00:00 2001 From: SkyratBot <59378654+SkyratBot@users.noreply.github.com> Date: Tue, 24 Jan 2023 23:31:46 +0100 Subject: [PATCH] [MIRROR] Layering: Fixes wires and pipes on lattice catwalk, glass floor [NO GBP] [MDB IGNORE] (#18930) Layering: Fixes wires and pipes on lattice catwalk, glass floor [NO GBP] (#72703) ## About The Pull Request - Fixes https://github.com/tgstation/tgstation/issues/72894 - Fixes layering for wiring and disposal pipes on lattice-based catwalk. (Goes on top.) Wiring and pipes on floor-based catwalk. (Goes underneath.) - Glass floor shifted to show wires/pipe underneath it. - Moves tram plaque to the game plane, layered underneath tossed objects. ## Why It's Good For The Game Wiring the solars looks weird with the wrong layering. ## Changelog :cl: LT3 fix: Wires and pipes again rest on top of lattice catwalk /:cl: Co-authored-by: lessthanthree <83487515+lessthnthree@users.noreply.github.com> --- code/__DEFINES/layers.dm | 14 +++++++------- .../objects/structures/plaques/static_plaques.dm | 1 + code/game/turfs/open/floor/glass.dm | 3 ++- .../industrial_lift/tram_override_objects.dm | 1 - 4 files changed, 10 insertions(+), 9 deletions(-) diff --git a/code/__DEFINES/layers.dm b/code/__DEFINES/layers.dm index 2ecdda04738..9bf9988160f 100644 --- a/code/__DEFINES/layers.dm +++ b/code/__DEFINES/layers.dm @@ -111,9 +111,13 @@ #define HIGH_TURF_LAYER 2.03 #define TURF_PLATING_DECAL_LAYER 2.031 #define TURF_DECAL_LAYER 2.039 //Makes turf decals appear in DM how they will look inworld. -#define DISPOSAL_PIPE_LAYER 2.04 -#define WIRE_LAYER 2.041 -#define ABOVE_OPEN_TURF_LAYER 2.042 +#define LATTICE_LAYER 2.04 +#define DISPOSAL_PIPE_LAYER 2.042 +#define WIRE_LAYER 2.044 +#define GLASS_FLOOR_LAYER 2.046 +#define TRAM_RAIL_LAYER 2.047 +#define TRAM_FLOOR_LAYER 2.048 +#define ABOVE_OPEN_TURF_LAYER 2.049 //WALL_PLANE layers #define CLOSED_TURF_LAYER 2.05 @@ -121,11 +125,7 @@ // GAME_PLANE layers #define BULLET_HOLE_LAYER 2.06 #define ABOVE_NORMAL_TURF_LAYER 2.08 -#define LATTICE_LAYER 2.2 #define GAS_PIPE_HIDDEN_LAYER 2.35 //layer = initial(layer) + piping_layer / 1000 in atmospherics/update_icon() to determine order of pipe overlap -#define TRAM_XING_LAYER 2.41 -#define TRAM_RAIL_LAYER 2.42 -#define TRAM_FLOOR_LAYER 2.43 #define WIRE_BRIDGE_LAYER 2.44 #define WIRE_TERMINAL_LAYER 2.45 #define GAS_SCRUBBER_LAYER 2.46 diff --git a/code/game/objects/structures/plaques/static_plaques.dm b/code/game/objects/structures/plaques/static_plaques.dm index 80436bf8d1c..7c1c4129c03 100644 --- a/code/game/objects/structures/plaques/static_plaques.dm +++ b/code/game/objects/structures/plaques/static_plaques.dm @@ -147,4 +147,5 @@ desc = "A plate showing details from the manufacturer about this Nakamura Engineering SkyyTram Mk IV, serial number LT301TG2563. We are not responsible for any injuries or fatalites caused by usage of the tram. For technical assistance in the event of malfunction please contact: (the info seems to be scratched up to the point of being unreadable.)" icon_state = "commission_tram" custom_materials = list(/datum/material/titanium = 2000) + plane = GAME_PLANE layer = LOW_OBJ_LAYER diff --git a/code/game/turfs/open/floor/glass.dm b/code/game/turfs/open/floor/glass.dm index a66b2a88bed..d00d25998f1 100644 --- a/code/game/turfs/open/floor/glass.dm +++ b/code/game/turfs/open/floor/glass.dm @@ -5,7 +5,8 @@ icon_state = "glass-0" base_icon_state = "glass" baseturfs = /turf/baseturf_bottom - underfloor_accessibility = UNDERFLOOR_INTERACTABLE + layer = GLASS_FLOOR_LAYER + underfloor_accessibility = UNDERFLOOR_VISIBLE smoothing_flags = SMOOTH_BITMASK smoothing_groups = SMOOTH_GROUP_TURF_OPEN + SMOOTH_GROUP_FLOOR_TRANSPARENT_GLASS canSmoothWith = SMOOTH_GROUP_FLOOR_TRANSPARENT_GLASS diff --git a/code/modules/industrial_lift/tram_override_objects.dm b/code/modules/industrial_lift/tram_override_objects.dm index 81fcfa5f4cc..f4bf2e999e5 100644 --- a/code/modules/industrial_lift/tram_override_objects.dm +++ b/code/modules/industrial_lift/tram_override_objects.dm @@ -54,7 +54,6 @@ /turf/open/floor/glass/reinforced/tram name = "tram bridge" desc = "It shakes a bit when you step, but lets you cross between sides quickly!" - layer = TRAM_XING_LAYER /obj/machinery/door/window/tram icon = 'icons/obj/doors/tramdoor.dmi'