Fix non-icon merge conflicts

code/ATMOSPHERICS/chiller.dm

@@ -62,13 +62,13 @@
 					C.loc = src
 					C.add_fingerprint(usr)
 
-					user.visible_message("\blue [user] inserts a power cell into [src].", "\blue You insert the power cell into [src].")
+					user.visible_message("<span class='notice'>[user] inserts a power cell into [src].</span>", "<span class='notice'>You insert the power cell into [src].</span>")
 		else
 			user << "The hatch must be open to insert a power cell."
 			return
 	else if(istype(I, /obj/item/weapon/screwdriver))
 		open = !open
-		user.visible_message("\blue [user] [open ? "opens" : "closes"] the hatch on the [src].", "\blue You [open ? "open" : "close"] the hatch on the [src].")
+		user.visible_message("<span class='notice'>[user] [open ? "opens" : "closes"] the hatch on the [src].</span>", "<span class='notice'>You [open ? "open" : "close"] the hatch on the [src].</span>")
 		update_icon()
 		if(!open && user.machine == src)
 			user << browse(null, "window=aircond")
@@ -106,7 +106,7 @@
 		onclose(user, "aircond")
 	else
 		on = !on
-		user.visible_message("\blue [user] switches [on ? "on" : "off"] the [src].","\blue You switch [on ? "on" : "off"] the [src].")
+		user.visible_message("<span class='notice'>[user] switches [on ? "on" : "off"] the [src].</span>","<span class='notice'>You switch [on ? "on" : "off"] the [src].</span>")
 		update_icon()
 	return
 
@@ -131,7 +131,7 @@
 					usr.put_in_hands(cell)
 					cell.add_fingerprint(usr)
 					cell = null
-					usr.visible_message("\blue [usr] removes the power cell from \the [src].", "\blue You remove the power cell from \the [src].")
+					usr.visible_message("<span class='notice'>[usr] removes the power cell from \the [src].</span>", "<span class='notice'>You remove the power cell from \the [src].</span>")
 
 
 			if("cellinstall")
@@ -143,7 +143,7 @@
 						C.loc = src
 						C.add_fingerprint(usr)
 
-						usr.visible_message("\blue [usr] inserts a power cell into \the [src].", "\blue You insert the power cell into \the [src].")
+						usr.visible_message("<span class='notice'>[usr] inserts a power cell into \the [src].</span>", "<span class='notice'>You insert the power cell into \the [src].</span>")
 
 		src.updateDialog()
 	else

code/ATMOSPHERICS/components/binary_devices/binary_atmos_base.dm

@@ -1,4 +1,4 @@
-obj/machinery/atmospherics/binary
+/obj/machinery/atmospherics/binary
 	dir = SOUTH
 	initialize_directions = SOUTH|NORTH
 	use_power = 1
@@ -12,131 +12,131 @@ obj/machinery/atmospherics/binary
 	var/datum/pipe_network/network1
 	var/datum/pipe_network/network2
 
-	New()
-		..()
-		switch(dir)
-			if(NORTH)
-				initialize_directions = NORTH|SOUTH
-			if(SOUTH)
-				initialize_directions = NORTH|SOUTH
-			if(EAST)
-				initialize_directions = EAST|WEST
-			if(WEST)
-				initialize_directions = EAST|WEST
-		air1 = new
-		air2 = new
+/obj/machinery/atmospherics/binary/New()
+	..()
+	switch(dir)
+		if(NORTH)
+			initialize_directions = NORTH|SOUTH
+		if(SOUTH)
+			initialize_directions = NORTH|SOUTH
+		if(EAST)
+			initialize_directions = EAST|WEST
+		if(WEST)
+			initialize_directions = EAST|WEST
+	air1 = new
+	air2 = new
 
-		air1.volume = 200
-		air2.volume = 200
+	air1.volume = 200
+	air2.volume = 200
+
+/obj/machinery/atmospherics/binary/Destroy()
+	loc = null
+
+	if(node1)
+		node1.disconnect(src)
+		qdel(network1)
+	if(node2)
+		node2.disconnect(src)
+		qdel(network2)
+
+	node1 = null
+	node2 = null
+
+	return ..()
 
 // Housekeeping and pipe network stuff below
-	network_expand(datum/pipe_network/new_network, obj/machinery/atmospherics/pipe/reference)
-		if(reference == node1)
-			network1 = new_network
+/obj/machinery/atmospherics/binary/network_expand(datum/pipe_network/new_network, obj/machinery/atmospherics/pipe/reference)
+	if(reference == node1)
+		network1 = new_network
 
-		else if(reference == node2)
-			network2 = new_network
+	else if(reference == node2)
+		network2 = new_network
 
-		if(new_network.normal_members.Find(src))
-			return 0
+	if(new_network.normal_members.Find(src))
+		return 0
 
-		new_network.normal_members += src
+	new_network.normal_members += src
 
-		return null
+	return null
 
-	Destroy()
-		loc = null
+/obj/machinery/atmospherics/binary/initialize()
+	if(node1 && node2) return
 
-		if(node1)
-			node1.disconnect(src)
-			qdel(network1)
-		if(node2)
-			node2.disconnect(src)
-			qdel(network2)
+	var/node2_connect = dir
+	var/node1_connect = turn(dir, 180)
 
+	for(var/obj/machinery/atmospherics/target in get_step(src,node1_connect))
+		if(target.initialize_directions & get_dir(target,src))
+			var/c = check_connect_types(target,src)
+			if (c)
+				target.connected_to = c
+				src.connected_to = c
+				node1 = target
+				break
+
+	for(var/obj/machinery/atmospherics/target in get_step(src,node2_connect))
+		if(target.initialize_directions & get_dir(target,src))
+			var/c = check_connect_types(target,src)
+			if (c)
+				target.connected_to = c
+				src.connected_to = c
+				node2 = target
+				break
+
+	update_icon()
+	update_underlays()
+
+/obj/machinery/atmospherics/binary/build_network()
+	if(!network1 && node1)
+		network1 = new /datum/pipe_network()
+		network1.normal_members += src
+		network1.build_network(node1, src)
+
+	if(!network2 && node2)
+		network2 = new /datum/pipe_network()
+		network2.normal_members += src
+		network2.build_network(node2, src)
+
+
+/obj/machinery/atmospherics/binary/return_network(obj/machinery/atmospherics/reference)
+	build_network()
+
+	if(reference==node1)
+		return network1
+
+	if(reference==node2)
+		return network2
+
+	return null
+
+/obj/machinery/atmospherics/binary/reassign_network(datum/pipe_network/old_network, datum/pipe_network/new_network)
+	if(network1 == old_network)
+		network1 = new_network
+	if(network2 == old_network)
+		network2 = new_network
+
+	return 1
+
+/obj/machinery/atmospherics/binary/return_network_air(datum/pipe_network/reference)
+	var/list/results = list()
+
+	if(network1 == reference)
+		results += air1
+	if(network2 == reference)
+		results += air2
+
+	return results
+
+/obj/machinery/atmospherics/binary/disconnect(obj/machinery/atmospherics/reference)
+	if(reference==node1)
+		qdel(network1)
 		node1 = null
+
+	else if(reference==node2)
+		qdel(network2)
 		node2 = null
 
-		return ..()
+	update_icon()
+	update_underlays()
 
-	initialize()
-		if(node1 && node2) return
-
-		var/node2_connect = dir
-		var/node1_connect = turn(dir, 180)
-
-		for(var/obj/machinery/atmospherics/target in get_step(src,node1_connect))
-			if(target.initialize_directions & get_dir(target,src))
-				var/c = check_connect_types(target,src)
-				if (c)
-					target.connected_to = c
-					src.connected_to = c
-					node1 = target
-					break
-
-		for(var/obj/machinery/atmospherics/target in get_step(src,node2_connect))
-			if(target.initialize_directions & get_dir(target,src))
-				var/c = check_connect_types(target,src)
-				if (c)
-					target.connected_to = c
-					src.connected_to = c
-					node2 = target
-					break
-
-		update_icon()
-		update_underlays()
-
-	build_network()
-		if(!network1 && node1)
-			network1 = new /datum/pipe_network()
-			network1.normal_members += src
-			network1.build_network(node1, src)
-
-		if(!network2 && node2)
-			network2 = new /datum/pipe_network()
-			network2.normal_members += src
-			network2.build_network(node2, src)
-
-
-	return_network(obj/machinery/atmospherics/reference)
-		build_network()
-
-		if(reference==node1)
-			return network1
-
-		if(reference==node2)
-			return network2
-
-		return null
-
-	reassign_network(datum/pipe_network/old_network, datum/pipe_network/new_network)
-		if(network1 == old_network)
-			network1 = new_network
-		if(network2 == old_network)
-			network2 = new_network
-
-		return 1
-
-	return_network_air(datum/pipe_network/reference)
-		var/list/results = list()
-
-		if(network1 == reference)
-			results += air1
-		if(network2 == reference)
-			results += air2
-
-		return results
-
-	disconnect(obj/machinery/atmospherics/reference)
-		if(reference==node1)
-			del(network1)
-			node1 = null
-
-		else if(reference==node2)
-			del(network2)
-			node2 = null
-
-		update_icon()
-		update_underlays()
-
-		return null
+	return null

code/ATMOSPHERICS/components/binary_devices/circulator.dm

@@ -73,7 +73,7 @@
 /obj/machinery/atmospherics/binary/circulator/attackby(obj/item/weapon/W as obj, mob/user as mob, params)
 	if(istype(W, /obj/item/weapon/wrench))
 		anchored = !anchored
-		user << "\blue You [anchored ? "secure" : "unsecure"] the bolts holding [src] to the floor."
+		user << "<span class='notice'>You [anchored ? "secure" : "unsecure"] the bolts holding [src] to the floor.</span>"
 
 		if(anchored)
 			if(dir & (NORTH|SOUTH))
@@ -92,10 +92,10 @@
 		else
 			if(node1)
 				node1.disconnect(src)
-				del(network1)
+				qdel(network1)
 			if(node2)
 				node2.disconnect(src)
-				del(network2)
+				qdel(network2)
 
 			node1 = null
 			node2 = null

code/ATMOSPHERICS/components/binary_devices/dp_vent_pump.dm

@@ -265,7 +265,7 @@
 	if(istype(W, /obj/item/weapon/weldingtool))
 		var/obj/item/weapon/weldingtool/WT = W
 		if (WT.remove_fuel(0,user))
-			user << "\blue Now welding the vent."
+			user << "<span class='notice'>Now welding the vent.</span>"
 			if(do_after(user, 20))
 				if(!src || !WT.isOn()) return
 				playsound(get_turf(src), 'sound/items/Welder2.ogg', 50, 1)
@@ -278,9 +278,9 @@
 					welded = 0
 					update_icon()
 			else
-				user << "\blue The welding tool needs to be on to start this task."
+				user << "<span class='notice'>The welding tool needs to be on to start this task.</span>"
 		else
-			user << "\blue You need more welding fuel to complete this task."
+			user << "<span class='notice'>You need more welding fuel to complete this task.</span>"
 			return 1*/
 	if(istype(W, /obj/item/device/multitool))
 		update_multitool_menu(user)
@@ -288,24 +288,24 @@
 	if (!istype(W, /obj/item/weapon/wrench))
 		return ..()
 	if (!(stat & NOPOWER) && on)
-		user << "\red You cannot unwrench this [src], turn it off first."
+		user << "<span class='alert'>You cannot unwrench this [src], turn it off first.</span>"
 		return 1
 	var/turf/T = src.loc
 	if (level==1 && isturf(T) && T.intact)
-		user << "\red You must remove the plating first."
+		user << "<span class='alert'>You must remove the plating first.</span>"
 		return 1
 	var/datum/gas_mixture/int_air = return_air()
 	var/datum/gas_mixture/env_air = loc.return_air()
 	if ((int_air.return_pressure()-env_air.return_pressure()) > 2*ONE_ATMOSPHERE)
-		user << "\red You cannot unwrench this [src], it too exerted due to internal pressure."
+		user << "<span class='alert'>You cannot unwrench \the [src], it is too exerted due to internal pressure.</span>"
 		add_fingerprint(user)
 		return 1
 	playsound(get_turf(src), 'sound/items/Ratchet.ogg', 50, 1)
-	user << "\blue You begin to unfasten \the [src]..."
+	user << "<span class='notice'>You begin to unfasten \the [src]...</span>"
 	if (do_after(user, 40))
 		user.visible_message( \
 			"[user] unfastens \the [src].", \
-			"\blue You have unfastened \the [src].", \
-			"You hear ratchet.")
+			"<span class='notice'>You have unfastened \the [src].</span>", \
+			"You hear a ratchet.")
 		new /obj/item/pipe(loc, make_from=src)
-		del(src)
+		qdel(src)

code/ATMOSPHERICS/components/binary_devices/passive_gate.dm

@@ -134,7 +134,7 @@
 		return
 	src.add_fingerprint(usr)
 	if(!src.allowed(user))
-		user << "\red Access denied."
+		user << "<span class='alert'>Access denied.</span>"
 		return
 	usr.set_machine(src)
 	interact(user)
@@ -156,20 +156,20 @@
 	if (!istype(W, /obj/item/weapon/wrench))
 		return ..()
 	if (on)
-		user << "\red You cannot unwrench this [src], turn it off first."
+		user << "<span class='alert'>You cannot unwrench this [src], turn it off first.</span>"
 		return 1
 	var/datum/gas_mixture/int_air = return_air()
 	var/datum/gas_mixture/env_air = loc.return_air()
 	if ((int_air.return_pressure()-env_air.return_pressure()) > 2*ONE_ATMOSPHERE)
-		user << "\red You cannot unwrench this [src], it too exerted due to internal pressure."
+		user << "<span class='alert'>You cannot unwrench \the [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 << "\blue You begin to unfasten \the [src]..."
+	user << "<span class='notice'>You begin to unfasten \the [src]...</span>"
 	if (do_after(user, 40))
 		user.visible_message( \
 			"[user] unfastens \the [src].", \
-			"\blue You have unfastened \the [src].", \
-			"You hear ratchet.")
+			"<span class='notice'>You have unfastened \the [src].</span>", \
+			"You hear a ratchet.")
 		new /obj/item/pipe(loc, make_from=src)
-		del(src)
+		qdel(src)

code/ATMOSPHERICS/components/binary_devices/pump.dm

@@ -160,7 +160,7 @@ Thus, the two variables affect pump operation are set in New():
 		return
 	src.add_fingerprint(usr)
 	if(!src.allowed(user))
-		user << "\red Access denied."
+		user << "<span class='alert'>Access denied.</span>"
 		return
 	usr.set_machine(src)
 	interact(user)
@@ -188,20 +188,20 @@ Thus, the two variables affect pump operation are set in New():
 	if (!istype(W, /obj/item/weapon/wrench))
 		return ..()
 	if (!(stat & NOPOWER) && on)
-		user << "\red You cannot unwrench this [src], turn it off first."
+		user << "<span class='alert'>You cannot unwrench this [src], turn it off first.</span>"
 		return 1
 	var/datum/gas_mixture/int_air = return_air()
 	var/datum/gas_mixture/env_air = loc.return_air()
 	if ((int_air.return_pressure()-env_air.return_pressure()) > 2*ONE_ATMOSPHERE)
-		user << "\red You cannot unwrench this [src], it too exerted due to internal pressure."
+		user << "<span class='alert'>You cannot unwrench \the [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 << "\blue You begin to unfasten \the [src]..."
+	user << "<span class='notice'>You begin to unfasten \the [src]...</span>"
 	if (do_after(user, 40))
 		user.visible_message( \
 			"[user] unfastens \the [src].", \
-			"\blue You have unfastened \the [src].", \
-			"You hear ratchet.")
+			"<span class='notice'>You have unfastened \the [src].</span>", \
+			"You hear a ratchet.")
 		new /obj/item/pipe(loc, make_from=src)
-		del(src)
+		qdel(src)

code/ATMOSPHERICS/components/binary_devices/volume_pump.dm

@@ -147,7 +147,7 @@ Thus, the two variables affect pump operation are set in New():
 		return
 	src.add_fingerprint(usr)
 	if(!src.allowed(user))
-		user << "\red Access denied."
+		user << "<span class='alert'>Access denied.</span>"
 		return
 	usr.set_machine(src)
 	interact(user)
@@ -175,20 +175,20 @@ Thus, the two variables affect pump operation are set in New():
 	if (!istype(W, /obj/item/weapon/wrench))
 		return ..()
 	if (!(stat & NOPOWER) && on)
-		user << "\red You cannot unwrench this [src], turn it off first."
+		user << "<span class='alert'>You cannot unwrench this [src], turn it off first.</span>"
 		return 1
 	var/datum/gas_mixture/int_air = return_air()
 	var/datum/gas_mixture/env_air = loc.return_air()
 	if ((int_air.return_pressure()-env_air.return_pressure()) > 2*ONE_ATMOSPHERE)
-		user << "\red You cannot unwrench this [src], it too exerted due to internal pressure."
+		user << "<span class='alert'>You cannot unwrench \the [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 << "\blue You begin to unfasten \the [src]..."
+	user << "<span class='notice'>You begin to unfasten \the [src]...</span>"
 	if (do_after(user, 40))
 		user.visible_message( \
 			"[user] unfastens \the [src].", \
-			"\blue You have unfastened \the [src].", \
-			"You hear ratchet.")
+			"<span class='notice'>You have unfastened \the [src].</span>", \
+			"You hear a ratchet.")
 		new /obj/item/pipe(loc, make_from=src)
-		del(src)
+		qdel(src)

code/ATMOSPHERICS/components/omni_devices/omni_base.dm

@@ -79,18 +79,18 @@
 		int_pressure += P.air.return_pressure()
 	var/datum/gas_mixture/env_air = loc.return_air()
 	if ((int_pressure - env_air.return_pressure()) > 2*ONE_ATMOSPHERE)
-		user << "<span class='warning'>You cannot unwrench [src], it is too exerted due to internal pressure.</span>"
+		user << "<span class='alert'>You cannot unwrench [src], it is too exerted due to internal pressure.</span>"
 		add_fingerprint(user)
 		return 1
-	user << "\blue You begin to unfasten \the [src]..."
+	user << "<span class='notice'>You begin to unfasten \the [src]...</span>"
 	playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1)
 	if(do_after(user, 40))
 		user.visible_message( \
 			"[user] unfastens \the [src].", \
-			"\blue You have unfastened \the [src].", \
+			"<span class='notice'>You have unfastened \the [src].</span>", \
 			"You hear a ratchet.")
 		new /obj/item/pipe(loc, make_from=src)
-		del(src)
+		qdel(src)
 
 /obj/machinery/atmospherics/omni/attack_hand(user as mob)
 	if(..())
@@ -283,7 +283,7 @@
 /obj/machinery/atmospherics/omni/disconnect(obj/machinery/atmospherics/reference)
 	for(var/datum/omni_port/P in ports)
 		if(reference == P.node)
-			del(P.network)
+			qdel(P.network)
 			P.node = null
 			P.update = 1
 			break

code/ATMOSPHERICS/components/portables_connector.dm

@@ -125,7 +125,7 @@
 
 /obj/machinery/atmospherics/portables_connector/disconnect(obj/machinery/atmospherics/reference)
 	if(reference==node)
-		del(network)
+		qdel(network)
 		node = null
 
 	update_underlays()
@@ -137,22 +137,22 @@
 	if (!istype(W, /obj/item/weapon/wrench))
 		return ..()
 	if (connected_device)
-		user << "\red You cannot unwrench this [src], detach [connected_device] first."
+		user << "<span class='alert'>You cannot unwrench this [src], detach [connected_device] first.</span>"
 		return 1
 	if (locate(/obj/machinery/portable_atmospherics, src.loc))
 		return 1
 	var/datum/gas_mixture/int_air = return_air()
 	var/datum/gas_mixture/env_air = loc.return_air()
 	if ((int_air.return_pressure()-env_air.return_pressure()) > 2*ONE_ATMOSPHERE)
-		user << "\red You cannot unwrench this [src], it too exerted due to internal pressure."
+		user << "<span class='alert'>You cannot unwrench \the [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 << "\blue You begin to unfasten \the [src]..."
+	user << "<span class='notice'>You begin to unfasten \the [src]...</span>"
 	if (do_after(user, 40))
 		user.visible_message( \
 			"[user] unfastens \the [src].", \
-			"\blue You have unfastened \the [src].", \
-			"You hear ratchet.")
+			"<span class='notice'>You have unfastened \the [src].</span>", \
+			"You hear a ratchet.")
 		new /obj/item/pipe(loc, make_from=src)
-		del(src)
+		qdel(src)

code/ATMOSPHERICS/components/trinary_devices/filter.dm

@@ -41,7 +41,7 @@ Filter types:
 		icon_state = "m"
 	else
 		icon_state = ""
-	
+
 	if(!powered())
 		icon_state += "off"
 	else if(node2 && node3 && node1)
@@ -162,18 +162,18 @@ Filter types:
 	var/datum/gas_mixture/int_air = return_air()
 	var/datum/gas_mixture/env_air = loc.return_air()
 	if ((int_air.return_pressure()-env_air.return_pressure()) > 2*ONE_ATMOSPHERE)
-		user << "\red You cannot unwrench this [src], it too exerted due to internal pressure."
+		user << "<span class='alert'>You cannot unwrench \the [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 << "\blue You begin to unfasten \the [src]..."
+	user << "<span class='notice'>You begin to unfasten \the [src]...</span>"
 	if (do_after(user, 40))
 		user.visible_message( \
 			"[user] unfastens \the [src].", \
-			"\blue You have unfastened \the [src].", \
-			"You hear ratchet.")
+			"<span class='notice'>You have unfastened \the [src].</span>", \
+			"You hear a ratchet.")
 		new /obj/item/pipe(loc, make_from=src)
-		del(src)
+		qdel(src)
 
 
 /obj/machinery/atmospherics/trinary/filter/attack_hand(user as mob) // -- TLE
@@ -181,7 +181,7 @@ Filter types:
 		return
 
 	if(!src.allowed(user))
-		user << "\red Access denied."
+		user << "<span class='alert'>Access denied.</span>"
 		return
 
 	var/dat
@@ -272,7 +272,7 @@ obj/machinery/atmospherics/trinary/filter/m_filter/New()
 
 /obj/machinery/atmospherics/trinary/filter/m_filter/initialize()
 	set_frequency(frequency)
-	
+
 	if(node1 && node2 && node3) return
 
 	var/node1_connect = turn(dir, -180)

code/ATMOSPHERICS/components/trinary_devices/mixer.dm

@@ -19,7 +19,7 @@
 		icon_state = "t"
 	else
 		icon_state = ""
-	
+
 	if(!powered())
 		icon_state += "off"
 	else if(node2 && node3 && node1)
@@ -120,25 +120,25 @@
 	var/datum/gas_mixture/int_air = return_air()
 	var/datum/gas_mixture/env_air = loc.return_air()
 	if ((int_air.return_pressure()-env_air.return_pressure()) > 2*ONE_ATMOSPHERE)
-		user << "\red You cannot unwrench this [src], it too exerted due to internal pressure."
+		user << "<span class='alert'>You cannot unwrench \the [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 << "\blue You begin to unfasten \the [src]..."
+	user << "<span class='notice'>You begin to unfasten \the [src]...</span>"
 	if (do_after(user, 40))
 		user.visible_message( \
 			"[user] unfastens \the [src].", \
-			"\blue You have unfastened \the [src].", \
-			"You hear ratchet.")
+			"<span class='notice'>You have unfastened \the [src].</span>", \
+			"You hear a ratchet.")
 		new /obj/item/pipe(loc, make_from=src)
-		del(src)
+		qdel(src)
 
 /obj/machinery/atmospherics/trinary/mixer/attack_hand(user as mob)
 	if(..())
 		return
 	src.add_fingerprint(usr)
 	if(!src.allowed(user))
-		user << "\red Access denied."
+		user << "<span class='alert'>Access denied.</span>"
 		return
 	usr.set_machine(src)
 	var/dat = {"<b>Power: </b><a href='?src=\ref[src];power=1'>[on?"On":"Off"]</a><br>
@@ -183,7 +183,7 @@
 	src.updateUsrDialog()
 	return
 
-obj/machinery/atmospherics/trinary/mixer/t_mixer
+/obj/machinery/atmospherics/trinary/mixer/t_mixer
 	icon_state = "tmap"
 
 	dir = SOUTH
@@ -191,7 +191,7 @@ obj/machinery/atmospherics/trinary/mixer/t_mixer
 
 	//node 3 is the outlet, nodes 1 & 2 are intakes
 
-obj/machinery/atmospherics/trinary/mixer/t_mixer/New()
+/obj/machinery/atmospherics/trinary/mixer/t_mixer/New()
 	..()
 	switch(dir)
 		if(NORTH)
@@ -203,7 +203,7 @@ obj/machinery/atmospherics/trinary/mixer/t_mixer/New()
 		if(WEST)
 			initialize_directions = WEST|NORTH|SOUTH
 
-obj/machinery/atmospherics/trinary/mixer/t_mixer/initialize()
+/obj/machinery/atmospherics/trinary/mixer/t_mixer/initialize()
 	if(node1 && node2 && node3) return
 
 	var/node1_connect = turn(dir, -90)
@@ -228,7 +228,7 @@ obj/machinery/atmospherics/trinary/mixer/t_mixer/initialize()
 	update_icon()
 	update_underlays()
 
-obj/machinery/atmospherics/trinary/mixer/m_mixer
+/obj/machinery/atmospherics/trinary/mixer/m_mixer
 	icon_state = "mmap"
 
 	dir = SOUTH
@@ -236,7 +236,7 @@ obj/machinery/atmospherics/trinary/mixer/m_mixer
 
 	//node 3 is the outlet, nodes 1 & 2 are intakes
 
-obj/machinery/atmospherics/trinary/mixer/m_mixer/New()
+/obj/machinery/atmospherics/trinary/mixer/m_mixer/New()
 	..()
 	switch(dir)
 		if(NORTH)
@@ -248,7 +248,7 @@ obj/machinery/atmospherics/trinary/mixer/m_mixer/New()
 		if(WEST)
 			initialize_directions = WEST|SOUTH|EAST
 
-obj/machinery/atmospherics/trinary/mixer/m_mixer/initialize()
+/obj/machinery/atmospherics/trinary/mixer/m_mixer/initialize()
 	if(node1 && node2 && node3) return
 
 	var/node1_connect = turn(dir, -180)

code/ATMOSPHERICS/components/trinary_devices/trinary_base.dm

@@ -1,4 +1,4 @@
-obj/machinery/atmospherics/trinary
+/obj/machinery/atmospherics/trinary
 	dir = SOUTH
 	initialize_directions = SOUTH|NORTH|WEST
 	use_power = 1
@@ -17,153 +17,153 @@ obj/machinery/atmospherics/trinary
 	var/datum/pipe_network/network2
 	var/datum/pipe_network/network3
 
-	New()
-		..()
-		switch(dir)
-			if(NORTH)
-				initialize_directions = EAST|NORTH|SOUTH
-			if(SOUTH)
-				initialize_directions = SOUTH|WEST|NORTH
-			if(EAST)
-				initialize_directions = EAST|WEST|SOUTH
-			if(WEST)
-				initialize_directions = WEST|NORTH|EAST
-		air1 = new
-		air2 = new
-		air3 = new
+/obj/machinery/atmospherics/trinary/New()
+	..()
+	switch(dir)
+		if(NORTH)
+			initialize_directions = EAST|NORTH|SOUTH
+		if(SOUTH)
+			initialize_directions = SOUTH|WEST|NORTH
+		if(EAST)
+			initialize_directions = EAST|WEST|SOUTH
+		if(WEST)
+			initialize_directions = WEST|NORTH|EAST
+	air1 = new
+	air2 = new
+	air3 = new
 
-		air1.volume = 200
-		air2.volume = 200
-		air3.volume = 200
+	air1.volume = 200
+	air2.volume = 200
+	air3.volume = 200
+
+/obj/machinery/atmospherics/trinary/Destroy()
+	loc = null
+
+	if(node1)
+		node1.disconnect(src)
+		qdel(network1)
+	if(node2)
+		node2.disconnect(src)
+		qdel(network2)
+	if(node3)
+		node3.disconnect(src)
+		qdel(network3)
+
+	node1 = null
+	node2 = null
+	node3 = null
+
+	return ..()
 
 // Housekeeping and pipe network stuff below
-	network_expand(datum/pipe_network/new_network, obj/machinery/atmospherics/pipe/reference)
-		if(reference == node1)
-			network1 = new_network
+/obj/machinery/atmospherics/trinary/network_expand(datum/pipe_network/new_network, obj/machinery/atmospherics/pipe/reference)
+	if(reference == node1)
+		network1 = new_network
 
-		else if(reference == node2)
-			network2 = new_network
+	else if(reference == node2)
+		network2 = new_network
 
-		else if (reference == node3)
-			network3 = new_network
+	else if (reference == node3)
+		network3 = new_network
 
-		if(new_network.normal_members.Find(src))
-			return 0
+	if(new_network.normal_members.Find(src))
+		return 0
 
-		new_network.normal_members += src
+	new_network.normal_members += src
 
-		return null
+	return null
 
-	Destroy()
-		loc = null
+/obj/machinery/atmospherics/trinary/initialize()
+	if(node1 && node2 && node3) return
 
-		if(node1)
-			node1.disconnect(src)
-			qdel(network1)
-		if(node2)
-			node2.disconnect(src)
-			qdel(network2)
-		if(node3)
-			node3.disconnect(src)
-			qdel(network3)
+	var/node1_connect = turn(dir, -180)
+	var/node2_connect = turn(dir, -90)
+	var/node3_connect = dir
 
+	for(var/obj/machinery/atmospherics/target in get_step(src,node1_connect))
+		if(target.initialize_directions & get_dir(target,src))
+			node1 = target
+			break
+
+	for(var/obj/machinery/atmospherics/target in get_step(src,node2_connect))
+		if(target.initialize_directions & get_dir(target,src))
+			node2 = target
+			break
+
+	for(var/obj/machinery/atmospherics/target in get_step(src,node3_connect))
+		if(target.initialize_directions & get_dir(target,src))
+			node3 = target
+			break
+
+	update_icon()
+	update_underlays()
+
+/obj/machinery/atmospherics/trinary/build_network()
+	if(!network1 && node1)
+		network1 = new /datum/pipe_network()
+		network1.normal_members += src
+		network1.build_network(node1, src)
+
+	if(!network2 && node2)
+		network2 = new /datum/pipe_network()
+		network2.normal_members += src
+		network2.build_network(node2, src)
+
+	if(!network3 && node3)
+		network3 = new /datum/pipe_network()
+		network3.normal_members += src
+		network3.build_network(node3, src)
+
+
+/obj/machinery/atmospherics/trinary/return_network(obj/machinery/atmospherics/reference)
+	build_network()
+
+	if(reference==node1)
+		return network1
+
+	if(reference==node2)
+		return network2
+
+	if(reference==node3)
+		return network3
+
+	return null
+
+/obj/machinery/atmospherics/trinary/reassign_network(datum/pipe_network/old_network, datum/pipe_network/new_network)
+	if(network1 == old_network)
+		network1 = new_network
+	if(network2 == old_network)
+		network2 = new_network
+	if(network3 == old_network)
+		network3 = new_network
+
+	return 1
+
+/obj/machinery/atmospherics/trinary/return_network_air(datum/pipe_network/reference)
+	var/list/results = list()
+
+	if(network1 == reference)
+		results += air1
+	if(network2 == reference)
+		results += air2
+	if(network3 == reference)
+		results += air3
+
+	return results
+
+/obj/machinery/atmospherics/trinary/disconnect(obj/machinery/atmospherics/reference)
+	if(reference==node1)
+		qdel(network1)
 		node1 = null
+
+	else if(reference==node2)
+		qdel(network2)
 		node2 = null
+
+	else if(reference==node3)
+		qdel(network3)
 		node3 = null
 
-		return ..()
+	update_underlays()
 
-	initialize()
-		if(node1 && node2 && node3) return
-
-		var/node1_connect = turn(dir, -180)
-		var/node2_connect = turn(dir, -90)
-		var/node3_connect = dir
-
-		for(var/obj/machinery/atmospherics/target in get_step(src,node1_connect))
-			if(target.initialize_directions & get_dir(target,src))
-				node1 = target
-				break
-
-		for(var/obj/machinery/atmospherics/target in get_step(src,node2_connect))
-			if(target.initialize_directions & get_dir(target,src))
-				node2 = target
-				break
-
-		for(var/obj/machinery/atmospherics/target in get_step(src,node3_connect))
-			if(target.initialize_directions & get_dir(target,src))
-				node3 = target
-				break
-
-		update_icon()
-		update_underlays()
-
-	build_network()
-		if(!network1 && node1)
-			network1 = new /datum/pipe_network()
-			network1.normal_members += src
-			network1.build_network(node1, src)
-
-		if(!network2 && node2)
-			network2 = new /datum/pipe_network()
-			network2.normal_members += src
-			network2.build_network(node2, src)
-
-		if(!network3 && node3)
-			network3 = new /datum/pipe_network()
-			network3.normal_members += src
-			network3.build_network(node3, src)
-
-
-	return_network(obj/machinery/atmospherics/reference)
-		build_network()
-
-		if(reference==node1)
-			return network1
-
-		if(reference==node2)
-			return network2
-
-		if(reference==node3)
-			return network3
-
-		return null
-
-	reassign_network(datum/pipe_network/old_network, datum/pipe_network/new_network)
-		if(network1 == old_network)
-			network1 = new_network
-		if(network2 == old_network)
-			network2 = new_network
-		if(network3 == old_network)
-			network3 = new_network
-
-		return 1
-
-	return_network_air(datum/pipe_network/reference)
-		var/list/results = list()
-
-		if(network1 == reference)
-			results += air1
-		if(network2 == reference)
-			results += air2
-		if(network3 == reference)
-			results += air3
-
-		return results
-
-	disconnect(obj/machinery/atmospherics/reference)
-		if(reference==node1)
-			del(network1)
-			node1 = null
-
-		else if(reference==node2)
-			del(network2)
-			node2 = null
-
-		else if(reference==node3)
-			del(network3)
-			node3 = null
-
-		update_underlays()
-
-		return null
+	return null

code/ATMOSPHERICS/components/tvalve.dm

@@ -128,9 +128,9 @@
 	update_icon()
 
 	if(network_node1)
-		del(network_node1)
+		qdel(network_node1)
 	if(network_node3)
-		del(network_node3)
+		qdel(network_node3)
 	build_network()
 
 	if(network_node1&&network_node2)
@@ -153,9 +153,9 @@
 	update_icon()
 
 	if(network_node1)
-		del(network_node1)
+		qdel(network_node1)
 	if(network_node2)
-		del(network_node2)
+		qdel(network_node2)
 	build_network()
 
 	if(network_node1&&network_node3)
@@ -271,15 +271,15 @@
 
 /obj/machinery/atmospherics/tvalve/disconnect(obj/machinery/atmospherics/reference)
 	if(reference==node1)
-		del(network_node1)
+		qdel(network_node1)
 		node1 = null
 
 	else if(reference==node2)
-		del(network_node2)
+		qdel(network_node2)
 		node2 = null
 
 	else if(reference==node3)
-		del(network_node3)
+		qdel(network_node3)
 		node2 = null
 
 	update_underlays()
@@ -317,7 +317,7 @@
 	if(!powered())
 		return
 	if(!src.allowed(user))
-		user << "\red Access denied."
+		user << "<span class='alert'>Access denied.</span>"
 		return
 	..()
 
@@ -359,23 +359,23 @@
 	if (!istype(W, /obj/item/weapon/wrench))
 		return ..()
 	if (istype(src, /obj/machinery/atmospherics/tvalve/digital))
-		user << "\red You cannot unwrench this [src], it's too complicated."
+		user << "<span class='alert'>You cannot unwrench this [src], it's too complicated.</span>"
 		return 1
 	var/datum/gas_mixture/int_air = return_air()
 	var/datum/gas_mixture/env_air = loc.return_air()
 	if ((int_air.return_pressure()-env_air.return_pressure()) > 2*ONE_ATMOSPHERE)
-		user << "\red You cannot unwrench this [src], it too exerted due to internal pressure."
+		user << "<span class='alert'>You cannot unwrench \the [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 << "\blue You begin to unfasten \the [src]..."
+	user << "<span class='notice'>You begin to unfasten \the [src]...</span>"
 	if (do_after(user, 40))
 		user.visible_message( \
 			"[user] unfastens \the [src].", \
-			"\blue You have unfastened \the [src].", \
-			"You hear ratchet.")
+			"<span class='notice'>You have unfastened \the [src].</span>", \
+			"You hear a ratchet.")
 		new /obj/item/pipe(loc, make_from=src)
-		del(src)
+		qdel(src)
 
 /obj/machinery/atmospherics/tvalve/mirrored
 	icon_state = "map_tvalvem0"
@@ -457,7 +457,7 @@
 	if(!powered())
 		return
 	if(!src.allowed(user))
-		user << "\red Access denied."
+		user << "<span class='alert'>Access denied.</span>"
 		return
 	..()
 

code/ATMOSPHERICS/components/unary/cold_sink.dm

@@ -12,30 +12,30 @@
 	var/current_temperature = T20C
 	var/current_heat_capacity = 50000 //totally random
 
-	update_icon()
-		if(node)
-			icon_state = "intact_[on?("on"):("off")]"
-		else
-			icon_state = "exposed"
+/obj/machinery/atmospherics/unary/cold_sink/update_icon()
+	if(node)
+		icon_state = "intact_[on?("on"):("off")]"
+	else
+		icon_state = "exposed"
 
-			on = 0
+		on = 0
 
-		return
+	return
 
-	process()
-		..()
-		if(!on || !network)
-			return 0
-		var/air_heat_capacity = air_contents.heat_capacity()
-		var/combined_heat_capacity = current_heat_capacity + air_heat_capacity
-		var/old_temperature = air_contents.temperature
+/obj/machinery/atmospherics/unary/cold_sink/process()
+	..()
+	if(!on || !network)
+		return 0
+	var/air_heat_capacity = air_contents.heat_capacity()
+	var/combined_heat_capacity = current_heat_capacity + air_heat_capacity
+	var/old_temperature = air_contents.temperature
 
-		if(combined_heat_capacity > 0)
-			var/combined_energy = current_temperature*current_heat_capacity + air_heat_capacity*air_contents.temperature
-			air_contents.temperature = combined_energy/combined_heat_capacity
+	if(combined_heat_capacity > 0)
+		var/combined_energy = current_temperature*current_heat_capacity + air_heat_capacity*air_contents.temperature
+		air_contents.temperature = combined_energy/combined_heat_capacity
 
-		//todo: have current temperature affected. require power to bring down current temperature again
+	//todo: have current temperature affected. require power to bring down current temperature again
 
-		if(abs(old_temperature-air_contents.temperature) > 1)
-			network.update = 1
-		return 1
+	if(abs(old_temperature-air_contents.temperature) > 1)
+		network.update = 1
+	return 1

code/ATMOSPHERICS/components/unary/generator_input.dm

@@ -8,14 +8,13 @@
 
 	var/update_cycle
 
-	update_icon()
-		if(node)
-			icon_state = "intact"
-		else
-			icon_state = "exposed"
+/obj/machinery/atmospherics/unary/generator_input/update_icon()
+	if(node)
+		icon_state = "intact"
+	else
+		icon_state = "exposed"
 
-		return
+	return
 
-	proc
-		return_exchange_air()
-			return air_contents
+/obj/machinery/atmospherics/unary/generator_input/proc/return_exchange_air()
+	return air_contents

code/ATMOSPHERICS/components/unary/heat_exchanger.dm

@@ -10,80 +10,80 @@
 	var/obj/machinery/atmospherics/unary/heat_exchanger/partner = null
 	var/update_cycle
 
-	update_icon()
-		if(node)
-			icon_state = "intact"
-		else
-			icon_state = "exposed"
+/obj/machinery/atmospherics/unary/heat_exchanger/update_icon()
+	if(node)
+		icon_state = "intact"
+	else
+		icon_state = "exposed"
 
-		return
+	return
 
-	initialize()
-		if(!partner)
-			var/partner_connect = turn(dir,180)
+/obj/machinery/atmospherics/unary/heat_exchanger/initialize()
+	if(!partner)
+		var/partner_connect = turn(dir,180)
 
-			for(var/obj/machinery/atmospherics/unary/heat_exchanger/target in get_step(src,partner_connect))
-				if(target.dir & get_dir(src,target))
-					partner = target
-					partner.partner = src
-					break
+		for(var/obj/machinery/atmospherics/unary/heat_exchanger/target in get_step(src,partner_connect))
+			if(target.dir & get_dir(src,target))
+				partner = target
+				partner.partner = src
+				break
 
-		..()
+	..()
 
-	process()
-		..()
-		if(!partner)
-			return 0
+/obj/machinery/atmospherics/unary/heat_exchanger/process()
+	..()
+	if(!partner)
+		return 0
 
-		if(!air_master || air_master.current_cycle <= update_cycle)
-			return 0
+	if(!air_master || air_master.current_cycle <= update_cycle)
+		return 0
 
-		update_cycle = air_master.current_cycle
-		partner.update_cycle = air_master.current_cycle
+	update_cycle = air_master.current_cycle
+	partner.update_cycle = air_master.current_cycle
 
-		var/air_heat_capacity = air_contents.heat_capacity()
-		var/other_air_heat_capacity = partner.air_contents.heat_capacity()
-		var/combined_heat_capacity = other_air_heat_capacity + air_heat_capacity
+	var/air_heat_capacity = air_contents.heat_capacity()
+	var/other_air_heat_capacity = partner.air_contents.heat_capacity()
+	var/combined_heat_capacity = other_air_heat_capacity + air_heat_capacity
 
-		var/old_temperature = air_contents.temperature
-		var/other_old_temperature = partner.air_contents.temperature
+	var/old_temperature = air_contents.temperature
+	var/other_old_temperature = partner.air_contents.temperature
 
-		if(combined_heat_capacity > 0)
-			var/combined_energy = partner.air_contents.temperature*other_air_heat_capacity + air_heat_capacity*air_contents.temperature
+	if(combined_heat_capacity > 0)
+		var/combined_energy = partner.air_contents.temperature*other_air_heat_capacity + air_heat_capacity*air_contents.temperature
 
-			var/new_temperature = combined_energy/combined_heat_capacity
-			air_contents.temperature = new_temperature
-			partner.air_contents.temperature = new_temperature
+		var/new_temperature = combined_energy/combined_heat_capacity
+		air_contents.temperature = new_temperature
+		partner.air_contents.temperature = new_temperature
 
-		if(network)
-			if(abs(old_temperature-air_contents.temperature) > 1)
-				network.update = 1
+	if(network)
+		if(abs(old_temperature-air_contents.temperature) > 1)
+			network.update = 1
 
-		if(partner.network)
-			if(abs(other_old_temperature-partner.air_contents.temperature) > 1)
-				partner.network.update = 1
+	if(partner.network)
+		if(abs(other_old_temperature-partner.air_contents.temperature) > 1)
+			partner.network.update = 1
 
+	return 1
+
+/obj/machinery/atmospherics/unary/heat_exchanger/attackby(var/obj/item/weapon/W as obj, var/mob/user as mob, params)
+	if (!istype(W, /obj/item/weapon/wrench))
+		return ..()
+	var/turf/T = src.loc
+	if (level==1 && isturf(T) && T.intact)
+		user << "<span class='alert'>You must remove the plating first.</span>"
 		return 1
-
-	attackby(var/obj/item/weapon/W as obj, var/mob/user as mob, params)
-		if (!istype(W, /obj/item/weapon/wrench))
-			return ..()
-		var/turf/T = src.loc
-		if (level==1 && isturf(T) && T.intact)
-			user << "\red You must remove the plating first."
-			return 1
-		var/datum/gas_mixture/int_air = return_air()
-		var/datum/gas_mixture/env_air = loc.return_air()
-		if ((int_air.return_pressure()-env_air.return_pressure()) > 2*ONE_ATMOSPHERE)
-			user << "\red You cannot unwrench this [src], it too exerted due to internal pressure."
-			add_fingerprint(user)
-			return 1
-		playsound(get_turf(src), 'sound/items/Ratchet.ogg', 50, 1)
-		user << "\blue You begin to unfasten \the [src]..."
-		if (do_after(user, 40))
-			user.visible_message( \
-				"[user] unfastens \the [src].", \
-				"\blue You have unfastened \the [src].", \
-				"You hear ratchet.")
-			new /obj/item/pipe(loc, make_from=src)
-			del(src)
+	var/datum/gas_mixture/int_air = return_air()
+	var/datum/gas_mixture/env_air = loc.return_air()
+	if ((int_air.return_pressure()-env_air.return_pressure()) > 2*ONE_ATMOSPHERE)
+		user << "<span class='alert'>You cannot unwrench \the [src], it is too exerted due to internal pressure.</span>"
+		add_fingerprint(user)
+		return 1
+	playsound(get_turf(src), 'sound/items/Ratchet.ogg', 50, 1)
+	user << "<span class='notice'>You begin to unfasten \the [src]...</span>"
+	if (do_after(user, 40))
+		user.visible_message( \
+			"[user] unfastens \the [src].", \
+			"<span class='notice'>You have unfastened \the [src].</span>", \
+			"You hear a ratchet.")
+		new /obj/item/pipe(loc, make_from=src)
+		qdel(src)

code/ATMOSPHERICS/components/unary/heat_source.dm

@@ -14,30 +14,30 @@
 	var/current_temperature = T20C
 	var/current_heat_capacity = 50000 //totally random
 
-	update_icon()
-		if(node)
-			icon_state = "intact_[on?("on"):("off")]"
-		else
-			icon_state = "exposed"
+/obj/machinery/atmospherics/unary/heat_reservoir/update_icon()
+	if(node)
+		icon_state = "intact_[on?("on"):("off")]"
+	else
+		icon_state = "exposed"
 
-			on = 0
+		on = 0
 
-		return
+	return
 
-	process()
-		..()
-		if(!on || !network)
-			return 0
-		var/air_heat_capacity = air_contents.heat_capacity()
-		var/combined_heat_capacity = current_heat_capacity + air_heat_capacity
-		var/old_temperature = air_contents.temperature
+/obj/machinery/atmospherics/unary/heat_reservoir/process()
+	..()
+	if(!on || !network)
+		return 0
+	var/air_heat_capacity = air_contents.heat_capacity()
+	var/combined_heat_capacity = current_heat_capacity + air_heat_capacity
+	var/old_temperature = air_contents.temperature
 
-		if(combined_heat_capacity > 0)
-			var/combined_energy = current_temperature*current_heat_capacity + air_heat_capacity*air_contents.temperature
-			air_contents.temperature = combined_energy/combined_heat_capacity
+	if(combined_heat_capacity > 0)
+		var/combined_energy = current_temperature*current_heat_capacity + air_heat_capacity*air_contents.temperature
+		air_contents.temperature = combined_energy/combined_heat_capacity
 
-		//todo: have current temperature affected. require power to bring up current temperature again
+	//todo: have current temperature affected. require power to bring up current temperature again
 
-		if(abs(old_temperature-air_contents.temperature) > 1)
-			network.update = 1
-		return 1
+	if(abs(old_temperature-air_contents.temperature) > 1)
+		network.update = 1
+	return 1

code/ATMOSPHERICS/components/unary/outlet_injector.dm

@@ -174,27 +174,27 @@
 	if (!istype(W, /obj/item/weapon/wrench))
 		return ..()
 	if (!(stat & NOPOWER) && on)
-		user << "\red You cannot unwrench this [src], turn it off first."
+		user << "<span class='alert'>You cannot unwrench this [src], turn it off first.</span>"
 		return 1
 	var/turf/T = src.loc
 	if (level==1 && isturf(T) && T.intact)
-		user << "\red You must remove the plating first."
+		user << "<span class='alert'>You must remove the plating first.</span>"
 		return 1
 	var/datum/gas_mixture/int_air = return_air()
 	var/datum/gas_mixture/env_air = loc.return_air()
 	if ((int_air.return_pressure()-env_air.return_pressure()) > 2*ONE_ATMOSPHERE)
-		user << "\red You cannot unwrench this [src], it too exerted due to internal pressure."
+		user << "<span class='alert'>You cannot unwrench \the [src], it is too exerted due to internal pressure.</span>"
 		add_fingerprint(user)
 		return 1
 	playsound(get_turf(src), 'sound/items/Ratchet.ogg', 50, 1)
-	user << "\blue You begin to unfasten \the [src]..."
+	user << "<span class='notice'>You begin to unfasten \the [src]...</span>"
 	if (do_after(user, 40))
 		user.visible_message( \
 			"[user] unfastens \the [src].", \
-			"\blue You have unfastened \the [src].", \
-			"You hear ratchet.")
+			"<span class='notice'>You have unfastened \the [src].</span>", \
+			"You hear a ratchet.")
 		new /obj/item/pipe(loc, make_from=src)
-		del(src)
+		qdel(src)
 
 /obj/machinery/atmospherics/unary/outlet_injector/interact(mob/user as mob)
 	update_multitool_menu(user)

code/ATMOSPHERICS/components/unary/oxygen_generator.dm

@@ -1,4 +1,4 @@
-obj/machinery/atmospherics/unary/oxygen_generator
+/obj/machinery/atmospherics/unary/oxygen_generator
 	icon = 'icons/obj/atmospherics/oxygen_generator.dmi'
 	icon_state = "intact_off"
 	density = 1
@@ -13,37 +13,37 @@ obj/machinery/atmospherics/unary/oxygen_generator
 
 	var/oxygen_content = 10
 
-	update_icon()
-		if(node)
-			icon_state = "intact_[on?("on"):("off")]"
-		else
-			icon_state = "exposed_off"
+/obj/machinery/atmospherics/unary/oxygen_generator/update_icon()
+	if(node)
+		icon_state = "intact_[on?("on"):("off")]"
+	else
+		icon_state = "exposed_off"
 
-			on = 0
+		on = 0
 
-		return
+	return
 
-	New()
-		..()
+/obj/machinery/atmospherics/unary/oxygen_generator/New()
+	..()
 
-		air_contents.volume = 50
+	air_contents.volume = 50
 
-	process()
-		..()
-		if(!on)
-			return 0
+/obj/machinery/atmospherics/unary/oxygen_generator/process()
+	..()
+	if(!on)
+		return 0
 
-		var/total_moles = air_contents.total_moles()
+	var/total_moles = air_contents.total_moles()
 
-		if(total_moles < oxygen_content)
-			var/current_heat_capacity = air_contents.heat_capacity()
+	if(total_moles < oxygen_content)
+		var/current_heat_capacity = air_contents.heat_capacity()
 
-			var/added_oxygen = oxygen_content - total_moles
+		var/added_oxygen = oxygen_content - total_moles
 
-			air_contents.temperature = (current_heat_capacity*air_contents.temperature + 20*added_oxygen*T0C)/(current_heat_capacity+20*added_oxygen)
-			air_contents.oxygen += added_oxygen
+		air_contents.temperature = (current_heat_capacity*air_contents.temperature + 20*added_oxygen*T0C)/(current_heat_capacity+20*added_oxygen)
+		air_contents.oxygen += added_oxygen
 
-			if(network)
-				network.update = 1
+		if(network)
+			network.update = 1
 
-		return 1
+	return 1

code/ATMOSPHERICS/components/unary/thermal_plate.dm

@@ -12,102 +12,101 @@
 	name = "Thermal Transfer Plate"
 	desc = "Transfers heat to and from an area"
 
-	update_icon()
-		var/prefix=""
-		//var/suffix="_idle" // Also available: _heat, _cool
-		if(level == 1 && istype(loc, /turf/simulated))
-			prefix="h"
-		icon_state = "[prefix]off"
+/obj/machinery/atmospherics/unary/thermal_plate/update_icon()
+	var/prefix=""
+	//var/suffix="_idle" // Also available: _heat, _cool
+	if(level == 1 && istype(loc, /turf/simulated))
+		prefix="h"
+	icon_state = "[prefix]off"
 
-	process()
-		..()
+/obj/machinery/atmospherics/unary/thermal_plate/process()
+	..()
 
-		var/datum/gas_mixture/environment = loc.return_air()
+	var/datum/gas_mixture/environment = loc.return_air()
 
-		//Get processable air sample and thermal info from environment
+	//Get processable air sample and thermal info from environment
 
-		var/transfer_moles = 0.25 * environment.total_moles()
-		var/datum/gas_mixture/external_removed = environment.remove(transfer_moles)
+	var/transfer_moles = 0.25 * environment.total_moles()
+	var/datum/gas_mixture/external_removed = environment.remove(transfer_moles)
 
-		if (!external_removed)
-			return radiate()
+	if (!external_removed)
+		return radiate()
 
-		if (external_removed.total_moles() < 10)
-			return radiate()
+	if (external_removed.total_moles() < 10)
+		return radiate()
 
-		//Get same info from connected gas
+	//Get same info from connected gas
 
-		var/internal_transfer_moles = 0.25 * air_contents.total_moles()
-		var/datum/gas_mixture/internal_removed = air_contents.remove(internal_transfer_moles)
+	var/internal_transfer_moles = 0.25 * air_contents.total_moles()
+	var/datum/gas_mixture/internal_removed = air_contents.remove(internal_transfer_moles)
 
-		if (!internal_removed)
-			environment.merge(external_removed)
-			return 1
-
-		var/combined_heat_capacity = internal_removed.heat_capacity() + external_removed.heat_capacity()
-		var/combined_energy = internal_removed.temperature * internal_removed.heat_capacity() + external_removed.heat_capacity() * external_removed.temperature
-
-		if(!combined_heat_capacity) combined_heat_capacity = 1
-		var/final_temperature = combined_energy / combined_heat_capacity
-
-		external_removed.temperature = final_temperature
+	if (!internal_removed)
 		environment.merge(external_removed)
-
-		internal_removed.temperature = final_temperature
-		air_contents.merge(internal_removed)
-
-		network.update = 1
-
 		return 1
 
-	hide(var/i) //to make the little pipe section invisible, the icon changes.
-		var/prefix=""
-		//var/suffix="_idle" // Also available: _heat, _cool
-		if(i == 1 && istype(loc, /turf/simulated))
-			prefix="h"
-		icon_state = "[prefix]off"
-		return
+	var/combined_heat_capacity = internal_removed.heat_capacity() + external_removed.heat_capacity()
+	var/combined_energy = internal_removed.temperature * internal_removed.heat_capacity() + external_removed.heat_capacity() * external_removed.temperature
 
-	attackby(var/obj/item/weapon/W as obj, var/mob/user as mob, params)
-		if (!istype(W, /obj/item/weapon/wrench))
-			return ..()
-		var/turf/T = src.loc
-		if (level==1 && isturf(T) && T.intact)
-			user << "\red You must remove the plating first."
-			return 1
-		var/datum/gas_mixture/int_air = return_air()
-		var/datum/gas_mixture/env_air = loc.return_air()
-		if ((int_air.return_pressure()-env_air.return_pressure()) > 2*ONE_ATMOSPHERE)
-			user << "\red You cannot unwrench this [src], it too exerted due to internal pressure."
-			add_fingerprint(user)
-			return 1
-		playsound(get_turf(src), 'sound/items/Ratchet.ogg', 50, 1)
-		user << "\blue You begin to unfasten \the [src]..."
-		if (do_after(user, 40))
-			user.visible_message( \
-				"[user] unfastens \the [src].", \
-				"\blue You have unfastened \the [src].", \
-				"You hear ratchet.")
-			new /obj/item/pipe(loc, make_from=src)
-			del(src)
+	if(!combined_heat_capacity) combined_heat_capacity = 1
+	var/final_temperature = combined_energy / combined_heat_capacity
 
-	proc/radiate()
+	external_removed.temperature = final_temperature
+	environment.merge(external_removed)
 
-		var/internal_transfer_moles = 0.25 * air_contents.total_moles()
-		var/datum/gas_mixture/internal_removed = air_contents.remove(internal_transfer_moles)
+	internal_removed.temperature = final_temperature
+	air_contents.merge(internal_removed)
 
-		if (!internal_removed)
-			return 1
+	network.update = 1
 
-		var/combined_heat_capacity = internal_removed.heat_capacity() + RADIATION_CAPACITY
-		var/combined_energy = internal_removed.temperature * internal_removed.heat_capacity() + (RADIATION_CAPACITY * 6.4)
+	return 1
 
-		var/final_temperature = combined_energy / combined_heat_capacity
+/obj/machinery/atmospherics/unary/thermal_plate/hide(var/i) //to make the little pipe section invisible, the icon changes.
+	var/prefix=""
+	//var/suffix="_idle" // Also available: _heat, _cool
+	if(i == 1 && istype(loc, /turf/simulated))
+		prefix="h"
+	icon_state = "[prefix]off"
+	return
 
-		internal_removed.temperature = final_temperature
-		air_contents.merge(internal_removed)
+/obj/machinery/atmospherics/unary/thermal_plate/attackby(var/obj/item/weapon/W as obj, var/mob/user as mob, params)
+	if (!istype(W, /obj/item/weapon/wrench))
+		return ..()
+	var/turf/T = src.loc
+	if (level==1 && isturf(T) && T.intact)
+		user << "<span class='alert'>You must remove the plating first.</span>"
+		return 1
+	var/datum/gas_mixture/int_air = return_air()
+	var/datum/gas_mixture/env_air = loc.return_air()
+	if ((int_air.return_pressure()-env_air.return_pressure()) > 2*ONE_ATMOSPHERE)
+		user << "<span class='alert'>You cannot unwrench \the [src], it is too exerted due to internal pressure.</span>"
+		add_fingerprint(user)
+		return 1
+	playsound(get_turf(src), 'sound/items/Ratchet.ogg', 50, 1)
+	user << "<span class='notice'>You begin to unfasten \the [src]...</span>"
+	if (do_after(user, 40))
+		user.visible_message( \
+			"[user] unfastens \the [src].", \
+			"<span class='notice'>You have unfastened \the [src].</span>", \
+			"You hear a ratchet.")
+		new /obj/item/pipe(loc, make_from=src)
+		qdel(src)
 
-		if (network)
-			network.update = 1
+/obj/machinery/atmospherics/unary/thermal_plate/proc/radiate()
+	var/internal_transfer_moles = 0.25 * air_contents.total_moles()
+	var/datum/gas_mixture/internal_removed = air_contents.remove(internal_transfer_moles)
 
-		return 1
+	if (!internal_removed)
+		return 1
+
+	var/combined_heat_capacity = internal_removed.heat_capacity() + RADIATION_CAPACITY
+	var/combined_energy = internal_removed.temperature * internal_removed.heat_capacity() + (RADIATION_CAPACITY * 6.4)
+
+	var/final_temperature = combined_energy / combined_heat_capacity
+
+	internal_removed.temperature = final_temperature
+	air_contents.merge(internal_removed)
+
+	if (network)
+		network.update = 1
+
+	return 1

code/ATMOSPHERICS/components/unary/unary_base.dm

@@ -9,88 +9,88 @@
 
 	var/datum/pipe_network/network
 
-	New()
-		..()
-		initialize_directions = dir
-		air_contents = new
+/obj/machinery/atmospherics/unary/New()
+	..()
+	initialize_directions = dir
+	air_contents = new
 
-		air_contents.volume = 200
+	air_contents.volume = 200
+
+/obj/machinery/atmospherics/unary/Destroy()
+	loc = null
+
+	if(node)
+		node.disconnect(src)
+		qdel(network)
+
+	node = null
+
+	return ..()
 
 // Housekeeping and pipe network stuff below
-	network_expand(datum/pipe_network/new_network, obj/machinery/atmospherics/pipe/reference)
-		if(reference == node)
-			network = new_network
+/obj/machinery/atmospherics/unary/network_expand(datum/pipe_network/new_network, obj/machinery/atmospherics/pipe/reference)
+	if(reference == node)
+		network = new_network
 
-		if(new_network.normal_members.Find(src))
-			return 0
+	if(new_network.normal_members.Find(src))
+		return 0
 
-		new_network.normal_members += src
+	new_network.normal_members += src
 
-		return null
+	return null
 
-	Destroy()
-		loc = null
+/obj/machinery/atmospherics/unary/initialize()
+	if(node) return
 
-		if(node)
-			node.disconnect(src)
-			qdel(network)
+	var/node_connect = dir
 
+	for(var/obj/machinery/atmospherics/target in get_step(src,node_connect))
+		if(target.initialize_directions & get_dir(target,src))
+			var/c = check_connect_types(target,src)
+			if (c)
+				target.connected_to = c
+				src.connected_to = c
+				node = target
+				break
+
+	update_icon()
+	update_underlays()
+
+/obj/machinery/atmospherics/unary/build_network()
+	if(!network && node)
+		network = new /datum/pipe_network()
+		network.normal_members += src
+		network.build_network(node, src)
+
+
+/obj/machinery/atmospherics/unary/return_network(obj/machinery/atmospherics/reference)
+	build_network()
+
+	if(reference == node || reference == src)
+		return network
+
+	return null
+
+/obj/machinery/atmospherics/unary/reassign_network(datum/pipe_network/old_network, datum/pipe_network/new_network)
+	if(network == old_network)
+		network = new_network
+
+	return 1
+
+/obj/machinery/atmospherics/unary/return_network_air(datum/pipe_network/reference)
+	var/list/results = list()
+
+	if(network == reference)
+		results += air_contents
+
+	return results
+
+/obj/machinery/atmospherics/unary/disconnect(obj/machinery/atmospherics/reference)
+	if(reference==node)
+		qdel(network)
 		node = null
 
-		return ..()
+	update_icon()
+	update_underlays()
 
-	initialize()
-		if(node) return
-
-		var/node_connect = dir
-
-		for(var/obj/machinery/atmospherics/target in get_step(src,node_connect))
-			if(target.initialize_directions & get_dir(target,src))
-				var/c = check_connect_types(target,src)
-				if (c)
-					target.connected_to = c
-					src.connected_to = c
-					node = target
-					break
-
-		update_icon()
-		update_underlays()
-
-	build_network()
-		if(!network && node)
-			network = new /datum/pipe_network()
-			network.normal_members += src
-			network.build_network(node, src)
-
-
-	return_network(obj/machinery/atmospherics/reference)
-		build_network()
-
-		if(reference == node || reference == src)
-			return network
-
-		return null
-
-	reassign_network(datum/pipe_network/old_network, datum/pipe_network/new_network)
-		if(network == old_network)
-			network = new_network
-
-		return 1
-
-	return_network_air(datum/pipe_network/reference)
-		var/list/results = list()
-
-		if(network == reference)
-			results += air_contents
-
-		return results
-
-	disconnect(obj/machinery/atmospherics/reference)
-		if(reference==node)
-			del(network)
-			node = null
-
-		update_icon()
-		update_underlays()
-
-		return null
+	return null

code/ATMOSPHERICS/components/unary/vent_pump.dm

@@ -324,7 +324,7 @@
 	if(istype(W, /obj/item/weapon/weldingtool))
 		var/obj/item/weapon/weldingtool/WT = W
 		if (WT.remove_fuel(0,user))
-			user << "\blue Now welding the vent."
+			user << "<span class='notice'>Now welding the vent.</span>"
 			if(do_after(user, 20))
 				if(!src || !WT.isOn()) return
 				playsound(src.loc, 'sound/items/Welder2.ogg', 50, 1)
@@ -338,9 +338,9 @@
 					update_icon()
 			else
 
-				user << "\blue The welding tool needs to be on to start this task."
+				user << "<span class='notice'>The welding tool needs to be on to start this task.</span>"
 		else
-			user << "\blue You need more welding fuel to complete this task."
+			user << "<span class='notice'>You need more welding fuel to complete this task.</span>"
 			return 1
 	else if(istype(W, /obj/item/device/multitool))
 		update_multitool_menu(user)
@@ -399,25 +399,25 @@
 	if (!istype(W, /obj/item/weapon/wrench))
 		return ..()
 	if (!(stat & NOPOWER) && on)
-		user << "\red You cannot unwrench this [src], turn it off first."
+		user << "<span class='alert'>You cannot unwrench this [src], turn it off first.</span>"
 		return 1
 	var/turf/T = src.loc
 	if (node && node.level==1 && isturf(T) && T.intact)
-		user << "\red You must remove the plating first."
+		user << "<span class='alert'>You must remove the plating first.</span>"
 		return 1
 	var/datum/gas_mixture/int_air = return_air()
 	var/datum/gas_mixture/env_air = loc.return_air()
 	if ((int_air.return_pressure()-env_air.return_pressure()) > 2*ONE_ATMOSPHERE)
-		user << "\red You cannot unwrench this [src], it too exerted due to internal pressure."
+		user << "<span class='alert'>You cannot unwrench \the [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 << "\blue You begin to unfasten \the [src]..."
+	user << "<span class='notice'>You begin to unfasten \the [src]...</span>"
 	if (do_after(user, 40))
 		user.visible_message( \
 			"[user] unfastens \the [src].", \
-			"\blue You have unfastened \the [src].", \
-			"You hear ratchet.")
+			"<span class='notice'>You have unfastened \the [src].</span>", \
+			"You hear a ratchet.")
 		new /obj/item/pipe(loc, make_from=src)
 		qdel(src)
 

code/ATMOSPHERICS/components/unary/vent_scrubber.dm

@@ -348,25 +348,25 @@
 	if (!istype(W, /obj/item/weapon/wrench))
 		return ..()
 	if (!(stat & NOPOWER) && on)
-		user << "\red You cannot unwrench this [src], turn it off first."
+		user << "<span class='alert'>You cannot unwrench this [src], turn it off first.</span>"
 		return 1
 	var/turf/T = src.loc
 	if (node && node.level==1 && isturf(T) && T.intact)
-		user << "\red You must remove the plating first."
+		user << "<span class='alert'>You must remove the plating first.</span>"
 		return 1
 	var/datum/gas_mixture/int_air = return_air()
 	var/datum/gas_mixture/env_air = loc.return_air()
 	if ((int_air.return_pressure()-env_air.return_pressure()) > 2*ONE_ATMOSPHERE)
-		user << "\red You cannot unwrench this [src], it too exerted due to internal pressure."
+		user << "<span class='alert'>You cannot unwrench \the [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 << "\blue You begin to unfasten \the [src]..."
+	user << "<span class='notice'>You begin to unfasten \the [src]...</span>"
 	if (do_after(user, 40))
 		user.visible_message( \
 			"[user] unfastens \the [src].", \
-			"\blue You have unfastened \the [src].", \
-			"You hear ratchet.")
+			"<span class='notice'>You have unfastened \the [src].</span>", \
+			"You hear a ratchet.")
 		new /obj/item/pipe(loc, make_from=src)
 		qdel(src)
 

code/ATMOSPHERICS/components/valve.dm

@@ -115,9 +115,9 @@
 	update_icon()
 
 	if(network_node1)
-		del(network_node1)
+		qdel(network_node1)
 	if(network_node2)
-		del(network_node2)
+		qdel(network_node2)
 
 	build_network()
 
@@ -222,11 +222,11 @@
 
 /obj/machinery/atmospherics/valve/disconnect(obj/machinery/atmospherics/reference)
 	if(reference==node1)
-		del(network_node1)
+		qdel(network_node1)
 		node1 = null
 
 	else if(reference==node2)
-		del(network_node2)
+		qdel(network_node2)
 		node2 = null
 
 	update_underlays()
@@ -250,7 +250,7 @@
 	if(!powered())
 		return
 	if(!src.allowed(user))
-		user << "\red Access denied."
+		user << "<span class='alert'>Access denied.</span>"
 		return
 	..()
 
@@ -319,18 +319,18 @@
 	var/datum/gas_mixture/int_air = return_air()
 	var/datum/gas_mixture/env_air = loc.return_air()
 	if ((int_air.return_pressure()-env_air.return_pressure()) > 2*ONE_ATMOSPHERE)
-		user << "\red You cannot unwrench this [src], it too exerted due to internal pressure."
+		user << "<span class='alert'>You cannot unwrench \the [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 << "\blue You begin to unfasten \the [src]..."
+	user << "<span class='notice'>You begin to unfasten \the [src]...</span>"
 	if (do_after(user, 40))
 		user.visible_message( \
 			"[user] unfastens \the [src].", \
-			"\blue You have unfastened \the [src].", \
-			"You hear ratchet.")
+			"<span class='notice'>You have unfastened \the [src].</span>", \
+			"You hear a ratchet.")
 		new /obj/item/pipe(loc, make_from=src)
-		del(src)
+		qdel(src)
 
 /obj/machinery/atmospherics/valve/digital/multitool_menu(var/mob/user,var/obj/item/device/multitool/P)
 	return {"

code/ATMOSPHERICS/datum_pipe_network.dm

@@ -1,6 +1,6 @@
 var/global/list/datum/pipe_network/pipe_networks = list()
 
-datum/pipe_network
+/datum/pipe_network
 	var/list/datum/gas_mixture/gases = list() //All of the gas_mixtures continuously connected in this network
 
 	var/list/obj/machinery/atmospherics/normal_members = list()
@@ -10,134 +10,134 @@ datum/pipe_network
 	var/update = 1
 	var/datum/gas_mixture/air_transient = null
 
-	New()
-		air_transient = new()
+/datum/pipe_network/New()
+	air_transient = new()
 
-		..()
+	..()
 
-	proc/process()
-		//Equalize gases amongst pipe if called for
-		if(update)
-			update = 0
-			reconcile_air() //equalize_gases(gases)
+/datum/pipe_network/proc/process()
+	//Equalize gases amongst pipe if called for
+	if(update)
+		update = 0
+		reconcile_air() //equalize_gases(gases)
 
-		//Give pipelines their process call for pressure checking and what not. Have to remove pressure checks for the time being as pipes dont radiate heat - Mport
-		//for(var/datum/pipeline/line_member in line_members)
-		//	line_member.process()
+	//Give pipelines their process call for pressure checking and what not. Have to remove pressure checks for the time being as pipes dont radiate heat - Mport
+	//for(var/datum/pipeline/line_member in line_members)
+	//	line_member.process()
 
-	proc/build_network(obj/machinery/atmospherics/start_normal, obj/machinery/atmospherics/reference)
-		//Purpose: Generate membership roster
-		//Notes: Assuming that members will add themselves to appropriate roster in network_expand()
+/datum/pipe_network/proc/build_network(obj/machinery/atmospherics/start_normal, obj/machinery/atmospherics/reference)
+	//Purpose: Generate membership roster
+	//Notes: Assuming that members will add themselves to appropriate roster in network_expand()
 
-		if(!start_normal)
-			qdel(src)
+	if(!start_normal)
+		qdel(src)
 
-		start_normal.network_expand(src, reference)
+	start_normal.network_expand(src, reference)
 
-		update_network_gases()
+	update_network_gases()
+
+	if((normal_members.len>0)||(line_members.len>0))
+		pipe_networks += src
+	else
+		qdel(src)
+
+/datum/pipe_network/proc/merge(datum/pipe_network/giver)
+	if(giver==src) return 0
+
+	normal_members |= giver.normal_members
+
+	line_members |= giver.line_members
+
+	for(var/obj/machinery/atmospherics/normal_member in giver.normal_members)
+		normal_member.reassign_network(giver, src)
+
+	for(var/datum/pipeline/line_member in giver.line_members)
+		line_member.network = src
+
+	update_network_gases()
+	return 1
+
+/datum/pipe_network/proc/update_network_gases()
+	//Go through membership roster and make sure gases is up to date
+
+	gases = list()
+
+	for(var/obj/machinery/atmospherics/normal_member in normal_members)
+		var/result = normal_member.return_network_air(src)
+		if(result) gases += result
+
+	for(var/datum/pipeline/line_member in line_members)
+		gases += line_member.air
+
+/datum/pipe_network/proc/reconcile_air()
+	//Perfectly equalize all gases members instantly
+
+	//Calculate totals from individual components
+	var/total_thermal_energy = 0
+	var/total_heat_capacity = 0
+
+	air_transient.volume = 0
+
+	air_transient.oxygen = 0
+	air_transient.nitrogen = 0
+	air_transient.toxins = 0
+	air_transient.carbon_dioxide = 0
+
+
+	air_transient.trace_gases = list()
+
+	for(var/datum/gas_mixture/gas in gases)
+		air_transient.volume += gas.volume
+		var/temp_heatcap = gas.heat_capacity()
+		total_thermal_energy += gas.temperature*temp_heatcap
+		total_heat_capacity += temp_heatcap
+
+		air_transient.oxygen += gas.oxygen
+		air_transient.nitrogen += gas.nitrogen
+		air_transient.toxins += gas.toxins
+		air_transient.carbon_dioxide += gas.carbon_dioxide
+
+		if(gas.trace_gases.len)
+			for(var/datum/gas/trace_gas in gas.trace_gases)
+				var/datum/gas/corresponding = locate(trace_gas.type) in air_transient.trace_gases
+				if(!corresponding)
+					corresponding = new trace_gas.type()
+					air_transient.trace_gases += corresponding
+
+				corresponding.moles += trace_gas.moles
+
+	if(air_transient.volume > 0)
+
+		if(total_heat_capacity > 0)
+			air_transient.temperature = total_thermal_energy/total_heat_capacity
+
+			//Allow air mixture to react
+			if(air_transient.react())
+				update = 1
 
-		if((normal_members.len>0)||(line_members.len>0))
-			pipe_networks += src
 		else
-			qdel(src)
-
-	proc/merge(datum/pipe_network/giver)
-		if(giver==src) return 0
-
-		normal_members |= giver.normal_members
-
-		line_members |= giver.line_members
-
-		for(var/obj/machinery/atmospherics/normal_member in giver.normal_members)
-			normal_member.reassign_network(giver, src)
-
-		for(var/datum/pipeline/line_member in giver.line_members)
-			line_member.network = src
-
-		update_network_gases()
-		return 1
-
-	proc/update_network_gases()
-		//Go through membership roster and make sure gases is up to date
-
-		gases = list()
-
-		for(var/obj/machinery/atmospherics/normal_member in normal_members)
-			var/result = normal_member.return_network_air(src)
-			if(result) gases += result
-
-		for(var/datum/pipeline/line_member in line_members)
-			gases += line_member.air
-
-	proc/reconcile_air()
-		//Perfectly equalize all gases members instantly
-
-		//Calculate totals from individual components
-		var/total_thermal_energy = 0
-		var/total_heat_capacity = 0
-
-		air_transient.volume = 0
-
-		air_transient.oxygen = 0
-		air_transient.nitrogen = 0
-		air_transient.toxins = 0
-		air_transient.carbon_dioxide = 0
-
-
-		air_transient.trace_gases = list()
+			air_transient.temperature = 0
 
+		//Update individual gas_mixtures by volume ratio
 		for(var/datum/gas_mixture/gas in gases)
-			air_transient.volume += gas.volume
-			var/temp_heatcap = gas.heat_capacity()
-			total_thermal_energy += gas.temperature*temp_heatcap
-			total_heat_capacity += temp_heatcap
+			gas.oxygen = air_transient.oxygen*gas.volume/air_transient.volume
+			gas.nitrogen = air_transient.nitrogen*gas.volume/air_transient.volume
+			gas.toxins = air_transient.toxins*gas.volume/air_transient.volume
+			gas.carbon_dioxide = air_transient.carbon_dioxide*gas.volume/air_transient.volume
 
-			air_transient.oxygen += gas.oxygen
-			air_transient.nitrogen += gas.nitrogen
-			air_transient.toxins += gas.toxins
-			air_transient.carbon_dioxide += gas.carbon_dioxide
+			gas.temperature = air_transient.temperature
 
-			if(gas.trace_gases.len)
-				for(var/datum/gas/trace_gas in gas.trace_gases)
-					var/datum/gas/corresponding = locate(trace_gas.type) in air_transient.trace_gases
+			if(air_transient.trace_gases.len)
+				for(var/datum/gas/trace_gas in air_transient.trace_gases)
+					var/datum/gas/corresponding = locate(trace_gas.type) in gas.trace_gases
 					if(!corresponding)
 						corresponding = new trace_gas.type()
-						air_transient.trace_gases += corresponding
+						gas.trace_gases += corresponding
 
-					corresponding.moles += trace_gas.moles
+					corresponding.moles = trace_gas.moles*gas.volume/air_transient.volume
+	return 1
 
-		if(air_transient.volume > 0)
-
-			if(total_heat_capacity > 0)
-				air_transient.temperature = total_thermal_energy/total_heat_capacity
-
-				//Allow air mixture to react
-				if(air_transient.react())
-					update = 1
-
-			else
-				air_transient.temperature = 0
-
-			//Update individual gas_mixtures by volume ratio
-			for(var/datum/gas_mixture/gas in gases)
-				gas.oxygen = air_transient.oxygen*gas.volume/air_transient.volume
-				gas.nitrogen = air_transient.nitrogen*gas.volume/air_transient.volume
-				gas.toxins = air_transient.toxins*gas.volume/air_transient.volume
-				gas.carbon_dioxide = air_transient.carbon_dioxide*gas.volume/air_transient.volume
-
-				gas.temperature = air_transient.temperature
-
-				if(air_transient.trace_gases.len)
-					for(var/datum/gas/trace_gas in air_transient.trace_gases)
-						var/datum/gas/corresponding = locate(trace_gas.type) in gas.trace_gases
-						if(!corresponding)
-							corresponding = new trace_gas.type()
-							gas.trace_gases += corresponding
-
-						corresponding.moles = trace_gas.moles*gas.volume/air_transient.volume
-		return 1
-
-proc/equalize_gases(datum/gas_mixture/list/gases)
+/proc/equalize_gases(datum/gas_mixture/list/gases)
 	//Perfectly equalize all gases members instantly
 
 	//Calculate totals from individual components

code/ATMOSPHERICS/datum_pipeline.dm

@@ -1,6 +1,6 @@
 #define STEFAN_BOLTZMANN_CONSTANT 0.0000000567
 
-datum/pipeline
+/datum/pipeline
 	var/datum/gas_mixture/air
 
 	var/list/obj/machinery/atmospherics/pipe/members
@@ -10,187 +10,187 @@ datum/pipeline
 
 	var/alert_pressure = 0
 
-	Destroy()
-		if(network)
-			qdel(network)
+/datum/pipeline/Destroy()
+	if(network)
+		qdel(network)
 
-		if(air && air.volume)
-			temporarily_store_air()
-			qdel(air)
+	if(air && air.volume)
+		temporarily_store_air()
+		qdel(air)
 
-		return ..()
+	return ..()
 
-	proc/process()//This use to be called called from the pipe networks
-
-		//Check to see if pressure is within acceptable limits
-		var/pressure = air.return_pressure()
-		if(pressure > alert_pressure)
-			for(var/obj/machinery/atmospherics/pipe/member in members)
-				if(!member.check_pressure(pressure))
-					break //Only delete 1 pipe per process
-
-		//Allow for reactions
-		//air.react() //Should be handled by pipe_network now
-
-	proc/temporarily_store_air()
-		//Update individual gas_mixtures by volume ratio
+/datum/pipeline/proc/process()//This use to be called called from the pipe networks
 
+	//Check to see if pressure is within acceptable limits
+	var/pressure = air.return_pressure()
+	if(pressure > alert_pressure)
 		for(var/obj/machinery/atmospherics/pipe/member in members)
-			member.air_temporary = new
-			member.air_temporary.volume = member.volume
+			if(!member.check_pressure(pressure))
+				break //Only delete 1 pipe per process
 
-			member.air_temporary.oxygen = air.oxygen*member.volume/air.volume
-			member.air_temporary.nitrogen = air.nitrogen*member.volume/air.volume
-			member.air_temporary.toxins = air.toxins*member.volume/air.volume
-			member.air_temporary.carbon_dioxide = air.carbon_dioxide*member.volume/air.volume
+	//Allow for reactions
+	//air.react() //Should be handled by pipe_network now
 
-			member.air_temporary.temperature = air.temperature
+/datum/pipeline/proc/temporarily_store_air()
+	//Update individual gas_mixtures by volume ratio
 
-			if(air.trace_gases.len)
-				for(var/datum/gas/trace_gas in air.trace_gases)
-					var/datum/gas/corresponding = new trace_gas.type()
-					member.air_temporary.trace_gases += corresponding
+	for(var/obj/machinery/atmospherics/pipe/member in members)
+		member.air_temporary = new
+		member.air_temporary.volume = member.volume
 
-					corresponding.moles = trace_gas.moles*member.volume/air.volume
+		member.air_temporary.oxygen = air.oxygen*member.volume/air.volume
+		member.air_temporary.nitrogen = air.nitrogen*member.volume/air.volume
+		member.air_temporary.toxins = air.toxins*member.volume/air.volume
+		member.air_temporary.carbon_dioxide = air.carbon_dioxide*member.volume/air.volume
 
-	proc/build_pipeline(obj/machinery/atmospherics/pipe/base)
+		member.air_temporary.temperature = air.temperature
+
+		if(air.trace_gases.len)
+			for(var/datum/gas/trace_gas in air.trace_gases)
+				var/datum/gas/corresponding = new trace_gas.type()
+				member.air_temporary.trace_gases += corresponding
+
+				corresponding.moles = trace_gas.moles*member.volume/air.volume
+
+/datum/pipeline/proc/build_pipeline(obj/machinery/atmospherics/pipe/base)
+	air = new
+
+	var/list/possible_expansions = list(base)
+	members = list(base)
+	edges = list()
+
+	var/volume = base.volume
+	base.parent = src
+	alert_pressure = base.alert_pressure
+
+	if(base.air_temporary)
+		air = base.air_temporary
+		base.air_temporary = null
+	else
 		air = new
 
-		var/list/possible_expansions = list(base)
-		members = list(base)
-		edges = list()
+	while(possible_expansions.len>0)
+		for(var/obj/machinery/atmospherics/pipe/borderline in possible_expansions)
 
-		var/volume = base.volume
-		base.parent = src
-		alert_pressure = base.alert_pressure
+			var/list/result = borderline.pipeline_expansion()
+			var/edge_check = result.len
 
-		if(base.air_temporary)
-			air = base.air_temporary
-			base.air_temporary = null
-		else
-			air = new
+			if(result.len>0)
+				for(var/obj/machinery/atmospherics/pipe/item in result)
+					if(!members.Find(item))
+						members += item
+						possible_expansions += item
 
-		while(possible_expansions.len>0)
-			for(var/obj/machinery/atmospherics/pipe/borderline in possible_expansions)
+						volume += item.volume
+						item.parent = src
 
-				var/list/result = borderline.pipeline_expansion()
-				var/edge_check = result.len
+						alert_pressure = min(alert_pressure, item.alert_pressure)
 
-				if(result.len>0)
-					for(var/obj/machinery/atmospherics/pipe/item in result)
-						if(!members.Find(item))
-							members += item
-							possible_expansions += item
+						if(item.air_temporary)
+							air.merge(item.air_temporary)
 
-							volume += item.volume
-							item.parent = src
+					edge_check--
 
-							alert_pressure = min(alert_pressure, item.alert_pressure)
+			if(edge_check>0)
+				edges += borderline
 
-							if(item.air_temporary)
-								air.merge(item.air_temporary)
+			possible_expansions -= borderline
 
-						edge_check--
+	air.volume = volume
 
-				if(edge_check>0)
-					edges += borderline
+/datum/pipeline/proc/network_expand(datum/pipe_network/new_network, obj/machinery/atmospherics/pipe/reference)
 
-				possible_expansions -= borderline
+	if(new_network.line_members.Find(src))
+		return 0
 
-		air.volume = volume
+	new_network.line_members += src
 
-	proc/network_expand(datum/pipe_network/new_network, obj/machinery/atmospherics/pipe/reference)
+	network = new_network
 
-		if(new_network.line_members.Find(src))
-			return 0
+	for(var/obj/machinery/atmospherics/pipe/edge in edges)
+		for(var/obj/machinery/atmospherics/result in edge.pipeline_expansion())
+			if(!istype(result,/obj/machinery/atmospherics/pipe) && (result!=reference))
+				result.network_expand(new_network, edge)
 
-		new_network.line_members += src
+	return 1
 
-		network = new_network
+/datum/pipeline/proc/return_network(obj/machinery/atmospherics/reference)
+	if(!network)
+		network = new /datum/pipe_network()
+		network.build_network(src, null)
+			//technically passing these parameters should not be allowed
+			//however pipe_network.build_network(..) and pipeline.network_extend(...)
+			//		were setup to properly handle this case
 
-		for(var/obj/machinery/atmospherics/pipe/edge in edges)
-			for(var/obj/machinery/atmospherics/result in edge.pipeline_expansion())
-				if(!istype(result,/obj/machinery/atmospherics/pipe) && (result!=reference))
-					result.network_expand(new_network, edge)
+	return network
 
-		return 1
+/datum/pipeline/proc/mingle_with_turf(turf/simulated/target, mingle_volume)
+	var/datum/gas_mixture/air_sample = air.remove_ratio(mingle_volume/air.volume)
+	air_sample.volume = mingle_volume
 
-	proc/return_network(obj/machinery/atmospherics/reference)
-		if(!network)
-			network = new /datum/pipe_network()
-			network.build_network(src, null)
-				//technically passing these parameters should not be allowed
-				//however pipe_network.build_network(..) and pipeline.network_extend(...)
-				//		were setup to properly handle this case
+	var/datum/gas_mixture/turf_air = target.return_air()
 
-		return network
+	equalize_gases(list(air_sample, turf_air))
+	air.merge(air_sample)
+	//turf_air already modified by equalize_gases()
 
-	proc/mingle_with_turf(turf/simulated/target, mingle_volume)
-		var/datum/gas_mixture/air_sample = air.remove_ratio(mingle_volume/air.volume)
-		air_sample.volume = mingle_volume
+	if(istype(target))
+		if(target.air)
+			if(target.air.check_tile_graphic())
+				target.update_visuals(target.air)
+	if(network)
+		network.update = 1
 
-		var/datum/gas_mixture/turf_air = target.return_air()
+/datum/pipeline/proc/temperature_interact(turf/target, share_volume, thermal_conductivity)
+	var/total_heat_capacity = air.heat_capacity()
+	var/partial_heat_capacity = total_heat_capacity*(share_volume/air.volume)
 
-		equalize_gases(list(air_sample, turf_air))
-		air.merge(air_sample)
-		//turf_air already modified by equalize_gases()
+	if(istype(target, /turf/simulated))
+		var/turf/simulated/modeled_location = target
 
-		if(istype(target))
-			if(target.air)
-				if(target.air.check_tile_graphic())
-					target.update_visuals(target.air)
-		if(network)
-			network.update = 1
+		if(modeled_location.blocks_air)
 
-	proc/temperature_interact(turf/target, share_volume, thermal_conductivity)
-		var/total_heat_capacity = air.heat_capacity()
-		var/partial_heat_capacity = total_heat_capacity*(share_volume/air.volume)
-
-		if(istype(target, /turf/simulated))
-			var/turf/simulated/modeled_location = target
-
-			if(modeled_location.blocks_air)
-
-				if((modeled_location.heat_capacity>0) && (partial_heat_capacity>0))
-					var/delta_temperature = air.temperature - modeled_location.temperature
-
-					var/heat = thermal_conductivity*delta_temperature* \
-						(partial_heat_capacity*modeled_location.heat_capacity/(partial_heat_capacity+modeled_location.heat_capacity))
-
-					air.temperature -= heat/total_heat_capacity
-					modeled_location.temperature += heat/modeled_location.heat_capacity
-
-			else
-				var/delta_temperature = 0
-				var/sharer_heat_capacity = 0
-
-				delta_temperature = (air.temperature - modeled_location.air.temperature)
-				sharer_heat_capacity = modeled_location.air.heat_capacity()
-
-				var/self_temperature_delta = 0
-				var/sharer_temperature_delta = 0
-
-				if((sharer_heat_capacity>0) && (partial_heat_capacity>0))
-					var/heat = thermal_conductivity*delta_temperature* \
-						(partial_heat_capacity*sharer_heat_capacity/(partial_heat_capacity+sharer_heat_capacity))
-
-					self_temperature_delta = -heat/total_heat_capacity
-					sharer_temperature_delta = heat/sharer_heat_capacity
-				else
-					return 1
-
-				air.temperature += self_temperature_delta
-
-				modeled_location.air.temperature += sharer_temperature_delta
-
-
-		else
-			if((target.heat_capacity>0) && (partial_heat_capacity>0))
-				var/delta_temperature = air.temperature - target.temperature
+			if((modeled_location.heat_capacity>0) && (partial_heat_capacity>0))
+				var/delta_temperature = air.temperature - modeled_location.temperature
 
 				var/heat = thermal_conductivity*delta_temperature* \
-					(partial_heat_capacity*target.heat_capacity/(partial_heat_capacity+target.heat_capacity))
+					(partial_heat_capacity*modeled_location.heat_capacity/(partial_heat_capacity+modeled_location.heat_capacity))
 
 				air.temperature -= heat/total_heat_capacity
-		if(network)
-			network.update = 1
+				modeled_location.temperature += heat/modeled_location.heat_capacity
+
+		else
+			var/delta_temperature = 0
+			var/sharer_heat_capacity = 0
+
+			delta_temperature = (air.temperature - modeled_location.air.temperature)
+			sharer_heat_capacity = modeled_location.air.heat_capacity()
+
+			var/self_temperature_delta = 0
+			var/sharer_temperature_delta = 0
+
+			if((sharer_heat_capacity>0) && (partial_heat_capacity>0))
+				var/heat = thermal_conductivity*delta_temperature* \
+					(partial_heat_capacity*sharer_heat_capacity/(partial_heat_capacity+sharer_heat_capacity))
+
+				self_temperature_delta = -heat/total_heat_capacity
+				sharer_temperature_delta = heat/sharer_heat_capacity
+			else
+				return 1
+
+			air.temperature += self_temperature_delta
+
+			modeled_location.air.temperature += sharer_temperature_delta
+
+
+	else
+		if((target.heat_capacity>0) && (partial_heat_capacity>0))
+			var/delta_temperature = air.temperature - target.temperature
+
+			var/heat = thermal_conductivity*delta_temperature* \
+				(partial_heat_capacity*target.heat_capacity/(partial_heat_capacity+target.heat_capacity))
+
+			air.temperature -= heat/total_heat_capacity
+	if(network)
+		network.update = 1

code/ATMOSPHERICS/he_pipes.dm

@@ -1,119 +0,0 @@
-
-/obj/machinery/atmospherics/pipe/simple/heat_exchanging
-	icon = 'icons/atmos/heat.dmi'
-	icon_state = "intact"
-	pipe_icon = "hepipe"
-	level = 2
-	var/initialize_directions_he
-	var/surface = 2
-
-	minimum_temperature_difference = 20
-	thermal_conductivity = OPEN_HEAT_TRANSFER_COEFFICIENT
-
-/obj/machinery/atmospherics/pipe/simple/heat_exchanging/process()
-	if(!parent)
-		..()
-	else
-		var/environment_temperature = 0
-		if(istype(loc, /turf/simulated/))
-			if(loc:blocks_air)
-				environment_temperature = loc:temperature
-			else
-				var/datum/gas_mixture/environment = loc.return_air()
-				environment_temperature = environment.temperature
-		else
-			environment_temperature = loc:temperature
-		var/datum/gas_mixture/pipe_air = return_air()
-		if(abs(environment_temperature-pipe_air.temperature) > minimum_temperature_difference)
-			parent.temperature_interact(loc, volume, thermal_conductivity)
-
-
-
-// BubbleWrap
-/obj/machinery/atmospherics/pipe/simple/heat_exchanging/New()
-	..()
-	initialize_directions_he = initialize_directions	// The auto-detection from /pipe is good enough for a simple HE pipe
-	// BubbleWrap END
-
-/obj/machinery/atmospherics/pipe/simple/heat_exchanging/initialize()
-	normalize_dir()
-	var/node1_dir
-	var/node2_dir
-
-	for(var/direction in cardinal)
-		if(direction&initialize_directions_he)
-			if (!node1_dir)
-				node1_dir = direction
-			else if (!node2_dir)
-				node2_dir = direction
-
-	for(var/obj/machinery/atmospherics/pipe/simple/heat_exchanging/target in get_step(src,node1_dir))
-		if(target.initialize_directions_he & get_dir(target,src))
-			node1 = target
-			break
-	for(var/obj/machinery/atmospherics/pipe/simple/heat_exchanging/target in get_step(src,node2_dir))
-		if(target.initialize_directions_he & get_dir(target,src))
-			node2 = target
-			break
-
-	if(!node1 && !node2)
-		del(src)
-		return
-
-	update_icon()
-	return
-
-
-/obj/machinery/atmospherics/pipe/simple/heat_exchanging/hidden
-	level=1
-	icon_state="intact-f"
-
-/////////////////////////////////
-// JUNCTION
-/////////////////////////////////
-/obj/machinery/atmospherics/pipe/simple/heat_exchanging/junction
-	icon = 'icons/atmos/junction.dmi'
-	icon_state = "intact"
-	pipe_icon = "hejunction"
-	level = 2
-	minimum_temperature_difference = 300
-	thermal_conductivity = WALL_HEAT_TRANSFER_COEFFICIENT
-
-	// BubbleWrap
-/obj/machinery/atmospherics/pipe/simple/heat_exchanging/junction/New()
-	.. ()
-	switch ( dir )
-		if ( SOUTH )
-			initialize_directions = NORTH
-			initialize_directions_he = SOUTH
-		if ( NORTH )
-			initialize_directions = SOUTH
-			initialize_directions_he = NORTH
-		if ( EAST )
-			initialize_directions = WEST
-			initialize_directions_he = EAST
-		if ( WEST )
-			initialize_directions = EAST
-			initialize_directions_he = WEST
-	// BubbleWrap END
-
-/obj/machinery/atmospherics/pipe/simple/heat_exchanging/junction/initialize()
-	for(var/obj/machinery/atmospherics/target in get_step(src,initialize_directions))
-		if(target.initialize_directions & get_dir(target,src))
-			node1 = target
-			break
-	for(var/obj/machinery/atmospherics/pipe/simple/heat_exchanging/target in get_step(src,initialize_directions_he))
-		if(target.initialize_directions_he & get_dir(target,src))
-			node2 = target
-			break
-
-	if(!node1 && !node2)
-		qdel(src)
-		return
-
-	update_icon()
-	return
-
-/obj/machinery/atmospherics/pipe/simple/heat_exchanging/junction/hidden
-	level=1
-	icon_state="intact-f"

code/ATMOSPHERICS/mainspipe.dm

@@ -649,7 +649,7 @@ obj/machinery/atmospherics/mains_pipe/valve
 
 		attack_hand(mob/user as mob)
 			if(!src.allowed(user))
-				user << "\red Access denied."
+				user << "<span class='alert>Access denied.</span>"
 				return
 			..()
 

code/ATMOSPHERICS/pipes/cap.dm

@@ -0,0 +1,122 @@
+/obj/machinery/atmospherics/pipe/cap
+	name = "pipe endcap"
+	desc = "An endcap for pipes"
+	icon = 'icons/atmos/pipes.dmi'
+	icon_state = "cap"
+	level = 2
+	layer = 2.4 //under wires with their 2.44
+
+	volume = 35
+
+	dir = SOUTH
+	initialize_directions = SOUTH
+
+	var/obj/machinery/atmospherics/node
+
+/obj/machinery/atmospherics/pipe/cap/New()
+	..()
+	initialize_directions = dir
+
+/obj/machinery/atmospherics/pipe/cap/hide(var/i)
+	if(level == 1 && istype(loc, /turf/simulated))
+		invisibility = i ? 101 : 0
+	update_icon()
+
+/obj/machinery/atmospherics/pipe/cap/pipeline_expansion()
+	return list(node)
+
+/obj/machinery/atmospherics/pipe/cap/process()
+	if(!parent)
+		..()
+	else
+		. = PROCESS_KILL
+/obj/machinery/atmospherics/pipe/cap/Destroy()
+	if(node)
+		node.disconnect(src)
+
+	return ..()
+
+/obj/machinery/atmospherics/pipe/cap/disconnect(obj/machinery/atmospherics/reference)
+	if(reference == node)
+		if(istype(node, /obj/machinery/atmospherics/pipe))
+			qdel(parent)
+		node = null
+
+	update_icon()
+
+	..()
+
+/obj/machinery/atmospherics/pipe/cap/change_color(var/new_color)
+	..()
+	//for updating connected atmos device pipes (i.e. vents, manifolds, etc)
+	if(node)
+		node.update_underlays()
+
+/obj/machinery/atmospherics/pipe/cap/update_icon(var/safety = 0)
+	if(!check_icon_cache())
+		return
+
+	alpha = 255
+
+	overlays.Cut()
+	overlays += icon_manager.get_atmos_icon("pipe", , pipe_color, "cap" + icon_connect_type)
+
+/obj/machinery/atmospherics/pipe/cap/initialize()
+	for(var/obj/machinery/atmospherics/target in get_step(src, dir))
+		if(target.initialize_directions & get_dir(target,src))
+			var/c = check_connect_types(target,src)
+			if (c)
+				target.connected_to = c
+				src.connected_to = c
+				node = target
+				break
+
+	var/turf/T = get_turf(src)			// hide if turf is not intact
+	if(!istype(T)) return
+	hide(T.intact)
+	update_icon()
+
+/obj/machinery/atmospherics/pipe/cap/visible
+	level = 2
+	icon_state = "cap"
+
+/obj/machinery/atmospherics/pipe/cap/visible/scrubbers
+	name = "scrubbers pipe endcap"
+	desc = "An endcap for scrubbers pipes"
+	icon_state = "cap-scrubbers"
+	connect_types = list(3)
+	layer = 2.38
+	icon_connect_type = "-scrubbers"
+	color = PIPE_COLOR_RED
+
+/obj/machinery/atmospherics/pipe/cap/visible/supply
+	name = "supply pipe endcap"
+	desc = "An endcap for supply pipes"
+	icon_state = "cap-supply"
+	connect_types = list(2)
+	layer = 2.39
+	icon_connect_type = "-supply"
+	color = PIPE_COLOR_BLUE
+
+/obj/machinery/atmospherics/pipe/cap/hidden
+	level = 1
+	icon_state = "cap"
+	alpha = 128
+
+/obj/machinery/atmospherics/pipe/cap/hidden/scrubbers
+	name = "scrubbers pipe endcap"
+	desc = "An endcap for scrubbers pipes"
+	icon_state = "cap-scrubbers"
+	connect_types = list(3)
+	layer = 2.38
+	icon_connect_type = "-scrubbers"
+	color = PIPE_COLOR_RED
+
+/obj/machinery/atmospherics/pipe/cap/hidden/supply
+	name = "supply pipe endcap"
+	desc = "An endcap for supply pipes"
+	icon_state = "cap-supply"
+	connect_types = list(2)
+	layer = 2.39
+	icon_connect_type = "-supply"
+	color = PIPE_COLOR_BLUE

code/ATMOSPHERICS/pipes/manifold.dm

@@ -0,0 +1,251 @@
+/obj/machinery/atmospherics/pipe/manifold
+	icon = 'icons/atmos/manifold.dmi'
+	icon_state = ""
+	name = "pipe manifold"
+	desc = "A manifold composed of regular pipes"
+
+	volume = 105
+
+	dir = SOUTH
+	initialize_directions = EAST|NORTH|WEST
+
+	var/obj/machinery/atmospherics/node1
+	var/obj/machinery/atmospherics/node2
+	var/obj/machinery/atmospherics/node3
+
+	level = 1
+	layer = 2.4 //under wires with their 2.44
+
+/obj/machinery/atmospherics/pipe/manifold/New()
+	..()
+	alpha = 255
+	icon = null
+
+	switch(dir)
+		if(NORTH)
+			initialize_directions = EAST|SOUTH|WEST
+		if(SOUTH)
+			initialize_directions = WEST|NORTH|EAST
+		if(EAST)
+			initialize_directions = SOUTH|WEST|NORTH
+		if(WEST)
+			initialize_directions = NORTH|EAST|SOUTH
+
+/obj/machinery/atmospherics/pipe/manifold/hide(var/i)
+	if(level == 1 && istype(loc, /turf/simulated))
+		invisibility = i ? 101 : 0
+	update_icon()
+
+/obj/machinery/atmospherics/pipe/manifold/pipeline_expansion()
+	return list(node1, node2, node3)
+
+/obj/machinery/atmospherics/pipe/manifold/process()
+	if(!parent)
+		..()
+	else
+		. = PROCESS_KILL
+
+/obj/machinery/atmospherics/pipe/manifold/Destroy()
+	if(node1)
+		node1.disconnect(src)
+	if(node2)
+		node2.disconnect(src)
+	if(node3)
+		node3.disconnect(src)
+
+	return ..()
+
+/obj/machinery/atmospherics/pipe/manifold/disconnect(obj/machinery/atmospherics/reference)
+	if(reference == node1)
+		if(istype(node1, /obj/machinery/atmospherics/pipe))
+			qdel(parent)
+		node1 = null
+
+	if(reference == node2)
+		if(istype(node2, /obj/machinery/atmospherics/pipe))
+			qdel(parent)
+		node2 = null
+
+	if(reference == node3)
+		if(istype(node3, /obj/machinery/atmospherics/pipe))
+			qdel(parent)
+		node3 = null
+
+	update_icon()
+
+	..()
+
+/obj/machinery/atmospherics/pipe/manifold/change_color(var/new_color)
+	..()
+	//for updating connected atmos device pipes (i.e. vents, manifolds, etc)
+	if(node1)
+		node1.update_underlays()
+	if(node2)
+		node2.update_underlays()
+	if(node3)
+		node3.update_underlays()
+
+/obj/machinery/atmospherics/pipe/manifold/update_icon(var/safety = 0)
+	if(!check_icon_cache())
+		return
+
+	alpha = 255
+
+	if(!node1 && !node2 && !node3)
+		var/turf/T = get_turf(src)
+		new /obj/item/pipe(loc, make_from=src)
+		for (var/obj/machinery/meter/meter in T)
+			if (meter.target == src)
+				new /obj/item/pipe_meter(T)
+				qdel(meter)
+		qdel(src)
+	else
+		overlays.Cut()
+		overlays += icon_manager.get_atmos_icon("manifold", , pipe_color, "core" + icon_connect_type)
+		overlays += icon_manager.get_atmos_icon("manifold", , , "clamps" + icon_connect_type)
+		underlays.Cut()
+
+		var/turf/T = get_turf(src)
+		if(!istype(T)) return
+		var/list/directions = list(NORTH, SOUTH, EAST, WEST)
+		var/node1_direction = get_dir(src, node1)
+		var/node2_direction = get_dir(src, node2)
+		var/node3_direction = get_dir(src, node3)
+
+		directions -= dir
+
+		directions -= add_underlay(T,node1,node1_direction,icon_connect_type)
+		directions -= add_underlay(T,node2,node2_direction,icon_connect_type)
+		directions -= add_underlay(T,node3,node3_direction,icon_connect_type)
+
+		for(var/D in directions)
+			add_underlay(T,,D,icon_connect_type)
+
+/obj/machinery/atmospherics/pipe/manifold/update_underlays()
+	..()
+	update_icon()
+
+/obj/machinery/atmospherics/pipe/manifold/initialize()
+	var/connect_directions = (NORTH|SOUTH|EAST|WEST)&(~dir)
+
+	for(var/direction in cardinal)
+		if(direction&connect_directions)
+			for(var/obj/machinery/atmospherics/target in get_step(src,direction))
+				if(target.initialize_directions & get_dir(target,src))
+					var/c = check_connect_types(target,src)
+					if (c)
+						target.connected_to = c
+						src.connected_to = c
+						node1 = target
+						connect_directions &= ~direction
+						break
+			if (node1)
+				break
+
+
+	for(var/direction in cardinal)
+		if(direction&connect_directions)
+			for(var/obj/machinery/atmospherics/target in get_step(src,direction))
+				if(target.initialize_directions & get_dir(target,src))
+					var/c = check_connect_types(target,src)
+					if (c)
+						target.connected_to = c
+						src.connected_to = c
+						node2 = target
+						connect_directions &= ~direction
+						break
+			if (node2)
+				break
+
+
+	for(var/direction in cardinal)
+		if(direction&connect_directions)
+			for(var/obj/machinery/atmospherics/target in get_step(src,direction))
+				if(target.initialize_directions & get_dir(target,src))
+					var/c = check_connect_types(target,src)
+					if (c)
+						target.connected_to = c
+						src.connected_to = c
+						node3 = target
+						connect_directions &= ~direction
+						break
+			if (node3)
+				break
+
+	if(!node1 && !node2 && !node3)
+		qdel(src)
+		return
+
+	var/turf/T = get_turf(src)
+	if(istype(T))
+		hide(T.intact)
+	update_icon()
+
+/obj/machinery/atmospherics/pipe/manifold/visible
+	icon_state = "map"
+	level = 2
+
+/obj/machinery/atmospherics/pipe/manifold/visible/scrubbers
+	name="Scrubbers pipe manifold"
+	desc = "A manifold composed of scrubbers pipes"
+	icon_state = "map-scrubbers"
+	connect_types = list(3)
+	layer = 2.38
+	icon_connect_type = "-scrubbers"
+	color = PIPE_COLOR_RED
+
+/obj/machinery/atmospherics/pipe/manifold/visible/supply
+	name="Air supply pipe manifold"
+	desc = "A manifold composed of supply pipes"
+	icon_state = "map-supply"
+	connect_types = list(2)
+	layer = 2.39
+	icon_connect_type = "-supply"
+	color = PIPE_COLOR_BLUE
+
+/obj/machinery/atmospherics/pipe/manifold/visible/yellow
+	color = PIPE_COLOR_YELLOW
+
+/obj/machinery/atmospherics/pipe/manifold/visible/cyan
+	color = PIPE_COLOR_CYAN
+
+/obj/machinery/atmospherics/pipe/manifold/visible/green
+	color = PIPE_COLOR_GREEN
+
+/obj/machinery/atmospherics/pipe/manifold/visible/purple
+	color = PIPE_COLOR_PURPLE
+
+/obj/machinery/atmospherics/pipe/manifold/hidden
+	icon_state = "map"
+	level = 1
+	alpha = 128		//set for the benefit of mapping - this is reset to opaque when the pipe is spawned in game
+
+/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers
+	name="Scrubbers pipe manifold"
+	desc = "A manifold composed of scrubbers pipes"
+	icon_state = "map-scrubbers"
+	connect_types = list(3)
+	layer = 2.38
+	icon_connect_type = "-scrubbers"
+	color = PIPE_COLOR_RED
+
+/obj/machinery/atmospherics/pipe/manifold/hidden/supply
+	name="Air supply pipe manifold"
+	desc = "A manifold composed of supply pipes"
+	icon_state = "map-supply"
+	connect_types = list(2)
+	layer = 2.39
+	icon_connect_type = "-supply"
+	color = PIPE_COLOR_BLUE
+
+/obj/machinery/atmospherics/pipe/manifold/hidden/yellow
+	color = PIPE_COLOR_YELLOW
+
+/obj/machinery/atmospherics/pipe/manifold/hidden/cyan
+	color = PIPE_COLOR_CYAN
+
+/obj/machinery/atmospherics/pipe/manifold/hidden/green
+	color = PIPE_COLOR_GREEN
+
+/obj/machinery/atmospherics/pipe/manifold/hidden/purple
+	color = PIPE_COLOR_PURPLE

code/ATMOSPHERICS/pipes/manifold4w.dm

@@ -0,0 +1,256 @@
+/obj/machinery/atmospherics/pipe/manifold4w
+	icon = 'icons/atmos/manifold.dmi'
+	icon_state = ""
+	name = "4-way pipe manifold"
+	desc = "A manifold composed of regular pipes"
+
+	volume = 140
+
+	dir = SOUTH
+	initialize_directions = NORTH|SOUTH|EAST|WEST
+
+	var/obj/machinery/atmospherics/node1
+	var/obj/machinery/atmospherics/node2
+	var/obj/machinery/atmospherics/node3
+	var/obj/machinery/atmospherics/node4
+
+	level = 1
+	layer = 2.4 //under wires with their 2.44
+
+/obj/machinery/atmospherics/pipe/manifold4w/New()
+	..()
+	alpha = 255
+	icon = null
+
+/obj/machinery/atmospherics/pipe/manifold4w/pipeline_expansion()
+	return list(node1, node2, node3, node4)
+
+/obj/machinery/atmospherics/pipe/manifold4w/process()
+	if(!parent)
+		..()
+	else
+		. = PROCESS_KILL
+
+/obj/machinery/atmospherics/pipe/manifold4w/Destroy()
+	if(node1)
+		node1.disconnect(src)
+	if(node2)
+		node2.disconnect(src)
+	if(node3)
+		node3.disconnect(src)
+	if(node4)
+		node4.disconnect(src)
+
+	return ..()
+
+/obj/machinery/atmospherics/pipe/manifold4w/disconnect(obj/machinery/atmospherics/reference)
+	if(reference == node1)
+		if(istype(node1, /obj/machinery/atmospherics/pipe))
+			qdel(parent)
+		node1 = null
+
+	if(reference == node2)
+		if(istype(node2, /obj/machinery/atmospherics/pipe))
+			qdel(parent)
+		node2 = null
+
+	if(reference == node3)
+		if(istype(node3, /obj/machinery/atmospherics/pipe))
+			qdel(parent)
+		node3 = null
+
+	if(reference == node4)
+		if(istype(node4, /obj/machinery/atmospherics/pipe))
+			qdel(parent)
+		node4 = null
+
+	update_icon()
+
+	..()
+
+/obj/machinery/atmospherics/pipe/manifold4w/change_color(var/new_color)
+	..()
+	//for updating connected atmos device pipes (i.e. vents, manifolds, etc)
+	if(node1)
+		node1.update_underlays()
+	if(node2)
+		node2.update_underlays()
+	if(node3)
+		node3.update_underlays()
+	if(node4)
+		node4.update_underlays()
+
+/obj/machinery/atmospherics/pipe/manifold4w/update_icon(var/safety = 0)
+	if(!check_icon_cache())
+		return
+
+	alpha = 255
+
+	if(!node1 && !node2 && !node3 && !node4)
+		var/turf/T = get_turf(src)
+		new /obj/item/pipe(loc, make_from=src)
+		for (var/obj/machinery/meter/meter in T)
+			if (meter.target == src)
+				new /obj/item/pipe_meter(T)
+				qdel(meter)
+		qdel(src)
+	else
+		overlays.Cut()
+		overlays += icon_manager.get_atmos_icon("manifold", , pipe_color, "4way" + icon_connect_type)
+		overlays += icon_manager.get_atmos_icon("manifold", , , "clamps_4way" + icon_connect_type)
+		underlays.Cut()
+
+		/*
+		var/list/directions = list(NORTH, SOUTH, EAST, WEST)
+
+		directions -= add_underlay(node1)
+		directions -= add_underlay(node2)
+		directions -= add_underlay(node3)
+		directions -= add_underlay(node4)
+
+		for(var/D in directions)
+			add_underlay(,D)
+		*/
+
+		var/turf/T = get_turf(src)
+		if(!istype(T)) return
+		var/list/directions = list(NORTH, SOUTH, EAST, WEST)
+		var/node1_direction = get_dir(src, node1)
+		var/node2_direction = get_dir(src, node2)
+		var/node3_direction = get_dir(src, node3)
+		var/node4_direction = get_dir(src, node4)
+
+		directions -= dir
+
+		directions -= add_underlay(T,node1,node1_direction,icon_connect_type)
+		directions -= add_underlay(T,node2,node2_direction,icon_connect_type)
+		directions -= add_underlay(T,node3,node3_direction,icon_connect_type)
+		directions -= add_underlay(T,node4,node4_direction,icon_connect_type)
+
+		for(var/D in directions)
+			add_underlay(T,,D,icon_connect_type)
+
+/obj/machinery/atmospherics/pipe/manifold4w/update_underlays()
+	..()
+	update_icon()
+
+/obj/machinery/atmospherics/pipe/manifold4w/hide(var/i)
+	if(level == 1 && istype(loc, /turf/simulated))
+		invisibility = i ? 101 : 0
+	update_icon()
+
+/obj/machinery/atmospherics/pipe/manifold4w/initialize()
+
+	for(var/obj/machinery/atmospherics/target in get_step(src,1))
+		if(target.initialize_directions & 2)
+			var/c = check_connect_types(target,src)
+			if (c)
+				target.connected_to = c
+				src.connected_to = c
+				node1 = target
+				break
+
+	for(var/obj/machinery/atmospherics/target in get_step(src,2))
+		if(target.initialize_directions & 1)
+			var/c = check_connect_types(target,src)
+			if (c)
+				target.connected_to = c
+				src.connected_to = c
+				node2 = target
+				break
+
+	for(var/obj/machinery/atmospherics/target in get_step(src,4))
+		if(target.initialize_directions & 8)
+			var/c = check_connect_types(target,src)
+			if (c)
+				target.connected_to = c
+				src.connected_to = c
+				node3 = target
+				break
+
+	for(var/obj/machinery/atmospherics/target in get_step(src,8))
+		if(target.initialize_directions & 4)
+			var/c = check_connect_types(target,src)
+			if (c)
+				target.connected_to = c
+				src.connected_to = c
+				node4 = target
+				break
+
+	if(!node1 && !node2 && !node3&& !node4)
+		qdel(src)
+		return
+
+	var/turf/T = get_turf(src)
+	if(istype(T))
+		hide(T.intact)
+	update_icon()
+
+/obj/machinery/atmospherics/pipe/manifold4w/visible
+	icon_state = "map_4way"
+	level = 2
+
+/obj/machinery/atmospherics/pipe/manifold4w/visible/scrubbers
+	name="4-way scrubbers pipe manifold"
+	desc = "A manifold composed of scrubbers pipes"
+	icon_state = "map_4way-scrubbers"
+	connect_types = list(3)
+	layer = 2.38
+	icon_connect_type = "-scrubbers"
+	color = PIPE_COLOR_RED
+
+/obj/machinery/atmospherics/pipe/manifold4w/visible/supply
+	name="4-way air supply pipe manifold"
+	desc = "A manifold composed of supply pipes"
+	icon_state = "map_4way-supply"
+	connect_types = list(2)
+	layer = 2.39
+	icon_connect_type = "-supply"
+	color = PIPE_COLOR_BLUE
+
+/obj/machinery/atmospherics/pipe/manifold4w/visible/yellow
+	color = PIPE_COLOR_YELLOW
+
+/obj/machinery/atmospherics/pipe/manifold4w/visible/cyan
+	color = PIPE_COLOR_CYAN
+
+/obj/machinery/atmospherics/pipe/manifold4w/visible/green
+	color = PIPE_COLOR_GREEN
+
+/obj/machinery/atmospherics/pipe/manifold4w/visible/purple
+	color = PIPE_COLOR_PURPLE
+
+/obj/machinery/atmospherics/pipe/manifold4w/hidden
+	icon_state = "map_4way"
+	level = 1
+	alpha = 128		//set for the benefit of mapping - this is reset to opaque when the pipe is spawned in game
+
+/obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers
+	name="4-way scrubbers pipe manifold"
+	desc = "A manifold composed of scrubbers pipes"
+	icon_state = "map_4way-scrubbers"
+	connect_types = list(3)
+	layer = 2.38
+	icon_connect_type = "-scrubbers"
+	color = PIPE_COLOR_RED
+
+/obj/machinery/atmospherics/pipe/manifold4w/hidden/supply
+	name="4-way air supply pipe manifold"
+	desc = "A manifold composed of supply pipes"
+	icon_state = "map_4way-supply"
+	connect_types = list(2)
+	layer = 2.39
+	icon_connect_type = "-supply"
+	color = PIPE_COLOR_BLUE
+
+/obj/machinery/atmospherics/pipe/manifold4w/hidden/yellow
+	color = PIPE_COLOR_YELLOW
+
+/obj/machinery/atmospherics/pipe/manifold4w/hidden/cyan
+	color = PIPE_COLOR_CYAN
+
+/obj/machinery/atmospherics/pipe/manifold4w/hidden/green
+	color = PIPE_COLOR_GREEN
+
+/obj/machinery/atmospherics/pipe/manifold4w/hidden/purple
+	color = PIPE_COLOR_PURPLE

code/ATMOSPHERICS/pipes/pipe.dm

@@ -0,0 +1,138 @@
+/obj/machinery/atmospherics/pipe
+
+	var/datum/gas_mixture/air_temporary //used when reconstructing a pipeline that broke
+	var/datum/pipeline/parent
+
+	var/volume = 0
+	var/frozen = 0 // used by the pipe freezer
+	force = 20
+
+	layer = 2.4 //under wires with their 2.44
+	use_power = 0
+
+	var/alert_pressure = 80*ONE_ATMOSPHERE
+		//minimum pressure before check_pressure(...) should be called
+/obj/machinery/atmospherics/pipe/New()
+	..()
+	//so pipes under walls are hidden
+	if(istype(get_turf(src), /turf/simulated/wall) || istype(get_turf(src), /turf/simulated/shuttle/wall) || istype(get_turf(src), /turf/unsimulated/wall))
+		level = 1
+
+/obj/machinery/atmospherics/pipe/proc/pipeline_expansion()
+	return null
+
+/obj/machinery/atmospherics/pipe/proc/check_pressure(pressure)
+	//Return 1 if parent should continue checking other pipes
+	//Return null if parent should stop checking other pipes. Recall: del(src) will by default return null
+
+	return 1
+
+/obj/machinery/atmospherics/pipe/return_air()
+	if(!parent)
+		parent = new /datum/pipeline()
+		parent.build_pipeline(src)
+
+	return parent.air
+
+/obj/machinery/atmospherics/pipe/build_network()
+	if(!parent)
+		parent = new /datum/pipeline()
+		parent.build_pipeline(src)
+
+	return parent.return_network()
+
+/obj/machinery/atmospherics/pipe/network_expand(datum/pipe_network/new_network, obj/machinery/atmospherics/pipe/reference)
+	if(!parent)
+		parent = new /datum/pipeline()
+		parent.build_pipeline(src)
+
+	return parent.network_expand(new_network, reference)
+
+/obj/machinery/atmospherics/pipe/return_network(obj/machinery/atmospherics/reference)
+	if(!parent)
+		parent = new /datum/pipeline()
+		parent.build_pipeline(src)
+
+	return parent.return_network(reference)
+
+
+/obj/machinery/atmospherics/pipe/Destroy()
+	qdel(parent)
+	if(air_temporary && loc)
+		loc.assume_air(air_temporary)
+
+	return ..()
+
+/obj/machinery/atmospherics/pipe/attackby(var/obj/item/weapon/W as obj, var/mob/user as mob, params)
+	if (istype(src, /obj/machinery/atmospherics/pipe/tank))
+		return ..()
+	if (istype(src, /obj/machinery/atmospherics/pipe/vent))
+		return ..()
+
+	if(istype(W,/obj/item/device/pipe_painter))
+		return 0
+
+	if (istype(W, /obj/item/device/pipe_freezer))
+		if(!src.frozen) // If the pipe is not already frozen
+			user << "<span class='alert'>You begin to freeze the [src].</span>"
+			if (do_after(user, 60))
+				user.visible_message( \
+					"[user] freezes \the [src].", \
+					"<span class='notice'>You finished freezing \the [src].</span>", \
+					"You hear the hiss of gas.")
+				src.frozen = 1
+				spawn (200)
+					src.frozen = 0
+					src.visible_message( \
+					"\The ice arounds \the [src] melts.", \
+					"<span class='notice'>Your frozen [src] has thawed.</span>", \
+					"You hear dripping water.")
+
+		add_fingerprint(user)
+		return 1
+
+	if (!istype(W, /obj/item/weapon/wrench))
+		return ..()
+	var/turf/T = src.loc
+	if (level==1 && isturf(T) && T.intact)
+		user << "<span class='alert'>You must remove the plating first.</span>"
+		return 1
+
+	var/datum/gas_mixture/int_air = return_air()
+	var/datum/gas_mixture/env_air = loc.return_air()
+	if ((int_air.return_pressure()-env_air.return_pressure()) > 2*ONE_ATMOSPHERE)
+		if (!src.frozen) // If the pipe is not frozen
+			user << "<span class='alert'>You cannot unwrench \the [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>"
+	if (do_after(user, 40))
+		user.visible_message( \
+			"[user] unfastens \the [src].", \
+			"<span class='notice'>You have unfastened \the [src].</span>", \
+			"You hear a ratchet.")
+		var/obj/item/P = new /obj/item/pipe(loc, make_from=src)
+		for (var/obj/machinery/meter/meter in T)
+			if (meter.target == src)
+				new /obj/item/pipe_meter(T)
+				qdel(meter)
+		if(P)
+			transfer_fingerprints_to(P)
+			P.add_fingerprint(user)
+		qdel(src)
+	return 1
+
+/obj/machinery/atmospherics/pipe/color_cache_name(var/obj/machinery/atmospherics/node)
+	if(istype(src, /obj/machinery/atmospherics/pipe/tank))
+		return ..()
+
+	if(istype(node, /obj/machinery/atmospherics/pipe/manifold) || istype(node, /obj/machinery/atmospherics/pipe/manifold4w))
+		if(pipe_color == node.pipe_color)
+			return node.pipe_color
+		else
+			return null
+	else if(istype(node, /obj/machinery/atmospherics/pipe/simple))
+		return node.pipe_color
+	else
+		return pipe_color

code/ATMOSPHERICS/pipes/simple/pipe_simple.dm

@@ -0,0 +1,181 @@
+/obj/machinery/atmospherics/pipe/simple
+	icon = 'icons/atmos/pipes.dmi'
+	icon_state = ""
+	var/pipe_icon = "" //what kind of pipe it is and from which dmi is the icon manager getting its icons, "" for simple pipes, "hepipe" for HE pipes, "hejunction" for HE junctions
+	name = "pipe"
+	desc = "A one meter section of regular pipe"
+
+	volume = 70
+
+	dir = SOUTH
+	initialize_directions = SOUTH|NORTH
+
+	var/obj/machinery/atmospherics/node1
+	var/obj/machinery/atmospherics/node2
+
+	var/minimum_temperature_difference = 300
+	var/thermal_conductivity = 0 //WALL_HEAT_TRANSFER_COEFFICIENT No
+
+	var/maximum_pressure = 70*ONE_ATMOSPHERE
+	var/fatigue_pressure = 55*ONE_ATMOSPHERE
+	alert_pressure = 55*ONE_ATMOSPHERE
+
+	level = 1
+
+/obj/machinery/atmospherics/pipe/simple/New()
+	..()
+
+	// Pipe colors and icon states are handled by an image cache - so color and icon should
+	//  be null. For mapping purposes color is defined in the object definitions.
+	icon = null
+	alpha = 255
+
+	switch(dir)
+		if(SOUTH || NORTH)
+			initialize_directions = SOUTH|NORTH
+		if(EAST || WEST)
+			initialize_directions = EAST|WEST
+		if(NORTHEAST)
+			initialize_directions = NORTH|EAST
+		if(NORTHWEST)
+			initialize_directions = NORTH|WEST
+		if(SOUTHEAST)
+			initialize_directions = SOUTH|EAST
+		if(SOUTHWEST)
+			initialize_directions = SOUTH|WEST
+
+/obj/machinery/atmospherics/pipe/simple/hide(var/i)
+	if(level == 1 && istype(loc, /turf/simulated))
+		invisibility = i ? 101 : 0
+	update_icon()
+
+/obj/machinery/atmospherics/pipe/simple/process()
+	if(!parent) //This should cut back on the overhead calling build_network thousands of times per cycle
+		..()
+	else
+		. = PROCESS_KILL
+
+/obj/machinery/atmospherics/pipe/simple/check_pressure(pressure)
+	var/datum/gas_mixture/environment = loc.return_air()
+
+	var/pressure_difference = pressure - environment.return_pressure()
+
+	if(pressure_difference > maximum_pressure)
+		burst()
+
+	else if(pressure_difference > fatigue_pressure)
+		//TODO: leak to turf, doing pfshhhhh
+		if(prob(5))
+			burst()
+
+	else return 1
+
+/obj/machinery/atmospherics/pipe/simple/proc/burst()
+	src.visible_message("<span class='danger'>\The [src] bursts!</span>");
+	playsound(src.loc, 'sound/effects/bang.ogg', 25, 1)
+	var/datum/effect/effect/system/harmless_smoke_spread/smoke = new
+	smoke.set_up(1,0, src.loc, 0)
+	smoke.start()
+	qdel(src)
+
+/obj/machinery/atmospherics/pipe/simple/proc/normalize_dir()
+	if(dir==3)
+		dir = 1
+	else if(dir==12)
+		dir = 4
+
+/obj/machinery/atmospherics/pipe/simple/Destroy()
+	if(node1)
+		node1.disconnect(src)
+	if(node2)
+		node2.disconnect(src)
+
+	return ..()
+
+/obj/machinery/atmospherics/pipe/simple/pipeline_expansion()
+	return list(node1, node2)
+
+/obj/machinery/atmospherics/pipe/simple/change_color(var/new_color)
+	..()
+	//for updating connected atmos device pipes (i.e. vents, manifolds, etc)
+	if(node1)
+		node1.update_underlays()
+	if(node2)
+		node2.update_underlays()
+
+/obj/machinery/atmospherics/pipe/simple/update_icon(var/safety = 0)
+	if(!check_icon_cache())
+		return
+
+	alpha = 255
+
+	overlays.Cut()
+
+	if(!node1 && !node2)
+		var/turf/T = get_turf(src)
+		new /obj/item/pipe(loc, make_from=src)
+		for (var/obj/machinery/meter/meter in T)
+			if (meter.target == src)
+				new /obj/item/pipe_meter(T)
+				qdel(meter)
+		qdel(src)
+	else if(node1 && node2)
+		overlays += icon_manager.get_atmos_icon("pipe", , pipe_color, pipe_icon + "intact" + icon_connect_type)
+	else
+		overlays += icon_manager.get_atmos_icon("pipe", , pipe_color, pipe_icon + "exposed[node1?1:0][node2?1:0]" + icon_connect_type)
+
+/obj/machinery/atmospherics/pipe/simple/update_underlays()
+	return
+
+/obj/machinery/atmospherics/pipe/simple/initialize()
+	normalize_dir()
+	var/node1_dir
+	var/node2_dir
+
+	for(var/direction in cardinal)
+		if(direction&initialize_directions)
+			if (!node1_dir)
+				node1_dir = direction
+			else if (!node2_dir)
+				node2_dir = direction
+
+	for(var/obj/machinery/atmospherics/target in get_step(src,node1_dir))
+		if(target.initialize_directions & get_dir(target,src))
+			var/c = check_connect_types(target,src)
+			if (c)
+				target.connected_to = c
+				src.connected_to = c
+				node1 = target
+				break
+	for(var/obj/machinery/atmospherics/target in get_step(src,node2_dir))
+		if(target.initialize_directions & get_dir(target,src))
+			var/c = check_connect_types(target,src)
+			if (c)
+				target.connected_to = c
+				src.connected_to = c
+				node2 = target
+				break
+
+	if(!node1 && !node2)
+		qdel(src)
+		return
+
+	var/turf/T = get_turf(src)
+	if(istype(T))
+		hide(T.intact)
+	update_icon()
+
+/obj/machinery/atmospherics/pipe/simple/disconnect(obj/machinery/atmospherics/reference)
+	if(reference == node1)
+		if(istype(node1, /obj/machinery/atmospherics/pipe))
+			qdel(parent)
+		node1 = null
+
+	if(reference == node2)
+		if(istype(node2, /obj/machinery/atmospherics/pipe))
+			qdel(parent)
+		node2 = null
+
+	update_icon()
+
+	return null

code/ATMOSPHERICS/pipes/simple/pipe_simple_he.dm

@@ -0,0 +1,118 @@
+/obj/machinery/atmospherics/pipe/simple/heat_exchanging
+	icon = 'icons/atmos/heat.dmi'
+	icon_state = "intact"
+	pipe_icon = "hepipe"
+	level = 2
+	var/initialize_directions_he
+	var/surface = 2
+
+	minimum_temperature_difference = 20
+	thermal_conductivity = OPEN_HEAT_TRANSFER_COEFFICIENT
+
+/obj/machinery/atmospherics/pipe/simple/heat_exchanging/process()
+	if(!parent)
+		..()
+	else
+		var/environment_temperature = 0
+		if(istype(loc, /turf/simulated/))
+			if(loc:blocks_air)
+				environment_temperature = loc:temperature
+			else
+				var/datum/gas_mixture/environment = loc.return_air()
+				environment_temperature = environment.temperature
+		else
+			environment_temperature = loc:temperature
+		var/datum/gas_mixture/pipe_air = return_air()
+		if(abs(environment_temperature-pipe_air.temperature) > minimum_temperature_difference)
+			parent.temperature_interact(loc, volume, thermal_conductivity)
+
+
+
+// BubbleWrap
+/obj/machinery/atmospherics/pipe/simple/heat_exchanging/New()
+	..()
+	initialize_directions_he = initialize_directions	// The auto-detection from /pipe is good enough for a simple HE pipe
+	// BubbleWrap END
+
+/obj/machinery/atmospherics/pipe/simple/heat_exchanging/initialize()
+	normalize_dir()
+	var/node1_dir
+	var/node2_dir
+
+	for(var/direction in cardinal)
+		if(direction&initialize_directions_he)
+			if (!node1_dir)
+				node1_dir = direction
+			else if (!node2_dir)
+				node2_dir = direction
+
+	for(var/obj/machinery/atmospherics/pipe/simple/heat_exchanging/target in get_step(src,node1_dir))
+		if(target.initialize_directions_he & get_dir(target,src))
+			node1 = target
+			break
+	for(var/obj/machinery/atmospherics/pipe/simple/heat_exchanging/target in get_step(src,node2_dir))
+		if(target.initialize_directions_he & get_dir(target,src))
+			node2 = target
+			break
+
+	if(!node1 && !node2)
+		qdel(src)
+		return
+
+	update_icon()
+	return
+
+
+/obj/machinery/atmospherics/pipe/simple/heat_exchanging/hidden
+	level=1
+	icon_state="intact-f"
+
+/////////////////////////////////
+// JUNCTION
+/////////////////////////////////
+/obj/machinery/atmospherics/pipe/simple/heat_exchanging/junction
+	icon = 'icons/atmos/junction.dmi'
+	icon_state = "intact"
+	pipe_icon = "hejunction"
+	level = 2
+	minimum_temperature_difference = 300
+	thermal_conductivity = WALL_HEAT_TRANSFER_COEFFICIENT
+
+	// BubbleWrap
+/obj/machinery/atmospherics/pipe/simple/heat_exchanging/junction/New()
+	.. ()
+	switch ( dir )
+		if ( SOUTH )
+			initialize_directions = NORTH
+			initialize_directions_he = SOUTH
+		if ( NORTH )
+			initialize_directions = SOUTH
+			initialize_directions_he = NORTH
+		if ( EAST )
+			initialize_directions = WEST
+			initialize_directions_he = EAST
+		if ( WEST )
+			initialize_directions = EAST
+			initialize_directions_he = WEST
+	// BubbleWrap END
+
+/obj/machinery/atmospherics/pipe/simple/heat_exchanging/junction/initialize()
+	for(var/obj/machinery/atmospherics/target in get_step(src,initialize_directions))
+		if(target.initialize_directions & get_dir(target,src))
+			node1 = target
+			break
+	for(var/obj/machinery/atmospherics/pipe/simple/heat_exchanging/target in get_step(src,initialize_directions_he))
+		if(target.initialize_directions_he & get_dir(target,src))
+			node2 = target
+			break
+
+	if(!node1 && !node2)
+		qdel(src)
+		return
+
+	update_icon()
+	return
+
+/obj/machinery/atmospherics/pipe/simple/heat_exchanging/junction/hidden
+	level=1
+	icon_state="intact-f"

code/ATMOSPHERICS/pipes/simple/pipe_simple_hidden.dm

@@ -0,0 +1,69 @@
+/obj/machinery/atmospherics/pipe/simple/hidden
+	icon_state = "intact"
+	level = 1
+	alpha = 128		//set for the benefit of mapping - this is reset to opaque when the pipe is spawned in game
+
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers
+	name = "Scrubbers pipe"
+	desc = "A one meter section of scrubbers pipe"
+	icon_state = "intact-scrubbers"
+	connect_types = list(3)
+	layer = 2.38
+	icon_connect_type = "-scrubbers"
+	color = PIPE_COLOR_RED
+
+/obj/machinery/atmospherics/pipe/simple/hidden/supply
+	name = "Air supply pipe"
+	desc = "A one meter section of supply pipe"
+	icon_state = "intact-supply"
+	connect_types = list(2)
+	layer = 2.39
+	icon_connect_type = "-supply"
+	color = PIPE_COLOR_BLUE
+
+/obj/machinery/atmospherics/pipe/simple/hidden/universal
+	name="Universal pipe adapter"
+	desc = "An adapter for regular, supply and scrubbers pipes"
+	connect_types = list(1,2,3)
+	icon_state = "map_universal"
+
+/obj/machinery/atmospherics/pipe/simple/hidden/universal/update_icon(var/safety = 0)
+	if(!check_icon_cache())
+		return
+
+	alpha = 255
+
+	overlays.Cut()
+	overlays += icon_manager.get_atmos_icon("pipe", , pipe_color, "universal")
+	underlays.Cut()
+
+	if (node1)
+		universal_underlays(node1)
+		if(node2)
+			universal_underlays(node2)
+		else
+			var/node2_dir = turn(get_dir(src,node1),-180)
+			universal_underlays(,node2_dir)
+	else if (node2)
+		universal_underlays(node2)
+		var/node1_dir = turn(get_dir(src,node2),-180)
+		universal_underlays(,node1_dir)
+	else
+		universal_underlays(,dir)
+		universal_underlays(,turn(dir, -180))
+
+/obj/machinery/atmospherics/pipe/simple/hidden/universal/update_underlays()
+	..()
+	update_icon()
+
+/obj/machinery/atmospherics/pipe/simple/hidden/yellow
+	color = PIPE_COLOR_YELLOW
+
+/obj/machinery/atmospherics/pipe/simple/hidden/cyan
+	color = PIPE_COLOR_CYAN
+
+/obj/machinery/atmospherics/pipe/simple/hidden/green
+	color = PIPE_COLOR_GREEN
+
+/obj/machinery/atmospherics/pipe/simple/hidden/purple
+	color = PIPE_COLOR_PURPLE

code/ATMOSPHERICS/pipes/simple/pipe_simple_insulated.dm

@@ -0,0 +1,11 @@
+/obj/machinery/atmospherics/pipe/simple/insulated
+	icon = 'icons/obj/atmospherics/red_pipe.dmi'
+	icon_state = "intact"
+
+	minimum_temperature_difference = 10000
+	thermal_conductivity = 0
+	maximum_pressure = 1000*ONE_ATMOSPHERE
+	fatigue_pressure = 900*ONE_ATMOSPHERE
+	alert_pressure = 900*ONE_ATMOSPHERE
+
+	level = 2

code/ATMOSPHERICS/pipes/simple/pipe_simple_visible.dm

@@ -0,0 +1,66 @@
+/obj/machinery/atmospherics/pipe/simple/visible
+	icon_state = "intact"
+	level = 2
+
+/obj/machinery/atmospherics/pipe/simple/visible/scrubbers
+	name = "Scrubbers pipe"
+	desc = "A one meter section of scrubbers pipe"
+	icon_state = "intact-scrubbers"
+	connect_types = list(3)
+	layer = 2.38
+	icon_connect_type = "-scrubbers"
+	color = PIPE_COLOR_RED
+
+/obj/machinery/atmospherics/pipe/simple/visible/supply
+	name = "Air supply pipe"
+	desc = "A one meter section of supply pipe"
+	icon_state = "intact-supply"
+	connect_types = list(2)
+	layer = 2.39
+	icon_connect_type = "-supply"
+	color = PIPE_COLOR_BLUE
+
+/obj/machinery/atmospherics/pipe/simple/visible/yellow
+	color = PIPE_COLOR_YELLOW
+
+/obj/machinery/atmospherics/pipe/simple/visible/cyan
+	color = PIPE_COLOR_CYAN
+
+/obj/machinery/atmospherics/pipe/simple/visible/green
+	color = PIPE_COLOR_GREEN
+
+/obj/machinery/atmospherics/pipe/simple/visible/purple
+	color = PIPE_COLOR_PURPLE
+
+/obj/machinery/atmospherics/pipe/simple/visible/universal
+	name="Universal pipe adapter"
+	desc = "An adapter for regular, supply and scrubbers pipes"
+	connect_types = list(1,2,3)
+	icon_state = "map_universal"
+
+/obj/machinery/atmospherics/pipe/simple/visible/universal/update_icon(var/safety = 0)
+	if(!check_icon_cache())
+		return
+
+	alpha = 255
+
+	overlays.Cut()
+	overlays += icon_manager.get_atmos_icon("pipe", , pipe_color, "universal")
+	underlays.Cut()
+
+	if (node1)
+		universal_underlays(node1)
+		if(node2)
+			universal_underlays(node2)
+		else
+			var/node1_dir = get_dir(node1,src)
+			universal_underlays(,node1_dir)
+	else if (node2)
+		universal_underlays(node2)
+	else
+		universal_underlays(,dir)
+		universal_underlays(,turn(dir, -180))
+
+/obj/machinery/atmospherics/pipe/simple/visible/universal/update_underlays()
+	..()
+	update_icon()

code/ATMOSPHERICS/pipes/tank.dm

@@ -0,0 +1,166 @@
+/obj/machinery/atmospherics/pipe/tank
+	icon = 'icons/atmos/tank.dmi'
+	icon_state = "air_map"
+
+	name = "Pressure Tank"
+	desc = "A large vessel containing pressurized gas."
+
+	volume = 10000 //in liters, 1 meters by 1 meters by 2 meters ~tweaked it a little to simulate a pressure tank without needing to recode them yet
+
+	level = 1
+	dir = SOUTH
+	initialize_directions = SOUTH
+	density = 1
+
+	var/obj/machinery/atmospherics/node1
+
+/obj/machinery/atmospherics/pipe/tank/New()
+	icon_state = "air"
+	initialize_directions = dir
+	..()
+
+/obj/machinery/atmospherics/pipe/tank/process()
+	if(!parent)
+		..()
+	else
+		. = PROCESS_KILL
+
+/obj/machinery/atmospherics/pipe/tank/Destroy()
+	if(node1)
+		node1.disconnect(src)
+
+	return ..()
+
+/obj/machinery/atmospherics/pipe/tank/pipeline_expansion()
+	return list(node1)
+
+/obj/machinery/atmospherics/pipe/tank/update_underlays()
+	if(..())
+		underlays.Cut()
+		var/turf/T = get_turf(src)
+		if(!istype(T))
+			return
+		add_underlay(T, node1, dir)
+
+/obj/machinery/atmospherics/pipe/tank/hide()
+	update_underlays()
+
+/obj/machinery/atmospherics/pipe/tank/initialize()
+	var/connect_direction = dir
+
+	for(var/obj/machinery/atmospherics/target in get_step(src,connect_direction))
+		if(target.initialize_directions & get_dir(target,src))
+			var/c = check_connect_types(target,src)
+			if (c)
+				target.connected_to = c
+				src.connected_to = c
+				node1 = target
+				break
+
+	update_underlays()
+
+/obj/machinery/atmospherics/pipe/tank/disconnect(obj/machinery/atmospherics/reference)
+	if(reference == node1)
+		if(istype(node1, /obj/machinery/atmospherics/pipe))
+			qdel(parent)
+		node1 = null
+
+	update_underlays()
+
+	return null
+
+/obj/machinery/atmospherics/pipe/tank/attackby(var/obj/item/W as obj, var/mob/user as mob, params)
+	if(istype(W, /obj/item/device/pipe_painter))
+		return
+
+	if(istype(W, /obj/item/device/analyzer))
+		atmosanalyzer_scan(parent.air, user)
+		return
+
+/obj/machinery/atmospherics/pipe/tank/air
+	name = "Pressure Tank (Air)"
+	icon_state = "air_map"
+
+/obj/machinery/atmospherics/pipe/tank/air/New()
+	air_temporary = new
+	air_temporary.volume = volume
+	air_temporary.temperature = T20C
+
+	air_temporary.oxygen = (25*ONE_ATMOSPHERE*O2STANDARD)*(air_temporary.volume)/(R_IDEAL_GAS_EQUATION*air_temporary.temperature)
+	air_temporary.nitrogen = (25*ONE_ATMOSPHERE*N2STANDARD)*(air_temporary.volume)/(R_IDEAL_GAS_EQUATION*air_temporary.temperature)
+
+	..()
+	icon_state = "air"
+
+/obj/machinery/atmospherics/pipe/tank/oxygen
+	name = "Pressure Tank (Oxygen)"
+	icon_state = "o2_map"
+
+/obj/machinery/atmospherics/pipe/tank/oxygen/New()
+	air_temporary = new
+	air_temporary.volume = volume
+	air_temporary.temperature = T20C
+
+	air_temporary.oxygen = (25*ONE_ATMOSPHERE)*(air_temporary.volume)/(R_IDEAL_GAS_EQUATION*air_temporary.temperature)
+
+	..()
+	icon_state = "o2"
+
+/obj/machinery/atmospherics/pipe/tank/nitrogen
+	name = "Pressure Tank (Nitrogen)"
+	icon_state = "n2_map"
+
+/obj/machinery/atmospherics/pipe/tank/nitrogen/New()
+	air_temporary = new
+	air_temporary.volume = volume
+	air_temporary.temperature = T20C
+
+	air_temporary.nitrogen = (25*ONE_ATMOSPHERE)*(air_temporary.volume)/(R_IDEAL_GAS_EQUATION*air_temporary.temperature)
+
+	..()
+	icon_state = "n2"
+
+/obj/machinery/atmospherics/pipe/tank/carbon_dioxide
+	name = "Pressure Tank (Carbon Dioxide)"
+	icon_state = "co2_map"
+
+/obj/machinery/atmospherics/pipe/tank/carbon_dioxide/New()
+	air_temporary = new
+	air_temporary.volume = volume
+	air_temporary.temperature = T20C
+
+	air_temporary.carbon_dioxide = (25*ONE_ATMOSPHERE)*(air_temporary.volume)/(R_IDEAL_GAS_EQUATION*air_temporary.temperature)
+
+	..()
+	icon_state = "co2"
+
+/obj/machinery/atmospherics/pipe/tank/toxins
+	name = "Pressure Tank (Toxins)"
+	icon_state = "toxins_map"
+
+/obj/machinery/atmospherics/pipe/tank/toxins/New()
+	air_temporary = new
+	air_temporary.volume = volume
+	air_temporary.temperature = T20C
+
+	air_temporary.toxins = (25*ONE_ATMOSPHERE)*(air_temporary.volume)/(R_IDEAL_GAS_EQUATION*air_temporary.temperature)
+
+	..()
+	icon_state = "toxins"
+
+/obj/machinery/atmospherics/pipe/tank/nitrous_oxide
+	name = "Pressure Tank (Nitrous Oxide)"
+	icon_state = "n2o_map"
+
+/obj/machinery/atmospherics/pipe/tank/nitrous_oxide/New()
+	air_temporary = new
+	air_temporary.volume = volume
+	air_temporary.temperature = T0C
+
+	var/datum/gas/sleeping_agent/trace_gas = new
+	trace_gas.moles = (25*ONE_ATMOSPHERE)*(air_temporary.volume)/(R_IDEAL_GAS_EQUATION*air_temporary.temperature)
+
+	air_temporary.trace_gases += trace_gas
+
+	..()
+	icon_state = "n2o"

code/ATMOSPHERICS/pipes/vent.dm

@@ -0,0 +1,105 @@
+/obj/machinery/atmospherics/pipe/vent
+	icon = 'icons/obj/atmospherics/pipe_vent.dmi'
+	icon_state = "intact"
+
+	name = "Vent"
+	desc = "A large air vent"
+
+	level = 1
+
+	volume = 250
+
+	dir = SOUTH
+	initialize_directions = SOUTH
+
+	var/build_killswitch = 1
+
+	var/obj/machinery/atmospherics/node1
+
+/obj/machinery/atmospherics/pipe/vent/New()
+	initialize_directions = dir
+	..()
+
+/obj/machinery/atmospherics/pipe/vent/high_volume
+	name = "Larger vent"
+	volume = 1000
+
+/obj/machinery/atmospherics/pipe/vent/process()
+	if(!parent)
+		if(build_killswitch <= 0)
+			. = PROCESS_KILL
+		else
+			build_killswitch--
+		..()
+		return
+	else
+		parent.mingle_with_turf(loc, volume)
+
+/obj/machinery/atmospherics/pipe/vent/Destroy()
+	if(node1)
+		node1.disconnect(src)
+
+	return ..()
+
+/obj/machinery/atmospherics/pipe/vent/pipeline_expansion()
+	return list(node1)
+
+/obj/machinery/atmospherics/pipe/vent/update_icon()
+	if(node1)
+		icon_state = "intact"
+
+		dir = get_dir(src, node1)
+
+	else
+		icon_state = "exposed"
+
+/obj/machinery/atmospherics/pipe/vent/initialize()
+	var/connect_direction = dir
+
+	for(var/obj/machinery/atmospherics/target in get_step(src,connect_direction))
+		if(target.initialize_directions & get_dir(target,src))
+			var/c = check_connect_types(target,src)
+			if (c)
+				target.connected_to = c
+				src.connected_to = c
+				node1 = target
+				break
+
+	update_icon()
+
+/obj/machinery/atmospherics/pipe/vent/disconnect(obj/machinery/atmospherics/reference)
+	if(reference == node1)
+		if(istype(node1, /obj/machinery/atmospherics/pipe))
+			qdel(parent)
+		node1 = null
+
+	update_icon()
+
+	return null
+
+/obj/machinery/atmospherics/pipe/vent/hide(var/i) //to make the little pipe section invisible, the icon changes.
+	if(node1)
+		icon_state = "[i == 1 && istype(loc, /turf/simulated) ? "h" : "" ]intact"
+		dir = get_dir(src, node1)
+	else
+		icon_state = "exposed"
+
+/obj/machinery/atmospherics/pipe/vent/attackby(var/obj/item/weapon/W, var/mob/user)
+	if (!istype(W, /obj/item/weapon/wrench))
+		return ..()
+	var/turf/T = get_turf(src)
+	var/datum/gas_mixture/int_air = return_air()
+	var/datum/gas_mixture/env_air = T.return_air()
+	if ((int_air.return_pressure()-env_air.return_pressure()) > 2*ONE_ATMOSPHERE)
+		user << "<span class='alert'>You cannot unwrench \the [src], it is too exerted due to internal pressure.</span>"
+		add_fingerprint(user)
+		return 1
+	playsound(T, 'sound/items/Ratchet.ogg', 50, 1)
+	user << "<span class='notice'>You begin to unfasten \the [src]...</span>"
+	if (do_after(user, 40))
+		user.visible_message( \
+			"[user] unfastens \the [src].", \
+			"<span class='notice'>You have unfastened \the [src].</span>", \
+			"You hear a ratchet.")
+		new /obj/item/pipe(T, make_from=src)
+		qdel(src)

code/__HELPERS/unsorted.dm

@@ -756,7 +756,7 @@ proc/anim(turf/location as turf,target as mob|obj,a_icon,a_icon_state as text,fl
 		animation.master = target
 		flick(flick_anim, animation)
 	sleep(max(sleeptime, 15))
-	del(animation)
+	qdel(animation)
 
 //Will return the contents of an atom recursivly to a depth of 'searchDepth'
 /atom/proc/GetAllContents(searchDepth = 5)
@@ -1017,7 +1017,7 @@ proc/anim(turf/location as turf,target as mob|obj,a_icon,a_icon_state as text,fl
 							X.icon = 'icons/turf/shuttle.dmi'
 							X.icon_state = replacetext(O.icon_state, "_f", "_s") // revert the turf to the old icon_state
 							X.name = "wall"
-							del(O) // prevents multiple shuttle corners from stacking
+							qdel(O) // prevents multiple shuttle corners from stacking
 							continue
 						if(!istype(O,/obj)) continue
 						O.loc.Exited(O)

code/_globalvars/station.dm

@@ -1,7 +1,5 @@
 var/global/obj/effect/datacore/data_core = null
 
-var/global/defer_powernet_rebuild = 0		// true if net rebuild will be called manually after an event
-
 var/CELLRATE = 0.002  // multiplier for watts per tick <> cell storage (eg: .002 means if there is a load of 1000 watts, 20 units will be taken from a cell per second)
 var/CHARGELEVEL = 0.0005 // Cap for how fast cells charge, as a percentage-per-tick (.001 means cellcharge is capped to 1% per second)
 

code/_onclick/click.dm

@@ -351,7 +351,7 @@
 		s.set_up(5, 1, src)
 		s.start()
 	if(L.damage <= 0)
-		del(L)
+		qdel(L)
 	if(L)
 		playsound(get_turf(src), 'sound/effects/eleczap.ogg', 75, 1)
 		L.tang = L.adjustAngle(get_angle(U,T))

code/_onclick/telekinesis.dm

@@ -80,14 +80,14 @@ var/const/tk_maxrange = 15
 			if(focus.Adjacent(loc))
 				focus.loc = loc
 
-		del(src)
+		qdel(src)
 		return
 
 
 	//stops TK grabs being equipped anywhere but into hands
 	equipped(var/mob/user, var/slot)
 		if( (slot == slot_l_hand) || (slot== slot_r_hand) )	return
-		del(src)
+		qdel(src)
 		return
 
 
@@ -99,10 +99,10 @@ var/const/tk_maxrange = 15
 		if(!target || !user)	return
 		if(last_throw+3 > world.time)	return
 		if(!host || host != user)
-			del(src)
+			qdel(src)
 			return
 		if(!(TK in host.mutations))
-			del(src)
+			qdel(src)
 			return
 		if(isobj(target) && !isturf(target.loc))
 			return
@@ -143,7 +143,7 @@ var/const/tk_maxrange = 15
 	proc/focus_object(var/obj/target, var/mob/living/user)
 		if(!istype(target,/obj))	return//Cant throw non objects atm might let it do mobs later
 		if(target.anchored || !isturf(target.loc))
-			del src
+			qdel(src)
 			return
 		focus = target
 		update_icon()

code/controllers/communications.dm

@@ -226,7 +226,7 @@ var/global/datum/controller/radio/radio_controller
 		frequency.remove_listener(device)
 
 		if(frequency.devices.len == 0)
-			del(frequency)
+			qdel(frequency)
 			frequencies -= f_text
 
 	return 1
@@ -251,7 +251,7 @@ var/global/datum/controller/radio/radio_controller
 	if(range)
 		start_point = get_turf(source)
 		if(!start_point)
-			del(signal)
+			qdel(signal)
 			return 0
 	if (filter)
 		send_to_filter(source, signal, filter, start_point, range)
@@ -300,7 +300,7 @@ var/global/datum/controller/radio/radio_controller
 			devices_line -= null
 		if (devices_line.len==0)
 			devices -= devices_filter
-			del(devices_line)
+			qdel(devices_line)
 
 /datum/signal
 	var/obj/source

code/controllers/emergency_shuttle_controller.dm

@@ -215,7 +215,7 @@ var/global/datum/emergency_shuttle_controller/emergency_shuttle
 	if (online())
 		if (is_stranded())
 			return "ETA-ERR"
-		
+
 		if (waiting_to_leave())
 			if (shuttle.moving_status == SHUTTLE_WARMUP)
 				return "Departing..."
@@ -256,7 +256,7 @@ var/global/datum/emergency_shuttle_controller/emergency_shuttle
 		sleep(speed)
 		step(src, direction)
 		for(var/obj/effect/starender/E in loc)
-			del(src)
+			qdel(src)
 
 
 /obj/effect/starender

code/datums/ai_laws.dm

@@ -165,7 +165,7 @@ datum/ai_laws/tyrant //This probably shouldn't be a default lawset.
 	src.ion += law
 
 /datum/ai_laws/proc/clear_inherent_laws()
-	del(src.inherent)
+	qdel(src.inherent)
 	src.inherent = list()
 
 /datum/ai_laws/proc/add_supplied_law(var/number, var/law)
@@ -179,7 +179,7 @@ datum/ai_laws/tyrant //This probably shouldn't be a default lawset.
 
 /datum/ai_laws/proc/clear_ion_laws()
 	src.ion = list()
-	
+
 /datum/ai_laws/proc/clear_zeroth_law(var/law_borg = null)
 	src.zeroth = null
 	if(law_borg)

code/datums/cargoprofile.dm

@@ -384,13 +384,13 @@
 		if(istype(W,/obj/item/stack))
 			var/obj/item/stack/I = W
 			if(!I.amount) // todo: am I making a bad assumption here?
-				del I
+				qdel(I)
 				return
 			for(var/obj/item/stack/O in master.contents)
 				if(O.type == I.type && O.amount < O.max_amount)
 					if(I.amount + O.amount <= O.max_amount)
 						O.amount += I.amount
-						del I
+						qdel(I)
 						return O.w_class
 					var/leftover = I.amount + O.amount - O.max_amount
 					O.amount = O.max_amount
@@ -403,13 +403,13 @@
 		if(istype(W,/obj/item/stack/cable_coil))
 			var/obj/item/stack/cable_coil/I = W
 			if(!I.amount) // todo: am I making a bad assumption here?
-				del I
+				qdel(I)
 				return
 			for(var/obj/item/stack/cable_coil/O in master.contents)
 				if(O.type == I.type && O.amount < MAXCOIL)
 					if(I.amount + O.amount <= MAXCOIL)
 						O.amount += I.amount
-						del I
+						qdel(I)
 						return O.w_class
 					var/leftover = I.amount + O.amount - MAXCOIL
 					O.amount = MAXCOIL
@@ -473,7 +473,7 @@
 				if(O.type == I.type && O.amount < O.max_amount)
 					if(I.amount + O.amount <= O.max_amount)
 						O.amount += I.amount
-						del I
+						qdel(I)
 						return
 					var/leftover = I.amount + O.amount - O.max_amount
 					O.amount = O.max_amount
@@ -489,7 +489,7 @@
 					if(I.amount + O.amount <= MAXCOIL) // Why did they make it a #define.
 						O.amount += I.amount
 						O.update_icon()
-						del I
+						qdel(I)
 						return
 					var/leftover = I.amount + O.amount - MAXCOIL // That wasn't a question
 					O.amount = MAXCOIL // It was a complaint
@@ -572,13 +572,13 @@
 
 	outlet_reaction(var/atom/W,var/turf/D)
 		if(istype(W,/obj/item/weapon/paper/crumpled))
-			del W
+			qdel(W)
 			return
 		if(istype(W,/obj/item/weapon/clipboard) || istype(W,/obj/item/weapon/folder))
 			// destroy folder, various effects on contents
 			for(var/obj/item/I in W.contents)
 				if(prob(25))//JUNK IT
-					del I
+					qdel(I)
 				else if(prob(50))  //We've been over this.  I can't just take it apart with a crowbar.
 					var/obj/item/weapon/paper/crumpled/P = new(master.loc)
 					if(I.name)
@@ -589,11 +589,11 @@
 					if(istype(I,/obj/item/weapon/paper))
 						var/obj/item/weapon/paper/O = I
 						P.info = garble_keeptags(O.info)
-					del I
+					qdel(I)
 					..(P,D)
 				else
 					..(I,D) // Eject
-			del W //destroy container
+			qdel(W) //destroy container
 			return
 		if(prob(50)) //JUNK IT NOW!
 			var/obj/item/weapon/paper/crumpled/P = new(master.loc)
@@ -612,10 +612,10 @@
 					P.info = garble_keeptags(B.dat)
 				if(B.carved && B.store)
 					..(B.store,D)
-			del W
+			qdel(W)
 			..(P,D)
 		else //I want it junked
-			del W
+			qdel(W)
 		return
 
 /datum/cargoprofile/unary/gibber

code/datums/helper_datums/construction_datum.dm

@@ -13,7 +13,7 @@
 		holder = atom
 		if(!holder) //don't want this without a holder
 			spawn
-				del src
+				qdel(src)
 		set_desc(steps.len)
 		return
 
@@ -97,7 +97,7 @@
 
 			new result(get_turf(holder))
 			spawn()
-				del holder
+				qdel(holder)
 		return
 
 	proc/set_desc(index as num)

code/datums/spell.dm

@@ -172,7 +172,7 @@ var/list/spells = typesof(/obj/effect/proc_holder/spell) //needed for the badmin
 			spell.anchored = 1
 			spell.density = 0
 			spawn(overlay_lifespan)
-				del(spell)
+				qdel(spell)
 
 /obj/effect/proc_holder/spell/wizard/proc/after_cast(list/targets)
 	for(var/atom/target in targets)

code/datums/spells/charge.dm

@@ -35,7 +35,7 @@
 				var/obj/item/weapon/spellbook/oneuse/I = item
 				if(prob(80))
 					user.visible_message("<span class='warning'>[I] catches fire!</span>")
-					del(I)
+					qdel(I)
 				else
 					I.used = 0
 					charged_item = I

code/datums/spells/conjure.dm

@@ -46,7 +46,7 @@
 				if(summon_lifespan)
 					spawn(summon_lifespan)
 						if(summoned_object)
-							del(summoned_object)
+							qdel(summoned_object)
 	else
 		switch(charge_type)
 			if("recharge")

code/datums/spells/dumbfire.dm

@@ -76,11 +76,11 @@
 							trail.icon_state = proj_trail_icon_state
 							trail.density = 0
 							spawn(proj_trail_lifespan)
-								del(trail)
+								qdel(trail)
 
 				current_loc = projectile.loc
 
 				sleep(proj_step_delay)
 
 			if(projectile)
-				del(projectile)
+				qdel(projectile)

code/datums/spells/horsemask.dm

@@ -41,7 +41,7 @@
 	target.visible_message(	"<span class='danger'>[target]'s face  lights up in fire, and after the event a horse's head takes its place!</span>", \
 							"<span class='danger'>Your face burns up, and shortly after the fire you realise you have the face of a horse!</span>")
 	if(!target.unEquip(target.wear_mask))
-		del target.wear_mask
+		qdel(target.wear_mask)
 	target.equip_to_slot_if_possible(magichead, slot_wear_mask, 1, 1)
 
 	flick("e_flash", target.flash)

code/datums/spells/projectile.dm

@@ -61,7 +61,7 @@
 					break
 
 				if(!proj_lingering && projectile.loc == current_loc) //if it didn't move since last time
-					del(projectile)
+					qdel(projectile)
 					break
 
 				if(proj_trail && projectile)
@@ -72,7 +72,7 @@
 							trail.icon_state = proj_trail_icon_state
 							trail.density = 0
 							spawn(proj_trail_lifespan)
-								del(trail)
+								qdel(trail)
 
 				if(projectile.loc in range(target.loc,proj_trigger_range))
 					projectile.perform(list(target))
@@ -83,4 +83,4 @@
 				sleep(proj_step_delay)
 
 			if(projectile)
-				del(projectile)
+				qdel(projectile)

code/defines/procs/records.dm

@@ -22,7 +22,7 @@
 	G.fields["photo_side"]	= side
 	data_core.general += G
 
-	del(dummy)
+	qdel(dummy)
 	return G
 
 /proc/CreateSecurityRecord(var/name as text, var/id as text)

code/game/atoms.dm

@@ -30,14 +30,10 @@
 	var/allow_spin = 1 //Set this to 1 for a _target_ that is being thrown at; if an atom has this set to 1 then atoms thrown AT it will not spin; currently used for the singularity. -Fox
 
 /atom/Destroy()
-	set_opacity(0)
-
-
 	if(reagents)
 		qdel(reagents)
 		reagents = null
-
-	// Idea by ChuckTheSheep to make the object even more unreferencable.
+	set_opacity(0)
 	invisibility = 101
 	return ..()
 
@@ -164,7 +160,7 @@ its easier to just keep the beam vertical.
 
 		for(var/obj/effect/overlay/beam/O in orange(10,src))	//This section erases the previously drawn beam because I found it was easier to
 			if(O.BeamSource==src)				//just draw another instance of the beam instead of trying to manipulate all the
-				del O							//pieces to a new orientation.
+				qdel(O)							//pieces to a new orientation.
 		var/Angle=round(Get_Angle(src,BeamTarget))
 		var/icon/I=new(icon,icon_state)
 		I.Turn(Angle)
@@ -205,7 +201,7 @@ its easier to just keep the beam vertical.
 			X.pixel_y=Pixel_y
 			var/turf/TT = get_turf(X.loc)
 			if(TT.density)
-				del(X)
+				qdel(X)
 				break
 			for(var/obj/O in TT)
 				if(!O.CanPass(light))
@@ -215,11 +211,11 @@ its easier to just keep the beam vertical.
 					broken = 1
 					break
 			if(broken)
-				del(X)
+				qdel(X)
 				break
 		sleep(3)	//Changing this to a lower value will cause the beam to follow more smoothly with movement, but it will also be more laggy.
 					//I've found that 3 ticks provided a nice balance for my use.
-	for(var/obj/effect/overlay/beam/O in orange(10,src)) if(O.BeamSource==src) del O
+	for(var/obj/effect/overlay/beam/O in orange(10,src)) if(O.BeamSource==src) qdel(O)
 
 
 //All atoms
@@ -406,7 +402,7 @@ its easier to just keep the beam vertical.
 /atom/proc/clean_blood()
 	src.germ_level = 0
 	if(istype(blood_DNA, /list))
-		del(blood_DNA)
+		qdel(blood_DNA)
 		return 1
 
 /atom/proc/add_vomit_floor(mob/living/carbon/M as mob, var/toxvomit = 0)

code/game/atoms_movable.dm

@@ -23,8 +23,14 @@
 
 
 /atom/movable/Destroy()
-	..()
+	for(var/atom/movable/AM in contents)
+		qdel(AM)
 	loc = null
+	if (pulledby)
+		if (pulledby.pulling == src)
+			pulledby.pulling = null
+		pulledby = null
+	..()
 	return QDEL_HINT_QUEUE
 
 // Used in shuttle movement and AI eye stuff.
@@ -104,7 +110,7 @@
 				if(A.density && !A.throwpass)	// **TODO: Better behaviour for windows which are dense, but shouldn't always stop movement
 					src.throw_impact(A,speed)
 
-/atom/movable/proc/throw_at(atom/target, range, speed, thrower)
+/atom/movable/proc/throw_at(atom/target, range, speed, thrower, no_spin)
 	if(!target || !src || (flags & NODROP))
 		return 0
 	//use a modified version of Bresenham's algorithm to get from the atom's current position to that of the target
@@ -113,7 +119,7 @@
 	src.thrower = thrower
 	src.throw_source = get_turf(src)	//store the origin turf
 	if(target.allow_spin) // turns out 1000+ spinning objects being thrown at the singularity creates lag - Iamgoofball
-		if(!no_spin_thrown)
+		if(!no_spin_thrown && !no_spin)
 			SpinAnimation(5, 1)
 	var/dist_x = abs(target.x - src.x)
 	var/dist_y = abs(target.y - src.y)
@@ -134,9 +140,6 @@
 	var/area/a = get_area(src.loc)
 	if(dist_x > dist_y)
 		var/error = dist_x/2 - dist_y
-
-
-
 		while(src && target &&((((src.x < target.x && dx == EAST) || (src.x > target.x && dx == WEST)) && dist_travelled < range) || (a && a.has_gravity == 0)  || istype(src.loc, /turf/space)) && src.throwing && istype(src.loc, /turf))
 			// only stop when we've gone the whole distance (or max throw range) and are on a non-space tile, or hit something, or hit the end of the map, or someone picks it up
 			if(error < 0)

code/game/dna/genes/vg_powers.dm

@@ -161,7 +161,7 @@ Obviously, requires DNA2.
 	for(var/x in all_hairs)
 		var/datum/sprite_accessory/hair/H = new x // create new hair datum based on type x
 		hairs.Add(H.name) // add hair name to hairs
-		del(H) // delete the hair after it's all done
+		qdel(H) // delete the hair after it's all done
 
 	var/new_style = input("Please select hair style", "Character Generation",M.h_style)  as null|anything in hairs
 
@@ -176,7 +176,7 @@ Obviously, requires DNA2.
 	for(var/x in all_fhairs)
 		var/datum/sprite_accessory/facial_hair/H = new x
 		fhairs.Add(H.name)
-		del(H)
+		qdel(H)
 
 	new_style = input("Please select facial style", "Character Generation",M.f_style)  as null|anything in fhairs
 

code/game/gamemodes/blob/blobs/core.dm

@@ -65,7 +65,7 @@
 		overmind_get_delay = world.time + 300 // 30 seconds
 
 		if(overmind)
-			del(overmind)
+			qdel(overmind)
 
 		var/client/C = null
 		var/list/candidates = list()

code/game/gamemodes/blob/theblob.dm

@@ -167,7 +167,7 @@
 		return
 
 	proc/Delete()
-		del(src)
+		qdel(src)
 
 /obj/effect/blob/normal
 	icon_state = "blob"

code/game/gamemodes/changeling/powers/mutations.dm

@@ -22,12 +22,12 @@
 
 /obj/effect/proc_holder/changeling/weapon/try_to_sting(var/mob/user, var/mob/target)
 	if(istype(user.l_hand, weapon_type)) //Not the nicest way to do it, but eh
-		del(user.l_hand)
+		qdel(user.l_hand)
 		user.visible_message("<span class='warning'>With a sickening crunch, [user] reforms his [weapon_name_simple] into an arm!</span>", "<span class='notice'>We assimilate the [weapon_name_simple] back into our body.</span>", "<span class='warning>You hear organic matter ripping and tearing!</span>")
 		user.update_inv_l_hand()
 		return
 	if(istype(user.r_hand, weapon_type))
-		del(user.r_hand)
+		qdel(user.r_hand)
 		user.visible_message("<span class='warning'>With a sickening crunch, [user] reforms his [weapon_name_simple] into an arm!</span>", "<span class='notice'>We assimilate the [weapon_name_simple] back into our body.</span>", "<span class='warning>You hear organic matter ripping and tearing!</span>")
 		user.update_inv_r_hand()
 		return
@@ -65,8 +65,8 @@
 	var/mob/living/carbon/human/H = user
 	if(istype(H.wear_suit, suit_type) || istype(H.head, helmet_type))
 		H.visible_message("<span class='warning'>[H] casts off their [suit_name_simple]!</span>", "<span class='warning'>We cast off our [suit_name_simple][genetic_damage > 0 ? ", temporarily weakening our genomes." : "."]</span>", "<span class='warning'>You hear the organic matter ripping and tearing!</span>")
-		del(H.wear_suit)
-		del(H.head)
+		qdel(H.wear_suit)
+		qdel(H.head)
 		H.update_inv_wear_suit()
 		H.update_inv_head()
 		H.update_hair()
@@ -140,7 +140,7 @@
 
 /obj/item/weapon/melee/arm_blade/dropped(mob/user)
 	user.visible_message("<span class='warning'>With a sickening crunch, [user] reforms his blade into an arm!</span>", "<span class='notice'>We assimilate the blade back into our body.</span>", "<span class='warning>You hear organic matter ripping and tearing!</span>")
-	del(src)
+	qdel(src)
 
 /obj/item/weapon/melee/arm_blade/afterattack(atom/target, mob/user, proximity)
 	if(!proximity)
@@ -216,7 +216,7 @@
 		loc.visible_message("<span class='warning'>The end of [loc.name]\'s hand inflates rapidly, forming a huge shield-like mass!</span>", "<span class='warning'>We inflate our hand into a strong shield.</span>", "<span class='warning'>You hear organic matter ripping and tearing!</span>")
 
 /obj/item/weapon/shield/changeling/dropped()
-	del(src)
+	qdel(src)
 
 /obj/item/weapon/shield/changeling/IsShield()
 	if(remaining_uses < 1)
@@ -224,7 +224,7 @@
 			var/mob/living/carbon/human/H = loc
 			H.visible_message("<span class='warning'>With a sickening crunch, [H] reforms his shield into an arm!</span>", "<span class='notice'>We assimilate our shield into our body</span>", "<span class='warning>You hear organic matter ripping and tearing!</span>")
 			H.unEquip(src, 1)
-		del(src)
+		qdel(src)
 		return 0
 	else
 		remaining_uses--
@@ -266,7 +266,7 @@
 	processing_objects += src
 
 /obj/item/clothing/suit/space/changeling/dropped()
-	del(src)
+	qdel(src)
 
 /obj/item/clothing/suit/space/changeling/process()
 	if(ishuman(loc))
@@ -281,7 +281,7 @@
 	armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0)
 
 /obj/item/clothing/head/helmet/space/changeling/dropped()
-	del(src)
+	qdel(src)
 
 
 /***************************************\
@@ -321,7 +321,7 @@
 		loc.visible_message("<span class='warning'>[loc.name]\'s flesh turns black, quickly transforming into a hard, chitinous mass!</span>", "<span class='warning'>We harden our flesh, creating a suit of armor!</span>", "<span class='warning'>You hear organic matter ripping and tearing!</span>")
 
 /obj/item/clothing/suit/armor/changeling/dropped()
-	del(src)
+	qdel(src)
 
 /obj/item/clothing/head/helmet/changeling
 	name = "chitinous mass"
@@ -332,4 +332,4 @@
 	flags_inv = HIDEEARS
 
 /obj/item/clothing/head/helmet/changeling/dropped()
-	del(src)
+	qdel(src)

code/game/gamemodes/changeling/powers/revive.dm

@@ -44,7 +44,7 @@
 				if(istype(s))
 					O.implants -= s
 					H.contents -= s
-					del(s)
+					qdel(s)
 			O.brute_dam = 0
 			O.burn_dam = 0
 			O.damage_state = "00"

code/game/gamemodes/cult/cult.dm

@@ -200,7 +200,7 @@
 
 		// remove the cult viewpoint object
 		var/obj/viewpoint = getCultViewpoint(cult_mind.current)
-		del(viewpoint)
+		qdel(viewpoint)
 
 		update_cult_icons_removed(cult_mind)
 		if(show_message)
@@ -243,13 +243,13 @@
 /datum/game_mode/proc/remove_cult_icon(client/target_client,mob/target_mob)
 	for(var/image/I in target_client.images)
 		if(I.icon_state == "cult" && I.loc == target_mob)
-			del(I)
+			qdel(I)
 
 
 /datum/game_mode/proc/remove_all_cult_icons_from_client(client/target)
 	for(var/image/I in target.images)
 		if(I.icon_state == "cult")
-			del(I)
+			qdel(I)
 
 
 /datum/game_mode/proc/remove_all_cult_icons(target)

code/game/gamemodes/cult/ritual.dm

@@ -95,11 +95,11 @@ var/engwords = list("travel", "blood", "join", "hell", "destroy", "technology",
 /obj/effect/rune/attackby(I as obj, user as mob, params)
 	if(istype(I, /obj/item/weapon/tome) && iscultist(user))
 		user << "You retrace your steps, carefully undoing the lines of the rune."
-		del(src)
+		qdel(src)
 		return
 	else if(istype(I, /obj/item/weapon/nullrod))
 		user << "\blue You disrupt the vile magic with the deadening field of the null rod!"
-		del(src)
+		qdel(src)
 		return
 	return
 

code/game/gamemodes/cult/runes.dm

@@ -22,7 +22,7 @@ var/list/sacrificed = list()
 		user << "\red You feel pain, as rune disappears in reality shift caused by too much wear of space-time fabric"
 		if (istype(user, /mob/living))
 			user.take_overall_damage(5, 0)
-		del(src)
+		qdel(src)
 	if(allrunesloc && index != 0)
 		if(istype(src,/obj/effect/rune))
 			user.say("Sas[pick("'","`")]so c'arta forbici!")//Only you can stop auto-muting
@@ -60,7 +60,7 @@ var/list/sacrificed = list()
 		user << "\red You feel pain, as rune disappears in reality shift caused by too much wear of space-time fabric"
 		if (istype(user, /mob/living))
 			user.take_overall_damage(5, 0)
-		del(src)
+		qdel(src)
 	for(var/mob/living/carbon/C in orange(1,src))
 		if(iscultist(C) && !C.stat)
 			culcount++
@@ -93,7 +93,7 @@ var/list/sacrificed = list()
 		new /obj/item/weapon/tome(src.loc)
 	else
 		new /obj/item/weapon/tome(usr.loc)
-	del(src)
+	qdel(src)
 	return
 
 
@@ -158,7 +158,7 @@ var/list/sacrificed = list()
 		T.hotspot_expose(700,125)
 	var/rune = src // detaching the proc - in theory
 	empulse(U, (range_red - 2), range_red)
-	del(rune)
+	qdel(rune)
 	return
 
 /////////////////////////////////////////SIXTH RUNE
@@ -320,7 +320,7 @@ var/list/sacrificed = list()
 			usr.say("Kla[pick("'","`")]atu barada nikt'o!")
 			for (var/mob/V in viewers(src))
 				V.show_message("\red The rune turns into gray dust, veiling the surrounding runes.", 3)
-			del(src)
+			qdel(src)
 		else
 			usr.whisper("Kla[pick("'","`")]atu barada nikt'o!")
 			usr << "\red Your talisman turns into gray dust, veiling the surrounding runes."
@@ -495,8 +495,8 @@ var/list/sacrificed = list()
 		for (var/mob/V in viewers(src))
 			V.show_message("\red The runes turn into dust, which then forms into an arcane image on the paper.", 3)
 		usr.say("H'drak v[pick("'","`")]loso, mir'kanas verbot!")
-		del(imbued_from)
-		del(newtalisman)
+		qdel(imbued_from)
+		qdel(newtalisman)
 	else
 		return fizzle()
 
@@ -565,7 +565,7 @@ var/list/sacrificed = list()
 	for(var/mob/spirit/spirit in spirits)
 		spirit << "<span class='cultspeech'><span class='name'><a href='byond://?src=\ref[spirit];track2=\ref[spirit];track=\ref[usr]'>[displayName]: </a></span><span class='message'>[input]</span></span>"
 
-	del(src)
+	qdel(src)
 	return 1
 
 /////////////////////////////////////////FIFTEENTH RUNE
@@ -711,7 +711,7 @@ var/list/sacrificed = list()
 			usr.say("Nikt[pick("'","`")]o barada kla'atu!")
 			for (var/mob/V in viewers(src))
 				V.show_message("\red The rune turns into red dust, reveaing the surrounding runes.", 3)
-			del(src)
+			qdel(src)
 			return
 		if(istype(W,/obj/item/weapon/paper/talisman))
 			usr.whisper("Nikt[pick("'","`")]o barada kla'atu!")
@@ -787,7 +787,7 @@ var/list/sacrificed = list()
 		for(var/mob/living/carbon/C in users)
 			user.take_overall_damage(15, 0)
 			C.say("Khari[pick("'","`")]d! Gual'te nikka!")
-		del(src)
+		qdel(src)
 	return fizzle()
 
 /////////////////////////////////////////NINETEENTH RUNE
@@ -821,7 +821,7 @@ var/list/sacrificed = list()
 		user.visible_message("\red Rune disappears with a flash of red light, and in its place now a body lies.", \
 		"\red You are blinded by the flash of red light! After you're able to see again, you see that now instead of the rune there's a body.", \
 		"\red You hear a pop and smell ozone.")
-		del(src)
+		qdel(src)
 	return fizzle()
 
 /////////////////////////////////////////TWENTIETH RUNES
@@ -843,7 +843,7 @@ var/list/sacrificed = list()
 		if(affected)
 			usr.say("Sti[pick("'","`")] kaliedir!")
 			usr << "\red The world becomes quiet as the deafening rune dissipates into fine dust."
-			del(src)
+			qdel(src)
 		else
 			return fizzle()
 	else
@@ -886,7 +886,7 @@ var/list/sacrificed = list()
 		if(affected)
 			usr.say("Sti[pick("'","`")] kaliesin!")
 			usr << "\red The rune flashes, blinding those who not follow the Nar-Sie, and dissipates into fine dust."
-			del(src)
+			qdel(src)
 		else
 			return fizzle()
 	else
@@ -940,7 +940,7 @@ var/list/sacrificed = list()
 			if(iscultist(C) && !C.stat)
 				C.say("Dedo ol[pick("'","`")]btoh!")
 				C.take_overall_damage(15, 0)
-		del(src)
+		qdel(src)
 	else
 		return fizzle()
 	return
@@ -970,8 +970,8 @@ var/list/sacrificed = list()
 					M << "\red Blood suddenly ignites, burning you!"
 					var/turf/T = get_turf(B)
 					T.hotspot_expose(700,125)
-					del(B)
-		del(src)
+					qdel(B)
+		qdel(src)
 
 //////////             Rune 24 (counting burningblood, which kinda doesnt work yet.)
 
@@ -993,7 +993,7 @@ var/list/sacrificed = list()
 				var/mob/living/silicon/S = L
 				S.Weaken(5)
 				S.show_message("\red BZZZT... The rune has exploded in a bright flash.", 3)
-		del(src)
+		qdel(src)
 	else                        ///When invoked as talisman, stun and mute the target mob.
 		usr.say("Dream sign ''Evil sealing talisman'[pick("'","`")]!")
 		var/obj/item/weapon/nullrod/N = locate() in T
@@ -1035,5 +1035,5 @@ var/list/sacrificed = list()
 	//the below calls update_icons() at the end, which will update overlay icons by using the (now updated) cache
 	user.put_in_hands(new /obj/item/weapon/melee/cultblade(user))	//put in hands or on floor
 
-	del(src)
+	qdel(src)
 	return

code/game/gamemodes/cult/talisman.dm

@@ -41,7 +41,7 @@
 			user.take_organ_damage(5, 0)
 			if(src && src.imbue!="supply" && src.imbue!="runestun")
 				if(delete)
-					del(src)
+					qdel(src)
 			return
 		else
 			user << "You see strange symbols on the paper. Are they supposed to mean something?"
@@ -53,7 +53,7 @@
 			if(imbue == "runestun")
 				user.take_organ_damage(5, 0)
 				call(/obj/effect/rune/proc/runestun)(T)
-				del(src)
+				qdel(src)
 			else
 				..()   ///If its some other talisman, use the generic attack code, is this supposed to work this way?
 		else
@@ -62,7 +62,7 @@
 
 	proc/supply(var/key)
 		if (!src.uses)
-			del(src)
+			qdel(src)
 			return
 
 		var/dat = "<B>There are [src.uses] bloody runes on the parchment.</B><BR>"

code/game/gamemodes/events/biomass.dm

@@ -23,24 +23,24 @@
 /obj/effect/biomass/attackby(obj/item/weapon/W as obj, mob/user as mob, params)
 	if (!W || !user || !W.type) return
 	switch(W.type)
-		if(/obj/item/weapon/circular_saw) del src
-		if(/obj/item/weapon/kitchen/utensil/knife) del src
-		if(/obj/item/weapon/scalpel) del src
-		if(/obj/item/weapon/twohanded/fireaxe) del src
-		if(/obj/item/weapon/hatchet) del src
-		if(/obj/item/weapon/melee/energy) del src
+		if(/obj/item/weapon/circular_saw) qdel(src)
+		if(/obj/item/weapon/kitchen/utensil/knife) qdel(src)
+		if(/obj/item/weapon/scalpel) qdel(src)
+		if(/obj/item/weapon/twohanded/fireaxe) qdel(src)
+		if(/obj/item/weapon/hatchet) qdel(src)
+		if(/obj/item/weapon/melee/energy) qdel(src)
 
 		//less effective weapons
 		if(/obj/item/weapon/wirecutters)
-			if(prob(25)) del src
+			if(prob(25)) qdel(src)
 		if(/obj/item/weapon/shard)
-			if(prob(25)) del src
+			if(prob(25)) qdel(src)
 
 		else //weapons with subtypes
-			if(istype(W, /obj/item/weapon/melee/energy/sword)) del src
+			if(istype(W, /obj/item/weapon/melee/energy/sword)) qdel(src)
 			else if(istype(W, /obj/item/weapon/weldingtool))
 				var/obj/item/weapon/weldingtool/WT = W
-				if(WT.remove_fuel(0, user)) del src
+				if(WT.remove_fuel(0, user)) qdel(src)
 			else
 				return
 	..()
@@ -55,7 +55,7 @@
 
 	New()
 		if(!istype(src.loc,/turf/simulated/floor))
-			del(src)
+			qdel(src)
 
 		spawn_biomass_piece(src.loc)
 		processing_objects.Add(src)
@@ -72,10 +72,10 @@
 
 	process()
 		if(!vines)
-			del(src) //space  vines exterminated. Remove the controller
+			qdel(src) //space  vines exterminated. Remove the controller
 			return
 		if(!growth_queue)
-			del(src) //Sanity check
+			qdel(src) //Sanity check
 			return
 		if(vines.len >= 250 && !reached_collapse_size)
 			reached_collapse_size = 1
@@ -155,7 +155,7 @@
 	return
 
 /obj/effect/biomass/fire_act(null, temp, volume) //hotspots kill biomass
-	del src
+	qdel(src)
 
 /datum/event/biomass/start()
 	biomass_infestation()

code/game/gamemodes/events/black_hole.dm

@@ -16,14 +16,14 @@
 	while(src)
 
 		if(!isturf(loc))
-			del(src)
+			qdel(src)
 			return
 
 		//DESTROYING STUFF AT THE EPICENTER
 		for(var/mob/living/M in orange(1,src))
-			del(M)
+			qdel(M)
 		for(var/obj/O in orange(1,src))
-			del(O)
+			qdel(O)
 		for(var/turf/simulated/ST in orange(1,src))
 			ST.ChangeTurf(/turf/space)
 
@@ -57,7 +57,7 @@
 
 /obj/effect/bhole/proc/grav(var/r, var/ex_act_force, var/pull_chance, var/turf_removal_chance)
 	if(!isturf(loc))	//blackhole cannot be contained inside anything. Weird stuff might happen
-		del(src)
+		qdel(src)
 		return
 	for(var/t = -r, t < r, t++)
 		affect_coord(x+t, y-r, ex_act_force, pull_chance, turf_removal_chance)

code/game/gamemodes/events/clang.dm

@@ -36,7 +36,7 @@ In my current plan for it, 'solid' will be defined as anything with density == 1
 			if(clong.density || prob(10))
 				clong.ex_act(2)
 		else
-			del(src)
+			qdel(src)
 
 		if(clong && prob(25))
 			src.loc = clong.loc
@@ -81,7 +81,7 @@ In my current plan for it, 'solid' will be defined as anything with density == 1
 		if ((immrod.z in config.station_levels))
 			immrod.z = 1
 		if(immrod.loc == end)
-			del(immrod)
+			qdel(immrod)
 		sleep(10)
 	for(var/obj/effect/immovablerod/imm in world)
 		return

code/game/gamemodes/events/wormholes.dm

@@ -62,4 +62,4 @@
 	P.icon_state = "anom"
 	P.name = "wormhole"
 	spawn(rand(300,600))
-		del(P)
+		qdel(P)

code/game/gamemodes/gameticker.dm

@@ -340,8 +340,8 @@ var/global/datum/controller/gameticker/ticker
 		//If its actually the end of the round, wait for it to end.
 		//Otherwise if its a verb it will continue on afterwards.
 		spawn(300)
-			if(cinematic)	del(cinematic)		//end the cinematic
-			if(temp_buckle)	del(temp_buckle)	//release everybody
+			if(cinematic)	qdel(cinematic)		//end the cinematic
+			if(temp_buckle)	qdel(temp_buckle)	//release everybody
 		return
 
 

code/game/gamemodes/heist/heist.dm

@@ -287,6 +287,6 @@ datum/game_mode/proc/auto_declare_completion_heist()
 	var/area/skipjack = locate(/area/shuttle/vox/station)
 	for (var/mob/living/M in skipjack.contents)
 		//maybe send the player a message that they've gone home/been kidnapped? Someone responsible for vox lore should write that.
-		del(M)
+		qdel(M)
 	for (var/obj/O in skipjack.contents)
-		del(O)	//no hiding in lockers or anything
+		qdel(O)	//no hiding in lockers or anything

code/game/gamemodes/meteor/meteor.dm

@@ -17,7 +17,6 @@
 
 
 /datum/game_mode/meteor/post_setup()
-	defer_powernet_rebuild = 2//Might help with the lag
 	spawn (rand(waittime_l, waittime_h))
 		send_intercept()
 	spawn(initialmeteordelay)

code/game/gamemodes/mutiny/auth_key.dm

@@ -26,7 +26,7 @@
 		else if (in_space && time_entered_space + (10 SECONDS) < world.time)
 			// Time is up
 			radio.autosay("This device has left the station's perimeter. Triggering emergency activation failsafe.", name)
-			del(src)
+			qdel(src)
 			return
 
 		spawn(10 SECONDS)

code/game/gamemodes/mutiny/mutiny.dm

@@ -135,11 +135,11 @@ datum/game_mode/mutiny
 		var/slots = get_equipment_slots()
 		switch(faction)
 			if("loyalist")
-				if(captains_key) del(captains_key)
+				if(captains_key) qdel(captains_key)
 				captains_key = new(H)
 				H.equip_in_one_of_slots(captains_key, slots)
 			if("mutineer")
-				if(secondary_key) del(secondary_key)
+				if(secondary_key) qdel(secondary_key)
 				secondary_key = new(H)
 				H.equip_in_one_of_slots(secondary_key, slots)
 
@@ -190,7 +190,7 @@ datum/game_mode/mutiny
 	proc/replace_nuke_with_ead()
 		for(var/obj/machinery/nuclearbomb/N in world)
 			ead = new(N.loc, src)
-			del(N)
+			qdel(N)
 
 	proc/unbolt_vault_door()
 		var/obj/machinery/door/airlock/vault = locate(/obj/machinery/door/airlock/vault)
@@ -247,11 +247,11 @@ datum/game_mode/mutiny
 
 		for(var/image/I in head_loyalist.current.client.images)
 			if(I.loc == M.current && (I.icon_state == "loyalist" || I.icon_state == "mutineer"))
-				del(I)
+				qdel(I)
 
 		for(var/image/I in head_mutineer.current.client.images)
 			if(I.loc == M.current && (I.icon_state == "loyalist" || I.icon_state == "mutineer"))
-				del(I)
+				qdel(I)
 
 		if(M in loyalists)
 			var/I = image('icons/mob/mob.dmi', loc=M.current, icon_state = "loyalist")

code/game/gamemodes/nations/nations.dm

@@ -40,7 +40,7 @@ datum/game_mode/nations
 
 /datum/game_mode/nations/proc/remove_flags()
 	for(var/obj/item/flag/F in world)
-		del(F)
+		qdel(F)
 
 /datum/game_mode/nations/proc/spawn_flags()
 

code/game/gamemodes/nuclear/nuclear.dm

@@ -73,7 +73,7 @@ proc/issyndicate(mob/living/M as mob)
 				if(synd_mind.current.client)
 					for(var/image/I in synd_mind.current.client.images)
 						if(I.icon_state == "synd")
-							del(I)
+							qdel(I)
 
 		for(var/datum/mind/synd_mind in syndicates)
 			if(synd_mind.current)
@@ -97,13 +97,13 @@ proc/issyndicate(mob/living/M as mob)
 				if(synd.current.client)
 					for(var/image/I in synd.current.client.images)
 						if(I.icon_state == "synd" && I.loc == synd_mind.current)
-							del(I)
+							qdel(I)
 
 		if(synd_mind.current)
 			if(synd_mind.current.client)
 				for(var/image/I in synd_mind.current.client.images)
 					if(I.icon_state == "synd")
-						del(I)
+						qdel(I)
 
 ////////////////////////////////////////////////////////////////////////////////////////
 ////////////////////////////////////////////////////////////////////////////////////////

code/game/gamemodes/nuclear/pinpointer.dm

@@ -159,7 +159,7 @@
 						var/n="[tmp_object]"
 						item_names+=n
 						item_paths[n]=typepath
-						del(tmp_object)
+						qdel(tmp_object)
 					var/targetitem = input("Select item to search for.", "Item Mode Select","") as null|anything in potential_theft_objectives
 					if(!targetitem)
 						return

code/game/gamemodes/objective.dm

@@ -598,7 +598,7 @@ datum/objective/steal
 			if (!O.typepath) return
 			var/tmp_obj = new O.typepath
 			var/custom_name = tmp_obj:name
-			del(tmp_obj)
+			qdel(tmp_obj)
 			O.name = sanitize(copytext(input("Enter target name:", "Objective target", custom_name) as text|null,1,MAX_NAME_LEN))
 			if (!O.name) return
 			steal_target = O

code/game/gamemodes/revolution/revolution.dm

@@ -277,14 +277,14 @@
 				if(head_rev_mind.current.client)
 					for(var/image/I in head_rev_mind.current.client.images)
 						if(I.icon_state == "rev" || I.icon_state == "rev_head")
-							del(I)
+							qdel(I)
 
 		for(var/datum/mind/rev_mind in revolutionaries)
 			if(rev_mind.current)
 				if(rev_mind.current.client)
 					for(var/image/I in rev_mind.current.client.images)
 						if(I.icon_state == "rev" || I.icon_state == "rev_head")
-							del(I)
+							qdel(I)
 
 		for(var/datum/mind/head_rev in head_revolutionaries)
 			if(head_rev.current)
@@ -346,20 +346,20 @@
 				if(head_rev_mind.current.client)
 					for(var/image/I in head_rev_mind.current.client.images)
 						if((I.icon_state == "rev" || I.icon_state == "rev_head") && I.loc == rev_mind.current)
-							del(I)
+							qdel(I)
 
 		for(var/datum/mind/rev_mind_1 in revolutionaries)
 			if(rev_mind_1.current)
 				if(rev_mind_1.current.client)
 					for(var/image/I in rev_mind_1.current.client.images)
 						if((I.icon_state == "rev" || I.icon_state == "rev_head") && I.loc == rev_mind.current)
-							del(I)
+							qdel(I)
 
 		if(rev_mind.current)
 			if(rev_mind.current.client)
 				for(var/image/I in rev_mind.current.client.images)
 					if(I.icon_state == "rev" || I.icon_state == "rev_head")
-						del(I)
+						qdel(I)
 
 //////////////////////////
 //Checks for rev victory//

code/game/gamemodes/setupgame.dm

@@ -141,7 +141,7 @@
 	for(var/x in typesof(/datum/faction))
 		var/datum/faction/F = new x
 		if(!F.name)
-			del(F)
+			qdel(F)
 			continue
 		else
 			ticker.factions.Add(F)

code/game/gamemodes/shadowling/shadowling.dm

@@ -279,17 +279,17 @@ Made by Xhuis
 				if(shadowling.current.client)
 					for(var/image/I in shadowling.current.client.images)
 						if((I.icon_state == "thrall" || I.icon_state == "shadowling") && I.loc == shadow_mind.current)
-							del(I)
+							qdel(I)
 
 		for(var/datum/mind/thrall in thralls)
 			if(thrall.current)
 				if(thrall.current.client)
 					for(var/image/I in thrall.current.client.images)
 						if((I.icon_state == "thrall" || I.icon_state == "shadowling") && I.loc == shadow_mind.current)
-							del(I)
+							qdel(I)
 
 		if(shadow_mind.current)
 			if(shadow_mind.current.client)
 				for(var/image/I in shadow_mind.current.client.images)
 					if(I.icon_state == "thrall" || I.icon_state == "shadowling")
-						del(I)
+						qdel(I)

code/game/gamemodes/traitor/traitor.dm

@@ -375,7 +375,7 @@
 					for(var/image/I in t_mind.current.client.images)
 						if((I.icon_state == "greytide" || I.icon_state == "greytide_head") && I.loc == traitor_mind.current)
 							//world.log << "deleting [traitor_mind] overlay"
-							del(I)
+							qdel(I)
 		if(head)
 			//world.log << "found [head.name]"
 			if(head.current)
@@ -383,12 +383,12 @@
 					for(var/image/I in head.current.client.images)
 						if((I.icon_state == "greytide" || I.icon_state == "greytide_head") && I.loc == traitor_mind.current)
 							//world.log << "deleting [traitor_mind] overlay"
-							del(I)
+							qdel(I)
 	if(traitor_mind.current)
 		if(traitor_mind.current.client)
 			for(var/image/I in traitor_mind.current.client.images)
 				if(I.icon_state == "greytide" || I.icon_state == "greytide_head")
-					del(I)
+					qdel(I)
 
 /datum/game_mode/proc/remove_traitor_mind(datum/mind/traitor_mind, datum/mind/head)
 	//var/list/removal

code/game/gamemodes/vampire/vampire.dm

@@ -417,7 +417,7 @@ You are weak to holy things and starlight. Don't go into space and avoid the Cha
 					for(var/image/I in t_mind.current.client.images)
 						if((I.icon_state == "vampthrall" || I.icon_state == "vampire") && I.loc == vampire_mind.current)
 							//world.log << "deleting [vampire_mind] overlay"
-							del(I)
+							qdel(I)
 		if(head)
 			//world.log << "found [head.name]"
 			if(head.current)
@@ -425,12 +425,12 @@ You are weak to holy things and starlight. Don't go into space and avoid the Cha
 					for(var/image/I in head.current.client.images)
 						if((I.icon_state == "vampthrall" || I.icon_state == "vampire") && I.loc == vampire_mind.current)
 							//world.log << "deleting [vampire_mind] overlay"
-							del(I)
+							qdel(I)
 	if(vampire_mind.current)
 		if(vampire_mind.current.client)
 			for(var/image/I in vampire_mind.current.client.images)
 				if(I.icon_state == "vampthrall" || I.icon_state == "vampire")
-					del(I)
+					qdel(I)
 
 /datum/game_mode/proc/remove_vampire_mind(datum/mind/vampire_mind, datum/mind/head)
 	//var/list/removal

code/game/gamemodes/vampire/vampire_powers.dm

@@ -412,8 +412,8 @@
 							break
 			M.current.canmove = 1
 			M.current.client.eye = M.current
-			del(animation)
-			del(holder)
+			qdel(animation)
+			qdel(holder)
 		M.current.remove_vampire_blood(30)
 		M.current.verbs -= /client/vampire/proc/vampire_jaunt
 		spawn(600) M.current.verbs += /client/vampire/proc/vampire_jaunt
@@ -473,7 +473,7 @@
 			//animation.master = src
 			usr.loc = picked
 			spawn(10)
-				del(animation)
+				qdel(animation)
 		M.current.remove_vampire_blood(30)
 		M.current.verbs -= /client/vampire/proc/vampire_shadowstep
 		spawn(20)

code/game/gamemodes/wizard/artefact.dm

@@ -133,7 +133,7 @@
 /obj/effect/rend/New()
 	spawn(50)
 		new /obj/singularity/narsie/wizard(get_turf(src))
-		del(src)
+		qdel(src)
 		return
 	return
 
@@ -172,13 +172,13 @@
 	new /mob/living/simple_animal/cow(loc)
 	cowsleft--
 	if(cowsleft <= 0)
-		del src
+		qdel(src)
 
 /obj/effect/rend/cow/attackby(obj/item/I as obj, mob/user as mob, params)
 	if(istype(I, /obj/item/weapon/nullrod))
 		visible_message("\red <b>[I] strikes a blow against \the [src], banishing it!</b>")
 		spawn(1)
-			del src
+			qdel(src)
 		return
 	..()
 

code/game/gamemodes/wizard/soulstone.dm

@@ -124,7 +124,7 @@
 							animation.icon = 'icons/mob/mob.dmi'
 							animation.master = T
 							flick("dust-h", animation)
-							del(animation)
+							qdel(animation)
 							var/mob/living/simple_animal/shade/S = new /mob/living/simple_animal/shade( T.loc )
 							S.loc = C //put shade in stone
 							S.status_flags |= GODMODE //So they won't die inside the stone somehow
@@ -141,7 +141,7 @@
 							U << "\blue <b>Capture successful!</b>: \black [T.real_name]'s soul has been ripped from their body and stored within the soul stone."
 							U << "The soulstone has been imprinted with [S.real_name]'s mind, it will no longer react to other souls."
 							C.imprinted = "[S.name]"
-							del T
+							qdel(T)
 		if("SHADE")
 			var/mob/living/simple_animal/shade/T = target
 			var/obj/item/device/soulstone/C = src
@@ -179,11 +179,11 @@
 							else
 								ticker.mode.cult+=Z.mind
 							ticker.mode.update_cult_icons_added(Z.mind)
-						del(T)
+						qdel(T)
 						Z << "<B>You are a Juggernaut. Though slow, your shell can withstand extreme punishment, create shield walls and even deflect energy weapons, and rip apart enemies and walls alike.</B>"
 						Z << "<B>You are still bound to serve your creator, follow their orders and help them complete their goals at all costs.</B>"
 						Z.cancel_camera()
-						del(C)
+						qdel(C)
 
 					if("Wraith")
 						var/mob/living/simple_animal/construct/wraith/Z = new /mob/living/simple_animal/construct/wraith (get_turf(T.loc))
@@ -195,11 +195,11 @@
 							else
 								ticker.mode.cult+=Z.mind
 							ticker.mode.update_cult_icons_added(Z.mind)
-						del(T)
+						qdel(T)
 						Z << "<B>You are a Wraith. Though relatively fragile, you are fast, deadly, and even able to phase through walls.</B>"
 						Z << "<B>You are still bound to serve your creator, follow their orders and help them complete their goals at all costs.</B>"
 						Z.cancel_camera()
-						del(C)
+						qdel(C)
 
 					if("Artificer")
 						var/mob/living/simple_animal/construct/builder/Z = new /mob/living/simple_animal/construct/builder (get_turf(T.loc))
@@ -211,11 +211,11 @@
 							else
 								ticker.mode.cult+=Z.mind
 							ticker.mode.update_cult_icons_added(Z.mind)
-						del(T)
+						qdel(T)
 						Z << "<B>You are an Artificer. You are incredibly weak and fragile, but you are able to construct fortifications, use magic missile, repair allied constructs (by clicking on them), </B><I>and most important of all create new constructs</I><B> (Use your Artificer spell to summon a new construct shell and Summon Soulstone to create a new soulstone).</B>"
 						Z << "<B>You are still bound to serve your creator, follow their orders and help them complete their goals at all costs.</B>"
 						Z.cancel_camera()
-						del(C)
+						qdel(C)
 			else
 				U << "\red <b>Creation failed!</b>: \black The soul stone is empty! Go kill someone!"
 	return

code/game/gamemodes/wizard/spellbook.dm

@@ -77,7 +77,7 @@
 		if(initial(S.name) == initial(aspell.name))
 			spell_levels = aspell.spell_level
 			user.mind.spell_list.Remove(aspell)
-			del(S)
+			qdel(S)
 			return cost * (spell_levels+1)
 	return -1
 
@@ -373,7 +373,7 @@
 			entries |= E
 			categories |= E.category
 		else
-			del(E)
+			qdel(E)
 	tab = categories[1]
 
 /obj/item/weapon/spellbook/attackby(obj/item/O as obj, mob/user as mob, params)
@@ -677,9 +677,9 @@
 		magichead.flags_inv = null	//so you can still see their face
 		magichead.voicechange = 1	//NEEEEIIGHH
 		if(!user.unEquip(user.wear_mask))
-			del user.wear_mask
+			qdel(user.wear_mask)
 		user.equip_to_slot_if_possible(magichead, slot_wear_mask, 1, 1)
-		del src
+		qdel(src)
 	else
 		user <<"<span class='notice'>I say thee neigh</span>"
 

code/game/gamemodes/wizard/wizard.dm

@@ -155,12 +155,12 @@
 		return
 
 	//So zards properly get their items when they are admin-made.
-	del(wizard_mob.wear_suit)
-	del(wizard_mob.head)
-	del(wizard_mob.shoes)
-	del(wizard_mob.r_hand)
-	del(wizard_mob.r_store)
-	del(wizard_mob.l_store)
+	qdel(wizard_mob.wear_suit)
+	qdel(wizard_mob.head)
+	qdel(wizard_mob.shoes)
+	qdel(wizard_mob.r_hand)
+	qdel(wizard_mob.r_store)
+	qdel(wizard_mob.l_store)
 
 	wizard_mob.equip_to_slot_or_del(new /obj/item/device/radio/headset(wizard_mob), slot_l_ear)
 	wizard_mob.equip_to_slot_or_del(new /obj/item/clothing/under/color/lightpurple(wizard_mob), slot_w_uniform)
@@ -276,7 +276,7 @@
 /mob/proc/spellremove(var/mob/M as mob, var/removeallspells=1)
 	for(var/obj/effect/proc_holder/spell/wizard/spell_to_remove in src.spell_list)
 		if (spell_to_remove.name == "Artificer" && !removeallspells) continue
-		del(spell_to_remove)
+		qdel(spell_to_remove)
 
 /*Checks if the wizard can cast spells.
 Made a proc so this is not repeated 14 (or more) times.*/

code/game/machinery/OpTable.dm

@@ -40,14 +40,14 @@
 
 /obj/machinery/optable/blob_act()
 	if(prob(75))
-		del(src)
+		qdel(src)
 
 /obj/machinery/optable/attack_hand(mob/user as mob)
 	if (HULK in usr.mutations)
 		usr << text("\blue You destroy the table.")
 		visible_message("\red [usr] destroys the operating table!")
 		src.density = 0
-		del(src)
+		qdel(src)
 	return
 
 /obj/machinery/optable/CanPass(atom/movable/mover, turf/target, height=0, air_group=0)
@@ -121,7 +121,7 @@
 	if (istype(W, /obj/item/weapon/grab))
 		if(iscarbon(W:affecting))
 			take_victim(W:affecting,usr)
-			del(W)
+			qdel(W)
 			return
 
 

code/game/machinery/Sleeper.dm

@@ -285,7 +285,7 @@
 		for(var/atom/movable/A as mob|obj in src)
 			A.loc = src.loc
 			A.blob_act()
-		del(src)
+		qdel(src)
 	return
 
 
@@ -360,7 +360,7 @@
 			M << "\blue <b>You feel cool air surround you. You go numb as your senses turn inward.</b>"
 
 			src.add_fingerprint(user)
-			del(G)
+			qdel(G)
 		return
 	return
 
@@ -601,7 +601,7 @@
 		src.icon_state = "sleeper"
 
 		for(var/obj/O in src)
-			del(O)
+			qdel(O)
 		src.add_fingerprint(usr)
 		return
 	return

code/game/machinery/adv_med.dm

@@ -82,7 +82,7 @@
 		src.icon_state = "body_scanner_1"
 		src.add_fingerprint(user)
 		//G = null
-		del(G)
+		qdel(G)
 		return
 
 /obj/machinery/bodyscanner/MouseDrop_T(atom/movable/O as mob|obj, mob/user as mob)
@@ -178,7 +178,7 @@
 	src.icon_state = "bodyscanner"
 	for(var/obj/O in src)
 		//O = null
-		del(O)
+		qdel(O)
 		//Foreach goto(124)
 	src.add_fingerprint(usr)
 	return
@@ -229,7 +229,7 @@
 	if(prob(50))
 		for(var/atom/movable/A as mob|obj in src)
 			A.loc = src.loc
-		del(src)
+		qdel(src)
 
 /obj/machinery/body_scanconsole
 	var/obj/machinery/bodyscanner/connected
@@ -286,7 +286,7 @@
 
 /obj/machinery/body_scanconsole/blob_act()
 	if(prob(50))
-		del(src)
+		qdel(src)
 
 /obj/machinery/body_scanconsole/proc/findscanner()
 	spawn( 5 )

code/game/machinery/alarm.dm

@@ -989,7 +989,7 @@
 				user << "You wire \the [src]!"
 				coil.amount -= 5
 				if(!coil.amount)
-					del(coil)
+					qdel(coil)
 
 				buildstage = 2
 				update_icon()
@@ -1009,7 +1009,7 @@
 		if(0)
 			if(istype(W, /obj/item/weapon/airalarm_electronics))
 				user << "You insert the circuit!"
-				del(W)
+				qdel(W)
 				buildstage = 1
 				update_icon()
 				return
@@ -1154,7 +1154,7 @@ FIRE ALARM
 
 					coil.amount -= 5
 					if(!coil.amount)
-						del(coil)
+						qdel(coil)
 
 					buildstage = 2
 					user << "<span class='notice'>You wire \the [src]!</span>"
@@ -1171,7 +1171,7 @@ FIRE ALARM
 			if(0)
 				if(istype(W, /obj/item/weapon/firealarm_electronics))
 					user << "<span class='notice'>You insert the circuit!</span>"
-					del(W)
+					qdel(W)
 					buildstage = 1
 					update_icon()
 
@@ -1179,7 +1179,7 @@ FIRE ALARM
 					user << "<span class='warning'>You remove the fire alarm assembly from the wall!</span>"
 					new /obj/item/mounted/frame/firealarm(get_turf(user))
 					playsound(get_turf(src), 'sound/items/Ratchet.ogg', 50, 1)
-					del(src)
+					qdel(src)
 		return
 
 	src.alarm()

code/game/machinery/atmo_control.dm

@@ -80,7 +80,7 @@ obj/machinery/air_sensor
 			if(do_after(user, 40))
 				user.visible_message("[user] unfastens \the [src].", "\blue You have unfastened \the [src].", "You hear ratchet.")
 				new /obj/item/pipe_gsensor(src.loc)
-				del(src)
+				qdel(src)
 				return 1
 		if(..())
 			return 1

code/game/machinery/atmoalter/canister.dm

@@ -340,7 +340,7 @@ update_flag
 			user << "\blue You salvage whats left of \the [src]"
 			var/obj/item/stack/sheet/metal/M = new /obj/item/stack/sheet/metal(src.loc)
 			M.amount = 3
-			del src
+			qdel(src)
 		return
 
 	if(!istype(W, /obj/item/weapon/wrench) && !istype(W, /obj/item/weapon/tank) && !istype(W, /obj/item/device/analyzer) && !istype(W, /obj/item/device/pda))

code/game/machinery/atmoalter/meter.dm

@@ -130,7 +130,7 @@
 			"\blue You have unfastened \the [src].", \
 			"You hear ratchet.")
 		new /obj/item/pipe_meter(src.loc)
-		del(src)
+		qdel(src)
 
 // TURF METER - REPORTS A TILE'S AIR CONTENTS
 

code/game/machinery/bees_items.dm

@@ -20,7 +20,7 @@
 	for(var/mob/living/simple_animal/bee/B in T)
 		if(B.feral < 0)
 			caught_bees += B.strength
-			del(B)
+			qdel(B)
 			user.visible_message("\blue [user] nets some bees.","\blue You net up some of the becalmed bees.")
 		else
 			user.visible_message("\red [user] swings at some bees, they don't seem to like it.","\red You swing at some bees, they don't seem to like it.")

code/game/machinery/cloning.dm

@@ -372,7 +372,7 @@
 		user << "\blue \The [src] processes \the [W]."
 		biomass += 50
 		user.drop_item()
-		del(W)
+		qdel(W)
 		return
 	else if (istype(W, /obj/item/weapon/wrench))
 		if(src.locked && (src.anchored || src.occupant))
@@ -458,7 +458,7 @@
 		src.icon_state = "pod_g"
 		src.occupant.ghostize()
 		spawn(5)
-			del(src.occupant)
+			qdel(src.occupant)
 	return
 
 /obj/machinery/clonepod/relaymove(mob/user as mob)

code/game/machinery/computer/HolodeckControl.dm

@@ -240,7 +240,7 @@
 	if(!silent)
 		var/obj/oldobj = obj
 		visible_message("The [oldobj.name] fades away!")
-	del(obj)
+	qdel(obj)
 
 /obj/machinery/computer/HolodeckControl/proc/checkInteg(var/area/A)
 	for(var/turf/T in A)
@@ -293,10 +293,10 @@
 		derez(item)
 
 	for(var/obj/effect/decal/cleanable/blood/B in linkedholodeck)
-		del(B)
+		qdel(B)
 
 	for(var/mob/living/simple_animal/hostile/carp/C in linkedholodeck)
-		del(C)
+		qdel(C)
 
 	holographic_items = A.copy_contents_to(linkedholodeck , 1)
 
@@ -402,7 +402,7 @@
 		G.affecting.loc = src.loc
 		G.affecting.Weaken(5)
 		visible_message("\red [G.assailant] puts [G.affecting] on the table.")
-		del(W)
+		qdel(W)
 		return
 
 	if (istype(W, /obj/item/weapon/wrench))
@@ -522,7 +522,7 @@
 		G.affecting.loc = src.loc
 		G.affecting.Weaken(5)
 		visible_message("\red [G.assailant] dunks [G.affecting] into the [src]!", 3)
-		del(W)
+		qdel(W)
 		return
 	else if (istype(W, /obj/item) && get_dist(src,user)<2)
 		user.drop_item(src)
@@ -577,7 +577,7 @@
 
 	currentarea = get_area(src.loc)
 	if(!currentarea)
-		del(src)
+		qdel(src)
 
 	if(eventstarted)
 		usr << "The event has already begun!"
@@ -608,7 +608,7 @@
 	eventstarted = 1
 
 	for(var/obj/structure/holowindow/W in currentarea)
-		del(W)
+		qdel(W)
 
 	for(var/mob/M in currentarea)
 		M << "FIGHT!"