From b1f2a4efef3fea7274ba8f53e831cc2f7268602b Mon Sep 17 00:00:00 2001 From: Darki255 Date: Tue, 20 Aug 2024 17:23:40 +0300 Subject: [PATCH] =?UTF-8?q?=D0=A4=D0=B8=D0=BA=D1=81=20=D0=B0=D0=BD=D0=B8?= =?UTF-8?q?=D0=BC=D0=B8=D1=80=D0=BE=D0=B2=D0=B0=D0=BD=D0=BD=D0=BE=D0=B3?= =?UTF-8?q?=D0=BE=20=D1=84=D0=BE=D0=BD=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Content.Client/Lobby/LobbyState.cs | 4 ++++ .../ADT/AnimatedLobbyScreen/lobbyScreens.yml | 6 +++--- .../backgrounds/{milkway.rsi => milkyway.rsi}/1.png | Bin .../{milkway.rsi => milkyway.rsi}/meta.json | 0 4 files changed, 7 insertions(+), 3 deletions(-) rename Resources/Textures/ADT/LobbyScreens/backgrounds/{milkway.rsi => milkyway.rsi}/1.png (100%) rename Resources/Textures/ADT/LobbyScreens/backgrounds/{milkway.rsi => milkyway.rsi}/meta.json (100%) diff --git a/Content.Client/Lobby/LobbyState.cs b/Content.Client/Lobby/LobbyState.cs index 7695da1e5bd..6f6210b67a4 100644 --- a/Content.Client/Lobby/LobbyState.cs +++ b/Content.Client/Lobby/LobbyState.cs @@ -216,6 +216,10 @@ private void UpdateLobbyBackground() { Lobby!.Background.SetRSI(_resourceCache.GetResource(_gameTicker.LobbyBackground).RSI); // ADT Tweak } + else + { + Lobby!.Background.Texture = null; + } } diff --git a/Resources/Prototypes/ADT/AnimatedLobbyScreen/lobbyScreens.yml b/Resources/Prototypes/ADT/AnimatedLobbyScreen/lobbyScreens.yml index 0606e728b4a..4c5c7c2f3b8 100644 --- a/Resources/Prototypes/ADT/AnimatedLobbyScreen/lobbyScreens.yml +++ b/Resources/Prototypes/ADT/AnimatedLobbyScreen/lobbyScreens.yml @@ -26,9 +26,9 @@ id: VangoghLobbyScreen path: /Textures/ADT/LobbyScreens/backgrounds/vangogh.rsi -#- type: animatedLobbyScreen -# id: ThirdLobbyScreen -# path: Ohio/Lobby/backgrounds/3.rsi +- type: animatedLobbyScreen + id: ThirdLobbyScreen + path: /Textures/ADT/LobbyScreens/backgrounds/3.rsi #- type: animatedLobbyScreen # id: FifthLobbyScreen diff --git a/Resources/Textures/ADT/LobbyScreens/backgrounds/milkway.rsi/1.png b/Resources/Textures/ADT/LobbyScreens/backgrounds/milkyway.rsi/1.png similarity index 100% rename from Resources/Textures/ADT/LobbyScreens/backgrounds/milkway.rsi/1.png rename to Resources/Textures/ADT/LobbyScreens/backgrounds/milkyway.rsi/1.png diff --git a/Resources/Textures/ADT/LobbyScreens/backgrounds/milkway.rsi/meta.json b/Resources/Textures/ADT/LobbyScreens/backgrounds/milkyway.rsi/meta.json similarity index 100% rename from Resources/Textures/ADT/LobbyScreens/backgrounds/milkway.rsi/meta.json rename to Resources/Textures/ADT/LobbyScreens/backgrounds/milkyway.rsi/meta.json