diff --git a/code/game/objects/tank.dm b/code/game/objects/tank.dm index cf5f5c8064f..159f8866013 100644 --- a/code/game/objects/tank.dm +++ b/code/game/objects/tank.dm @@ -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 The meter on the tank indicates you are almost out of air!") + 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 The meter on the tank indicates you are almost out of air!") + 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 The meter on the tank indicates you are almost out of air!") + playsound(usr, 'alert.ogg', 50, 1) /obj/item/weapon/tank/blob_act() diff --git a/icons/changelog.html b/icons/changelog.html index 25e8220bc17..02eba86b0eb 100644 --- a/icons/changelog.html +++ b/icons/changelog.html @@ -56,7 +56,7 @@ should be listed in the changelog upon commit tho. Thanks. --> 6 September 2011 - + 5 September 2011. diff --git a/sound/misc/NewRound.ogg b/sound/misc/NewRound.ogg deleted file mode 100644 index b3a3624de56..00000000000 Binary files a/sound/misc/NewRound.ogg and /dev/null differ