From e05e024cc5ce9c8f3d09cd07a12bf5bbb9023aae Mon Sep 17 00:00:00 2001
From: PsiOmega <git@psiomega.se>
Date: Sun, 8 Mar 2015 18:31:59 +0100
Subject: [PATCH] Fixes issues with remote air alarm access.

---
 code/game/machinery/computer/atmos_control.dm | 2 +-
 nano/templates/air_alarm.tmpl                 | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/code/game/machinery/computer/atmos_control.dm b/code/game/machinery/computer/atmos_control.dm
index a6eb8765f1f..d63259bc4c5 100644
--- a/code/game/machinery/computer/atmos_control.dm
+++ b/code/game/machinery/computer/atmos_control.dm
@@ -93,6 +93,6 @@
 /datum/topic_state/air_alarm/href_list(var/mob/user)
 	var/list/extra_href = list()
 	extra_href["remote_connection"] = 1
-	extra_href["remote_access"] = user && (atmos_control.allowed(user) || atmos_control.emagged || air_alarm.rcon_setting == RCON_YES || (air_alarm.alarm_area.atmosalm && air_alarm.rcon_setting == RCON_AUTO))
+	extra_href["remote_access"] = user && (user.isAI() || atmos_control.allowed(user) || atmos_control.emagged || air_alarm.rcon_setting == RCON_YES || (air_alarm.alarm_area.atmosalm && air_alarm.rcon_setting == RCON_AUTO))
 
 	return extra_href
diff --git a/nano/templates/air_alarm.tmpl b/nano/templates/air_alarm.tmpl
index 6ba6b14057f..edfe41cda7a 100644
--- a/nano/templates/air_alarm.tmpl
+++ b/nano/templates/air_alarm.tmpl
@@ -74,7 +74,7 @@ Used In File(s): \code\game\machinery\alarm.dm
         </tr>
     </table>
 <HR>
-{{if data.locked || (data.remote_connection && ! data.remote_access)}}
+{{if (data.locked && !data.remote_connection) || (data.remote_connection && ! data.remote_access)}}
 	{{if data.remote_connection}}
 		<span class='noticePlaceholder'>(Current remote control settings and alarm status restricts access.)</span>
 	{{else}}