[MIRROR] fixes an issue with disposal junctions ending with weird directions & RPD icons (#8176)

Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
Co-authored-by: CHOMPStation2 <chompsation2@gmail.com>
This commit is contained in:
CHOMPStation2
2024-04-06 23:26:53 -07:00
committed by GitHub
parent 3dbc81a577
commit 0fd6b95aa3
4 changed files with 13 additions and 10 deletions

View File

@@ -16,7 +16,7 @@ Pipelines + Other Objects -> Pipe network
power_channel = ENVIRON power_channel = ENVIRON
var/nodealert = 0 var/nodealert = 0
var/power_rating //the maximum amount of power the machine can use to do work, affects how powerful the machine is, in Watts var/power_rating //the maximum amount of power the machine can use to do work, affects how powerful the machine is, in Watts
unacidable = TRUE unacidable = TRUE
layer = ATMOS_LAYER layer = ATMOS_LAYER
plane = PLATING_PLANE plane = PLATING_PLANE
@@ -171,6 +171,9 @@ Pipelines + Other Objects -> Pipe network
if(construction_type) if(construction_type)
var/obj/item/pipe/I = new construction_type(loc, null, null, src) var/obj/item/pipe/I = new construction_type(loc, null, null, src)
I.setPipingLayer(piping_layer) I.setPipingLayer(piping_layer)
if(istype(I, /obj/item/pipe/trinary/flippable))
var/obj/item/pipe/trinary/flippable/flip = I
flip.icon_state = "[flip.icon_state][flip.mirrored ? "m" : ""]"
transfer_fingerprints_to(I) transfer_fingerprints_to(I)
qdel(src) qdel(src)

View File

@@ -25,15 +25,15 @@
// Disposals handle "bent"/"corner" strangely, handle this specially. // Disposals handle "bent"/"corner" strangely, handle this specially.
if(ptype == DISPOSAL_PIPE_STRAIGHT && (dir in cornerdirs)) if(ptype == DISPOSAL_PIPE_STRAIGHT && (dir in cornerdirs))
ptype = DISPOSAL_PIPE_CORNER ptype = DISPOSAL_PIPE_CORNER
switch(dir) switch(dir)
if(NORTHWEST) if(NORTHWEST)
dir = WEST dir = WEST
if(NORTHEAST) if(NORTHEAST)
dir = NORTH dir = NORTH
if(SOUTHWEST) if(SOUTHWEST)
dir = SOUTH dir = SOUTH
if(SOUTHEAST) if(SOUTHEAST)
dir = EAST dir = EAST
switch(ptype) switch(ptype)
if(DISPOSAL_PIPE_BIN, DISPOSAL_PIPE_OUTLET, DISPOSAL_PIPE_CHUTE) if(DISPOSAL_PIPE_BIN, DISPOSAL_PIPE_OUTLET, DISPOSAL_PIPE_CHUTE)

Binary file not shown.

Before

Width:  |  Height:  |  Size: 29 KiB

After

Width:  |  Height:  |  Size: 32 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 112 KiB

After

Width:  |  Height:  |  Size: 114 KiB