Fixes air alarms going off if the upper bounds were set to disabled.

Fixes atmos control computer displaying some air alarms in unreadable yellow
Fixes a text error in item descriptions.
This commit is contained in:
SkyMarshal
2013-05-15 14:31:31 -07:00
parent a1bc5d6cf0
commit 88a65b63e4
3 changed files with 6 additions and 6 deletions
+2 -2
View File
@@ -39,9 +39,9 @@
dat += "<a href='?src=\ref[src]&alarm=\ref[alarm]'>"
switch(max(alarm.danger_level, alarm.alarm_area.atmosalm))
if (0)
dat += "<font color=blue>"
dat += "<font color=green>"
if (1)
dat += "<font color=yellow>"
dat += "<font color=blue>"
if (2)
dat += "<font color=red>"
dat += "[alarm]</font></a><br/>"
@@ -3,13 +3,13 @@
/obj/item/clothing/head/beret/centcom/officer
name = "officers beret"
desc = "A black beret adorned with the shield&mdash;a silver kite shield with an engraved sword&mdash;of the NanoTrasen security forces, announcing to the world that the wearer is a defender of NanoTrasen."
desc = "A black beret adorned with the shielda silver kite shield with an engraved swordof the NanoTrasen security forces, announcing to the world that the wearer is a defender of NanoTrasen."
icon_state = "centcomofficerberet"
flags = FPRINT | TABLEPASS
/obj/item/clothing/head/beret/centcom/captain
name = "captains beret"
desc = "A white beret adorned with the shield&mdash;a cobalt kite shield with an engraved sword&mdash;of the NanoTrasen security forces, worn only by those captaining a vessel of the NanoTrasen Navy."
desc = "A white beret adorned with the shielda cobalt kite shield with an engraved swordof the NanoTrasen security forces, worn only by those captaining a vessel of the NanoTrasen Navy."
icon_state = "centcomcaptain"
flags = FPRINT | TABLEPASS