From 88a65b63e47a21c9216e5cf03cc69493e24782a1 Mon Sep 17 00:00:00 2001 From: SkyMarshal Date: Wed, 15 May 2013 14:31:31 -0700 Subject: [PATCH 1/2] 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. --- code/WorkInProgress/Mini/atmos_control.dm | 4 ++-- code/WorkInProgress/SkyMarshal/officer_stuff.dm | 4 ++-- code/game/machinery/alarm.dm | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/code/WorkInProgress/Mini/atmos_control.dm b/code/WorkInProgress/Mini/atmos_control.dm index b7c80761a95..acca1bf7593 100644 --- a/code/WorkInProgress/Mini/atmos_control.dm +++ b/code/WorkInProgress/Mini/atmos_control.dm @@ -39,9 +39,9 @@ dat += "" switch(max(alarm.danger_level, alarm.alarm_area.atmosalm)) if (0) - dat += "" + dat += "" if (1) - dat += "" + dat += "" if (2) dat += "" dat += "[alarm]
" diff --git a/code/WorkInProgress/SkyMarshal/officer_stuff.dm b/code/WorkInProgress/SkyMarshal/officer_stuff.dm index d57106d843f..7741a9aa36a 100644 --- a/code/WorkInProgress/SkyMarshal/officer_stuff.dm +++ b/code/WorkInProgress/SkyMarshal/officer_stuff.dm @@ -3,13 +3,13 @@ /obj/item/clothing/head/beret/centcom/officer name = "officers beret" - desc = "A black beret adorned with the shield—a silver kite shield with an engraved sword—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—a silver kite shield with an engraved sword—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—a cobalt kite shield with an engraved sword—of the NanoTrasen security forces, worn only by those captaining a vessel of the NanoTrasen Navy." + desc = "A white beret adorned with the shield—a cobalt kite shield with an engraved sword—of the NanoTrasen security forces, worn only by those captaining a vessel of the NanoTrasen Navy." icon_state = "centcomcaptain" flags = FPRINT | TABLEPASS diff --git a/code/game/machinery/alarm.dm b/code/game/machinery/alarm.dm index 6a48ee0f1b5..636ed6b8802 100644 --- a/code/game/machinery/alarm.dm +++ b/code/game/machinery/alarm.dm @@ -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] || (current_value <= danger_levels[1] && danger_levels[1] > 0)) return 2 - if(current_value >= danger_levels[3] || current_value <= danger_levels[2]) + if(current_value >= danger_levels[3] || (current_value <= danger_levels[2] && danger_levels[1] > 0)) return 1 return 0 From 6e2879dc74083ae62354fd7996bb6277b417fdf2 Mon Sep 17 00:00:00 2001 From: SkyMarshal Date: Wed, 15 May 2013 14:36:32 -0700 Subject: [PATCH 2/2] Made an oopsie --- code/game/machinery/alarm.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/game/machinery/alarm.dm b/code/game/machinery/alarm.dm index 636ed6b8802..4ac0922f20e 100644 --- a/code/game/machinery/alarm.dm +++ b/code/game/machinery/alarm.dm @@ -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] && danger_levels[1] > 0)) + 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] && danger_levels[1] > 0)) + if((current_value >= danger_levels[3] && danger_levels[3] > 0) || current_value <= danger_levels[2]) return 1 return 0