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
- - Agouri updated:
+
- Greek Rioter updated:
- Removed dumb/badly sprited drinks for barman. This is for you, people that love to play barman. Your job is now non-retarded again. EDIT: FIXED DRINK MIXING
- More info here: rev2136
@@ -67,11 +67,11 @@ should be listed in the changelog upon commit tho. Thanks. -->
- Fixed the karma exploit! Uhangi can rest in peace knowing his -87 karma ways were not his own.
- Added new ambient sound for space and the mines.
- - Oxygen tanks will now beep to warn you when you are about to run out of air.
+ - Examining an oxygen tank will now tell you if it is about to run out of air. If it is, you will recieve a beep and a message, and if not, then you'll just get the default "this is an oxygentank!" message.
- - Erro updated:
+
- Rageroro updated:
- Sleeper update! Sleepers can now only inject soporific, dermaline, bicaridine, and dexaline into people with 1% or more health. They can also inject inaprovaline into people with -100% or more health. Nothing can be injected into people who are dead.
@@ -90,11 +90,17 @@ should be listed in the changelog upon commit tho. Thanks. -->
- Fixed electropack bug regarding using screwdrivers on electropacks.
-
+
+ - Microwave updated:
+
+ - Nuka Cola re-added.
+ - Synaptizine now makes you immune to being stunned or knocked down while it is in your body.
+
+
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