Merge pull request #6093 from Heroman3003/zpipe-fix

Fixes newly constructed vertical pipes being invisible
This commit is contained in:
Neerti
2019-04-16 22:00:09 -04:00
committed by VirgoBot
parent fa51e6f28f
commit fee131b612

View File

@@ -2,32 +2,31 @@
// parent class for pipes // // parent class for pipes //
//////////////////////////// ////////////////////////////
obj/machinery/atmospherics/pipe/zpipe obj/machinery/atmospherics/pipe/zpipe
icon = 'icons/obj/structures.dmi' icon = 'icons/obj/structures.dmi'
icon_state = "up" icon_state = "up"
name = "upwards pipe" name = "upwards pipe"
desc = "A pipe segment to connect upwards." desc = "A pipe segment to connect upwards."
volume = 70 volume = 70
dir = SOUTH dir = SOUTH
initialize_directions = SOUTH initialize_directions = SOUTH
construction_type = /obj/item/pipe/directional construction_type = /obj/item/pipe/directional
pipe_state = "cap" pipe_state = "cap"
// node1 is the connection on the same Z // node1 is the connection on the same Z
// node2 is the connection on the other Z // node2 is the connection on the other Z
var/minimum_temperature_difference = 300 var/minimum_temperature_difference = 300
var/thermal_conductivity = 0 //WALL_HEAT_TRANSFER_COEFFICIENT No var/thermal_conductivity = 0 //WALL_HEAT_TRANSFER_COEFFICIENT No
var/maximum_pressure = 70*ONE_ATMOSPHERE var/maximum_pressure = 70*ONE_ATMOSPHERE
var/fatigue_pressure = 55*ONE_ATMOSPHERE var/fatigue_pressure = 55*ONE_ATMOSPHERE
alert_pressure = 55*ONE_ATMOSPHERE alert_pressure = 55*ONE_ATMOSPHERE
level = 1
level = 1
/obj/machinery/atmospherics/pipe/zpipe/New() /obj/machinery/atmospherics/pipe/zpipe/New()
..() ..()
@@ -152,7 +151,7 @@ obj/machinery/atmospherics/pipe/zpipe/up/atmos_init()
var/turf/T = src.loc // hide if turf is not intact var/turf/T = src.loc // hide if turf is not intact
hide(!T.is_plating()) if(level == 1 && !T.is_plating()) hide(1) // but respect level
/////////////////////// ///////////////////////
// and the down pipe // // and the down pipe //
@@ -189,7 +188,7 @@ obj/machinery/atmospherics/pipe/zpipe/down/atmos_init()
var/turf/T = src.loc // hide if turf is not intact var/turf/T = src.loc // hide if turf is not intact
hide(!T.is_plating()) if(level == 1 && !T.is_plating()) hide(1) // but respect level
/////////////////////// ///////////////////////
// supply/scrubbers // // supply/scrubbers //