Removes insulated pipes and some related variables (#24156)

* Removes insulated pipes

* Fixes some issues

* This is a better layout

* Removes the datum

* Removes defines

* Sean review
This commit is contained in:
DGamerL
2024-02-25 12:16:02 +01:00
committed by GitHub
parent 5c2f3170f5
commit d0c4dbfab3
15 changed files with 147 additions and 200 deletions
+21 -10
View File
@@ -63432,7 +63432,7 @@
},
/area/station/hallway/secondary/exit)
"dOz" = (
/obj/machinery/atmospherics/pipe/simple/insulated,
/obj/machinery/atmospherics/pipe/simple/visible,
/turf/simulated/floor/plasteel{
icon_state = "whitepurple"
},
@@ -66502,10 +66502,10 @@
/turf/simulated/floor/plasteel/white,
/area/station/science/rnd)
"ehm" = (
/obj/machinery/atmospherics/pipe/simple/insulated{
dir = 8
},
/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/pipe/simple/visible{
dir = 4
},
/turf/simulated/floor/plasteel/white,
/area/station/science/toxins/mixing)
"ehT" = (
@@ -66518,6 +66518,17 @@
},
/turf/simulated/floor/plating,
/area/station/command/office/rd)
"ehV" = (
/obj/structure/grille,
/obj/structure/window/plasmareinforced{
dir = 1
},
/obj/structure/window/plasmareinforced,
/obj/machinery/atmospherics/meter{
layer = 3.3
},
/turf/simulated/floor/plating,
/area/station/science/toxins/mixing)
"eir" = (
/obj/machinery/economy/vending/cart,
/obj/machinery/computer/security/telescreen/entertainment{
@@ -81058,8 +81069,8 @@
/turf/simulated/floor/plating,
/area/station/maintenance/aft2)
"mUZ" = (
/obj/machinery/atmospherics/pipe/simple/insulated,
/obj/effect/spawner/window/reinforced/plasma/grilled,
/obj/machinery/atmospherics/pipe/simple/visible,
/turf/simulated/floor/plating,
/area/station/science/toxins/mixing)
"mVd" = (
@@ -87408,8 +87419,8 @@
/turf/simulated/floor/plating,
/area/station/maintenance/apmaint)
"qJA" = (
/obj/machinery/atmospherics/pipe/simple/insulated{
dir = 8
/obj/machinery/atmospherics/pipe/simple/visible{
dir = 4
},
/turf/simulated/floor/plasteel/white,
/area/station/science/toxins/mixing)
@@ -95292,10 +95303,10 @@
dir = 1
},
/obj/structure/window/plasmareinforced,
/obj/machinery/atmospherics/pipe/simple/insulated,
/obj/machinery/atmospherics/meter{
layer = 3.3
},
/obj/machinery/atmospherics/pipe/simple/visible,
/turf/simulated/floor/plating,
/area/station/science/toxins/mixing)
"vbA" = (
@@ -132124,7 +132135,7 @@ ecs
dyz
iTn
wbZ
vaZ
ehV
wRN
cKu
sMj
@@ -132638,7 +132649,7 @@ lwr
vhS
nBP
xkJ
vaZ
ehV
jzV
cRy
qwo
+79 -72
View File
@@ -1953,7 +1953,7 @@
/obj/structure/window/plasmareinforced{
dir = 8
},
/obj/machinery/atmospherics/pipe/simple/insulated,
/obj/machinery/atmospherics/pipe/simple/visible,
/obj/machinery/atmospherics/meter{
layer = 3.3
},
@@ -44750,8 +44750,8 @@
/turf/simulated/floor/plating/airless,
/area/station/science/toxins/test)
"dce" = (
/obj/structure/dispenser,
/turf/simulated/floor/plasteel,
/obj/structure/sign/poster/official/random,
/turf/simulated/wall/r_wall,
/area/station/science/toxins/mixing)
"dch" = (
/obj/structure/lattice/catwalk,
@@ -49150,15 +49150,6 @@
},
/turf/simulated/floor/plasteel,
/area/station/maintenance/aft2)
"eIY" = (
/obj/machinery/door/poddoor/preopen{
name = "Biohazard Shutter";
id_tag = "RnDChem"
},
/obj/effect/spawner/window/reinforced/plasma,
/obj/machinery/atmospherics/pipe/simple/insulated,
/turf/simulated/floor/engine,
/area/station/science/test_chamber)
"eJh" = (
/obj/machinery/atmospherics/unary/thermomachine/heater/on{
dir = 1
@@ -50146,9 +50137,8 @@
/area/station/engineering/secure_storage)
"fdt" = (
/obj/machinery/atmospherics/pipe/simple/heat_exchanging{
dir = 6
dir = 5
},
/obj/machinery/atmospherics/pipe/simple/insulated,
/turf/simulated/floor/engine/vacuum,
/area/station/science/toxins/mixing)
"fdu" = (
@@ -50372,13 +50362,6 @@
icon_state = "cafeteria"
},
/area/station/service/kitchen)
"fjU" = (
/obj/machinery/atmospherics/pipe/simple/insulated,
/obj/machinery/atmospherics/pipe/simple/heat_exchanging{
dir = 5
},
/turf/simulated/floor/engine/vacuum,
/area/station/science/toxins/mixing)
"fkr" = (
/obj/structure/table,
/obj/item/flashlight/lamp,
@@ -54607,6 +54590,9 @@
/obj/effect/spawner/window/reinforced/tinted/grilled,
/turf/simulated/floor/plating,
/area/station/maintenance/asmaint)
"gWO" = (
/turf/simulated/floor/plasteel,
/area/station/science/toxins/mixing)
"gXg" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
@@ -54734,7 +54720,7 @@
},
/area/station/engineering/control)
"gZT" = (
/obj/machinery/atmospherics/pipe/simple/insulated{
/obj/machinery/atmospherics/pipe/simple/visible{
dir = 6
},
/turf/simulated/floor/plasteel{
@@ -57013,10 +56999,6 @@
/turf/simulated/floor/plasteel,
/area/station/hallway/secondary/garden)
"hVw" = (
/obj/machinery/atmospherics/pipe/simple/insulated,
/obj/machinery/atmospherics/pipe/simple/heat_exchanging{
dir = 9
},
/turf/simulated/floor/engine/vacuum,
/area/station/science/toxins/mixing)
"hVK" = (
@@ -58216,6 +58198,9 @@
id = "toxinsigniter";
pixel_y = -25
},
/obj/machinery/atmospherics/pipe/simple/heat_exchanging{
dir = 4
},
/turf/simulated/floor/engine/vacuum,
/area/station/science/toxins/mixing)
"iuU" = (
@@ -58321,11 +58306,6 @@
/turf/simulated/floor/plating,
/area/station/science/robotics/showroom)
"iwB" = (
/obj/machinery/camera{
c_tag = "Science - Toxins Lab";
dir = 1;
network = list("Research","SS13")
},
/obj/machinery/atmospherics/unary/vent_pump/on{
dir = 1
},
@@ -59934,6 +59914,17 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/turf/simulated/floor/wood,
/area/station/public/mrchangs)
"jjG" = (
/obj/machinery/atmospherics/pipe/simple/heat_exchanging/junction{
dir = 8
},
/obj/machinery/door/poddoor{
id_tag = "ToxinsVenting";
name = "Toxins Venting Bay Door";
power_state = 0
},
/turf/space,
/area/station/science/toxins/mixing)
"jjL" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/rack,
@@ -65723,7 +65714,7 @@
"lEw" = (
/obj/structure/closet/firecloset,
/obj/machinery/light/small{
dir = 4
dir = 8
},
/turf/simulated/floor/plasteel{
icon_state = "white"
@@ -66959,10 +66950,6 @@
/obj/effect/turf_decal/stripes/white/line{
dir = 4
},
/obj/item/radio/intercom{
name = "south bump";
pixel_y = -28
},
/turf/simulated/floor/plasteel,
/area/station/science/toxins/mixing)
"mcP" = (
@@ -67495,7 +67482,7 @@
/obj/structure/window/plasmareinforced{
dir = 4
},
/obj/machinery/atmospherics/pipe/simple/insulated,
/obj/machinery/atmospherics/pipe/simple/visible,
/obj/machinery/atmospherics/meter{
layer = 3.3
},
@@ -72753,10 +72740,7 @@
/turf/simulated/floor/wood,
/area/station/maintenance/starboard2)
"oFF" = (
/obj/machinery/atmospherics/pipe/simple/insulated,
/obj/machinery/light/small{
dir = 4
},
/obj/machinery/atmospherics/pipe/simple/visible,
/turf/simulated/floor/plasteel,
/area/station/science/toxins/mixing)
"oFN" = (
@@ -75938,8 +75922,8 @@
name = "south bump";
pixel_y = -24
},
/obj/machinery/atmospherics/unary/portables_connector{
dir = 8
/obj/machinery/atmospherics/pipe/simple/visible{
dir = 9
},
/turf/simulated/floor/plasteel,
/area/station/science/toxins/mixing)
@@ -76884,9 +76868,8 @@
},
/area/station/medical/exam_room)
"qnp" = (
/obj/machinery/atmospherics/pipe/simple/insulated,
/obj/machinery/atmospherics/pipe/simple/heat_exchanging{
dir = 4
dir = 6
},
/turf/simulated/floor/engine/vacuum,
/area/station/science/toxins/mixing)
@@ -78041,6 +78024,15 @@
icon_state = "white"
},
/area/station/science/xenobiology)
"qPh" = (
/obj/machinery/door/poddoor/preopen{
name = "Biohazard Shutter";
id_tag = "RnDChem"
},
/obj/effect/spawner/window/reinforced/plasma,
/obj/machinery/atmospherics/pipe/simple/visible,
/turf/simulated/floor/engine,
/area/station/science/test_chamber)
"qPp" = (
/obj/structure/cable/yellow{
d2 = 4;
@@ -78464,6 +78456,15 @@
icon_state = "purple"
},
/area/station/science/xenobiology)
"qYD" = (
/obj/structure/window/plasmareinforced{
dir = 4
},
/obj/machinery/atmospherics/pipe/simple/visible{
dir = 4
},
/turf/simulated/wall/r_wall,
/area/station/science/toxins/mixing)
"qYT" = (
/obj/machinery/computer/nonfunctional,
/obj/effect/spawner/random_spawners/cobweb_right_rare,
@@ -78814,11 +78815,11 @@
},
/area/station/science/break_room)
"rfK" = (
/obj/machinery/atmospherics/pipe/simple/insulated{
dir = 4
/obj/item/radio/intercom{
name = "south bump";
pixel_y = -28
},
/obj/effect/spawner/random_spawners/wall_rusted_probably,
/turf/simulated/wall/r_wall,
/turf/simulated/floor/plasteel,
/area/station/science/toxins/mixing)
"rgo" = (
/obj/machinery/hydroponics/soil,
@@ -84382,10 +84383,11 @@
},
/area/station/security/armory/secure)
"tCf" = (
/obj/machinery/atmospherics/pipe/simple/insulated{
dir = 9
},
/obj/effect/landmark/start/scientist,
/obj/machinery/atmospherics/pipe/manifold/visible{
dir = 4;
initialize_directions = 11
},
/turf/simulated/floor/plasteel,
/area/station/science/toxins/mixing)
"tCr" = (
@@ -87844,7 +87846,6 @@
/turf/simulated/floor/plating,
/area/station/maintenance/port)
"veO" = (
/obj/machinery/atmospherics/pipe/simple/insulated,
/obj/machinery/light/small{
dir = 8
},
@@ -87855,6 +87856,7 @@
pixel_y = 8;
req_access_txt = "8"
},
/obj/machinery/atmospherics/pipe/simple/visible,
/turf/simulated/floor/plasteel,
/area/station/science/toxins/mixing)
"vfd" = (
@@ -88286,10 +88288,7 @@
},
/area/station/security/detective)
"vpj" = (
/obj/machinery/atmospherics/pipe/manifold/visible{
dir = 4;
initialize_directions = 11
},
/obj/machinery/atmospherics/pipe/simple/visible,
/obj/machinery/atmospherics/meter,
/turf/simulated/floor/plasteel,
/area/station/science/toxins/mixing)
@@ -92017,8 +92016,16 @@
/turf/simulated/floor/plating,
/area/station/security/prison/cell_block/A)
"xbs" = (
/obj/structure/sign/poster/official/random,
/turf/simulated/wall,
/obj/structure/dispenser,
/obj/effect/turf_decal/stripes/white/line{
dir = 1
},
/obj/machinery/camera{
c_tag = "Science - Toxins Lab";
dir = 1;
network = list("Research","SS13")
},
/turf/simulated/floor/plasteel,
/area/station/science/toxins/mixing)
"xbt" = (
/obj/machinery/atmospherics/portable/canister/nitrogen,
@@ -92142,7 +92149,7 @@
dir = 4;
pixel_y = -32
},
/obj/machinery/atmospherics/unary/thermomachine/freezer{
/obj/machinery/atmospherics/binary/valve{
dir = 4
},
/turf/simulated/floor/plasteel,
@@ -124537,9 +124544,9 @@ mAA
qbe
veO
aox
fdt
fjU
saM
qnp
fdt
cOp
rKH
vZo
@@ -124794,7 +124801,7 @@ klo
hQB
jFo
vZA
wwR
hVw
uZk
iuI
cOp
@@ -125051,9 +125058,9 @@ mAA
kRQ
oFF
mmG
qnp
hVw
wnf
wwR
wwR
cOp
hqx
lYB
@@ -125306,11 +125313,11 @@ cFH
cFH
bMg
mcw
rfK
cEK
cEK
jjG
agK
nec
agK
agK
cOp
mtr
lYB
@@ -125565,9 +125572,9 @@ iRd
iwB
xbs
dce
rfK
gQc
cQd
gQc
qYD
gty
coG
coG
@@ -125822,7 +125829,7 @@ hhN
cOB
jlU
hQB
nbM
gWO
nbM
xdo
cOp
@@ -132495,7 +132502,7 @@ cUQ
uOY
mfA
gZT
eIY
qPh
cAS
uzR
qyw
@@ -1932,7 +1932,7 @@
/obj/machinery/atmospherics/meter{
layer = 3.3
},
/obj/machinery/atmospherics/pipe/simple/insulated{
/obj/machinery/atmospherics/pipe/simple/visible{
dir = 4
},
/turf/simulated/floor/plating,
@@ -4787,12 +4787,12 @@
/obj/machinery/atmospherics/meter{
layer = 3.3
},
/obj/machinery/atmospherics/pipe/simple/insulated{
dir = 4
},
/obj/machinery/light{
dir = 1
},
/obj/machinery/atmospherics/pipe/simple/visible{
dir = 4
},
/turf/simulated/floor/plating,
/area/ruin/unpowered/syndicate_space_base/atmos)
"Ao" = (
+2 -2
View File
@@ -31143,7 +31143,7 @@
/turf/simulated/wall/r_wall,
/area/station/hallway/primary/fore)
"dmB" = (
/obj/machinery/atmospherics/pipe/simple/insulated{
/obj/machinery/atmospherics/pipe/simple/visible{
dir = 9
},
/turf/simulated/floor/plasteel{
@@ -68555,7 +68555,7 @@
/turf/simulated/floor/plating,
/area/station/maintenance/disposal/northeast)
"pgO" = (
/obj/machinery/atmospherics/pipe/simple/insulated{
/obj/machinery/atmospherics/pipe/simple/visible{
dir = 5
},
/turf/simulated/floor/plasteel{
+34 -44
View File
@@ -43045,7 +43045,6 @@
pixel_x = 3;
pixel_y = -3
},
/obj/machinery/atmospherics/pipe/simple/insulated,
/turf/simulated/floor/plasteel{
icon_state = "whitepurple"
},
@@ -43403,14 +43402,17 @@
/turf/simulated/floor/engine,
/area/station/science/misc_lab)
"cJR" = (
/obj/machinery/door/poddoor/preopen{
name = "Biohazard Shutter";
id_tag = "RnDChem"
/obj/machinery/atmospherics/meter{
layer = 3.3
},
/obj/machinery/atmospherics/pipe/simple/insulated,
/obj/effect/spawner/window/reinforced/plasma,
/turf/simulated/floor/engine,
/area/station/science/misc_lab)
/obj/structure/grille,
/obj/structure/window/plasmareinforced,
/obj/structure/window/plasmareinforced{
dir = 1
},
/obj/machinery/atmospherics/pipe/simple/visible,
/turf/simulated/floor/plating,
/area/station/science/toxins/mixing)
"cJV" = (
/obj/machinery/atmospherics/pipe/simple/hidden/cyan{
dir = 4
@@ -54801,7 +54803,7 @@
inlet_injector_autolink_id = "o2_in";
name = "Oxygen Supply Control";
outlet_vent_autolink_id = "o2_out";
autolink_sensors = list("o2_sensor" = "Tank")
autolink_sensors = list("o2_sensor"="Tank")
},
/turf/simulated/floor/plasteel{
icon_state = "blue"
@@ -55744,7 +55746,7 @@
/obj/effect/turf_decal/stripes/line{
dir = 1
},
/obj/machinery/atmospherics/pipe/simple/insulated,
/obj/machinery/atmospherics/pipe/simple/visible,
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "whitepurple"
@@ -56692,7 +56694,7 @@
inlet_injector_autolink_id = "n2_in";
name = "Nitrogen Supply Control";
outlet_vent_autolink_id = "n2_out";
autolink_sensors = list("n2_sensor" = "Tank")
autolink_sensors = list("n2_sensor"="Tank")
},
/obj/machinery/atmospherics/pipe/simple/visible/yellow,
/turf/simulated/floor/plasteel{
@@ -57966,7 +57968,7 @@
/obj/machinery/computer/general_air_control{
dir = 4;
name = "Tank Monitor";
autolink_sensors = list("n2_sensor" = "Nitrogen", "o2_sensor" = "Oxygen", "co2_sensor" = "Carbon Dioxide", "tox_sensor" = "Toxins", "n2o_sensor" = "Nitrous Oxide", "waste_sensor" = "Gas Mix Tank")
autolink_sensors = list("n2_sensor"="Nitrogen","o2_sensor"="Oxygen","co2_sensor"="Carbon Dioxide","tox_sensor"="Toxins","n2o_sensor"="Nitrous Oxide","waste_sensor"="Gas Mix Tank")
},
/turf/simulated/floor/plasteel,
/area/station/engineering/atmos/control)
@@ -68492,7 +68494,7 @@
inlet_injector_autolink_id = "co2_in";
name = "Carbon Dioxide Supply Control";
outlet_vent_autolink_id = "co2_out";
autolink_sensors = list("co2_sensor" = "Tank")
autolink_sensors = list("co2_sensor"="Tank")
},
/turf/simulated/floor/plasteel{
dir = 4;
@@ -70976,12 +70978,12 @@
/turf/simulated/wall/mineral/titanium,
/area/shuttle/pod_3)
"lRi" = (
/obj/machinery/atmospherics/pipe/simple/insulated{
dir = 8
},
/obj/machinery/atmospherics/binary/pump{
name = "cooling loop to port"
},
/obj/machinery/atmospherics/pipe/simple/visible{
dir = 4
},
/turf/simulated/floor/plasteel{
icon_state = "white"
},
@@ -71387,7 +71389,7 @@
dir = 1;
level = 3;
name = "Distribution and Waste Monitor";
autolink_sensors = list("mair_in_meter" = "Mixed Air In", "air_sensor" = "Mixed Air Supply Tank", "mair_out_meter" = "Mixed Air Out", "dloop_atm_meter" = "Distribution Loop", "wloop_atm_meter" = "Waste Loop")
autolink_sensors = list("mair_in_meter"="Mixed Air In","air_sensor"="Mixed Air Supply Tank","mair_out_meter"="Mixed Air Out","dloop_atm_meter"="Distribution Loop","wloop_atm_meter"="Waste Loop")
},
/turf/simulated/floor/plasteel,
/area/station/engineering/controlroom)
@@ -76685,13 +76687,13 @@
},
/area/station/science/genetics)
"oGU" = (
/obj/machinery/atmospherics/pipe/simple/insulated{
dir = 8
},
/obj/machinery/atmospherics/binary/valve{
dir = 1;
name = "port to space"
},
/obj/machinery/atmospherics/pipe/simple/visible{
dir = 4
},
/turf/simulated/floor/plasteel{
icon_state = "white"
},
@@ -76991,7 +76993,7 @@
inlet_injector_autolink_id = "tox_in";
name = "Toxin Supply Control";
outlet_vent_autolink_id = "tox_out";
autolink_sensors = list("tox_sensor" = "Tank")
autolink_sensors = list("tox_sensor"="Tank")
},
/obj/effect/turf_decal/stripes/line{
dir = 4
@@ -77308,7 +77310,7 @@
dir = 8;
level = 3;
name = "Distribution and Waste Monitor";
autolink_sensors = list("mair_in_meter" = "Mixed Air In", "air_sensor" = "Mixed Air Supply Tank", "mair_out_meter" = "Mixed Air Out", "dloop_atm_meter" = "Distribution Loop", "wloop_atm_meter" = "Waste Loop")
autolink_sensors = list("mair_in_meter"="Mixed Air In","air_sensor"="Mixed Air Supply Tank","mair_out_meter"="Mixed Air Out","dloop_atm_meter"="Distribution Loop","wloop_atm_meter"="Waste Loop")
},
/turf/simulated/floor/plasteel,
/area/station/engineering/atmos/control)
@@ -79968,7 +79970,7 @@
},
/obj/machinery/computer/general_air_control{
name = "Bomb Mix Monitor";
autolink_sensors = list("burn_sensor" = "Burn Mix")
autolink_sensors = list("burn_sensor"="Burn Mix")
},
/obj/machinery/door_control{
id = "ToxinsVenting";
@@ -81443,8 +81445,8 @@
/turf/simulated/floor/engine,
/area/station/engineering/control)
"qRw" = (
/obj/machinery/atmospherics/pipe/simple/insulated,
/obj/effect/spawner/window/reinforced/plasma/grilled,
/obj/machinery/atmospherics/pipe/simple/visible,
/turf/simulated/floor/plating,
/area/station/science/toxins/mixing)
"qRE" = (
@@ -81708,7 +81710,7 @@
},
/obj/machinery/computer/general_air_control{
name = "Tank Monitor";
autolink_sensors = list("n2_sensor" = "Nitrogen", "o2_sensor" = "Oxygen", "co2_sensor" = "Carbon Dioxide", "tox_sensor" = "Toxins", "n2o_sensor" = "Nitrous Oxide", "waste_sensor" = "Gas Mix Tank")
autolink_sensors = list("n2_sensor"="Nitrogen","o2_sensor"="Oxygen","co2_sensor"="Carbon Dioxide","tox_sensor"="Toxins","n2o_sensor"="Nitrous Oxide","waste_sensor"="Gas Mix Tank")
},
/obj/machinery/light{
dir = 4
@@ -82882,7 +82884,7 @@
name = "Mixed Air Supply Control";
outlet_vent_autolink_id = "air_out";
outlet_setting = 2000;
autolink_sensors = list("air_sensor" = "Tank")
autolink_sensors = list("air_sensor"="Tank")
},
/turf/simulated/floor/plasteel{
icon_state = "arrival"
@@ -88689,7 +88691,7 @@
inlet_injector_autolink_id = "waste_in";
name = "Gas Mix Tank Control";
outlet_vent_autolink_id = "waste_out";
autolink_sensors = list("waste_sensor" = "Tank")
autolink_sensors = list("waste_sensor"="Tank")
},
/turf/simulated/floor/plasteel{
dir = 4;
@@ -90479,18 +90481,6 @@
icon_state = "dark"
},
/area/station/engineering/smes)
"vBv" = (
/obj/machinery/atmospherics/pipe/simple/insulated,
/obj/machinery/atmospherics/meter{
layer = 3.3
},
/obj/structure/grille,
/obj/structure/window/plasmareinforced,
/obj/structure/window/plasmareinforced{
dir = 1
},
/turf/simulated/floor/plating,
/area/station/science/toxins/mixing)
"vBC" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/closet,
@@ -94324,7 +94314,7 @@
inlet_injector_autolink_id = "n2o_in";
name = "Nitrous Oxide Supply Control";
outlet_vent_autolink_id = "n2o_out";
autolink_sensors = list("n2o_sensor" = "Tank")
autolink_sensors = list("n2o_sensor"="Tank")
},
/turf/simulated/floor/plasteel{
dir = 4;
@@ -145605,7 +145595,7 @@ cDG
cFU
cHp
cIF
cJR
cJP
oEK
cLe
tWz
@@ -148413,7 +148403,7 @@ cgs
pMj
eis
nTk
vBv
cJR
vXo
ijP
eAb
@@ -148670,7 +148660,7 @@ cgs
gZe
ooY
plq
vBv
cJR
evw
tHH
iFq
@@ -148927,7 +148917,7 @@ cgs
iUx
jzz
lVB
vBv
cJR
oGw
cqe
wuZ
+2 -2
View File
@@ -11,8 +11,8 @@
#define PIPE_MVALVE 8
#define PIPE_PUMP 9
#define PIPE_SCRUBBER 10
#define PIPE_INSULATED_STRAIGHT 11
#define PIPE_INSULATED_BENT 12
// #define PIPE_INSULATED_STRAIGHT 11
// #define PIPE_INSULATED_BENT 12
#define PIPE_GAS_FILTER 13
#define PIPE_GAS_MIXER 14
#define PIPE_PASSIVE_GATE 15
-9
View File
@@ -343,15 +343,6 @@ GLOBAL_LIST_EMPTY(rpd_pipe_list) //Some pipes we don't want to be dispensable
pipe_id = PIPE_CIRCULATOR
pipe_icon = "circ"
/datum/pipes/atmospheric/insulated
pipe_name = "insulated pipe"
pipe_id = PIPE_INSULATED_STRAIGHT
pipe_icon = "insulated"
/datum/pipes/atmospheric/insulated/bent
pipe_name = "bent insulated pipe"
pipe_id = PIPE_INSULATED_BENT
/datum/pipes/disposal/left_sortjunction
pipe_name = "disposals sort junction left"
pipe_id = PIPE_DISPOSALS_SORT_LEFT
+4 -12
View File
@@ -34,9 +34,6 @@
else if(istype(make_from, /obj/machinery/atmospherics/pipe/simple/heat_exchanging))
pipe_type = PIPE_HE_STRAIGHT + is_bent
else if(istype(make_from, /obj/machinery/atmospherics/pipe/simple/insulated))
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))
pipe_type = PIPE_SUPPLY_STRAIGHT + is_bent
connect_types = list(CONNECT_TYPE_SUPPLY)
@@ -208,7 +205,6 @@
return pipe_type in list( \
PIPE_SIMPLE_BENT, \
PIPE_HE_BENT, \
PIPE_INSULATED_BENT, \
PIPE_SUPPLY_BENT, \
PIPE_SCRUBBERS_BENT)
@@ -241,7 +237,7 @@
if(is_bent_pipe() && (dir in GLOB.cardinal))
dir = dir | turn(dir, 90)
else if(pipe_type in list (PIPE_SIMPLE_STRAIGHT, PIPE_SUPPLY_STRAIGHT, PIPE_SCRUBBERS_STRAIGHT, PIPE_UNIVERSAL, PIPE_HE_STRAIGHT, PIPE_INSULATED_STRAIGHT, PIPE_MVALVE, PIPE_DVALVE))
else if(pipe_type in list (PIPE_SIMPLE_STRAIGHT, PIPE_SUPPLY_STRAIGHT, PIPE_SCRUBBERS_STRAIGHT, PIPE_UNIVERSAL, PIPE_HE_STRAIGHT, PIPE_MVALVE, PIPE_DVALVE))
if(dir == 2)
dir = 1
@@ -265,12 +261,12 @@
var/acw = turn(direct, 90)
switch(pipe_type)
if(PIPE_SIMPLE_STRAIGHT, PIPE_INSULATED_STRAIGHT, PIPE_HE_STRAIGHT, PIPE_JUNCTION,\
if(PIPE_SIMPLE_STRAIGHT, PIPE_HE_STRAIGHT, PIPE_JUNCTION,\
PIPE_PUMP, PIPE_VOLUME_PUMP, PIPE_PASSIVE_GATE, PIPE_MVALVE, PIPE_DVALVE, PIPE_DP_VENT,
PIPE_SUPPLY_STRAIGHT, PIPE_SCRUBBERS_STRAIGHT, PIPE_UNIVERSAL)
return dir|flip
if(PIPE_SIMPLE_BENT, PIPE_INSULATED_BENT, PIPE_HE_BENT, PIPE_SUPPLY_BENT, PIPE_SCRUBBERS_BENT)
if(PIPE_SIMPLE_BENT, PIPE_HE_BENT, PIPE_SUPPLY_BENT, PIPE_SCRUBBERS_BENT)
return dir //dir|acw
if(PIPE_CONNECTOR, PIPE_HEAT_EXCHANGE, PIPE_INJECTOR)
@@ -332,7 +328,7 @@
//Helper to clean up dir
/obj/item/pipe/proc/fixdir()
if(pipe_type in list (PIPE_SIMPLE_STRAIGHT, PIPE_SUPPLY_STRAIGHT, PIPE_SCRUBBERS_STRAIGHT, PIPE_HE_STRAIGHT, PIPE_INSULATED_STRAIGHT, PIPE_MVALVE, PIPE_DVALVE))
if(pipe_type in list (PIPE_SIMPLE_STRAIGHT, PIPE_SUPPLY_STRAIGHT, PIPE_SCRUBBERS_STRAIGHT, PIPE_HE_STRAIGHT, PIPE_MVALVE, PIPE_DVALVE))
if(dir == 2)
dir = 1
@@ -482,10 +478,6 @@
S.on_construction(dir, pipe_dir, color)
if(PIPE_INSULATED_STRAIGHT, PIPE_INSULATED_BENT)
var/obj/machinery/atmospherics/pipe/simple/insulated/P = new(loc)
P.on_construction(dir, pipe_dir, color)
if(PIPE_CAP)
var/obj/machinery/atmospherics/pipe/cap/C = new(loc)
C.on_construction(dir, pipe_dir, color)
@@ -1,7 +1,7 @@
/datum/painter/pipe
module_name = "pipe painter"
module_state = "pipe_painter"
var/static/list/blacklisted_pipes = list(/obj/machinery/atmospherics/pipe/simple/heat_exchanging, /obj/machinery/atmospherics/pipe/simple/insulated)
var/static/list/blacklisted_pipes = list(/obj/machinery/atmospherics/pipe/simple/heat_exchanging)
var/static/list/modes = list()
/datum/painter/pipe/New()
@@ -7,8 +7,6 @@
var/update = 1
var/alert_pressure = 0
/datum/pipeline/New()
SSair.networks += src
@@ -33,7 +31,6 @@
if(istype(base, /obj/machinery/atmospherics/pipe))
var/obj/machinery/atmospherics/pipe/E = base
volume = E.volume
alert_pressure = E.alert_pressure
members += E
if(E.air_temporary)
air = E.air_temporary
@@ -62,8 +59,6 @@
volume += item.volume
item.parent = src
alert_pressure = min(alert_pressure, item.alert_pressure)
if(item.air_temporary)
air.merge(item.air_temporary)
item.air_temporary = null
@@ -6,8 +6,6 @@
power_state = NO_POWER_USE
can_unwrench = TRUE
damage_deflection = 12
var/alert_pressure = 80*ONE_ATMOSPHERE //minimum pressure before check_pressure(...) should be called
can_be_undertile = TRUE
//Buckling
@@ -57,12 +55,6 @@
/obj/machinery/atmospherics/proc/pipeline_expansion()
return null
/obj/machinery/atmospherics/pipe/proc/check_pressure(pressure)
//Return 1 if parent should continue checking other pipes
//Return null if parent should stop checking other pipes. Recall: qdel(src) will by default return null
return 1
/obj/machinery/atmospherics/pipe/proc/releaseAirToTurf()
if(air_temporary)
var/turf/T = loc
@@ -16,10 +16,6 @@
var/minimum_temperature_difference = 300
var/thermal_conductivity = 0 //WALL_HEAT_TRANSFER_COEFFICIENT No
var/maximum_pressure = 70*ONE_ATMOSPHERE
var/fatigue_pressure = 55*ONE_ATMOSPHERE
alert_pressure = 55*ONE_ATMOSPHERE
level = 1
/obj/machinery/atmospherics/pipe/simple/New()
@@ -72,21 +68,6 @@
hide(T.intact)
update_icon()
/obj/machinery/atmospherics/pipe/simple/check_pressure(pressure)
var/datum/gas_mixture/environment = loc.return_air()
var/pressure_difference = pressure - environment.return_pressure()
if(pressure_difference > maximum_pressure)
burst()
else if(pressure_difference > fatigue_pressure)
//TODO: leak to turf, doing pfshhhhh
if(prob(5))
burst()
else return 1
/obj/machinery/atmospherics/pipe/simple/proc/burst()
src.visible_message("<span class='danger'>\The [src] bursts!</span>")
playsound(src.loc, 'sound/effects/bang.ogg', 25, 1)
@@ -1,11 +0,0 @@
/obj/machinery/atmospherics/pipe/simple/insulated
icon = 'icons/obj/atmospherics/red_pipe.dmi'
icon_state = "intact"
minimum_temperature_difference = 10000
thermal_conductivity = 0
maximum_pressure = 1000*ONE_ATMOSPHERE
fatigue_pressure = 900*ONE_ATMOSPHERE
alert_pressure = 900*ONE_ATMOSPHERE
level = 2
Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.2 KiB

-1
View File
@@ -1531,7 +1531,6 @@
#include "code\modules\atmospherics\machinery\pipes\simple\pipe_simple.dm"
#include "code\modules\atmospherics\machinery\pipes\simple\pipe_simple_he.dm"
#include "code\modules\atmospherics\machinery\pipes\simple\pipe_simple_hidden.dm"
#include "code\modules\atmospherics\machinery\pipes\simple\pipe_simple_insulated.dm"
#include "code\modules\atmospherics\machinery\pipes\simple\pipe_simple_visible.dm"
#include "code\modules\atmospherics\machinery\portable\canister.dm"
#include "code\modules\atmospherics\machinery\portable\portable_atmospherics.dm"