From d0c4dbfab390291aed5e1e2eea98cd03027e487b Mon Sep 17 00:00:00 2001
From: DGamerL <108773801+DGamerL@users.noreply.github.com>
Date: Sun, 25 Feb 2024 12:16:02 +0100
Subject: [PATCH] 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
---
_maps/map_files/Delta/delta.dmm | 31 ++--
_maps/map_files/MetaStation/MetaStation.dmm | 151 +++++++++---------
.../SpaceRuins/syndie_space_base.dmm | 8 +-
_maps/map_files/cerestation/cerestation.dmm | 4 +-
_maps/map_files/cyberiad/cyberiad.dmm | 78 ++++-----
code/__DEFINES/pipes.dm | 4 +-
code/datums/pipe_datums.dm | 9 --
code/game/machinery/pipe/pipe_construction.dm | 16 +-
.../items/devices/painter/pipe_painter.dm | 2 +-
.../atmospherics/machinery/datum_pipeline.dm | 5 -
.../atmospherics/machinery/pipes/pipe.dm | 8 -
.../machinery/pipes/simple/pipe_simple.dm | 19 ---
.../pipes/simple/pipe_simple_insulated.dm | 11 --
icons/obj/atmospherics/red_pipe.dmi | Bin 5315 -> 0 bytes
paradise.dme | 1 -
15 files changed, 147 insertions(+), 200 deletions(-)
delete mode 100644 code/modules/atmospherics/machinery/pipes/simple/pipe_simple_insulated.dm
delete mode 100644 icons/obj/atmospherics/red_pipe.dmi
diff --git a/_maps/map_files/Delta/delta.dmm b/_maps/map_files/Delta/delta.dmm
index 7596b19df95..4dae54a2a4f 100644
--- a/_maps/map_files/Delta/delta.dmm
+++ b/_maps/map_files/Delta/delta.dmm
@@ -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
diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm
index 0c0f73d9546..f308ad53b0a 100644
--- a/_maps/map_files/MetaStation/MetaStation.dmm
+++ b/_maps/map_files/MetaStation/MetaStation.dmm
@@ -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
diff --git a/_maps/map_files/RandomRuins/SpaceRuins/syndie_space_base.dmm b/_maps/map_files/RandomRuins/SpaceRuins/syndie_space_base.dmm
index 23f12d138ff..6f5702e29ba 100644
--- a/_maps/map_files/RandomRuins/SpaceRuins/syndie_space_base.dmm
+++ b/_maps/map_files/RandomRuins/SpaceRuins/syndie_space_base.dmm
@@ -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" = (
diff --git a/_maps/map_files/cerestation/cerestation.dmm b/_maps/map_files/cerestation/cerestation.dmm
index fb07bd65d56..9c21aef6a5d 100644
--- a/_maps/map_files/cerestation/cerestation.dmm
+++ b/_maps/map_files/cerestation/cerestation.dmm
@@ -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{
diff --git a/_maps/map_files/cyberiad/cyberiad.dmm b/_maps/map_files/cyberiad/cyberiad.dmm
index da3ef0ff841..6fd1463aa6d 100644
--- a/_maps/map_files/cyberiad/cyberiad.dmm
+++ b/_maps/map_files/cyberiad/cyberiad.dmm
@@ -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
diff --git a/code/__DEFINES/pipes.dm b/code/__DEFINES/pipes.dm
index 92fc2f12788..dbf877001bf 100644
--- a/code/__DEFINES/pipes.dm
+++ b/code/__DEFINES/pipes.dm
@@ -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
diff --git a/code/datums/pipe_datums.dm b/code/datums/pipe_datums.dm
index 51995f87ec5..41adb4a1882 100644
--- a/code/datums/pipe_datums.dm
+++ b/code/datums/pipe_datums.dm
@@ -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
diff --git a/code/game/machinery/pipe/pipe_construction.dm b/code/game/machinery/pipe/pipe_construction.dm
index e904a75a357..ff8de1af847 100644
--- a/code/game/machinery/pipe/pipe_construction.dm
+++ b/code/game/machinery/pipe/pipe_construction.dm
@@ -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)
diff --git a/code/game/objects/items/devices/painter/pipe_painter.dm b/code/game/objects/items/devices/painter/pipe_painter.dm
index fb254955d41..879533899fb 100644
--- a/code/game/objects/items/devices/painter/pipe_painter.dm
+++ b/code/game/objects/items/devices/painter/pipe_painter.dm
@@ -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()
diff --git a/code/modules/atmospherics/machinery/datum_pipeline.dm b/code/modules/atmospherics/machinery/datum_pipeline.dm
index 4bcce55dd21..7a4b3b77a12 100644
--- a/code/modules/atmospherics/machinery/datum_pipeline.dm
+++ b/code/modules/atmospherics/machinery/datum_pipeline.dm
@@ -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
diff --git a/code/modules/atmospherics/machinery/pipes/pipe.dm b/code/modules/atmospherics/machinery/pipes/pipe.dm
index d4cc70df67f..e2d946cfc3c 100644
--- a/code/modules/atmospherics/machinery/pipes/pipe.dm
+++ b/code/modules/atmospherics/machinery/pipes/pipe.dm
@@ -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
diff --git a/code/modules/atmospherics/machinery/pipes/simple/pipe_simple.dm b/code/modules/atmospherics/machinery/pipes/simple/pipe_simple.dm
index c46515870a8..fd63c21119f 100644
--- a/code/modules/atmospherics/machinery/pipes/simple/pipe_simple.dm
+++ b/code/modules/atmospherics/machinery/pipes/simple/pipe_simple.dm
@@ -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("\The [src] bursts!")
playsound(src.loc, 'sound/effects/bang.ogg', 25, 1)
diff --git a/code/modules/atmospherics/machinery/pipes/simple/pipe_simple_insulated.dm b/code/modules/atmospherics/machinery/pipes/simple/pipe_simple_insulated.dm
deleted file mode 100644
index e7e5ec55e90..00000000000
--- a/code/modules/atmospherics/machinery/pipes/simple/pipe_simple_insulated.dm
+++ /dev/null
@@ -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
diff --git a/icons/obj/atmospherics/red_pipe.dmi b/icons/obj/atmospherics/red_pipe.dmi
deleted file mode 100644
index 83803dfb1c998788414eccbf954b8af4ca58afbd..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 5315
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