mirror of
https://github.com/vgstation-coders/vgstation13.git
synced 2025-12-10 18:32:03 +00:00
Make atmos control computers somewhat more stable.
This commit is contained in:
@@ -53,10 +53,13 @@
|
||||
else if(!emagged)
|
||||
overridden = 0
|
||||
|
||||
return ui_interact(user)
|
||||
/*
|
||||
|
||||
var/dat = "<a href='?src=\ref[src]&reset=1'>Main Menu</a><hr>"
|
||||
if(current)
|
||||
//dat += specific()
|
||||
return ui_interact(user)
|
||||
//return ui_interact(user)
|
||||
else
|
||||
for(var/obj/machinery/alarm/alarm in sortAtom(machines))
|
||||
if(!is_in_filter(alarm.alarm_area.type))
|
||||
@@ -71,6 +74,7 @@
|
||||
dat += "<font color=red>"
|
||||
dat += "[alarm]</font></a><br/>"
|
||||
user << browse(dat, "window=atmoscontrol")
|
||||
*/
|
||||
|
||||
|
||||
/obj/machinery/computer/atmoscontrol/attackby(var/obj/item/I as obj, var/mob/user as mob)
|
||||
@@ -133,6 +137,7 @@
|
||||
return
|
||||
if(href_list["reset"])
|
||||
current = null
|
||||
|
||||
if(href_list["alarm"])
|
||||
current = locate(href_list["alarm"])
|
||||
if(href_list["command"])
|
||||
|
||||
@@ -242,7 +242,10 @@
|
||||
//send resources to the client. It's here in its own proc so we can move it around easiliy if need be
|
||||
/client/proc/send_resources()
|
||||
getFiles(
|
||||
'nano/js/libraries.min.js',
|
||||
//'nano/js/libraries.min.js',
|
||||
'nano/js/libraries/1-jquery.js',
|
||||
'nano/js/libraries/2-jsviews.js',
|
||||
'nano/js/libraries/3-jquery.timers.js',
|
||||
'nano/js/nano_update.js',
|
||||
'nano/js/nano_config.js',
|
||||
'nano/js/nano_base_helpers.js',
|
||||
|
||||
@@ -19,7 +19,7 @@ nanoui is used to open and update nano browser uis
|
||||
// the title of this ui
|
||||
var/title
|
||||
// /vg/ - Whether to write debug information to nano/debug.html
|
||||
var/writeDebug=FALSE
|
||||
var/writeDebug=TRUE
|
||||
// the key of this ui, this is to allow multiple (different) uis for each src_object
|
||||
var/ui_key
|
||||
// window_id is used as the window name/identifier for browse and onclose
|
||||
@@ -93,7 +93,11 @@ nanoui is used to open and update nano browser uis
|
||||
* @return nothing
|
||||
*/
|
||||
/datum/nanoui/proc/add_common_assets()
|
||||
add_script("libraries.min.js") // The jQuery library
|
||||
//add_script("libraries.min.js") // The jQuery library
|
||||
add_script("1-jquery.js")
|
||||
add_script("2-jsviews.js")
|
||||
add_script("3-jquery.timers.js")
|
||||
|
||||
add_script("nano_update.js") // The NanoUpdate JS, this is used to receive updates and apply them.
|
||||
add_script("nano_config.js") // The NanoUpdate JS, this is used to receive updates and apply them.
|
||||
add_script("nano_base_helpers.js") // The NanoBaseHelpers JS, this is used to set up template helpers which are common to all templates
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -16,7 +16,7 @@ Used In File(s): /code/game/machinery/alarm.dm
|
||||
#define AALARM_SCREEN_MODE 4
|
||||
#define AALARM_SCREEN_SENSORS 5
|
||||
--}}
|
||||
{{if !alarm}}
|
||||
{^{if !alarm}}
|
||||
<h3>Atmospherics Control</h3>
|
||||
<div class="statusDisplay">
|
||||
{^{for alarms}}
|
||||
|
||||
Reference in New Issue
Block a user