From 38198063403a0a492510f3f304068235ac4bff50 Mon Sep 17 00:00:00 2001 From: Lzimann Date: Sun, 9 Oct 2016 13:38:56 -0300 Subject: [PATCH 1/2] Makes "Show alerts" tg's custom browser datum. Also removed an unused var(viewalerts) from borgs. --- code/modules/mob/living/silicon/robot/robot.dm | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/code/modules/mob/living/silicon/robot/robot.dm b/code/modules/mob/living/silicon/robot/robot.dm index f968118a12b..4ca32cad489 100644 --- a/code/modules/mob/living/silicon/robot/robot.dm +++ b/code/modules/mob/living/silicon/robot/robot.dm @@ -50,7 +50,6 @@ var/list/req_access = list(access_robotics) var/alarms = list("Motion"=list(), "Fire"=list(), "Atmosphere"=list(), "Power"=list(), "Camera"=list(), "Burglar"=list()) - var/viewalerts = 0 var/speed = 0 // VTEC speed boost. var/magpulse = FALSE // Magboot-like effect. @@ -315,8 +314,7 @@ uneq_active() /mob/living/silicon/robot/proc/robot_alerts() - var/dat = "Current Station Alerts\n" - dat += "Close

" + var/dat = "" for (var/cat in alarms) dat += text("[cat]
\n") var/list/L = alarms[cat] @@ -324,18 +322,16 @@ for (var/alarm in L) var/list/alm = L[alarm] var/area/A = alm[1] - var/list/sources = alm[3] dat += "" dat += text("-- [A.name]") - if (sources.len > 1) - dat += text("- [sources.len] sources") dat += "
\n" else dat += "-- All Systems Nominal
\n" dat += "
\n" - viewalerts = 1 - src << browse(dat, "window=robotalerts&can_close=0") + var/datum/browser/alerts = new(usr, "robotalerts", "Current Station Alerts", 400, 350) + alerts.set_content(dat) + alerts.open() /mob/living/silicon/robot/proc/ionpulse() if(!ionpulse_on) @@ -407,7 +403,6 @@ C = O L[A.name] = list(A, (C) ? C : O, list(alarmsource)) queueAlarm(text("--- [class] alarm detected in [A.name]!"), class) -// if (viewalerts) robot_alerts() return 1 /mob/living/silicon/robot/cancelAlarm(class, area/A, obj/origin) @@ -424,7 +419,6 @@ L -= I if (cleared) queueAlarm("--- [class] alarm in [A.name] has been cleared.", class, 0) -// if (viewalerts) robot_alerts() return !cleared /mob/living/silicon/robot/attackby(obj/item/weapon/W, mob/user, params) From 5cea8f8180e2d78d2ec5b706202f3a56bc411182 Mon Sep 17 00:00:00 2001 From: Lzimann Date: Sun, 9 Oct 2016 23:27:17 -0300 Subject: [PATCH 2/2] Changes the height. --- code/modules/mob/living/silicon/robot/robot.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mob/living/silicon/robot/robot.dm b/code/modules/mob/living/silicon/robot/robot.dm index 4ca32cad489..46a5ea5ce86 100644 --- a/code/modules/mob/living/silicon/robot/robot.dm +++ b/code/modules/mob/living/silicon/robot/robot.dm @@ -329,7 +329,7 @@ dat += "-- All Systems Nominal
\n" dat += "
\n" - var/datum/browser/alerts = new(usr, "robotalerts", "Current Station Alerts", 400, 350) + var/datum/browser/alerts = new(usr, "robotalerts", "Current Station Alerts", 400, 410) alerts.set_content(dat) alerts.open()