cyberpresidentvanellope/vgstation13
1
0
Fork 0
mirror of https://github.com/vgstation-coders/vgstation13.git synced 2025-12-10 18:32:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Merge branch 'json' into Bleeding-Edge" (#14425)

Browse Source 
This reverts commit 24f7c0a960, reversing
changes made to ff9b9664ea.
This commit is contained in:
sood
2017-03-24 22:19:34 -07:00
committed by GitHub
parent 7678fd914b
commit d0d4b09ec9
8 changed files with 378 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
code/modules/atmos_automation/console.dm
View File

@@ -320,11 +320,11 @@
var/list/json[0]
for(var/datum/automation/A in automations)
json += list(A.Export())
return json_encode(json)
return list2json(json)
/obj/machinery/computer/general_air_control/atmos_automation/proc/ReadCode(var/jsonStr)
automations.len = 0
var/list/json=json_decode(jsonStr)
var/list/json=json2list(jsonStr)
if(json && json.len > 0)
for(var/list/cData in json)
if(isnull(cData) || !("type" in cData))