mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-08-22 20:48:56 +01:00
[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 🆑 LT3 fix: Wires and pipes again rest on top of lattice catwalk /🆑 Co-authored-by: lessthanthree <83487515+lessthnthree@users.noreply.github.com>
This commit is contained in:
co-authored by
lessthanthree
parent
4a4f15342d
commit
92a3f862ef
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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'
|
||||
|
||||
Reference in New Issue
Block a user