From 28de2e5fe666d088d9f08d7a8de6d659309333c5 Mon Sep 17 00:00:00 2001 From: adrix89 Date: Wed, 13 Nov 2013 13:24:07 +0200 Subject: [PATCH] Fixes pipe bug. Issue https://github.com/tgstation/-tg-station/issues/1669 and its duplicate https://github.com/tgstation/-tg-station/issues/1099 --- .../components/binary_devices/binary_atmos_base.dm | 9 +-------- code/ATMOSPHERICS/components/portables_connector.dm | 5 +---- .../components/trinary_devices/trinary_base.dm | 13 +------------ code/ATMOSPHERICS/components/unary/unary_base.dm | 5 +---- 4 files changed, 4 insertions(+), 28 deletions(-) diff --git a/code/ATMOSPHERICS/components/binary_devices/binary_atmos_base.dm b/code/ATMOSPHERICS/components/binary_devices/binary_atmos_base.dm index 3a23972ce70..bb19ff5f9ab 100644 --- a/code/ATMOSPHERICS/components/binary_devices/binary_atmos_base.dm +++ b/code/ATMOSPHERICS/components/binary_devices/binary_atmos_base.dm @@ -60,14 +60,7 @@ obj/machinery/atmospherics/binary ..() initialize() - if(node1) - node1.disconnect(src) - del(network1) - node1 = null - if(node2) - node2.disconnect(src) - del(network2) - node2 = null + src.disconnect(src) var/node2_connect = dir var/node1_connect = turn(dir, 180) diff --git a/code/ATMOSPHERICS/components/portables_connector.dm b/code/ATMOSPHERICS/components/portables_connector.dm index 60a42eccf92..05005ac4942 100644 --- a/code/ATMOSPHERICS/components/portables_connector.dm +++ b/code/ATMOSPHERICS/components/portables_connector.dm @@ -79,10 +79,7 @@ ..() initialize() - if(node) - node.disconnect(src) - del(network) - node = null + src.disconnect(src) var/node_connect = dir diff --git a/code/ATMOSPHERICS/components/trinary_devices/trinary_base.dm b/code/ATMOSPHERICS/components/trinary_devices/trinary_base.dm index 2078eca74b3..73ab0965cf4 100644 --- a/code/ATMOSPHERICS/components/trinary_devices/trinary_base.dm +++ b/code/ATMOSPHERICS/components/trinary_devices/trinary_base.dm @@ -72,18 +72,7 @@ obj/machinery/atmospherics/trinary ..() initialize() - if(node1) - node1.disconnect(src) - del(network1) - node1 = null - if(node2) - node2.disconnect(src) - del(network2) - node2 = null - if(node3) - node3.disconnect(src) - del(network3) - node3 = null + src.disconnect(src) var/node1_connect = turn(dir, -180) var/node2_connect = turn(dir, -90) diff --git a/code/ATMOSPHERICS/components/unary/unary_base.dm b/code/ATMOSPHERICS/components/unary/unary_base.dm index a697536b8dd..9961ce8a1f0 100644 --- a/code/ATMOSPHERICS/components/unary/unary_base.dm +++ b/code/ATMOSPHERICS/components/unary/unary_base.dm @@ -40,10 +40,7 @@ ..() initialize() - if(node) - node.disconnect(src) - del(network) - node = null + src.disconnect(src) var/node_connect = dir