cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-01-10 01:12:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into prepare_stuff_for_second_week

Browse Source
This commit is contained in:
alberyk
2022-01-29 11:45:45 -03:00
parent 8e875dc192 edb1c08178
commit cd07daa559
35 changed files with 208 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
code/controllers/subsystems/documents.dm
View File

@@ -137,10 +137,11 @@ var/datum/controller/subsystem/docs/SSdocs
//Loads the document data from JSON
/datum/controller/subsystem/docs/proc/load_from_json()
var/list/docsconfig = list()
try
if(isfile("config/docs.json"))
docsconfig = json_decode(return_file_text("config/docs.json"))
catch(var/exception/ej)
log_debug("SSdocs: Warning: Could not load config, as docs.json is missing - [ej]")
else
log_debug("SSdocs: Warning: Could not load config, as docs.json is missing")
return 0
//Reset the currently loaded data

11
code/controllers/subsystems/processing/ntsl2.dm
View File

@@ -34,7 +34,7 @@ NTSL2 deamon management subsystem, responsible for handling events from deamon a
if(RUSTG_HTTP_METHOD_POST)
if(arguments)
body = json_encode(arguments)
return http_create_request(method, url, body)
return FALSE
@@ -107,7 +107,7 @@ NTSL2 deamon management subsystem, responsible for handling events from deamon a
if(istype(cb))
cb.InvokeAsync(response)
/datum/controller/subsystem/processing/ntsl2/proc/is_complete(var/task_id)
if(!task_id)
@@ -115,9 +115,12 @@ NTSL2 deamon management subsystem, responsible for handling events from deamon a
if(tasks[task_id])
return FALSE
return TRUE
/datum/controller/subsystem/processing/ntsl2/proc/attempt_connect()
if(config.ntsl_disabled)
log_debug("NTSL2++ Daemon disabled via config")
return FALSE
var/res = sync_send("clear")
if(!res)
log_debug("NTSL2++ Daemon could not be connected to. Functionality will not be enabled.")
@@ -150,4 +153,4 @@ NTSL2 deamon management subsystem, responsible for handling events from deamon a
handle_task_completion(result, task)
tasks -= task_id
. = ..()
. = ..()