From d2e84ba9b0d78673c79c3fa42e550ff429212e57 Mon Sep 17 00:00:00 2001 From: SkyratBot <59378654+SkyratBot@users.noreply.github.com> Date: Wed, 27 Apr 2022 05:48:30 +0200 Subject: [PATCH] [MIRROR] Remove data/ from /datum/asset/json url mapping [MDB IGNORE] (#13154) * Remove data/ from /datum/asset/json url mapping (#66549) * Remove data/ from /datum/asset/json url mapping Closes #66535. * Create JSON in data folder * Remove data/ from /datum/asset/json url mapping Co-authored-by: Mothblocks <35135081+Mothblocks@users.noreply.github.com> --- code/modules/asset_cache/asset_list.dm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/code/modules/asset_cache/asset_list.dm b/code/modules/asset_cache/asset_list.dm index 3c5169e27df..bb1a93f1eb4 100644 --- a/code/modules/asset_cache/asset_list.dm +++ b/code/modules/asset_cache/asset_list.dm @@ -473,18 +473,18 @@ GLOBAL_LIST_EMPTY(asset_datums) var/name /datum/asset/json/send(client) - return SSassets.transport.send_assets(client, "data/[name].json") + return SSassets.transport.send_assets(client, "[name].json") /datum/asset/json/get_url_mappings() return list( - "[name].json" = SSassets.transport.get_asset_url("data/[name].json"), + "[name].json" = SSassets.transport.get_asset_url("[name].json"), ) /datum/asset/json/register() var/filename = "data/[name].json" fdel(filename) text2file(json_encode(generate()), filename) - SSassets.transport.register_asset(filename, fcopy_rsc(filename)) + SSassets.transport.register_asset("[name].json", fcopy_rsc(filename)) fdel(filename) /// Returns the data that will be JSON encoded