cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-12 19:22:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8625 from Dennok/patch-7

Browse Source 
Add CONNECT_TYPE_HE
This commit is contained in:
Chinsky
2015-03-27 20:57:38 +03:00
parent aed4156a77 7f89a145b9
commit c322481d36
3 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
code/ATMOSPHERICS/_atmos_setup.dm
View File

@@ -17,6 +17,7 @@
#define CONNECT_TYPE_REGULAR 1 #define CONNECT_TYPE_REGULAR 1
#define CONNECT_TYPE_SUPPLY 2 #define CONNECT_TYPE_SUPPLY 2
#define CONNECT_TYPE_SCRUBBER 4 #define CONNECT_TYPE_SCRUBBER 4
#define CONNECT_TYPE_HE 8
var/global/list/pipe_colors = list("grey" = PIPE_COLOR_GREY, "red" = PIPE_COLOR_RED, "blue" = PIPE_COLOR_BLUE, "cyan" = PIPE_COLOR_CYAN, "green" = PIPE_COLOR_GREEN, "yellow" = PIPE_COLOR_YELLOW, "purple" = PIPE_COLOR_PURPLE) var/global/list/pipe_colors = list("grey" = PIPE_COLOR_GREY, "red" = PIPE_COLOR_RED, "blue" = PIPE_COLOR_BLUE, "cyan" = PIPE_COLOR_CYAN, "green" = PIPE_COLOR_GREEN, "yellow" = PIPE_COLOR_YELLOW, "purple" = PIPE_COLOR_PURPLE)

3
code/ATMOSPHERICS/he_pipes.dm
View File

@@ -5,6 +5,8 @@ obj/machinery/atmospherics/pipe/simple/heat_exchanging
pipe_icon = "hepipe" pipe_icon = "hepipe"
color = "#404040" color = "#404040"
level = 2 level = 2
connect_types = CONNECT_TYPE_HE
layer = 2.41
var/initialize_directions_he var/initialize_directions_he
var/surface = 2 //surface area in m^2 var/surface = 2 //surface area in m^2
var/icon_temperature = T20C //stop small changes in temperature causing an icon refresh var/icon_temperature = T20C //stop small changes in temperature causing an icon refresh
@@ -106,6 +108,7 @@ obj/machinery/atmospherics/pipe/simple/heat_exchanging/junction
icon_state = "intact" icon_state = "intact"
pipe_icon = "hejunction" pipe_icon = "hejunction"
level = 2 level = 2
connect_types = CONNECT_TYPE_REGULAR|CONNECT_TYPE_HE
minimum_temperature_difference = 300 minimum_temperature_difference = 300
thermal_conductivity = WALL_HEAT_TRANSFER_COEFFICIENT thermal_conductivity = WALL_HEAT_TRANSFER_COEFFICIENT

6
code/game/machinery/pipe/construction.dm
View File

@@ -78,8 +78,10 @@ Buildable meters
is_bent = 1 is_bent = 1
if (istype(make_from, /obj/machinery/atmospherics/pipe/simple/heat_exchanging/junction)) if (istype(make_from, /obj/machinery/atmospherics/pipe/simple/heat_exchanging/junction))
src.pipe_type = PIPE_JUNCTION src.pipe_type = PIPE_JUNCTION
connect_types = CONNECT_TYPE_REGULAR|CONNECT_TYPE_HE
else if(istype(make_from, /obj/machinery/atmospherics/pipe/simple/heat_exchanging)) else if(istype(make_from, /obj/machinery/atmospherics/pipe/simple/heat_exchanging))
src.pipe_type = PIPE_HE_STRAIGHT + is_bent src.pipe_type = PIPE_HE_STRAIGHT + is_bent
connect_types = CONNECT_TYPE_HE
else if(istype(make_from, /obj/machinery/atmospherics/pipe/simple/insulated)) else if(istype(make_from, /obj/machinery/atmospherics/pipe/simple/insulated))
src.pipe_type = PIPE_INSULATED_STRAIGHT + is_bent src.pipe_type = PIPE_INSULATED_STRAIGHT + is_bent
else if(istype(make_from, /obj/machinery/atmospherics/pipe/simple/visible/supply) || istype(make_from, /obj/machinery/atmospherics/pipe/simple/hidden/supply)) else if(istype(make_from, /obj/machinery/atmospherics/pipe/simple/visible/supply) || istype(make_from, /obj/machinery/atmospherics/pipe/simple/hidden/supply))
@@ -190,6 +192,10 @@ Buildable meters
else if (pipe_type == 31 || pipe_type == 32 || pipe_type == 34 || pipe_type == 36 || pipe_type == 38 || pipe_type == 40 || pipe_type == 42) else if (pipe_type == 31 || pipe_type == 32 || pipe_type == 34 || pipe_type == 36 || pipe_type == 38 || pipe_type == 40 || pipe_type == 42)
connect_types = CONNECT_TYPE_SCRUBBER connect_types = CONNECT_TYPE_SCRUBBER
src.color = PIPE_COLOR_RED src.color = PIPE_COLOR_RED
else if (pipe_type == 2 || pipe_type == 3)
connect_types = CONNECT_TYPE_HE
else if (pipe_type == 6)
connect_types = CONNECT_TYPE_REGULAR|CONNECT_TYPE_HE
else if (pipe_type == 28) else if (pipe_type == 28)
connect_types = CONNECT_TYPE_REGULAR|CONNECT_TYPE_SUPPLY|CONNECT_TYPE_SCRUBBER connect_types = CONNECT_TYPE_REGULAR|CONNECT_TYPE_SUPPLY|CONNECT_TYPE_SCRUBBER
//src.pipe_dir = get_pipe_dir() //src.pipe_dir = get_pipe_dir()