mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-08-31 00:58:26 +01:00
[MIRROR] Fixes layering between tram bridge, pipes, and cables [MDB IGNORE] (#18590)
* Fixes layering between tram bridge, pipes, and cables (#72389) ## About The Pull Request Fixes the cover up job of https://github.com/tgstation/tgstation/pull/71858 throwing iron tiles instead of the tram bridge to get ambient occlusion working. Puts the pipes and wires on an appropriate plane and layer so they can co-exist with the tram bridge without screwing with the tram's shading.   ## Why It's Good For The Game #71858 was a temporary fix for the bridge until a permanent solution was found. ## Changelog 🆑 LT3 fix: Disposal pipes and cable wires now co-exist with the tram bridge /🆑 * Fixes layering between tram bridge, pipes, and cables Co-authored-by: lessthanthree <83487515+lessthnthree@users.noreply.github.com>
This commit is contained in:
co-authored by
lessthanthree
parent
7bf6b0092f
commit
355319485f
+1005
-1001
File diff suppressed because it is too large
Load Diff
@@ -111,7 +111,9 @@
|
||||
#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 ABOVE_OPEN_TURF_LAYER 2.04
|
||||
#define DISPOSAL_PIPE_LAYER 2.04
|
||||
#define WIRE_LAYER 2.041
|
||||
#define ABOVE_OPEN_TURF_LAYER 2.042
|
||||
|
||||
//WALL_PLANE layers
|
||||
#define CLOSED_TURF_LAYER 2.05
|
||||
@@ -120,9 +122,7 @@
|
||||
#define BULLET_HOLE_LAYER 2.06
|
||||
#define ABOVE_NORMAL_TURF_LAYER 2.08
|
||||
#define LATTICE_LAYER 2.2
|
||||
#define DISPOSAL_PIPE_LAYER 2.3
|
||||
#define GAS_PIPE_HIDDEN_LAYER 2.35 //layer = initial(layer) + piping_layer / 1000 in atmospherics/update_icon() to determine order of pipe overlap
|
||||
#define WIRE_LAYER 2.4
|
||||
#define TRAM_XING_LAYER 2.41
|
||||
#define TRAM_RAIL_LAYER 2.42
|
||||
#define TRAM_FLOOR_LAYER 2.43
|
||||
|
||||
@@ -17,6 +17,7 @@ GLOBAL_LIST_INIT(wire_node_generating_types, typecacheof(list(/obj/structure/gri
|
||||
icon = 'icons/obj/power_cond/layer_cable.dmi'
|
||||
icon_state = "l2-1-2-4-8-node"
|
||||
color = CABLE_HEX_COLOR_YELLOW
|
||||
plane = FLOOR_PLANE
|
||||
layer = WIRE_LAYER //Above hidden pipes, GAS_PIPE_HIDDEN_LAYER
|
||||
anchored = TRUE
|
||||
obj_flags = CAN_BE_HIT
|
||||
|
||||
@@ -10,6 +10,7 @@
|
||||
dir = NONE // dir will contain dominant direction for junction pipes
|
||||
max_integrity = 200
|
||||
armor_type = /datum/armor/structure_disposalpipe
|
||||
plane = FLOOR_PLANE
|
||||
layer = DISPOSAL_PIPE_LAYER // slightly lower than wires and other pipes
|
||||
damage_deflection = 10
|
||||
var/dpdir = NONE // bitmask of pipe directions
|
||||
|
||||
Reference in New Issue
Block a user