Merge pull request #2944 from Anewbe/vox_toys

Adds and tweaks Vox toys
This commit is contained in:
Anewbe
2017-01-26 22:42:53 -06:00
committed by GitHub
37 changed files with 242 additions and 71 deletions
@@ -100,14 +100,21 @@
src.loc = F
return
/obj/item/weapon/tank/phoron/vox
/obj/item/weapon/tank/vox //Can't be a child of phoron or the gas amount gets screwey.
name = "phoron tank"
desc = "Contains dangerous phoron. Do not inhale. Warning: extremely flammable."
icon_state = "oxygen_fr"
gauge_icon = null
flags = CONDUCT
distribute_pressure = ONE_ATMOSPHERE*O2STANDARD
slot_flags = SLOT_BACK //these ones have straps!
/obj/item/weapon/tank/vox/New()
..()
air_contents.adjust_gas("phoron", (6*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C))
return
/*
* Emergency Oxygen
*/