From 81e22ea2700b76a4d8a6cfb63122d2bb3f5a378b Mon Sep 17 00:00:00 2001 From: comma Date: Thu, 11 Jul 2013 00:59:44 +0400 Subject: [PATCH] Fixes wires on air alarm not displaying cut status properly. Fixes #3087 --- code/game/machinery/alarm.dm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/code/game/machinery/alarm.dm b/code/game/machinery/alarm.dm index d156e8eebf7..71906ffb3b6 100644 --- a/code/game/machinery/alarm.dm +++ b/code/game/machinery/alarm.dm @@ -658,22 +658,22 @@ if(wiresexposed && (!istype(user, /mob/living/silicon))) var/t1 = text("[alarm_area.name] Air Alarm WiresAccess Panel
\n") - var/list/AAlarmwires = list( + var/list/wirecolors = list( "Orange" = 1, "Dark red" = 2, "White" = 3, "Yellow" = 4, "Black" = 5, ) - for(var/wiredesc in AAlarmwires) - var/is_uncut = AAlarmwires & AAlarmWireColorToFlag[AAlarmwires[wiredesc]] + for(var/wiredesc in wirecolors) + var/is_uncut = AAlarmwires & AAlarmWireColorToFlag[wirecolors[wiredesc]] t1 += "[wiredesc] wire: " if(!is_uncut) - t1 += "Mend" + t1 += "Mend" else - t1 += "Cut " - t1 += "Pulse " + t1 += "Cut " + t1 += "Pulse " t1 += "
" t1 += text("
\n[(locked ? "The Air Alarm is locked." : "The Air Alarm is unlocked.")]
\n[((shorted || (stat & (NOPOWER|BROKEN))) ? "The Air Alarm is offline." : "The Air Alarm is working properly!")]
\n[(aidisabled ? "The 'AI control allowed' light is off." : "The 'AI control allowed' light is on.")]")