diff --git a/code/ATMOSPHERICS/components/binary_devices/pump.dm b/code/ATMOSPHERICS/components/binary_devices/pump.dm
index 9044fdb8ffb..a008536187d 100644
--- a/code/ATMOSPHERICS/components/binary_devices/pump.dm
+++ b/code/ATMOSPHERICS/components/binary_devices/pump.dm
@@ -21,11 +21,18 @@ obj/machinery/atmospherics/binary/pump
 
 	var/on = 0
 	var/target_pressure = ONE_ATMOSPHERE
+	var/max_pressure = 4500
 
 	var/frequency = 0
 	var/id = null
 	var/datum/radio_frequency/radio_connection
 
+	highcap
+		name = "High capacity gas pump"
+		desc = "A high capacity pump"
+
+		max_pressure = 15000000
+
 /*
 	attack_hand(mob/user)
 		on = !on
@@ -160,8 +167,8 @@ obj/machinery/atmospherics/binary/pump
 		if(href_list["power"])
 			on = !on
 		if(href_list["set_press"])
-			var/new_pressure = input(usr,"Enter new output pressure (0-4500kPa)","Pressure control",src.target_pressure) as num
-			src.target_pressure = max(0, min(4500, new_pressure))
+			var/new_pressure = input(usr,"Enter new output pressure (0-[max_pressure]kPa)","Pressure control",src.target_pressure) as num
+			src.target_pressure = max(0, min(max_pressure, new_pressure))
 		usr.machine = src
 		src.update_icon()
 		src.updateUsrDialog()
diff --git a/code/ATMOSPHERICS/pipes.dm b/code/ATMOSPHERICS/pipes.dm
index b186603a44c..78bd890fe12 100644
--- a/code/ATMOSPHERICS/pipes.dm
+++ b/code/ATMOSPHERICS/pipes.dm
@@ -437,6 +437,123 @@ obj/machinery/atmospherics/pipe
 
 				..()
 
+		n2o
+			icon = 'n2o_pipe_tank.dmi'
+			name = "Pressure Tank (N2O)"
+
+			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
+
+				..()
+
+
+		highcap
+			carbon_dioxide
+				name = "High Capacity Pressure Tank (Carbon Dioxide)"
+
+				New()
+					air_temporary = new
+					air_temporary.volume = volume
+					air_temporary.temperature = T20C
+
+					air_temporary.carbon_dioxide = (160*ONE_ATMOSPHERE)*(air_temporary.volume)/(R_IDEAL_GAS_EQUATION*air_temporary.temperature)
+
+					..()
+
+			toxins
+				icon = 'orange_pipe_tank.dmi'
+				name = "High Capacity Pressure Tank (Plasma)"
+
+				New()
+					air_temporary = new
+					air_temporary.volume = volume
+					air_temporary.temperature = T20C
+
+					air_temporary.toxins = (160*ONE_ATMOSPHERE)*(air_temporary.volume)/(R_IDEAL_GAS_EQUATION*air_temporary.temperature)
+
+					..()
+
+			oxygen_agent_b
+				icon = 'red_orange_pipe_tank.dmi'
+				name = "High Capacity Pressure Tank (Oxygen + Plasma)"
+
+				New()
+					air_temporary = new
+					air_temporary.volume = volume
+					air_temporary.temperature = T0C
+
+					var/datum/gas/oxygen_agent_b/trace_gas = new
+					trace_gas.moles = (160*ONE_ATMOSPHERE)*(air_temporary.volume)/(R_IDEAL_GAS_EQUATION*air_temporary.temperature)
+
+					air_temporary.trace_gases += trace_gas
+
+					..()
+
+			oxygen
+				icon = 'blue_pipe_tank.dmi'
+				name = "High Capacity Pressure Tank (Oxygen)"
+
+				New()
+					air_temporary = new
+					air_temporary.volume = volume
+					air_temporary.temperature = T20C
+
+					air_temporary.oxygen = (160*ONE_ATMOSPHERE)*(air_temporary.volume)/(R_IDEAL_GAS_EQUATION*air_temporary.temperature)
+
+					..()
+
+			nitrogen
+				icon = 'red_pipe_tank.dmi'
+				name = "High Capacity Pressure Tank (Nitrogen)"
+
+				New()
+					air_temporary = new
+					air_temporary.volume = volume
+					air_temporary.temperature = T20C
+
+					air_temporary.nitrogen = (160*ONE_ATMOSPHERE)*(air_temporary.volume)/(R_IDEAL_GAS_EQUATION*air_temporary.temperature)
+
+					..()
+
+			air
+				icon = 'red_pipe_tank.dmi'
+				name = "High Capacity Pressure Tank (Air)"
+
+				New()
+					air_temporary = new
+					air_temporary.volume = volume
+					air_temporary.temperature = T20C
+
+					air_temporary.oxygen = (160*ONE_ATMOSPHERE*O2STANDARD)*(air_temporary.volume)/(R_IDEAL_GAS_EQUATION*air_temporary.temperature)
+					air_temporary.nitrogen = (160*ONE_ATMOSPHERE*N2STANDARD)*(air_temporary.volume)/(R_IDEAL_GAS_EQUATION*air_temporary.temperature)
+
+					..()
+
+			n2o
+				icon = 'n2o_pipe_tank.dmi'
+				name = "High Capacity Pressure Tank (N2O)"
+
+				New()
+					air_temporary = new
+					air_temporary.volume = volume
+					air_temporary.temperature = T0C
+
+					var/datum/gas/sleeping_agent/trace_gas = new
+					trace_gas.moles = (160*ONE_ATMOSPHERE)*(air_temporary.volume)/(R_IDEAL_GAS_EQUATION*air_temporary.temperature)
+
+					air_temporary.trace_gases += trace_gas
+
+					..()
+
+
+
 		Del()
 			if(node1)
 				node1.disconnect(src)
diff --git a/code/modules/mob/new_player/preferences.dm b/code/modules/mob/new_player/preferences.dm
index 8e23153041e..194f4af8c92 100644
--- a/code/modules/mob/new_player/preferences.dm
+++ b/code/modules/mob/new_player/preferences.dm
@@ -636,7 +636,7 @@ datum/preferences
 				if("input")
 					var/new_age = input(user, "Please select type in age: 15-45", "Character Generation")  as num
 					if(new_age)
-						age = max(min(round(text2num(new_age)), 45), 15)
+						age = max(min(round(text2num(new_age)), 65), 20)
 				if("random")
 					age = rand (20, 45)
 
diff --git a/code/modules/mob/new_player/preferences_setup.dm b/code/modules/mob/new_player/preferences_setup.dm
index b75fef33f1d..79a76a6d2f1 100644
--- a/code/modules/mob/new_player/preferences_setup.dm
+++ b/code/modules/mob/new_player/preferences_setup.dm
@@ -15,7 +15,7 @@ datum/preferences
 		underwear = 1
 		backbag = 2
 		b_type = pick("A+", "A-", "B+", "B-", "AB+", "AB-", "O+", "O-")
-		age = rand(19,35)
+		age = rand(20,65)
 		copy_to(H,1)
 
 	proc/randomize_name()
diff --git a/icons/obj/atmospherics/n2o_pipe_tank.dmi b/icons/obj/atmospherics/n2o_pipe_tank.dmi
new file mode 100644
index 00000000000..71a8381a689
Binary files /dev/null and b/icons/obj/atmospherics/n2o_pipe_tank.dmi differ