cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 02:34:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Removes JSON encoding of PDA Manifest list.

Browse Source
This commit is contained in:
Datraen
2016-03-26 15:31:08 -04:00
parent 357fd67a65
commit c09bb6d807
4 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
code/defines/obj.dm
View File

@@ -62,9 +62,8 @@ using /datum/datacore/proc/manifest_inject( ), or manifest_insert( )
*/ */
var/global/list/PDA_Manifest = list() 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) if(PDA_Manifest.len)
return return
var/heads[0] var/heads[0]
@@ -146,7 +145,6 @@ var/global/ManifestJSON
"bot" = bot,\ "bot" = bot,\
"misc" = misc\ "misc" = misc\
) )
ManifestJSON = json_encode(PDA_Manifest)
return return

4
code/game/objects/items/devices/PDA/PDA.dm
View File

@@ -462,7 +462,7 @@ var/global/list/obj/item/device/pda/PDAs = list()
data["convo_job"] = sanitize(c["job"]) data["convo_job"] = sanitize(c["job"])
break break
if(mode==41) if(mode==41)
data_core.get_manifest_json() data_core.get_manifest_list()
if(mode==3) if(mode==3)
@@ -531,7 +531,7 @@ var/global/list/obj/item/device/pda/PDAs = list()
data["feed"] = feed data["feed"] = feed
data["manifest"] = list("__json_cache" = ManifestJSON) data["manifest"] = PDA_Manifest
nanoUI = data nanoUI = data
// update the ui if it exists, returns null if no ui is passed/found // update the ui if it exists, returns null if no ui is passed/found

4
code/modules/mob/living/silicon/pai/software_modules.dm
View File

@@ -121,11 +121,11 @@
toggle = 0 toggle = 0
on_ui_interact(mob/living/silicon/pai/user, datum/nanoui/ui=null, force_open=1) 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] var/data[0]
// This is dumb, but NanoUI breaks if it has no data to send // 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) ui = nanomanager.try_update_ui(user, user, id, ui, data, force_open)
if(!ui) if(!ui)

6
html/changelogs/Datraen-ManifestTweak.yml Normal file
View File

@@ -0,0 +1,6 @@
author: Datraen
delete-after: True
changes:
- tweak: "Removed JSON encoding of the PDA Manifest list."