Tank Refactor; Breathing Retool (#15371)

* Tank Refactor Breathing Retool

* missed maps and doc

* just in case

code/game/objects/effects/spawners/bombspawner.dm

@@ -24,8 +24,8 @@
 	..()
 
 	var/obj/item/transfer_valve/V = new(src.loc)
-	var/obj/item/tank/plasma/PT = new(V)
-	var/obj/item/tank/oxygen/OT = new(V)
+	var/obj/item/tank/internals/plasma/PT = new(V)
+	var/obj/item/tank/internals/oxygen/OT = new(V)
 
 	V.tank_one = PT
 	V.tank_two = OT

code/game/objects/effects/spawners/lootdrop.dm

@@ -117,8 +117,8 @@
 				/obj/item/storage/fancy/cigarettes/dromedaryco = 10,
 				/obj/item/storage/toolbox/mechanical = 10,
 				/obj/item/screwdriver = 30,
-				/obj/item/tank/emergency_oxygen = 20,
-				/obj/item/tank/emergency_oxygen/engi = 10,
+				/obj/item/tank/internals/emergency_oxygen = 20,
+				/obj/item/tank/internals/emergency_oxygen/engi = 10,
 				/obj/item/vending_refill/cola = 10,
 				/obj/item/weldingtool = 30,
 				/obj/item/wirecutters = 10,
@@ -320,7 +320,7 @@
 				/obj/item/storage/belt/utility/chief/full = 25,
 				/obj/item/rcd/combat = 25,
 				/obj/item/rpd/bluespace = 25,
-				/obj/item/tank/emergency_oxygen/double/full = 25,
+				/obj/item/tank/internals/emergency_oxygen/double = 25,
 				/obj/item/slimepotion/speed = 25,
 				/obj/item/storage/backpack/holding = 25,
 				/obj/item/clothing/glasses/meson/night = 25, // NV mesons

code/game/objects/items/weapons/flamethrower.dm

@@ -20,7 +20,7 @@
 	var/operating = FALSE//cooldown
 	var/obj/item/weldingtool/weldtool = null
 	var/obj/item/assembly/igniter/igniter = null
-	var/obj/item/tank/plasma/ptank = null
+	var/obj/item/tank/internals/plasma/ptank = null
 	var/warned_admins = FALSE //for the message_admins() when lit
 	//variables for prebuilt flamethrowers
 	var/create_full = FALSE
@@ -89,7 +89,7 @@
 		update_icon()
 		return
 
-	else if(istype(I, /obj/item/tank/plasma))
+	else if(istype(I, /obj/item/tank/internals/plasma))
 		if(ptank)
 			if(user.drop_item())
 				I.forceMove(src)
@@ -227,7 +227,7 @@
 		igniter.secured = FALSE
 		status = TRUE
 		if(create_with_tank)
-			ptank = new /obj/item/tank/plasma/full(src)
+			ptank = new /obj/item/tank/internals/plasma/full(src)
 		update_icon()
 
 /obj/item/flamethrower/full

code/game/objects/items/weapons/pneumaticCannon.dm

@@ -12,7 +12,7 @@
 	armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 60, "acid" = 50)
 	var/maxWeightClass = 20 //The max weight of items that can fit into the cannon
 	var/loadedWeightClass = 0 //The weight of items currently in the cannon
-	var/obj/item/tank/tank = null //The gas tank that is drawn from to fire things
+	var/obj/item/tank/internals/tank = null //The gas tank that is drawn from to fire things
 	var/gasPerThrow = 3 //How much gas is drawn from a tank's pressure to fire
 	var/list/loadedItems = list() //The items loaded into the cannon that will be fired out
 	var/pressureSetting = 1 //How powerful the cannon is - higher pressure = more gas but more powerful throws
@@ -34,8 +34,8 @@
 
 /obj/item/pneumatic_cannon/attackby(obj/item/W, mob/user, params)
 	..()
-	if(istype(W, /obj/item/tank/) && !tank)
-		if(istype(W, /obj/item/tank/emergency_oxygen))
+	if(istype(W, /obj/item/tank/internals/) && !tank)
+		if(istype(W, /obj/item/tank/internals/emergency_oxygen))
 			to_chat(user, "<span class='warning'>\The [W] is too small for \the [src].</span>")
 			return
 		updateTank(W, 0, user)

code/game/objects/items/weapons/powerfist.dm

@@ -15,7 +15,7 @@
 	var/click_delay = 1.5
 	var/fisto_setting = 1
 	var/gasperfist = 3
-	var/obj/item/tank/tank = null //Tank used for the gauntlet's piston-ram.
+	var/obj/item/tank/internals/tank = null //Tank used for the gauntlet's piston-ram.
 
 
 /obj/item/melee/powerfist/Destroy()
@@ -30,9 +30,9 @@
 		. += "<span class='notice'>[bicon(tank)] It has [tank] mounted onto it.</span>"
 
 /obj/item/melee/powerfist/attackby(obj/item/W, mob/user, params)
-	if(istype(W, /obj/item/tank))
+	if(istype(W, /obj/item/tank/internals))
 		if(!tank)
-			var/obj/item/tank/IT = W
+			var/obj/item/tank/internals/IT = W
 			if(IT.volume <= 3)
 				to_chat(user, "<span class='warning'>[IT] is too small for [src].</span>")
 				return

code/game/objects/items/weapons/storage/boxes.dm

@@ -44,7 +44,7 @@
 	..()
 	contents = list()
 	new /obj/item/clothing/mask/breath( src )
-	new /obj/item/tank/emergency_oxygen( src )
+	new /obj/item/tank/internals/emergency_oxygen( src )
 	new /obj/item/reagent_containers/hypospray/autoinjector( src )
 	new /obj/item/flashlight/flare/glowstick/emergency( src )
 	return
@@ -56,7 +56,7 @@
 	..()
 	contents = list()
 	new /obj/item/clothing/mask/breath/vox(src)
-	new /obj/item/tank/emergency_oxygen/nitrogen(src)
+	new /obj/item/tank/internals/emergency_oxygen/nitrogen(src)
 	new /obj/item/reagent_containers/hypospray/autoinjector(src)
 	new /obj/item/flashlight/flare/glowstick/emergency(src)
 
@@ -67,7 +67,7 @@
 	..()
 	contents = list()
 	new /obj/item/clothing/mask/breath(src)
-	new /obj/item/tank/emergency_oxygen/plasma(src)
+	new /obj/item/tank/internals/emergency_oxygen/plasma(src)
 	new /obj/item/reagent_containers/hypospray/autoinjector(src)
 	new /obj/item/flashlight/flare/glowstick/emergency(src)
 
@@ -78,7 +78,7 @@
 	..()
 	contents = list()
 	new /obj/item/clothing/mask/breath( src )
-	new /obj/item/tank/emergency_oxygen/engi( src )
+	new /obj/item/tank/internals/emergency_oxygen/engi( src )
 	new /obj/item/reagent_containers/hypospray/autoinjector( src )
 	new /obj/item/flashlight/flare/glowstick/emergency( src )
 	return
@@ -90,7 +90,7 @@
 	..()
 	contents = list()
 	new /obj/item/clothing/mask/gas/explorer(src)
-	new /obj/item/tank/emergency_oxygen/engi(src)
+	new /obj/item/tank/internals/emergency_oxygen/engi(src)
 	new /obj/item/crowbar/red(src)
 	new /obj/item/reagent_containers/hypospray/autoinjector(src)
 	new /obj/item/flashlight/flare/glowstick/emergency(src)
@@ -102,7 +102,7 @@
 	..()
 	contents = list()
 	new /obj/item/clothing/mask/gas/syndicate(src)
-	new /obj/item/tank/emergency_oxygen/syndi(src)
+	new /obj/item/tank/internals/emergency_oxygen/engi/syndi(src)
 	new /obj/item/reagent_containers/hypospray/autoinjector(src)
 	new /obj/item/reagent_containers/food/pill/initropidril(src)
 	new /obj/item/flashlight/flare/glowstick/red(src)
@@ -1006,7 +1006,7 @@
 	..()
 	contents = list()
 	new /obj/item/clothing/mask/breath(src)
-	new /obj/item/tank/emergency_oxygen/double/full(src)
+	new /obj/item/tank/internals/emergency_oxygen/double(src)
 	new /obj/item/flashlight/seclite(src)
 	new /obj/item/kitchen/knife/combat(src)
 
@@ -1025,7 +1025,7 @@
 /obj/item/storage/box/responseteam/New()
 	..()
 	new /obj/item/clothing/mask/breath(src)
-	new /obj/item/tank/emergency_oxygen/engi/full(src)
+	new /obj/item/tank/internals/emergency_oxygen/engi(src)
 	new /obj/item/flashlight/flare(src)
 	new /obj/item/crowbar/red(src)
 	new /obj/item/kitchen/knife/combat(src)

code/game/objects/items/weapons/storage/uplink_kits.dm

@@ -126,7 +126,7 @@
 
 /obj/item/storage/box/syndie_kit/space
 	name = "Boxed Space Suit and Helmet"
-	can_hold = list(/obj/item/clothing/suit/space/syndicate/black/red, /obj/item/clothing/head/helmet/space/syndicate/black/red, /obj/item/tank/emergency_oxygen/syndi, /obj/item/clothing/mask/gas/syndicate)
+	can_hold = list(/obj/item/clothing/suit/space/syndicate/black/red, /obj/item/clothing/head/helmet/space/syndicate/black/red, /obj/item/tank/internals/emergency_oxygen/engi/syndi, /obj/item/clothing/mask/gas/syndicate)
 	max_w_class = WEIGHT_CLASS_NORMAL
 
 /obj/item/storage/box/syndie_kit/space/New()
@@ -134,19 +134,19 @@
 	new /obj/item/clothing/suit/space/syndicate/black/red(src)
 	new /obj/item/clothing/head/helmet/space/syndicate/black/red(src)
 	new /obj/item/clothing/mask/gas/syndicate(src)
-	new /obj/item/tank/emergency_oxygen/syndi(src)
+	new /obj/item/tank/internals/emergency_oxygen/engi/syndi(src)
 	return
 
 /obj/item/storage/box/syndie_kit/hardsuit
 	name = "Boxed Blood Red Suit and Helmet"
-	can_hold = list(/obj/item/clothing/suit/space/hardsuit/syndi, /obj/item/tank/emergency_oxygen/syndi, /obj/item/clothing/mask/gas/syndicate)
+	can_hold = list(/obj/item/clothing/suit/space/hardsuit/syndi, /obj/item/tank/internals/emergency_oxygen/engi/syndi, /obj/item/clothing/mask/gas/syndicate)
 	max_w_class = WEIGHT_CLASS_NORMAL
 
 /obj/item/storage/box/syndie_kit/hardsuit/New()
 	..()
 	new /obj/item/clothing/suit/space/hardsuit/syndi(src)
 	new /obj/item/clothing/mask/gas/syndicate(src)
-	new /obj/item/tank/emergency_oxygen/syndi(src)
+	new /obj/item/tank/internals/emergency_oxygen/engi/syndi(src)
 
 /obj/item/storage/box/syndie_kit/conversion
 	name = "box (CK)"

code/game/objects/items/weapons/tanks/jetpack.dm

@@ -4,12 +4,21 @@
 	icon_state = "jetpack"
 	w_class = WEIGHT_CLASS_BULKY
 	item_state = "jetpack"
-	distribute_pressure = ONE_ATMOSPHERE*O2STANDARD
+	distribute_pressure = ONE_ATMOSPHERE * O2STANDARD
 	actions_types = list(/datum/action/item_action/set_internals, /datum/action/item_action/toggle_jetpack, /datum/action/item_action/jetpack_stabilization)
+	var/gas_type = "oxygen"
 	var/on = 0
 	var/stabilizers = 0
 	var/volume_rate = 500              //Needed for borg jetpack transfer
 
+/obj/item/tank/jetpack/populate_gas()
+	if(gas_type)
+		switch(gas_type)
+			if("oxygen")
+				air_contents.oxygen = ((6 * ONE_ATMOSPHERE) * volume / (R_IDEAL_GAS_EQUATION * T20C))
+			if("carbon dioxide")
+				air_contents.carbon_dioxide = ((6 * ONE_ATMOSPHERE) * volume / (R_IDEAL_GAS_EQUATION * T20C))
+
 /obj/item/tank/jetpack/on_mob_move(direction, mob/user)
 	if(on)
 		var/turf/T = get_step(src, GetOppositeDir(direction))
@@ -29,14 +38,6 @@
 		stabilizers = !stabilizers
 		to_chat(user, "<span class='notice'>You turn [src]'s stabilization [stabilizers ? "on" : "off"].</span>")
 
-
-/obj/item/tank/jetpack/examine(mob/user)
-	. = ..()
-	if(get_dist(user, src) <= 0 && air_contents.oxygen < 10)
-		. += "<span class='danger'>The meter on [src] indicates you are almost out of air!</span>"
-		playsound(user, 'sound/effects/alert.ogg', 50, 1)
-
-
 /obj/item/tank/jetpack/proc/cycle(mob/user)
 	if(user.incapacitated())
 		return
@@ -77,16 +78,27 @@
 	T.assume_air(removed)
 	return 1
 
+/obj/item/tank/jetpack/improvised
+	name = "improvised jetpack"
+	desc = "A jetpack made from two air tanks, a fire extinguisher and some atmospherics equipment. It doesn't look like it can hold much."
+	icon_state = "jetpack-improvised"
+	item_state = "jetpack-improvised"
+	volume = 20 //normal jetpacks have 70 volume
+	gas_type = null //it starts empty
+
+/obj/item/tank/jetpack/improvised/allow_thrust(num, mob/living/user)
+	if(rand(0, 250) == 0)
+		to_chat(user, "<span class='notice'>You feel your jetpack's engines cut out.</span>")
+		turn_off(user)
+		return
+	return ..()
+
 /obj/item/tank/jetpack/void
 	name = "Void Jetpack (Oxygen)"
 	desc = "It works well in a void."
 	icon_state = "jetpack-void"
 	item_state =  "jetpack-void"
 
-/obj/item/tank/jetpack/void/New()
-	..()
-	air_contents.oxygen = (6*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C)
-
 /obj/item/tank/jetpack/void/grey
 	name = "Void Jetpack (Oxygen)"
 	icon_state = "jetpack-void-grey"
@@ -95,16 +107,20 @@
 	name = "Retro Jetpack (Oxygen)"
 	icon_state = "jetpack-void-gold"
 
-
 /obj/item/tank/jetpack/oxygen
 	name = "Jetpack (Oxygen)"
 	desc = "A tank of compressed oxygen for use as propulsion in zero-gravity areas. Use with caution."
 	icon_state = "jetpack"
 	item_state = "jetpack"
 
-/obj/item/tank/jetpack/oxygen/New()
-	..()
-	air_contents.oxygen = (6*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C)
+/obj/item/tank/jetpack/oxygen/harness
+	name = "jet harness (oxygen)"
+	desc = "A lightweight tactical harness, used by those who don't want to be weighed down by traditional jetpacks."
+	icon_state = "jetpack-mini"
+	item_state = "jetpack-mini"
+	volume = 40
+	throw_range = 7
+	w_class = WEIGHT_CLASS_NORMAL
 
 /obj/item/tank/jetpack/oxygen/captain
 	name = "Captain's jetpack"
@@ -115,24 +131,11 @@
 	w_class = WEIGHT_CLASS_NORMAL
 	resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | ACID_PROOF //steal objective items are hard to destroy.
 
-/obj/item/tank/jetpack/oxygen/harness
-	name = "jet harness (oxygen)"
-	desc = "A lightweight tactical harness, used by those who don't want to be weighed down by traditional jetpacks."
-	icon_state = "jetpack-mini"
-	item_state = "jetpack-mini"
-	volume = 40
-	throw_range = 8
-	w_class = WEIGHT_CLASS_NORMAL
-
-/obj/item/tank/jetpack/oxygenblack
-	name = "Jetpack (Oxygen)"
-	desc = "A black tank of compressed oxygen for use as propulsion in zero-gravity areas. Use with caution."
-	icon_state = "jetpack-black"
-	item_state = "jetpack-black"
-
-/obj/item/tank/jetpack/oxygenblack/New()
-	..()
-	air_contents.oxygen = (6*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C)
+/obj/item/tank/jetpack/oxygen/security
+	name = "security jetpack (oxygen)"
+	desc = "A tank of compressed oxygen for use as propulsion in zero-gravity areas by security forces."
+	icon_state = "jetpack-sec"
+	item_state = "jetpack-sec"
 
 /obj/item/tank/jetpack/carbondioxide
 	name = "Jetpack (Carbon Dioxide)"
@@ -140,16 +143,7 @@
 	distribute_pressure = 0
 	icon_state = "jetpack-black"
 	item_state =  "jetpack-black"
-
-/obj/item/tank/jetpack/carbondioxide/New()
-	..()
-	air_contents.carbon_dioxide = (6*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C)
-
-/obj/item/tank/jetpack/carbondioxide/examine(mob/user)
-	. = ..()
-	if(get_dist(user, src) <= 0 && air_contents.carbon_dioxide < 10)
-		. += "<span class='danger'>The meter on [src] indicates you are almost out of air!</span>"
-		playsound(user, 'sound/effects/alert.ogg', 50, 1)
+	gas_type = "carbon dioxide"
 
 /obj/item/tank/jetpack/suit
 	name = "hardsuit jetpack upgrade"
@@ -161,8 +155,9 @@
 	actions_types = list(/datum/action/item_action/toggle_jetpack, /datum/action/item_action/jetpack_stabilization)
 	volume = 1
 	slot_flags = null
+	gas_type = null
 	var/datum/gas_mixture/temp_air_contents
-	var/obj/item/tank/tank = null
+	var/obj/item/tank/internals/tank = null
 	var/mob/living/carbon/human/cur_user
 
 /obj/item/tank/jetpack/suit/New()

code/game/objects/items/weapons/tanks/tank_types.dm

@@ -1,250 +1,224 @@
 /* Types of tanks!
  * Contains:
  *		Oxygen
- *		Nitrogen
- *		Plasma
- *		Air Mix
  *		Anesthetic
+ *		Air
+ *		Plasma
+ *		Emergency Oxygen
+ *		Generic
  */
 
 /*
  * Oxygen
  */
-/obj/item/tank/oxygen
+/obj/item/tank/internals/oxygen
 	name = "oxygen tank"
-	desc = "A tank of oxygen."
+	desc = "A tank of oxygen, this one is blue."
 	icon_state = "oxygen"
+	distribute_pressure = TANK_DEFAULT_RELEASE_PRESSURE
+	force = 10
 	dog_fashion = /datum/dog_fashion/back
 
-/obj/item/tank/oxygen/New()
-	..()
-	air_contents.oxygen = (6*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C)
+/obj/item/tank/internals/oxygen/populate_gas()
+	air_contents.oxygen = (6 * ONE_ATMOSPHERE) * volume / (R_IDEAL_GAS_EQUATION * T20C)
 
-/obj/item/tank/oxygen/examine(mob/user)
-	. = ..()
-	if(get_dist(user, src) <= 0 && air_contents.oxygen < 10)
-		. += "<span class='danger'>The meter on [src] indicates you are almost out of air!</span>"
-
-/obj/item/tank/oxygen/empty/New()
-	..()
-	air_contents.oxygen = null
-
-/obj/item/tank/oxygen/yellow
+/obj/item/tank/internals/oxygen/yellow
 	desc = "A tank of oxygen, this one is yellow."
 	icon_state = "oxygen_f"
 	dog_fashion = null
 
-/obj/item/tank/oxygen/red
+/obj/item/tank/internals/oxygen/red
 	desc = "A tank of oxygen, this one is red."
 	icon_state = "oxygen_fr"
 	dog_fashion = null
 
-/obj/item/tank/emergency_oxygen
+/obj/item/tank/internals/oxygen/empty/populate_gas()
+	return
+
+/*
+ * Anesthetic
+ */
+/obj/item/tank/internals/anesthetic
+	name = "anesthetic tank"
+	desc = "A tank with an N2O/O2 gas mix."
+	icon_state = "anesthetic"
+	item_state = "an_tank"
+	force = 10
+
+/obj/item/tank/internals/anesthetic/populate_gas()
+	air_contents.oxygen = (3 * ONE_ATMOSPHERE) * volume / (R_IDEAL_GAS_EQUATION * T20C) * O2STANDARD
+	air_contents.sleeping_agent = (3 * ONE_ATMOSPHERE) * volume / (R_IDEAL_GAS_EQUATION * T20C) * N2STANDARD
+
+/*
+ * Plasma
+ */
+/obj/item/tank/internals/plasma
+	name = "plasma tank"
+	desc = "Contains dangerous plasma. Do not inhale. Warning: extremely flammable."
+	icon_state = "plasma"
+	flags = CONDUCT
+	slot_flags = null	//they have no straps!
+	force = 8
+
+/obj/item/tank/internals/plasma/populate_gas()
+	air_contents.toxins = (3 * ONE_ATMOSPHERE) * volume / (R_IDEAL_GAS_EQUATION * T20C)
+
+/obj/item/tank/internals/plasma/attackby(obj/item/I, mob/user, params)
+	if(istype(I, /obj/item/flamethrower))
+		var/obj/item/flamethrower/F = I
+		if((!F.status)||(F.ptank))
+			return
+		master = F
+		F.ptank = src
+		user.unEquip(src)
+		loc = F
+		F.update_icon()
+	else
+		return ..()
+
+/obj/item/tank/internals/plasma/full/populate_gas()
+	air_contents.toxins = (10 * ONE_ATMOSPHERE) * volume / (R_IDEAL_GAS_EQUATION * T20C)
+
+/obj/item/tank/internals/plasma/empty/populate_gas()
+	return
+
+/*
+ * Plasmaman Plasma Tank
+ */
+/obj/item/tank/internals/plasmaman
+	name = "plasma internals tank"
+	desc = "A tank of plasma gas designed specifically for use as internals, particularly for plasma-based lifeforms. If you're not a Plasmaman, you probably shouldn't use this."
+	icon_state = "plasma_fr"
+	item_state = "plasma_fr"
+	force = 10
+	distribute_pressure = TANK_DEFAULT_RELEASE_PRESSURE
+
+/obj/item/tank/internals/plasmaman/populate_gas()
+	air_contents.toxins = (3 * ONE_ATMOSPHERE) * volume / (R_IDEAL_GAS_EQUATION * T20C)
+
+/obj/item/tank/internals/plasmaman/full/populate_gas()
+	air_contents.toxins = (10 * ONE_ATMOSPHERE) * volume / (R_IDEAL_GAS_EQUATION * T20C)
+
+
+/obj/item/tank/internals/plasmaman/belt
+	icon_state = "plasmaman_tank_belt"
+	item_state = "plasmaman_tank_belt"
+	slot_flags = SLOT_BELT
+	force = 5
+	volume = 35
+	w_class = WEIGHT_CLASS_SMALL
+
+/obj/item/tank/internals/plasmaman/belt/full/populate_gas()
+	air_contents.toxins = (10 * ONE_ATMOSPHERE) * volume / (R_IDEAL_GAS_EQUATION * T20C)
+
+/obj/item/tank/internals/plasmaman/belt/empty/populate_gas()
+	return
+
+/obj/item/tank/internals/emergency_oxygen/plasma
+	name = "emergency plasma tank"
+	desc = "An emergency tank designed specifically for Plasmamen."
+	icon_state = "emergency_p"
+
+/obj/item/tank/internals/emergency_oxygen/plasma/populate_gas()
+	air_contents.toxins = (10 * ONE_ATMOSPHERE) * volume / (R_IDEAL_GAS_EQUATION * T20C)
+
+/*
+ * Emergency Oxygen
+ */
+/obj/item/tank/internals/emergency_oxygen
 	name = "emergency oxygen tank"
 	desc = "Used for emergencies. Contains very little oxygen, so try to conserve it until you actually need it."
 	icon_state = "emergency"
 	flags = CONDUCT
 	slot_flags = SLOT_BELT
 	w_class = WEIGHT_CLASS_SMALL
-	force = 4.0
+	force = 4
+	distribute_pressure = TANK_DEFAULT_RELEASE_PRESSURE
 	volume = 3 //Tiny. Real life equivalents only have 21 breaths of oxygen in them. They're EMERGENCY tanks anyway -errorage (dangercon 2011)
 
+/obj/item/tank/internals/emergency_oxygen/populate_gas()
+	air_contents.oxygen = (10 * ONE_ATMOSPHERE) * volume / (R_IDEAL_GAS_EQUATION * T20C)
 
-/obj/item/tank/emergency_oxygen/New()
-	..()
-	air_contents.oxygen = (3*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C)
+/obj/item/tank/internals/emergency_oxygen/empty/populate_gas()
+	return
 
-/obj/item/tank/emergency_oxygen/examine(mob/user)
-	. = ..()
-	if(get_dist(user, src) <= 0 && air_contents.oxygen < 0.2)
-		. += "<span class='danger'>The meter on [src] indicates you are almost out of air!</span>"
-		playsound(user, 'sound/effects/alert.ogg', 50, 1)
-
-/obj/item/tank/emergency_oxygen/empty/New()
-	..()
-	air_contents.oxygen = null
-
-/obj/item/tank/emergency_oxygen/engi
+/obj/item/tank/internals/emergency_oxygen/engi
 	name = "extended-capacity emergency oxygen tank"
 	icon_state = "emergency_engi"
-	volume = 6
+	volume = 6 // should last 24 minutes if full
 
-/obj/item/tank/emergency_oxygen/engi/full/New()
-	..()
-	air_contents.oxygen = (10*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C)
+/obj/item/tank/internals/emergency_oxygen/engi/empty/populate_gas()
+	return
 
-
-/obj/item/tank/emergency_oxygen/engi/empty/New()
-	..()
-	air_contents.oxygen = null
-
-/obj/item/tank/emergency_oxygen/syndi
+/obj/item/tank/internals/emergency_oxygen/engi/syndi
 	name = "suspicious emergency oxygen tank"
 	icon_state = "emergency_syndi"
 	desc = "A dark emergency oxygen tank. The label on the back reads \"Original Oxygen Tank Design, Do Not Steal.\""
-	volume = 6
 
-/obj/item/tank/emergency_oxygen/double
+/obj/item/tank/internals/emergency_oxygen/double
 	name = "double emergency oxygen tank"
 	icon_state = "emergency_double"
-	volume = 10
+	volume = 12 //If it's double of the above, shouldn't it be double the volume??
 
-/obj/item/tank/emergency_oxygen/double/empty/New()
-	..()
-	air_contents.oxygen = null
-
-/obj/item/tank/emergency_oxygen/double/full
-	name = "pressurized double emergency oxygen tank"
-	desc = "Used for \"emergencies,\" it actually contains a fair amount of oxygen."
-
-/obj/item/tank/emergency_oxygen/double/full/New()
-	..()
-	air_contents.oxygen = (10*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C)
+/obj/item/tank/internals/emergency_oxygen/double/empty/populate_gas()
+	return
 
 /*
  * Nitrogen
  */
-
-/obj/item/tank/nitrogen
+/obj/item/tank/internals/nitrogen
 	name = "nitrogen tank"
 	desc = "A tank of nitrogen."
 	icon_state = "oxygen_fr"
 	sprite_sheets = list("Vox Armalis" = 'icons/mob/species/armalis/back.dmi') //Do it for Big Bird.
+	distribute_pressure = TANK_DEFAULT_RELEASE_PRESSURE
 
-/obj/item/tank/nitrogen/New()
-	..()
-	air_contents.nitrogen = (3*ONE_ATMOSPHERE)*70/(R_IDEAL_GAS_EQUATION*T20C)
+/obj/item/tank/internals/nitrogen/populate_gas()
+	air_contents.nitrogen = (6 * ONE_ATMOSPHERE) * volume / (R_IDEAL_GAS_EQUATION * T20C)
 
-/obj/item/tank/nitrogen/examine(mob/user)
-	. = ..()
-	if(get_dist(user, src) <= 0 && air_contents.nitrogen < 10)
-		. += "<span class='danger'>The meter on the [src.name] indicates you are almost out of air!</span>"
-
-/obj/item/tank/emergency_oxygen/vox
-	name = "vox specialized nitrogen tank"
-	desc = "A high-tech nitrogen tank designed specifically for Vox."
-	icon_state = "emergency_vox"
-	volume = 25
-	sprite_sheets = list("Vox Armalis" = 'icons/mob/species/armalis/belt.dmi') //Do it for Big Bird.
-
-/obj/item/tank/emergency_oxygen/vox/New()
-	..()
-	air_contents.oxygen -= (3*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C)
-	air_contents.nitrogen = (10*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C)
-
-/obj/item/tank/emergency_oxygen/nitrogen
+/obj/item/tank/internals/emergency_oxygen/nitrogen
 	name = "emergency nitrogen tank"
 	desc = "An emergency tank designed specifically for Vox."
 	icon_state = "emergency_nitrogen"
-	volume = 3
 
-/obj/item/tank/emergency_oxygen/nitrogen/New()
-	..()
-	air_contents.oxygen -= (3*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C)
-	air_contents.nitrogen = (10*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C)
+/obj/item/tank/internals/emergency_oxygen/nitrogen/populate_gas()
+	air_contents.nitrogen = (10 * ONE_ATMOSPHERE) * volume / (R_IDEAL_GAS_EQUATION * T20C)
 
-/*
- Plasma
-*/
+/obj/item/tank/internals/emergency_oxygen/double/vox
+	name = "vox specialized nitrogen tank"
+	desc = "A high-tech nitrogen tank designed specifically for Vox."
+	icon_state = "emergency_vox"
+	sprite_sheets = list("Vox Armalis" = 'icons/mob/species/armalis/belt.dmi') //Do it for Big Bird.
+	volume = 35
 
-/obj/item/tank/plasma
-	name = "plasma tank"
-	desc = "Contains dangerous plasma. Do not inhale. Warning: extremely flammable."
-	icon_state = "plasma"
-	flags = CONDUCT
-	slot_flags = null	//they have no straps!
-
-/obj/item/tank/plasma/New()
-	..()
-	air_contents.toxins = (3*ONE_ATMOSPHERE)*70/(R_IDEAL_GAS_EQUATION*T20C)
-
-/obj/item/tank/plasma/attackby(obj/item/W as obj, mob/user as mob, params)
-	..()
-
-	if(istype(W, /obj/item/flamethrower))
-		var/obj/item/flamethrower/F = W
-		if((!F.status)||(F.ptank))	return
-		master = F
-		F.ptank = src
-		user.unEquip(src)
-		loc = F
-		F.update_icon()
-
-/obj/item/tank/plasma/full/New()
-	..()
-	air_contents.toxins = (10*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C)
-
-/obj/item/tank/plasma/plasmaman
-	name = "plasma internals tank"
-	desc = "A tank of plasma gas designed specifically for use as internals, particularly for plasma-based lifeforms. If you're not a Plasmaman, you probably shouldn't use this."
-	icon_state = "plasmaman_tank"
-	item_state = "plasmaman_tank"
-	force = 10
-
-/obj/item/tank/plasma/plasmaman/examine(mob/user)
-	. = ..()
-	if(get_dist(user, src) <= 0 && air_contents.toxins < 0.2)
-		. += "<span class='danger'>The meter on [src] indicates you are almost out of plasma!</span>"
-		playsound(user, 'sound/effects/alert.ogg', 50, 1)
-
-
-/obj/item/tank/plasma/plasmaman/belt
-	icon_state = "plasmaman_tank_belt"
-	item_state = "plasmaman_tank_belt"
-	slot_flags = SLOT_BELT
-	force = 5
-	volume = 25
-	w_class = WEIGHT_CLASS_SMALL
-
-/obj/item/tank/plasma/plasmaman/belt/full/New()
-	..()
-	air_contents.toxins = (10 * ONE_ATMOSPHERE) * volume / (R_IDEAL_GAS_EQUATION * T20C)
-
-/obj/item/tank/emergency_oxygen/plasma
-	name = "emergency plasma tank"
-	desc = "An emergency tank designed specifically for Plasmamen."
-	icon_state = "emergency_p"
-	volume = 3
-
-/obj/item/tank/emergency_oxygen/plasma/New()
-	..()
-	air_contents.oxygen -= (3*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C)
-	air_contents.toxins = (10*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C)
+/obj/item/tank/internals/emergency_oxygen/double/vox/populate_gas()
+	air_contents.nitrogen = (10 * ONE_ATMOSPHERE) * volume / (R_IDEAL_GAS_EQUATION * T20C)
 
 /*
  * Air Mix
  */
-/obj/item/tank/air
+/obj/item/tank/internals/air
 	name = "air tank"
 	desc = "Mixed anyone?"
 	icon_state = "air"
 	item_state = "air"
 	distribute_pressure = ONE_ATMOSPHERE
 
-/obj/item/tank/air/examine(mob/user)
-	. = ..()
-	if(get_dist(user, src) <= 0 && air_contents.oxygen < 1)
-		. += "<span class='danger'>The meter on [src] indicates you are almost out of air!</span>"
-		playsound(user, 'sound/effects/alert.ogg', 50, 1)
-
-/obj/item/tank/air/New()
-	..()
-	air_contents.oxygen = (6*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C) * O2STANDARD
-	air_contents.nitrogen = (6*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C) * N2STANDARD
-
+/obj/item/tank/internals/air/populate_gas()
+	air_contents.oxygen = (3 * ONE_ATMOSPHERE) * volume / (R_IDEAL_GAS_EQUATION * T20C) * O2STANDARD
+	air_contents.nitrogen = (3 * ONE_ATMOSPHERE) * volume / (R_IDEAL_GAS_EQUATION * T20C) * N2STANDARD
 
 /*
- * Anesthetic
+ * Generic
  */
-/obj/item/tank/anesthetic
-	name = "anesthetic tank"
-	desc = "A tank with an N2O/O2 gas mix."
-	icon_state = "anesthetic"
-	item_state = "an_tank"
-	distribute_pressure = ONE_ATMOSPHERE
-
-/obj/item/tank/anesthetic/New()
-	..()
-	air_contents.oxygen = (3 * ONE_ATMOSPHERE) * 70 / (R_IDEAL_GAS_EQUATION * T20C) * O2STANDARD
-	air_contents.sleeping_agent = (3 * ONE_ATMOSPHERE) * 70 / (R_IDEAL_GAS_EQUATION * T20C) * N2STANDARD
+/obj/item/tank/internals/generic
+	name = "gas tank"
+	desc = "A generic tank used for storing and transporting gasses. Can be used for internals."
+	icon_state = "generic"
+	item_state = "generic"
+	distribute_pressure = TANK_DEFAULT_RELEASE_PRESSURE
+	force = 10
+	dog_fashion = /datum/dog_fashion/back
 
+/obj/item/tank/internals/generic/populate_gas()
+	return

code/game/objects/items/weapons/tanks/tanks.dm

@@ -1,5 +1,3 @@
-#define TANK_MAX_RELEASE_PRESSURE (3*ONE_ATMOSPHERE)
-
 /obj/item/tank
 	name = "tank"
 	icon = 'icons/obj/tank.dmi'
@@ -8,14 +6,14 @@
 	hitsound = 'sound/weapons/smash.ogg'
 	w_class = WEIGHT_CLASS_NORMAL
 	pressure_resistance = ONE_ATMOSPHERE * 5
-	force = 5.0
-	throwforce = 10.0
+	force = 5
+	throwforce = 10
 	throw_speed = 1
 	throw_range = 4
 	armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 10, "bio" = 0, "rad" = 0, "fire" = 80, "acid" = 30)
 	actions_types = list(/datum/action/item_action/set_internals)
 	var/datum/gas_mixture/air_contents = null
-	var/distribute_pressure = TANK_DEFAULT_RELEASE_PRESSURE
+	var/distribute_pressure = ONE_ATMOSPHERE
 	var/integrity = 3
 	var/volume = 70
 
@@ -25,6 +23,9 @@
 	air_contents = new /datum/gas_mixture()
 	air_contents.volume = volume //liters
 	air_contents.temperature = T20C
+
+	populate_gas()
+
 	START_PROCESSING(SSobj, src)
 	return
 
@@ -35,6 +36,8 @@
 
 	return ..()
 
+/obj/item/tank/proc/populate_gas()
+	return
 
 /obj/item/tank/ui_action_click(mob/user)
 	toggle_internals(user)
@@ -82,7 +85,7 @@
 			. += "<span class='notice'>It's \a [bicon(icon)][src]! If you want any more information you'll need to get closer.</span>"
 		return
 
-	var/celsius_temperature = air_contents.temperature-T0C
+	var/celsius_temperature = air_contents.temperature - T0C
 	var/descriptive
 
 	if(celsius_temperature < 20)
@@ -147,10 +150,10 @@
 
 /obj/item/tank/ui_data(mob/user)
 	var/list/data = list()
-	data["tankPressure"] = round(air_contents.return_pressure() ? air_contents.return_pressure() : 0)
-	data["releasePressure"] = round(distribute_pressure ? distribute_pressure : 0)
+	data["tankPressure"] = round(air_contents.return_pressure())
+	data["releasePressure"] = round(distribute_pressure)
 	data["defaultReleasePressure"] = round(TANK_DEFAULT_RELEASE_PRESSURE)
-	data["minReleasePressure"] = round(TANK_DEFAULT_RELEASE_PRESSURE)
+	data["minReleasePressure"] = round(TANK_MIN_RELEASE_PRESSURE)
 	data["maxReleasePressure"] = round(TANK_MAX_RELEASE_PRESSURE)
 	var/mob/living/carbon/C = user
 	if(!istype(C))
@@ -171,7 +174,7 @@
 			if(pressure == "reset")
 				pressure = initial(distribute_pressure)
 			else if(pressure == "min")
-				pressure = TANK_DEFAULT_RELEASE_PRESSURE
+				pressure = TANK_MIN_RELEASE_PRESSURE
 			else if(pressure == "max")
 				pressure = TANK_MAX_RELEASE_PRESSURE
 			else if(text2num(pressure) != null)
@@ -179,7 +182,7 @@
 			else
 				. = FALSE
 			if(.)
-				distribute_pressure = clamp(round(pressure), TANK_DEFAULT_RELEASE_PRESSURE, TANK_MAX_RELEASE_PRESSURE)
+				distribute_pressure = clamp(round(pressure), TANK_MIN_RELEASE_PRESSURE, TANK_MAX_RELEASE_PRESSURE)
 		if("internals")
 			toggle_internals(usr)
 		else
@@ -204,10 +207,9 @@
 		return null
 
 	var/tank_pressure = air_contents.return_pressure()
-	if(tank_pressure < distribute_pressure)
-		distribute_pressure = tank_pressure
+	var/actual_distribute_pressure = clamp(tank_pressure, 0, distribute_pressure)
 
-	var/moles_needed = distribute_pressure*volume_to_return/(R_IDEAL_GAS_EQUATION*air_contents.temperature)
+	var/moles_needed = actual_distribute_pressure * volume_to_return / (R_IDEAL_GAS_EQUATION * air_contents.temperature)
 
 	return remove_air(moles_needed)
 

code/game/objects/objs.dm

@@ -118,8 +118,11 @@
 	//		null if object handles breathing logic for lifeform
 	//		datum/air_group to tell lifeform to process using that breath return
 	//DEFAULT: Take air from turf to give to have mob process
+
 	if(breath_request > 0)
-		return remove_air(breath_request)
+		var/datum/gas_mixture/environment = return_air()
+		var/breath_percentage = BREATH_VOLUME / environment.return_volume()
+		return remove_air(environment.total_moles() * breath_percentage)
 	else
 		return null
 

code/game/objects/structures/crates_lockers/closets/job_closets.dm

@@ -149,5 +149,5 @@
 	new /obj/item/clothing/head/soft/blue(src)
 	new /obj/item/clothing/suit/storage/paramedic(src)
 	new /obj/item/clothing/suit/storage/paramedic(src)
-	new /obj/item/tank/emergency_oxygen/engi(src)
-	new /obj/item/tank/emergency_oxygen/engi(src)
+	new /obj/item/tank/internals/emergency_oxygen/engi(src)
+	new /obj/item/tank/internals/emergency_oxygen/engi(src)

code/game/objects/structures/crates_lockers/closets/l3closet.dm

@@ -31,7 +31,7 @@
 	new /obj/item/clothing/suit/bio_suit/virology( src )
 	new /obj/item/clothing/head/bio_hood/virology( src )
 	new /obj/item/clothing/mask/breath(src)
-	new /obj/item/tank/oxygen(src)
+	new /obj/item/tank/internals/oxygen(src)
 
 
 /obj/structure/closet/l3closet/security

code/game/objects/structures/crates_lockers/closets/secure/cargo.dm

@@ -35,7 +35,7 @@
 	new /obj/item/radio/headset/headset_cargo(src)
 	new /obj/item/clothing/gloves/fingerless(src)
 	new /obj/item/clothing/suit/fire/firefighter(src)
-	new /obj/item/tank/emergency_oxygen(src)
+	new /obj/item/tank/internals/emergency_oxygen(src)
 	new /obj/item/clothing/mask/gas(src)
 	new /obj/item/clothing/glasses/meson(src)
 	new /obj/item/clothing/head/soft(src)

code/game/objects/structures/crates_lockers/closets/secure/engineering.dm

@@ -139,7 +139,7 @@
 	new /obj/item/grenade/gas/oxygen(src)
 	new /obj/item/clothing/suit/storage/hazardvest(src)
 	new /obj/item/clothing/mask/gas(src)
-	new /obj/item/tank/emergency_oxygen/engi(src)
+	new /obj/item/tank/internals/emergency_oxygen/engi(src)
 	new /obj/item/holosign_creator/atmos(src)
 	new /obj/item/watertank/atmos(src)
 	new /obj/item/clothing/suit/fire/atmos(src)

code/game/objects/structures/crates_lockers/closets/secure/medical.dm

@@ -37,9 +37,9 @@
 	req_access = list(ACCESS_SURGERY)
 
 /obj/structure/closet/secure_closet/medical2/populate_contents()
-	new /obj/item/tank/anesthetic(src)
-	new /obj/item/tank/anesthetic(src)
-	new /obj/item/tank/anesthetic(src)
+	new /obj/item/tank/internals/anesthetic(src)
+	new /obj/item/tank/internals/anesthetic(src)
+	new /obj/item/tank/internals/anesthetic(src)
 	new /obj/item/clothing/mask/breath/medical(src)
 	new /obj/item/clothing/mask/breath/medical(src)
 	new /obj/item/clothing/mask/breath/medical(src)

code/game/objects/structures/crates_lockers/closets/secure/scientist.dm

@@ -18,7 +18,7 @@
 	new /obj/item/clothing/shoes/white(src)
 //		new /obj/item/cartridge/signal/toxins(src)
 	new /obj/item/radio/headset/headset_sci(src)
-	new /obj/item/tank/air(src)
+	new /obj/item/tank/internals/air(src)
 	new /obj/item/clothing/mask/gas(src)
 	new /obj/item/clothing/shoes/sandal/white(src)
 
@@ -64,7 +64,7 @@
 	new /obj/item/clothing/shoes/white(src)
 	new /obj/item/clothing/gloves/color/latex(src)
 	new /obj/item/radio/headset/heads/rd(src)
-	new /obj/item/tank/air(src)
+	new /obj/item/tank/internals/air(src)
 	new /obj/item/clothing/mask/gas(src)
 	new /obj/item/clothing/suit/armor/reactive/teleport(src)
 	new /obj/item/flash(src)

code/game/objects/structures/crates_lockers/closets/secure/security.dm

@@ -32,7 +32,7 @@
 	new /obj/item/gun/energy/gun(src)
 	new /obj/item/door_remote/captain(src)
 	new /obj/item/reagent_containers/food/drinks/mug/cap(src)
-	new /obj/item/tank/emergency_oxygen/double(src)
+	new /obj/item/tank/internals/emergency_oxygen/double(src)
 
 
 /obj/structure/closet/secure_closet/hop

code/game/objects/structures/crates_lockers/closets/utility_closets.dm

@@ -25,23 +25,23 @@
 /obj/structure/closet/emcloset/populate_contents()
 	switch(pickweight(list("small" = 55, "aid" = 25, "tank" = 10, "both" = 10, "nothing" = 0, "delete" = 0)))
 		if("small")
-			new /obj/item/tank/emergency_oxygen(src)
-			new /obj/item/tank/emergency_oxygen(src)
+			new /obj/item/tank/internals/emergency_oxygen(src)
+			new /obj/item/tank/internals/emergency_oxygen(src)
 			new /obj/item/clothing/mask/breath(src)
 			new /obj/item/clothing/mask/breath(src)
 		if("aid")
-			new /obj/item/tank/emergency_oxygen(src)
+			new /obj/item/tank/internals/emergency_oxygen(src)
 			new /obj/item/storage/toolbox/emergency(src)
 			new /obj/item/clothing/mask/breath(src)
 			new /obj/item/storage/firstaid/o2(src)
 		if("tank")
-			new /obj/item/tank/emergency_oxygen/engi(src)
+			new /obj/item/tank/internals/emergency_oxygen/engi(src)
 			new /obj/item/clothing/mask/breath(src)
-			new /obj/item/tank/emergency_oxygen/engi(src)
+			new /obj/item/tank/internals/emergency_oxygen/engi(src)
 			new /obj/item/clothing/mask/breath(src)
 		if("both")
 			new /obj/item/storage/toolbox/emergency(src)
-			new /obj/item/tank/emergency_oxygen/engi(src)
+			new /obj/item/tank/internals/emergency_oxygen/engi(src)
 			new /obj/item/clothing/mask/breath(src)
 			new /obj/item/storage/firstaid/o2(src)
 		if("nothing")
@@ -57,7 +57,7 @@
 			qdel(src)*/
 
 /obj/structure/closet/emcloset/legacy/populate_contents()
-	new /obj/item/tank/oxygen(src)
+	new /obj/item/tank/internals/oxygen(src)
 	new /obj/item/clothing/mask/gas(src)
 
 /*
@@ -73,7 +73,7 @@
 /obj/structure/closet/firecloset/populate_contents()
 	new /obj/item/clothing/suit/fire/firefighter(src)
 	new /obj/item/clothing/mask/gas(src)
-	new /obj/item/tank/oxygen/red(src)
+	new /obj/item/tank/internals/oxygen/red(src)
 	new /obj/item/extinguisher(src)
 	new /obj/item/clothing/head/hardhat/red(src)
 
@@ -81,7 +81,7 @@
 	new /obj/item/clothing/suit/fire/firefighter(src)
 	new /obj/item/clothing/mask/gas(src)
 	new /obj/item/flashlight(src)
-	new /obj/item/tank/oxygen/red(src)
+	new /obj/item/tank/internals/oxygen/red(src)
 	new /obj/item/extinguisher(src)
 	new /obj/item/clothing/head/hardhat/red(src)
 
@@ -191,7 +191,7 @@
 	new /obj/item/clothing/suit/fire/firefighter(src)
 	new /obj/item/clothing/mask/gas(src)
 	new /obj/item/flashlight(src)
-	new /obj/item/tank/oxygen/red(src)
+	new /obj/item/tank/internals/oxygen/red(src)
 	new /obj/item/extinguisher(src)
 	new /obj/item/clothing/head/hardhat/red(src)
 

code/game/objects/structures/crates_lockers/walllocker.dm

@@ -23,9 +23,9 @@
 	icon_opened = "emergopen"
 
 /obj/structure/closet/walllocker/emerglocker/populate_contents()
-	new /obj/item/tank/emergency_oxygen(src)
-	new /obj/item/tank/emergency_oxygen(src)
-	new /obj/item/tank/emergency_oxygen(src)
+	new /obj/item/tank/internals/emergency_oxygen(src)
+	new /obj/item/tank/internals/emergency_oxygen(src)
+	new /obj/item/tank/internals/emergency_oxygen(src)
 	new /obj/item/clothing/mask/breath(src)
 	new /obj/item/clothing/mask/breath(src)
 	new /obj/item/clothing/mask/breath(src)

code/game/objects/structures/tank_dispenser.dm

@@ -30,11 +30,11 @@
 
 /obj/structure/dispenser/proc/initialize_tanks()
 	for(var/I in 1 to starting_plasma_tanks)
-		var/obj/item/tank/plasma/P = new(src)
+		var/obj/item/tank/internals/plasma/P = new(src)
 		stored_plasma_tanks.Add(P)
 
 	for(var/I in 1 to starting_oxygen_tanks)
-		var/obj/item/tank/oxygen/O = new(src)
+		var/obj/item/tank/internals/oxygen/O = new(src)
 		stored_oxygen_tanks.Add(O)
 
 /obj/structure/dispenser/update_icon()
@@ -89,11 +89,11 @@
 	return TRUE
 
 /obj/structure/dispenser/attackby(obj/item/I, mob/user, params)
-	if(istype(I, /obj/item/tank/oxygen) || istype(I, /obj/item/tank/air) || istype(I, /obj/item/tank/anesthetic))
+	if(istype(I, /obj/item/tank/internals/oxygen) || istype(I, /obj/item/tank/internals/air) || istype(I, /obj/item/tank/internals/anesthetic))
 		try_insert_tank(user, stored_oxygen_tanks, I)
 		return
 
-	if(istype(I, /obj/item/tank/plasma))
+	if(istype(I, /obj/item/tank/internals/plasma))
 		try_insert_tank(user, stored_plasma_tanks, I)
 		return
 
@@ -112,7 +112,7 @@
 	if(!LAZYLEN(tank_list))
 		return // There are no tanks left to withdraw.
 
-	var/obj/item/tank/T = tank_list[1]
+	var/obj/item/tank/internals/T = tank_list[1]
 	tank_list.Remove(T)
 
 	if(!user.put_in_hands(T))