diff --git a/code/__defines/subsystem-priority.dm b/code/__defines/subsystem-priority.dm index 4cea85495d3..05130fbc573 100644 --- a/code/__defines/subsystem-priority.dm +++ b/code/__defines/subsystem-priority.dm @@ -1,6 +1,7 @@ -#define SS_INIT_PERSISTENT_CONFIG 24 -#define SS_INIT_MISC_FIRST 23 -#define SS_INIT_SEEDS 22 // Plant controller setup. +#define SS_INIT_PERSISTENT_CONFIG 25 +#define SS_INIT_MISC_FIRST 24 +#define SS_INIT_SEEDS 23 // Plant controller setup. +#define SS_INIT_ASSETS 22 // Assets subsystem setup. #define SS_INIT_MAPLOAD 21 // DMM parsing and load. Unless you know what you're doing, make sure this remains first. #define SS_INIT_JOBS 20 #define SS_INIT_MAPFINALIZE 19 // Asteroid generation. diff --git a/code/controllers/subsystems/assets.dm b/code/controllers/subsystems/assets.dm index 19f5f8d01f7..b09d9ec6f07 100644 --- a/code/controllers/subsystems/assets.dm +++ b/code/controllers/subsystems/assets.dm @@ -2,7 +2,7 @@ /datum/controller/subsystem/assets name = "Assets" - init_order = SS_INIT_MISC_FIRST + init_order = SS_INIT_ASSETS flags = SS_BACKGROUND | SS_FIRE_IN_LOBBY wait = 1 var/list/cache = list() @@ -18,7 +18,7 @@ /datum/controller/subsystem/assets/Initialize(timeofday) for(var/type in typesof(/datum/asset)) var/datum/asset/A = type - if (type != initial(A._abstract) && !initial(A.delayed)) + if (type != initial(A._abstract)) get_asset_datum(type) CHECK_TICK diff --git a/code/modules/client/asset_cache.dm b/code/modules/client/asset_cache.dm index 5b824f1978f..66333a3695a 100644 --- a/code/modules/client/asset_cache.dm +++ b/code/modules/client/asset_cache.dm @@ -150,7 +150,6 @@ var/list/asset_datums = list() /datum/asset var/_abstract = /datum/asset - var/delayed = FALSE /datum/asset/New() asset_datums[type] = src @@ -482,7 +481,6 @@ var/list/asset_datums = list() /datum/asset/spritesheet/vending name = "vending" - delayed = TRUE /datum/asset/spritesheet/vending/register() var/list/vending_products = list() @@ -517,6 +515,8 @@ var/list/asset_datums = list() if(istype(O, /obj/item/seeds)) // thanks seeds for being overlays defined at runtime var/obj/item/seeds/S = O + if(!S.seed && S.seed_type && !isnull(SSplants.seeds) && SSplants.seeds[S.seed_type]) + S.seed = SSplants.seeds[S.seed_type] I = S.update_appearance(TRUE) Insert(imgid, I, forced=I) else diff --git a/html/changelogs/MDP-circlefix.yml b/html/changelogs/MDP-circlefix.yml new file mode 100644 index 00000000000..eff14a5972b --- /dev/null +++ b/html/changelogs/MDP-circlefix.yml @@ -0,0 +1,44 @@ +################################ +# Example Changelog File +# +# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. +# +# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) +# When it is, any changes listed below will disappear. +# +# Valid Prefixes: +# bugfix +# wip (For works in progress) +# tweak +# soundadd +# sounddel +# rscadd (general adding of nice things) +# rscdel (general deleting of nice things) +# imageadd +# imagedel +# maptweak +# spellcheck (typo fixes) +# experiment +# balance +# admin +# backend +# security +# refactor +################################# + +# Your name. +author: MoondancerPony + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +# Any changes you've made. See valid prefix list above. +# INDENT WITH TWO SPACES. NOT TABS. SPACES. +# SCREW THIS UP AND IT WON'T WORK. +# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries. +# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog. +changes: + - bugfix: "Fixes an infinite recursion in vendor spritesheet code." + - bugfix: "Fixes missing placeholder item sprites causing SSassets warnings." + - refactor: "Assets now load after SSplants." + - rscdel: "Removes the now-useless delayed asset load variable." diff --git a/icons/obj/ammo.dmi b/icons/obj/ammo.dmi index c72b359c7b5..85897bb18c9 100644 Binary files a/icons/obj/ammo.dmi and b/icons/obj/ammo.dmi differ diff --git a/icons/obj/syringe.dmi b/icons/obj/syringe.dmi index 06a984d74f4..c86945dad1a 100644 Binary files a/icons/obj/syringe.dmi and b/icons/obj/syringe.dmi differ