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

Conflicts:
	code/game/gamemodes/setupgame.dm
	code/modules/mob/living/carbon/human/life.dm
	code/modules/reagents/Chemistry-Machinery.dm

code/ATMOSPHERICS/components/binary_devices/binary_atmos_base.dm

@@ -17,6 +17,14 @@
 
 /obj/machinery/atmospherics/binary/New()
 	..()
+
+	air1 = new
+	air2 = new
+
+	air1.volume = 200
+	air2.volume = 200
+
+/obj/machinery/atmospherics/binary/SetInitDirections()
 	switch(dir)
 		if(NORTH)
 			initialize_directions = NORTH|SOUTH
@@ -26,11 +34,6 @@
 			initialize_directions = EAST|WEST
 		if(WEST)
 			initialize_directions = EAST|WEST
-	air1 = new
-	air2 = new
-
-	air1.volume = 200
-	air2.volume = 200
 
 //Separate this because we don't need to update pipe icons if we just are going to change the state
 /obj/machinery/atmospherics/binary/proc/update_icon_nopipes()

code/ATMOSPHERICS/components/binary_devices/pump.dm

@@ -44,7 +44,7 @@ Thus, the two variables affect pump operation are set in New():
 /obj/machinery/atmospherics/binary/pump/process()
 //	..()
 	if(stat & (NOPOWER|BROKEN))
-		return
+		return 0
 	if(!on)
 		return 0
 
@@ -70,8 +70,7 @@ Thus, the two variables affect pump operation are set in New():
 
 	return 1
 
-	//Radio remote control
-
+//Radio remote control
 /obj/machinery/atmospherics/binary/pump/proc/set_frequency(new_frequency)
 	radio_controller.remove_object(src, frequency)
 	frequency = new_frequency

code/ATMOSPHERICS/components/trinary_devices/trinary_base.dm

@@ -20,6 +20,16 @@
 
 /obj/machinery/atmospherics/trinary/New()
 	..()
+
+	air1 = new
+	air2 = new
+	air3 = new
+
+	air1.volume = 200
+	air2.volume = 200
+	air3.volume = 200
+
+/obj/machinery/atmospherics/trinary/SetInitDirections()
 	switch(dir)
 		if(NORTH)
 			initialize_directions = EAST|NORTH|SOUTH
@@ -29,14 +39,6 @@
 			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
-
 /*
 Iconnery
 */

code/ATMOSPHERICS/components/unary/unary_base.dm

@@ -10,10 +10,12 @@
 
 /obj/machinery/atmospherics/unary/New()
 	..()
-	initialize_directions = dir
 	air_contents = new
 	air_contents.volume = 200
 
+
+/obj/machinery/atmospherics/unary/SetInitDirections()
+	initialize_directions = dir
 /*
 Iconnery
 */

code/ATMOSPHERICS/components/valve.dm

@@ -46,9 +46,9 @@
 	return
 
 /obj/machinery/atmospherics/binary/valve/proc/normalize_dir()
-	if(dir==3)
+	if(dir==2)
 		dir = 1
-	else if(dir==12)
+	else if(dir==8)
 		dir = 4
 
 /obj/machinery/atmospherics/binary/valve/attack_ai(mob/user)
@@ -69,7 +69,7 @@
 	desc = "A digitally controlled valve."
 	icon_state = "dvalve_map"
 
-/obj/machinery/atmospherics/valve/digital/attack_ai(mob/user)
+/obj/machinery/atmospherics/binary/valve/digital/attack_ai(mob/user)
 	return src.attack_hand(user)
 
 /obj/machinery/atmospherics/binary/valve/digital/update_icon_nopipes(animation)