Merge pull request #257 from Meowykins/master

Stuff for stuff.

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

@@ -123,6 +123,8 @@
 	allow_quick_gather = 1
 	use_to_pickup = 1
 	storage_slots = 14
+	m_amt = 100
+	g_amt = 700
 	use_sound = null
 
 /obj/item/weapon/storage/pill_bottle/verb/rename()

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

@@ -850,6 +850,7 @@ LOOK FOR SURGERY.DM*/
 	force = 8.0
 	throwforce = 9.0
 	throw_speed = 3
+	m_amt = 1000
 	throw_range = 5
 	w_class = 2.0
 	attack_verb = list("attacked", "hit", "bludgeoned")

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

@@ -186,4 +186,16 @@
 	..()
 	if(air_contents.nitrogen < 10)
 		usr << text("\red <B>The meter on the [src.name] indicates you are almost out of air!</B>")
-		//playsound(usr, 'sound/effects/alert.ogg', 50, 1)
+		//playsound(usr, 'sound/effects/alert.ogg', 50, 1)
+
+/obj/item/weapon/tank/autolathe
+	name = "Emergency Tank"
+	desc = "Used for emergencies. Use wisely."
+	icon_state = "emergency"
+	flags = FPRINT | TABLEPASS | CONDUCT
+	slot_flags = SLOT_BELT
+	w_class = 2.0
+	force = 4.0
+	m_amt = 1000
+	distribute_pressure = ONE_ATMOSPHERE*O2STANDARD
+	volume = 2