-Added dexalin pills.

-Added oxygen deprivation kit. 
-Added O2 kit to med supply crate from QM.
-Added O2 kit to medbay.
-Added O2 kit to emergency lockers. 
-Changed spawn chances and what items spawn in emergency lockers to something more sensible.
-Changed barman's top hat to allow small items to be stored within.
-Decreased emergency oxygen tank contents to ~100. Can be undone if people get really pissy.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@702 316c924e-a436-60f5-8080-3fe189b3f50e

code/game/objects/closets/emergency.dm

@@ -4,13 +4,14 @@
 	if (prob(40))
 		new /obj/item/weapon/storage/toolbox/emergency(src)
 
-	switch (pickweight(list("small" = 20, "mask" = 5, "tank" = 4, "both" = 2, "nothing" = 1, "delete" = 1)))
+	switch (pickweight(list("small" = 25, "aid" = 10, "tank" = 5, "both" = 5, "nothing" = 4, "delete" = 1)))
 		if ("small")
 			new /obj/item/weapon/tank/emergency_oxygen(src)
 			new /obj/item/weapon/tank/emergency_oxygen(src)
 
-		if ("mask")
-			new /obj/item/clothing/mask/breath(src)
+		if ("aid")
+			new /obj/item/weapon/tank/emergency_oxygen(src)
+			new /obj/item/weapon/storage/firstaid/o2(src)
 
 		if ("tank")
 			new /obj/item/weapon/tank/air(src)

code/game/objects/storage/firstaid.dm

@@ -44,6 +44,18 @@
 	new /obj/item/device/healthanalyzer( src )
 	return
 
+/obj/item/weapon/storage/firstaid/o2/New()
+
+	..()
+	new /obj/item/weapon/reagent_containers/pill/dexalin( src )
+	new /obj/item/weapon/reagent_containers/pill/dexalin( src )
+	new /obj/item/weapon/reagent_containers/pill/dexalin( src )
+	new /obj/item/weapon/reagent_containers/pill/dexalin( src )
+	new /obj/item/weapon/reagent_containers/syringe/inaprovaline( src )
+	new /obj/item/weapon/reagent_containers/syringe/inaprovaline( src )
+	new /obj/item/device/healthanalyzer( src )
+	return
+
 /obj/item/weapon/storage/pill_bottle/kelotane
 	name = "Pill bottle (kelotane)"
 	desc = "Contains pills used to treat burns."

code/game/objects/tank.dm

@@ -260,7 +260,7 @@
 /obj/item/weapon/tank/emergency_oxygen/New()
 	..()
 
-	src.air_contents.oxygen = (3*ONE_ATMOSPHERE)*70/(R_IDEAL_GAS_EQUATION*T20C)
+	src.air_contents.oxygen = (1*ONE_ATMOSPHERE)*70/(R_IDEAL_GAS_EQUATION*T20C)
 	return
 
 /obj/item/weapon/tank/jetpack/New()