Fixes issues with remote air alarm access.

This commit is contained in:
PsiOmega
2015-03-08 18:31:59 +01:00
parent a1dbd153bd
commit e05e024cc5
2 changed files with 2 additions and 2 deletions

View File

@@ -93,6 +93,6 @@
/datum/topic_state/air_alarm/href_list(var/mob/user) /datum/topic_state/air_alarm/href_list(var/mob/user)
var/list/extra_href = list() var/list/extra_href = list()
extra_href["remote_connection"] = 1 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 return extra_href

View File

@@ -74,7 +74,7 @@ Used In File(s): \code\game\machinery\alarm.dm
</tr> </tr>
</table> </table>
<HR> <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}} {{if data.remote_connection}}
<span class='noticePlaceholder'>(Current remote control settings and alarm status restricts access.)</span> <span class='noticePlaceholder'>(Current remote control settings and alarm status restricts access.)</span>
{{else}} {{else}}