From 9558991873f05dadf4d29a872f727bf74a5d4b53 Mon Sep 17 00:00:00 2001
From: Fox-McCloud <Fox_P_McCloud@hotmail.com>
Date: Mon, 19 Oct 2015 17:50:47 -0400
Subject: [PATCH] Pipe Fixes

---
 code/ATMOSPHERICS/atmospherics.dm | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/code/ATMOSPHERICS/atmospherics.dm b/code/ATMOSPHERICS/atmospherics.dm
index ce4bfaaf65a..3686bc46d2f 100644
--- a/code/ATMOSPHERICS/atmospherics.dm
+++ b/code/ATMOSPHERICS/atmospherics.dm
@@ -53,11 +53,12 @@ Pipelines + Other Objects -> Pipe network
 	if(stored)
 		qdel(stored)
 		stored = null
-	for(var/mob/living/M in src) //ventcrawling is serious business
-		M.remove_ventcrawl()
-		M.forceMove(loc)
+	for(var/mob/living/L in src) //ventcrawling is serious business
+		L.remove_ventcrawl()
+		L.forceMove(get_turf(src))
 	if(pipe_image)
 		qdel(pipe_image) //we have to del it, or it might keep a ref somewhere else
+		pipe_image = null
 	return ..()
 
 // Icons/overlays/underlays
@@ -200,15 +201,10 @@ Pipelines + Other Objects -> Pipe network
 
 /obj/machinery/atmospherics/proc/Deconstruct()
 	if(can_unwrench)
-		var/turf/T = get_turf(src)
-		stored.loc = T
+		stored.loc = get_turf(src)
 		transfer_fingerprints_to(stored)
 		stored = null
-		if(istype(src, /obj/machinery/atmospherics/pipe))
-			for(var/obj/machinery/meter/meter in T)
-				if(meter.target == src)
-					new /obj/item/pipe_meter(T)
-					qdel(meter)
+
 	qdel(src)
 
 /obj/machinery/atmospherics/construction(D, P, C)