cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 10:43:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Air alarm fix, atmos control computer fix, item description fix.
This commit is contained in:
Chinsky
2013-05-15 14:37:07 -07:00
parent e0f22c9931 6e2879dc74
commit 4f35f581c0
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
code/WorkInProgress/Mini/atmos_control.dm
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/>"

4
code/WorkInProgress/SkyMarshal/officer_stuff.dm
View File

@@ -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 shield<EFBFBD>a silver kite shield with an engraved sword<EFBFBD>of 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 shield<EFBFBD>a cobalt kite shield with an engraved sword<EFBFBD>of the NanoTrasen security forces, worn only by those captaining a vessel of the NanoTrasen Navy."
icon_state = "centcomcaptain"
flags = FPRINT | TABLEPASS

4
code/game/machinery/alarm.dm
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