From c09bb6d80778c229fce4cee3ecee5f66e22f6bb8 Mon Sep 17 00:00:00 2001
From: Datraen <datraen@gmail.com>
Date: Sat, 26 Mar 2016 15:31:08 -0400
Subject: [PATCH] Removes JSON encoding of PDA Manifest list.

---
 code/defines/obj.dm                                     | 4 +---
 code/game/objects/items/devices/PDA/PDA.dm              | 4 ++--
 code/modules/mob/living/silicon/pai/software_modules.dm | 4 ++--
 html/changelogs/Datraen-ManifestTweak.yml               | 6 ++++++
 4 files changed, 11 insertions(+), 7 deletions(-)
 create mode 100644 html/changelogs/Datraen-ManifestTweak.yml

diff --git a/code/defines/obj.dm b/code/defines/obj.dm
index 7babc9c4c1..3300da0ceb 100644
--- a/code/defines/obj.dm
+++ b/code/defines/obj.dm
@@ -62,9 +62,8 @@ using /datum/datacore/proc/manifest_inject( ), or manifest_insert( )
 */
 
 var/global/list/PDA_Manifest = list()
-var/global/ManifestJSON
 
-/datum/datacore/proc/get_manifest_json()
+/datum/datacore/proc/get_manifest_list()
 	if(PDA_Manifest.len)
 		return
 	var/heads[0]
@@ -146,7 +145,6 @@ var/global/ManifestJSON
 		"bot" = bot,\
 		"misc" = misc\
 		)
-	ManifestJSON = json_encode(PDA_Manifest)
 	return
 
 
diff --git a/code/game/objects/items/devices/PDA/PDA.dm b/code/game/objects/items/devices/PDA/PDA.dm
index ed2e134154..7fa6b508f8 100644
--- a/code/game/objects/items/devices/PDA/PDA.dm
+++ b/code/game/objects/items/devices/PDA/PDA.dm
@@ -462,7 +462,7 @@ var/global/list/obj/item/device/pda/PDAs = list()
 				data["convo_job"] = sanitize(c["job"])
 				break
 	if(mode==41)
-		data_core.get_manifest_json()
+		data_core.get_manifest_list()
 
 
 	if(mode==3)
@@ -531,7 +531,7 @@ var/global/list/obj/item/device/pda/PDAs = list()
 
 		data["feed"] = feed
 
-	data["manifest"] = list("__json_cache" = ManifestJSON)
+	data["manifest"] = PDA_Manifest
 
 	nanoUI = data
 	// update the ui if it exists, returns null if no ui is passed/found
diff --git a/code/modules/mob/living/silicon/pai/software_modules.dm b/code/modules/mob/living/silicon/pai/software_modules.dm
index 52c075552d..537e7c0c50 100644
--- a/code/modules/mob/living/silicon/pai/software_modules.dm
+++ b/code/modules/mob/living/silicon/pai/software_modules.dm
@@ -121,11 +121,11 @@
 	toggle = 0
 
 	on_ui_interact(mob/living/silicon/pai/user, datum/nanoui/ui=null, force_open=1)
-		data_core.get_manifest_json()
+		data_core.get_manifest_list()
 
 		var/data[0]
 		// This is dumb, but NanoUI breaks if it has no data to send
-		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/html/changelogs/Datraen-ManifestTweak.yml b/html/changelogs/Datraen-ManifestTweak.yml
new file mode 100644
index 0000000000..34401ded76
--- /dev/null
+++ b/html/changelogs/Datraen-ManifestTweak.yml
@@ -0,0 +1,6 @@
+author: Datraen
+
+delete-after: True
+
+changes: 
+  - tweak: "Removed JSON encoding of the PDA Manifest list."