Merge branch 'master' of https://github.com/tgstation/-tg-station into AttackAnimation

Conflicts:
	code/modules/mob/living/living.dm

code/ATMOSPHERICS/atmospherics.dm

@@ -19,6 +19,7 @@ Pipelines + Other Objects -> Pipe network
 	var/can_unwrench = 0
 	var/initialize_directions = 0
 	var/pipe_color
+	var/obj/item/pipe/stored
 
 	var/global/list/iconsetids = list()
 	var/global/list/pipeimages = list()
@@ -27,6 +28,12 @@ Pipelines + Other Objects -> Pipe network
 /obj/machinery/atmospherics/process()
 	//build_network()
 */
+
+/obj/machinery/atmospherics/New()
+	..()
+	if(can_unwrench)
+		stored = new(src, make_from=src)
+
 /obj/machinery/atmospherics/proc/network_expand(datum/pipe_network/new_network, obj/machinery/atmospherics/pipe/reference)
 	// Check to see if should be added to network. Add self if so and adjust variables appropriately.
 	// Note don't forget to have neighbors look as well!
@@ -90,17 +97,22 @@ Pipelines + Other Objects -> Pipe network
 				"[user] unfastens \the [src].", \
 				"<span class='notice'>You have unfastened \the [src].</span>", \
 				"You hear ratchet.")
-			var/obj/item/pipe/newpipe = new(loc, make_from=src)
-			transfer_fingerprints_to(newpipe)
-			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)
+			Deconstruct()
 	else
 		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)
+
 /obj/machinery/atmospherics/proc/nullifyPipenetwork()
 	return
 
@@ -125,3 +137,6 @@ Pipelines + Other Objects -> Pipe network
 
 	return img
 
+/obj/machinery/atmospherics/singularity_pull(S, current_size)
+	if(current_size >= STAGE_FIVE)
+		Deconstruct()

code/ATMOSPHERICS/pipes.dm

@@ -2,7 +2,6 @@
 	var/datum/gas_mixture/air_temporary //used when reconstructing a pipeline that broke
 	var/datum/pipeline/parent
 	var/volume = 0
-	force = 20
 	layer = 2.4 //under wires with their 2.44
 	use_power = 0
 	can_unwrench = 1