From 55f039e30a2506cfaa613c93dcc335eb5e16c7ac Mon Sep 17 00:00:00 2001 From: NovaBot <154629622+NovaBot13@users.noreply.github.com> Date: Tue, 16 Apr 2024 19:28:51 -0400 Subject: [PATCH] [MIRROR] [no gbp] Loot panel subsystem initializes now (#2025) * [no gbp] Loot panel subsystem initializes now (#82680) ## About The Pull Request Confusing error message at loading screen ![image](https://github.com/tgstation/tgstation/assets/42397676/850e5f97-f319-4f4d-b49a-ff90bb527aa8) ## Why It's Good For The Game Less confusing ## Changelog :cl: fix: CentCom dispatched a team of interns to fix the loot panel's loading message. It should now load properly. It did before too, but now the message is fixed. /:cl: --------- Co-authored-by: MrMelbert <51863163+MrMelbert@users.noreply.github.com> * [no gbp] Loot panel subsystem initializes now --------- Co-authored-by: Jeremiah <42397676+jlsnow301@users.noreply.github.com> Co-authored-by: MrMelbert <51863163+MrMelbert@users.noreply.github.com> --- code/__DEFINES/subsystems.dm | 1 - code/modules/lootpanel/ss_looting.dm | 5 +++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/code/__DEFINES/subsystems.dm b/code/__DEFINES/subsystems.dm index f667fa8e2df..1e372ef058b 100644 --- a/code/__DEFINES/subsystems.dm +++ b/code/__DEFINES/subsystems.dm @@ -190,7 +190,6 @@ #define INIT_ORDER_PATH -50 #define INIT_ORDER_DECAY -61 //NOVA EDIT ADDITION #define INIT_ORDER_EXPLOSIONS -69 -#define INIT_ORDER_LOOT -70 #define INIT_ORDER_STATPANELS -97 #define INIT_ORDER_BAN_CACHE -98 #define INIT_ORDER_INIT_PROFILER -99 //Near the end, logs the costs of initialize diff --git a/code/modules/lootpanel/ss_looting.dm b/code/modules/lootpanel/ss_looting.dm index cf0882fa890..94e12f88f95 100644 --- a/code/modules/lootpanel/ss_looting.dm +++ b/code/modules/lootpanel/ss_looting.dm @@ -2,8 +2,9 @@ /// Queues image generation for search objects without icons SUBSYSTEM_DEF(looting) name = "Loot Icon Generation" - init_order = INIT_ORDER_LOOT + flags = SS_NO_INIT priority = FIRE_PRIORITY_PROCESS + runlevels = RUNLEVEL_LOBBY|RUNLEVELS_DEFAULT wait = 0.5 SECONDS /// Backlog of items. Gets put into processing var/list/datum/lootpanel/backlog = list() @@ -32,7 +33,7 @@ SUBSYSTEM_DEF(looting) if(!panel.process_images()) backlog += panel - + if(MC_TICK_CHECK) return