cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-23 03:57:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

Remote control atmos fix

Browse Source
This commit is contained in:
Markolie
2015-08-12 21:38:21 +02:00
parent 362a817d79
commit 567aeb09b5
2 changed files with 17 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/machinery/alarm.dm
+16 -8
View File
@@ -824,12 +824,18 @@
ui.open()
ui.set_auto_update(1)
/obj/machinery/alarm/proc/is_authenticated(mob/user as mob)
if(isAI(user) || isrobot(user))
/obj/machinery/alarm/proc/is_authenticated(mob/user as mob, href_list)
if(isAI(user) || isrobot(user) || emagged || is_auth_rcon(href_list))
return 1
else
return !locked
/obj/machinery/alarm/proc/is_auth_rcon(href_list)
if(href_list["remote_connection"] && href_list["remote_access"])
return 1
else
return 0
/obj/machinery/alarm/CanUseTopic(var/mob/user, var/datum/topic_state/state, var/href_list = list())
if(buildstage != 2)
return STATUS_CLOSE
@@ -842,8 +848,8 @@
if(. == STATUS_INTERACTIVE)
var/extra_href = state.href_list(usr)
// Prevent remote users from altering RCON settings unless they already have access
if(href_list["rcon"] && extra_href["remote_connection"] && !extra_href["remote_access"])
// Prevent remote users from altering RCON settings or activating atmos alarms unless they already have access
if((href_list["atmos_alarm"] || href_list["rcon"]) && extra_href["remote_connection"] && !extra_href["remote_access"])
. = STATUS_UPDATE
return min(..(), .)
@@ -851,6 +857,8 @@
if(..(href, href_list, nowindow, state))
return 1
var/state_href = state.href_list(usr)
if(href_list["rcon"])
var/attempted_rcon_setting = text2num(href_list["rcon"])
switch(attempted_rcon_setting)
@@ -865,7 +873,7 @@
add_fingerprint(usr)
if(href_list["command"])
if(!is_authenticated(usr))
if(!is_authenticated(usr, state_href))
return
var/device_id = href_list["id_tag"]
@@ -920,7 +928,7 @@
tlv.vars[varname] = newval
if(href_list["screen"])
if(!is_authenticated(usr))
if(!is_authenticated(usr, state_href))
return
screen = text2num(href_list["screen"])
@@ -941,7 +949,7 @@
return 1
if(href_list["mode"])
if(!is_authenticated(usr))
if(!is_authenticated(usr, state_href))
return
mode = text2num(href_list["mode"])
@@ -949,7 +957,7 @@
return 1
if(href_list["preset"])
if(!is_authenticated(usr))
if(!is_authenticated(usr, state_href))
return
preset = text2num(href_list["preset"])
code/modules/nano/modules/atmos_control.dm
+1 -2
View File
@@ -27,7 +27,6 @@
if(alarm)
var/datum/topic_state/TS = generate_state(alarm)
alarm.ui_interact(usr, master_ui = ui_ref, state = TS)
return 1
/datum/nano_module/atmos_control/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1, var/master_ui = null, var/datum/topic_state/state = default_state)
var/data[0]
@@ -69,4 +68,4 @@
return extra_href
/datum/topic_state/air_alarm/proc/has_access(var/mob/user)
return user && (isAI(user) || atmos_control.access.allowed(user) || atmos_control.emagged || air_alarm.rcon_setting == RCON_YES || (air_alarm.alarm_area.atmosalm && air_alarm.rcon_setting == RCON_AUTO))
return user && (isAI(user) || atmos_control.access.allowed(user) || atmos_control.emagged || air_alarm.rcon_setting == RCON_YES || air_alarm.emagged || (air_alarm.alarm_area.atmosalm && air_alarm.rcon_setting == RCON_AUTO))