Merge remote-tracking branch 'remotes/git-svn' r4920 into bs12_with_tgport

Conflicts:
	baystation12.dme
	code/game/gamemodes/changeling/modularchangling.dm
	code/game/gamemodes/cult/runes.dm
	code/game/gamemodes/events.dm
	code/game/machinery/computer/HolodeckControl.dm
	code/game/objects/items/devices/radio/radio.dm
	code/modules/admin/admin_verbs.dm
	code/modules/awaymissions/zlevel.dm
	code/modules/client/client procs.dm
	code/modules/mob/living/say.dm
	code/modules/mob/living/simple_animal/life.dm
	code/modules/mob/mob_cleanup.dm
	code/modules/paperwork/paperbin.dm
	html/changelog.html
	icons/turf/areas.dmi
	maps/RandomZLevels/assistantChamber.dmm
	maps/RandomZLevels/fileList.txt

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>

code/ATMOSPHERICS/components/unary/vent_pump.dm

@@ -5,6 +5,7 @@
 	name = "Air Vent"
 	desc = "Has a valve and pump attached to it"
 
+	var/area/initial_loc
 	level = 1
 	var/area_uid
 	var/id_tag = null
@@ -41,10 +42,10 @@
 			icon_state = "in"
 
 	New()
-		var/area/A = get_area(loc)
-		if (A.master)
-			A = A.master
-		area_uid = A.uid
+		initial_loc = get_area(loc)
+		if (initial_loc.master)
+			initial_loc = initial_loc.master
+		area_uid = initial_loc.uid
 		if (!id_tag)
 			assign_uid()
 			id_tag = num2text(uid)
@@ -321,3 +322,8 @@
 				"You hear ratchet.")
 			new /obj/item/pipe(loc, make_from=src)
 			del(src)
+
+	/obj/machinery/atmospherics/unary/vent_pump/Del()
+		initial_loc.air_scrub_info -= id_tag
+		..()
+		return

code/ATMOSPHERICS/components/unary/vent_scrubber.dm

@@ -7,6 +7,7 @@
 
 	level = 1
 
+	var/area/initial_loc
 	var/id_tag = null
 	var/frequency = 1439
 	var/datum/radio_frequency/radio_connection
@@ -24,10 +25,10 @@
 	var/radio_filter_out
 	var/radio_filter_in
 	New()
-		var/area/A = get_area(loc)
-		if (A.master)
-			A = A.master
-		area_uid = A.uid
+		initial_loc = get_area(loc)
+		if (initial_loc.master)
+			initial_loc = initial_loc.master
+		area_uid = initial_loc.uid
 		if (!id_tag)
 			assign_uid()
 			id_tag = num2text(uid)
@@ -257,3 +258,8 @@
 				"You hear ratchet.")
 			new /obj/item/pipe(loc, make_from=src)
 			del(src)
+
+	/obj/machinery/atmospherics/unary/vent_scrubber/Del()
+		initial_loc.air_scrub_info -= id_tag
+		..()
+		return

code/ATMOSPHERICS/components/valve.dm

@@ -174,11 +174,14 @@ obj/machinery/atmospherics/valve
 			if(target.initialize_directions & get_dir(target,src))
 				node2 = target
 				break
+
+		build_network()
+
 		if(openDuringInit)
+			close()
 			open()
 			openDuringInit = 0
 
-		build_network()
 /*
 		var/connect_directions
 		switch(dir)