- 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

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 <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()

icons/changelog.html

@@ -56,7 +56,7 @@ should be listed in the changelog upon commit tho. Thanks. -->
 
 <b><font color='blue'>6 September 2011</font color><b>
 <ul>
-  <li><b>Agouri updated:</b>
+  <li><b><a href='#' id='greekrioter_link' onclick="changeText('greekrioter_tag','Agouri', 'greekrioter_link')"><span id='greekrioter_tag'>Greek Rioter</span></a> updated:</b>
   <ul>
     <li>Removed dumb/badly sprited drinks for barman. This is for you, people that love to play barman. Your job is now non-retarded again. <font color='red'><b>EDIT: FIXED DRINK MIXING</b></font></li>
     <li>More info here: <a href="http://code.google.com/p/tgstation13/source/detail?r=2136/" target='_blank'>rev2136</a></li>
@@ -67,11 +67,11 @@ should be listed in the changelog upon commit tho. Thanks. -->
   <ul>
     <li>Fixed the karma exploit! Uhangi can rest in peace knowing his -87 karma ways were not his own.</li>
     <li>Added new ambient sound for space and the mines.</li>
-	<li>Oxygen tanks will now beep to warn you when you are about to run out of air.</li>
+	<li>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.</li>
   </ul>
 </ul>
 <ul>
-  <li><b>Erro updated:</b>
+  <li><b><a href='#' id='rageroro_link' onclick="changeText('rageroro_tag','Errorage', 'rageroro_link')"><span id='rageroro_tag'>Rageroro</span></a> updated:</b>
   <ul>
     <li>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.</li>
    </ul>
@@ -90,11 +90,17 @@ should be listed in the changelog upon commit tho. Thanks. -->
 	<li>Fixed electropack bug regarding using screwdrivers on electropacks.</li>
   </ul>
 </ul>
-
+<ul>
+  <li><b>Microwave updated:</b>
+  <ul>
+    <li>Nuka Cola re-added. </li>
+	<li>Synaptizine now makes you immune to being stunned or knocked down while it is in your body. </li>
+   </ul>
+</ul>
 <ul>
   <li><b>Urist McDorf updated:</b>
   <ul>
-    <li>Added XCom aliens, by Xerif (Donated by the <a href="http://www.ss13.org/">Foundation project</a> )  </li>
+    <li>Added XCom aliens, by Xerif (Donated by the <a href="http://www.ss13.org/"target='_blank'>Foundation project</a> )  </li>
    </ul>
 </ul>
 <b><font color='blue'>5 September 2011.</font color><b>