-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/WorkInProgress/Chemistry-Tools.dm

@@ -2328,6 +2328,15 @@
 		..()
 		reagents.add_reagent("inaprovaline", 30)
 
+/obj/item/weapon/reagent_containers/pill/dexalin
+	name = "Dexalin pill"
+	desc = "Used to treat oxygen deprivation."
+	icon_state = "pill16"
+
+	New()
+		..()
+		reagents.add_reagent("dexalin", 30)
+
 //Dispensers
 /obj/reagent_dispensers/watertank
 	name = "watertank"

code/defines/obj/clothing.dm

@@ -199,10 +199,11 @@
 	item_state = "pwig"
 
 /obj/item/clothing/head/that
-	name = "hat"
+	name = "Top hat"
 	desc = "An amish looking hat"
 	icon_state = "tophat"
 	item_state = "that"
+	flags = FPRINT|TABLEPASS|HEADSPACE
 
 /obj/item/clothing/head/wizard
 	name = "wizard hat"

code/defines/obj/storage.dm

@@ -88,6 +88,11 @@
 	icon_state = "antitoxin"
 	item_state = "firstaid-toxin"
 
+/obj/item/weapon/storage/firstaid/o2
+	name = "Oxygen Deprivation First Aid"
+	icon_state = "o2"
+	item_state = "firstaid-o2"
+
 /obj/item/weapon/storage/flashbang_kit
 	desc = "<FONT color=red><B>WARNING: Do not use without reading these preautions!</B></FONT>\n<B>These devices are extremely dangerous and can cause blindness or deafness if used incorrectly.</B>\nThe chemicals contained in these devices have been tuned for maximal effectiveness and due to\nextreme safety precuaiotn shave been incased in a tamper-proof pack. DO NOT ATTEMPT TO OPEN\nFLASH WARNING: Do not use continually. Excercise extreme care when detonating in closed spaces.\n\tMake attemtps not to detonate withing range of 2 meters of the intended target. It is imperative\n\tthat the targets visit a medical professional after usage. Damage to eyes increases extremely per\n\tuse and according to range. Glasses with flash resistant filters DO NOT always work on high powered\n\tflash devices such as this. <B>EXERCISE CAUTION REGARDLESS OF CIRCUMSTANCES</B>\nSOUND WARNING: Do not use continually. Visit a medical professional if hearing is lost.\n\tThere is a slight chance per use of complete deafness. Exercise caution and restraint.\nSTUN WARNING: If the intended or unintended target is too close to detonation the resulting sound\n\tand flash have been known to cause extreme sensory overload resulting in temporary\n\tincapacitation.\n<B>DO NOT USE CONTINUALLY</B>\nOperating Directions:\n\t1. Pull detonnation pin. <B>ONCE THE PIN IS PULLED THE GRENADE CAN NOT BE DISARMED!</B>\n\t2. Throw grenade. <B>NEVER HOLD A LIVE FLASHBANG</B>\n\t3. The grenade will detonste 10 seconds hafter being primed. <B>EXCERCISE CAUTION</B>\n\t-<B>Never prime another grenade until after the first is detonated</B>\nNote: Usage of this pyrotechnic device without authorization is an extreme offense and can\nresult in severe punishment upwards of <B>10 years in prison per use</B>.\n\nDefault 3 second wait till from prime to detonation. This can be switched with a screwdriver\nto 10 seconds.\n\nCopyright of Nanotrasen Industries- Military Armnaments Division\nThis device was created by Nanotrasen Labs a member of the Expert Advisor Corporation"
 	name = "Flashbangs (WARNING)"

code/defines/obj/supplypacks.dm

@@ -100,6 +100,7 @@
 	contains = list("/obj/item/weapon/storage/firstaid/regular",
 					"/obj/item/weapon/storage/firstaid/fire",
 					"/obj/item/weapon/storage/firstaid/toxin",
+					"/obj/item/weapon/storage/firstaid/o2",
 					"/obj/item/weapon/reagent_containers/glass/bottle/antitoxin",
 					"/obj/item/weapon/reagent_containers/glass/bottle/inaprovaline",
 					"/obj/item/weapon/reagent_containers/glass/bottle/stoxin",

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()