Merge pull request #8402 from PsiOmegaDelta/RemoteAir

Fixes various alarm issues.

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

code/game/machinery/computer/station_alert.dm

@@ -38,7 +38,7 @@
 	if(stat & (BROKEN|NOPOWER))
 		return
 
-	var/list/alarms = alarm_monitor.active_alarms()
+	var/list/alarms = alarm_monitor.major_alarms()
 	if(alarms.len)
 		icon_state = "alert:2"
 	else

code/modules/nano/modules/alarm_monitor.dm

@@ -30,11 +30,24 @@
 	for(var/datum/alarm_handler/AH in alarm_handlers)
 		AH.unregister(object)
 
-/obj/nano_module/alarm_monitor/proc/active_alarms()
+/obj/nano_module/alarm_monitor/proc/all_alarms()
 	var/list/all_alarms = new()
 	for(var/datum/alarm_handler/AH in alarm_handlers)
-		var/list/alarms = AH.alarms
-		all_alarms += alarms
+		all_alarms += AH.alarms
+
+	return all_alarms
+
+/obj/nano_module/alarm_monitor/proc/major_alarms()
+	var/list/all_alarms = new()
+	for(var/datum/alarm_handler/AH in alarm_handlers)
+		all_alarms += AH.major_alarms()
+
+	return all_alarms
+
+/obj/nano_module/alarm_monitor/proc/minor_alarms()
+	var/list/all_alarms = new()
+	for(var/datum/alarm_handler/AH in alarm_handlers)
+		all_alarms += AH.minor_alarms()
 
 	return all_alarms
 

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}}

nano/templates/atmos_alert.tmpl

@@ -1,17 +1,18 @@
 <H1>Priority Alerts</H1>
 {{for data.priority_alarms}}
 	<div class="item">
-	{{:value.name}} {{:helper.link('Reset', null, {'clear_alarm' : value.ref})}}
+        {{:value.name}} {{:helper.link('Reset', null, {'clear_alarm' : value.ref})}}
 	</div>
 {{empty}}
 	No priority alerts detected.
 {{/for}}
 
 <H3>Minor Alerts</H3>
-<div class="item">
-	{{for data.minor_alarms}}
-		{{:value.name}} {{:helper.link('Reset', null, {'clear_alarm' : value.ref})}}
-	{{empty}}
-		No minor alerts detected.
-	{{/for}}
-</div>
+{{for data.minor_alarms}}
+    <div class="item">
+        {{:value.name}} {{:helper.link('Reset', null, {'clear_alarm' : value.ref})}}
+    </div>
+{{empty}}
+    No minor alerts detected.
+{{/for}}
+