cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2026-01-06 07:22:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6986 from VOREStation/vplk-fix-manifold-underlays

Browse Source 
Fix manifold and manifold4w underlay rendering.
This commit is contained in:
Atermonera
2020-04-12 23:18:32 -07:00
committed by GitHub
parent 28bede5936 1feb05d8b3
commit 8e63aa69c7
4 changed files with 20 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
code/ATMOSPHERICS/pipes/manifold.dm
View File

@@ -108,16 +108,23 @@
underlays.Cut()
var/turf/T = get_turf(src)
var/list/directions = list(NORTH, SOUTH, EAST, WEST)
var/node1_direction = get_dir(src, node1)
var/node2_direction = get_dir(src, node2)
var/node3_direction = get_dir(src, node3)
// Unfortunately our nodes are not in consistent directions (see atmos_init()) so do the dance...
var/list/directions = list(NORTH, SOUTH, EAST, WEST) // UN-connected directions
directions -= dir
if(node1)
var/node1_direction = get_dir(src, node1)
add_underlay(T, node1, node1_direction, icon_connect_type)
directions -= node1_direction
if(node2)
var/node2_direction = get_dir(src, node2)
add_underlay(T, node2, node2_direction, icon_connect_type)
directions -= node2_direction
if(node3)
var/node3_direction = get_dir(src, node3)
add_underlay(T, node3, node3_direction, icon_connect_type)
directions -= node3_direction
directions -= add_underlay(T,node1,node1_direction,icon_connect_type)
directions -= add_underlay(T,node2,node2_direction,icon_connect_type)
directions -= add_underlay(T,node3,node3_direction,icon_connect_type)
for(var/D in directions)
add_underlay(T,,D,icon_connect_type)

34
code/ATMOSPHERICS/pipes/manifold4w.dm
View File

@@ -107,36 +107,12 @@
overlays += icon_manager.get_atmos_icon("manifold", , , "clamps_4way" + icon_connect_type)
underlays.Cut()
/*
var/list/directions = list(NORTH, SOUTH, EAST, WEST)
directions -= add_underlay(node1)
directions -= add_underlay(node2)
directions -= add_underlay(node3)
directions -= add_underlay(node4)
for(var/D in directions)
add_underlay(,D)
*/
var/turf/T = get_turf(src)
var/list/directions = list(NORTH, SOUTH, EAST, WEST)
var/node1_direction = get_dir(src, node1)
var/node2_direction = get_dir(src, node2)
var/node3_direction = get_dir(src, node3)
var/node4_direction = get_dir(src, node4)
directions -= dir
directions -= add_underlay(T,node1,node1_direction,icon_connect_type)
directions -= add_underlay(T,node2,node2_direction,icon_connect_type)
directions -= add_underlay(T,node3,node3_direction,icon_connect_type)
directions -= add_underlay(T,node4,node4_direction,icon_connect_type)
for(var/D in directions)
add_underlay(T,,D,icon_connect_type)
// Take advantage of the fact that our nodes are *always* in the same directions (see atmos_init())
add_underlay(T, node1, NORTH, icon_connect_type)
add_underlay(T, node2, SOUTH, icon_connect_type)
add_underlay(T, node3, EAST, icon_connect_type)
add_underlay(T, node4, WEST, icon_connect_type)
/obj/machinery/atmospherics/pipe/manifold4w/update_underlays()
..()

2
code/ATMOSPHERICS/pipes/vent.dm
View File

@@ -16,7 +16,7 @@
initialize_directions = SOUTH
pipe_flags = PIPING_DEFAULT_LAYER_ONLY
construction_type = /obj/item/pipe/directional
pipe_state = "passive vent"
pipe_state = "passive_vent"
var/build_killswitch = 1