From b405928961d4e04def852ebf0f79ed8c89f9e591 Mon Sep 17 00:00:00 2001
From: Atermonera <atermonera@gmail.com>
Date: Wed, 24 Jul 2019 23:11:54 -0800
Subject: [PATCH] Manifolds now obey the laws of pipes.

---
 code/ATMOSPHERICS/pipes/manifold.dm   | 17 +++++++++++++++++
 code/ATMOSPHERICS/pipes/manifold4w.dm | 17 +++++++++++++++++
 2 files changed, 34 insertions(+)

diff --git a/code/ATMOSPHERICS/pipes/manifold.dm b/code/ATMOSPHERICS/pipes/manifold.dm
index 524d420d39..4b0df6f2ef 100644
--- a/code/ATMOSPHERICS/pipes/manifold.dm
+++ b/code/ATMOSPHERICS/pipes/manifold.dm
@@ -71,6 +71,23 @@
 
 	..()
 
+<<<<<<< HEAD
+=======
+/obj/machinery/atmospherics/pipe/manifold/handle_leaking()
+	if(node1 && node2 && node3)
+		set_leaking(FALSE)
+	else
+		set_leaking(TRUE)
+
+/obj/machinery/atmospherics/pipe/manifold/process()
+	if(!parent)
+		..()
+	else if(leaking)
+		parent.mingle_with_turf(loc, volume)
+	else
+		. = PROCESS_KILL
+
+>>>>>>> 31518fe... Merge pull request #6344 from Mechoid/ManifoldLeaking
 /obj/machinery/atmospherics/pipe/manifold/change_color(var/new_color)
 	..()
 	//for updating connected atmos device pipes (i.e. vents, manifolds, etc)
diff --git a/code/ATMOSPHERICS/pipes/manifold4w.dm b/code/ATMOSPHERICS/pipes/manifold4w.dm
index 0cc022423b..99274183b4 100644
--- a/code/ATMOSPHERICS/pipes/manifold4w.dm
+++ b/code/ATMOSPHERICS/pipes/manifold4w.dm
@@ -69,6 +69,23 @@
 
 	..()
 
+<<<<<<< HEAD
+=======
+/obj/machinery/atmospherics/pipe/manifold4w/handle_leaking()
+	if(node1 && node2 && node3 && node4)
+		set_leaking(FALSE)
+	else
+		set_leaking(TRUE)
+
+/obj/machinery/atmospherics/pipe/manifold4w/process()
+	if(!parent)
+		..()
+	else if(leaking)
+		parent.mingle_with_turf(loc, volume)
+	else
+		. = PROCESS_KILL
+
+>>>>>>> 31518fe... Merge pull request #6344 from Mechoid/ManifoldLeaking
 /obj/machinery/atmospherics/pipe/manifold4w/change_color(var/new_color)
 	..()
 	//for updating connected atmos device pipes (i.e. vents, manifolds, etc)