- Oxygen tanks now actually do the thing I said they would, but now it's on examine instead of automagically warning you. This is to ensure you still have to be somewhat attentive to not die.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2146 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
LastBattaWolf@hotmail.com
2011-09-06 22:04:20 +00:00
parent eec98db7d5
commit c4b9ae8487
3 changed files with 29 additions and 6 deletions

View File

@@ -15,6 +15,7 @@
throw_range = 4
var/volume = 70
/obj/item/weapon/tank/anesthetic
name = "Gas Tank (Sleeping Agent)"
desc = "Seriously, who uses this anymore?"
@@ -60,11 +61,23 @@
desc = "A tank of oxygen meant for firefighters."
icon_state = "oxygen_fr"
/obj/item/weapon/tank/oxygen/examine()
set src in usr
if(air_contents.oxygen < 10)
usr << text("\red <B>The meter on the tank indicates you are almost out of air!</B>")
playsound(usr, 'alert.ogg', 50, 1)
/obj/item/weapon/tank/air
name = "Gas Tank (Air Mix)"
desc = "Mixed anyone?"
icon_state = "oxygen"
/obj/item/weapon/tank/air/examine()
set src in usr
if(air_contents.oxygen < 1)
usr << text("\red <B>The meter on the tank indicates you are almost out of air!</B>")
playsound(usr, 'alert.ogg', 50, 1)
/obj/item/weapon/tank/plasma
name = "Gas Tank (BIOHAZARD)"
desc = "Contains dangerous plasma. Do not inhale."
@@ -90,7 +103,11 @@
name = "Double Emergency Oxygen Tank"
volume = 10 //These have the same emoung of gas in them as air tanks, but can be worn on your belt -errorage (dangercon 2011)
/obj/item/weapon/tank/emergency_oxygen/examine()
set src in usr
if(air_contents.oxygen < 0.4)
usr << text("\red <B>The meter on the tank indicates you are almost out of air!</B>")
playsound(usr, 'alert.ogg', 50, 1)
/obj/item/weapon/tank/blob_act()