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