From f340c5a62f992ce9760c2d28ba8da806daf10b46 Mon Sep 17 00:00:00 2001 From: Mothblocks <35135081+Mothblocks@users.noreply.github.com> Date: Fri, 16 May 2025 14:28:03 -0700 Subject: [PATCH] Explicitly set lobby background layer (#91160) Right now this is based on insertion order which is a bit gross and breaks event-base. No difference for us though --- code/__DEFINES/layers.dm | 10 ++++++---- code/_onclick/hud/new_player.dm | 1 + 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/code/__DEFINES/layers.dm b/code/__DEFINES/layers.dm index 144ec585fb5..48f413cea14 100644 --- a/code/__DEFINES/layers.dm +++ b/code/__DEFINES/layers.dm @@ -314,12 +314,14 @@ ///Layer for lobby menu collapse button #define LOBBY_BELOW_MENU_LAYER 2 -///Layer for lobby menu background image and main buttons (Join/Ready, Observe, Character Prefs) -#define LOBBY_MENU_LAYER 3 +/// Layer for background +#define LOBBY_BACKGROUND_LAYER 3 +///Layer for main buttons (Join/Ready, Observe, Character Prefs) +#define LOBBY_MENU_LAYER 4 ///Layer for lobby menu shutter, which covers up the menu to collapse/expand it -#define LOBBY_SHUTTER_LAYER 4 +#define LOBBY_SHUTTER_LAYER 5 ///Layer for lobby menu buttons that are hanging away from and lower than the main panel -#define LOBBY_BOTTOM_BUTTON_LAYER 5 +#define LOBBY_BOTTOM_BUTTON_LAYER 6 ///cinematics are "below" the splash screen #define CINEMATIC_LAYER -1 diff --git a/code/_onclick/hud/new_player.dm b/code/_onclick/hud/new_player.dm index c2a8253ad74..19ce26c937d 100644 --- a/code/_onclick/hud/new_player.dm +++ b/code/_onclick/hud/new_player.dm @@ -124,6 +124,7 @@ /atom/movable/screen/lobby/background icon = 'icons/hud/lobby/background.dmi' icon_state = "background" + layer = LOBBY_BACKGROUND_LAYER screen_loc = "TOP,CENTER:-61" /atom/movable/screen/lobby/button