From 71a7f10b7f053697999f13230c8a7993ffb9326c Mon Sep 17 00:00:00 2001 From: Tastyfish Date: Thu, 5 May 2016 20:36:32 -0400 Subject: [PATCH] Unbroke the pda manifest --- code/game/objects/effects/datacore-effect.dm | 2 -- code/modules/mob/living/silicon/pai/software_modules.dm | 2 +- code/modules/pda/core_apps.dm | 8 ++++---- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/code/game/objects/effects/datacore-effect.dm b/code/game/objects/effects/datacore-effect.dm index a5e687956f8..5c2fe3f5167 100644 --- a/code/game/objects/effects/datacore-effect.dm +++ b/code/game/objects/effects/datacore-effect.dm @@ -141,7 +141,6 @@ using /obj/effect/datacore/proc/manifest_inject( ), or manifest_insert( ) */ var/global/list/PDA_Manifest = list() -var/global/ManifestJSON /obj/effect/datacore/proc/get_manifest_json() if(PDA_Manifest.len) @@ -224,6 +223,5 @@ var/global/ManifestJSON "bot" = bot,\ "misc" = misc\ ) - ManifestJSON = json_encode(PDA_Manifest) return diff --git a/code/modules/mob/living/silicon/pai/software_modules.dm b/code/modules/mob/living/silicon/pai/software_modules.dm index 5d5f335391d..b4fd1ff3fa7 100644 --- a/code/modules/mob/living/silicon/pai/software_modules.dm +++ b/code/modules/mob/living/silicon/pai/software_modules.dm @@ -123,7 +123,7 @@ on_ui_interact(mob/living/silicon/pai/user, datum/nanoui/ui=null, force_open=1) var/data[0] - data["manifest"] = list("__json_cache" = ManifestJSON) + data["manifest"] = PDA_Manifest ui = nanomanager.try_update_ui(user, user, id, ui, data, force_open) if(!ui) diff --git a/code/modules/pda/core_apps.dm b/code/modules/pda/core_apps.dm index 0117a6b9140..065253fcfab 100644 --- a/code/modules/pda/core_apps.dm +++ b/code/modules/pda/core_apps.dm @@ -5,13 +5,13 @@ /datum/data/pda/app/main_menu/update_ui(mob/user as mob, list/data) title = pda.name - + data["app"]["is_home"] = 1 - + data["apps"] = pda.shortcut_cache data["categories"] = pda.shortcut_cat_order data["pai"] = !isnull(pda.pai) // pAI inserted? - + var/list/notifying[0] for(var/P in pda.notifying_programs) notifying["\ref[P]"] = 1 @@ -72,7 +72,7 @@ /datum/data/pda/app/manifest/update_ui(mob/user as mob, list/data) data_core.get_manifest_json() - data["manifest"] = list("__json_cache" = ManifestJSON) + data["manifest"] = PDA_Manifest /datum/data/pda/app/manifest/Topic(href, list/href_list)