Merge pull request #2768 from SkyMarshal/bleeding-edge-freeze

Air alarm fix, atmos control computer fix, item description fix.
This commit is contained in:
Chinsky
2013-05-15 14:37:07 -07:00
3 changed files with 6 additions and 6 deletions

View File

@@ -238,9 +238,9 @@
return 0
proc/get_danger_level(var/current_value, var/list/danger_levels)
if(current_value >= danger_levels[4] || current_value <= danger_levels[1])
if((current_value >= danger_levels[4] && danger_levels[4] > 0) || current_value <= danger_levels[1])
return 2
if(current_value >= danger_levels[3] || current_value <= danger_levels[2])
if((current_value >= danger_levels[3] && danger_levels[3] > 0) || current_value <= danger_levels[2])
return 1
return 0