From e0f2c1ac78e846bb6a0e4da5042aa06e77148c9f Mon Sep 17 00:00:00 2001 From: Tigercat2000 Date: Thu, 12 Mar 2015 21:55:20 +0100 Subject: [PATCH] Fix according to MarkvA's comments --- code/game/machinery/poolcontroller.dm | 5 +++++ nano/templates/poolcontroller.tmpl | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/code/game/machinery/poolcontroller.dm b/code/game/machinery/poolcontroller.dm index 3e563295901..aff22a0a681 100644 --- a/code/game/machinery/poolcontroller.dm +++ b/code/game/machinery/poolcontroller.dm @@ -105,13 +105,18 @@ ui.open() /obj/machinery/poolcontroller/Topic(href, href_list) + if(..()) return 1 switch(href_list["temp"]) if("Scalding") + if(!src.emagged) + return 0 src.temperature = "scalding" src.temperaturecolor = "#FF0000" miston() if("Frigid") + if(!src.emagged) + return 0 src.temperature = "frigid" src.temperaturecolor = "#00CCCC" mistoff() diff --git a/nano/templates/poolcontroller.tmpl b/nano/templates/poolcontroller.tmpl index cd01e3e8a0e..246542107a2 100644 --- a/nano/templates/poolcontroller.tmpl +++ b/nano/templates/poolcontroller.tmpl @@ -15,7 +15,7 @@ Used In File(s): \code\game\machinery\poolcontroller.dm {{if data.emagged}} WARNING: SAFE MODE OVERRIDE {{else}} - Safties Nominal + Safeties Nominal {{/if}}