From 9a0f3f0c12d8703db15180243ddc575ca73873bf Mon Sep 17 00:00:00 2001
From: Razharas <kostmartin@gmail.com>
Date: Sun, 16 Nov 2014 05:47:30 +0300
Subject: [PATCH] Fixes pipes and qdel

They dont disappear after multiple clicks anymore
They now show success message only once
Fix #5795
---
 code/ATMOSPHERICS/atmospherics.dm | 24 +++++++++++-------------
 1 file changed, 11 insertions(+), 13 deletions(-)

diff --git a/code/ATMOSPHERICS/atmospherics.dm b/code/ATMOSPHERICS/atmospherics.dm
index 4808e2d90c1..bae8c908699 100644
--- a/code/ATMOSPHERICS/atmospherics.dm
+++ b/code/ATMOSPHERICS/atmospherics.dm
@@ -72,14 +72,13 @@ Pipelines + Other Objects -> Pipe network
 			return 1
 		var/datum/gas_mixture/int_air = return_air()
 		var/datum/gas_mixture/env_air = loc.return_air()
+		add_fingerprint(user)
 		if ((int_air.return_pressure()-env_air.return_pressure()) > 2*ONE_ATMOSPHERE)
 			user << "<span class='danger'>You cannot unwrench this [src], it is too exerted due to internal pressure.</span>"
-			add_fingerprint(user)
 			return 1
 		playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1)
 		user << "<span class='notice'>You begin to unfasten \the [src]...</span>"
-		add_fingerprint(user)
-		if (do_after(user, 40))
+		if (do_after(user, 40) && !gc_destroyed)
 			user.visible_message( \
 				"[user] unfastens \the [src].", \
 				"<span class='notice'>You have unfastened \the [src].</span>", \
@@ -89,16 +88,15 @@ Pipelines + Other Objects -> Pipe network
 		return ..()
 
 /obj/machinery/atmospherics/Deconstruct()
-	if(can_unwrench)
-		var/turf/T = loc
-		stored.loc = T
-		transfer_fingerprints_to(stored)
-		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)
+	var/turf/T = loc
+	stored.loc = T
+	transfer_fingerprints_to(stored)
+	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/proc/nullifyPipenet(datum/pipeline/P)
 	P.other_atmosmch -= src