diff --git a/code/controllers/subsystem/assets.dm b/code/controllers/subsystem/assets.dm index 2ad4faa09af..ca1611d8bcf 100644 --- a/code/controllers/subsystem/assets.dm +++ b/code/controllers/subsystem/assets.dm @@ -1,4 +1,4 @@ -var/datum/controller/subsystem/assets/SSasset +var/datum/controller/subsystem/assets/SSassets /datum/controller/subsystem/assets name = "Assets" @@ -7,7 +7,7 @@ var/datum/controller/subsystem/assets/SSasset var/list/cache = list() /datum/controller/subsystem/assets/New() - NEW_SS_GLOBAL(SSasset) + NEW_SS_GLOBAL(SSassets) /datum/controller/subsystem/assets/Initialize(timeofday) for(var/type in typesof(/datum/asset) - list(/datum/asset, /datum/asset/simple)) diff --git a/code/controllers/subsystem/garbage.dm b/code/controllers/subsystem/garbage.dm index 4b06dd1c280..830a8d182e5 100644 --- a/code/controllers/subsystem/garbage.dm +++ b/code/controllers/subsystem/garbage.dm @@ -617,7 +617,7 @@ var/datum/controller/subsystem/garbage_collector/SSgarbage SearchVar(CURRENT_TICKLIMIT) SearchVar(SSacid) SearchVar(SSair) - SearchVar(SSasset) + SearchVar(SSassets) SearchVar(SSaugury) SearchVar(SScommunications) SearchVar(SSdisease) diff --git a/code/modules/client/asset_cache.dm b/code/modules/client/asset_cache.dm index 77ec3bb6e91..e7970c5e365 100644 --- a/code/modules/client/asset_cache.dm +++ b/code/modules/client/asset_cache.dm @@ -41,7 +41,7 @@ You can set verify to TRUE if you want send() to sleep until the client has the if(client.cache.Find(asset_name) || client.sending.Find(asset_name)) return 0 - client << browse_rsc(SSasset.cache[asset_name], asset_name) + client << browse_rsc(SSassets.cache[asset_name], asset_name) if(!verify || !winexists(client, "asset_cache_browser")) // Can't access the asset cache browser, rip. if (client) client.cache += asset_name @@ -91,8 +91,8 @@ You can set verify to TRUE if you want send() to sleep until the client has the if (unreceived.len >= ASSET_CACHE_TELL_CLIENT_AMOUNT) to_chat(client, "Sending Resources...") for(var/asset in unreceived) - if (asset in SSasset.cache) - client << browse_rsc(SSasset.cache[asset], asset) + if (asset in SSassets.cache) + client << browse_rsc(SSassets.cache[asset], asset) if(!verify || !winexists(client, "asset_cache_browser")) // Can't access the asset cache browser, rip. if (client) @@ -136,7 +136,7 @@ You can set verify to TRUE if you want send() to sleep until the client has the //This proc "registers" an asset, it adds it to the cache for further use, you cannot touch it from this point on or you'll fuck things up. //if it's an icon or something be careful, you'll have to copy it before further use. /proc/register_asset(var/asset_name, var/asset) - SSasset.cache[asset_name] = asset + SSassets.cache[asset_name] = asset //These datums are used to populate the asset cache, the proc "register()" does this. diff --git a/code/modules/client/client_procs.dm b/code/modules/client/client_procs.dm index b5489901814..7be0544a3e2 100644 --- a/code/modules/client/client_procs.dm +++ b/code/modules/client/client_procs.dm @@ -530,7 +530,7 @@ var/next_external_rsc = 0 ) spawn (10) //removing this spawn causes all clients to not get verbs. //Precache the client with all other assets slowly, so as to not block other browse() calls - getFilesSlow(src, SSasset.cache, register_asset = FALSE) + getFilesSlow(src, SSassets.cache, register_asset = FALSE) //Hook, override it to run code when dir changes