From 287225d35178db4d0edd1aa986800d747d7a099b Mon Sep 17 00:00:00 2001 From: "baloh.matevz" Date: Sat, 11 Feb 2012 07:57:08 +0000 Subject: [PATCH] - Brought the fire alarm code into the 21st century (replaced the text("blah[][][][]",var,var,var,var)) with the proper "blah[var][var][var][var]" way of writing. - Added an "The current alert level is: %alert%" to fire alarms when you open their interface. git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3088 316c924e-a436-60f5-8080-3fe189b3f50e --- 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 ae4ead7cfd5..e75e93f675e 100644 --- a/code/game/machinery/alarm.dm +++ b/code/game/machinery/alarm.dm @@ -1098,7 +1098,7 @@ table tr:first-child th:first-child { border: none;} d2 = text("Initiate Time Lock", src) var/second = src.time % 60 var/minute = (src.time - second) / 60 - var/dat = text("Fire alarm []\n
\nTimer System: []
\nTime Left: [][] - - + +\n
", d1, d2, (minute ? text("[]:", minute) : null), second, src, src, src, src) + var/dat = "Fire alarm [d1]\n
The current alert level is: [get_security_level()]

\nTimer System: [d2]
\nTime Left: [(minute ? "[minute]:" : null)][second] - - + +\n
" user << browse(dat, "window=firealarm") onclose(user, "firealarm") else @@ -1113,7 +1113,7 @@ table tr:first-child th:first-child { border: none;} d2 = text("[]", src, stars("Initiate Time Lock")) var/second = src.time % 60 var/minute = (src.time - second) / 60 - var/dat = text("[] []\n
\nTimer System: []
\nTime Left: [][] - - + +\n
", stars("Fire alarm"), d1, d2, (minute ? text("[]:", minute) : null), second, src, src, src, src) + var/dat = "[stars("Fire alarm")] [d1]\n
The current alert level is: [stars(get_security_level())]

\nTimer System: [d2]
\nTime Left: [(minute ? text("[]:", minute) : null)][second] - - + +\n
" user << browse(dat, "window=firealarm") onclose(user, "firealarm") return