diff --git a/Content.Client/Lobby/LobbyState.cs b/Content.Client/Lobby/LobbyState.cs index f8bd453e8d..a363a1f937 100644 --- a/Content.Client/Lobby/LobbyState.cs +++ b/Content.Client/Lobby/LobbyState.cs @@ -14,6 +14,7 @@ using Content.Client.UserInterface.Systems.Chat; using Content.Client.Voting; using Robust.Client; using Robust.Client.Console; +using Robust.Client.GameObjects; using Robust.Client.ResourceManagement; using Robust.Client.UserInterface; using Robust.Client.UserInterface.Controls; @@ -206,6 +207,7 @@ namespace Content.Client.Lobby private void LobbyStatusUpdated() { UpdateLobbyUi(); + UpdateLobbyBackground(); } private void LobbyLateJoinStatusUpdated() @@ -278,14 +280,7 @@ namespace Content.Client.Lobby private void UpdateLobbyBackground() { if (_gameTicker.LobbyBackground != null) - { - _lobby!.Background.Texture = _resourceCache.GetResource(_gameTicker.LobbyBackground ); - } - else - { - _lobby!.Background.Texture = null; - } - + _lobby!.Background.SetRSI(_resourceCache.GetResource(_gameTicker.LobbyBackground).RSI); } private void SetReady(bool newReady) diff --git a/Content.Client/_Ohio/UI/AnimatedBackgroundControl.cs b/Content.Client/_Ohio/UI/AnimatedBackgroundControl.cs index cedba1cbf3..46f799a71f 100644 --- a/Content.Client/_Ohio/UI/AnimatedBackgroundControl.cs +++ b/Content.Client/_Ohio/UI/AnimatedBackgroundControl.cs @@ -15,7 +15,8 @@ public sealed class AnimatedBackgroundControl : TextureRect [Dependency] private readonly IClyde _clyde = default!; [Dependency] private readonly IPrototypeManager _prototypeManager = default!; - private string _rsiPath = "/Textures/Ohio/Lobby/backgrounds/native.rsi"; + private string _rsiPath = "/Textures/White/Lobby/backgrounds/native.rsi"; + public RSI? _RSI; private const int States = 1; private IRenderTexture? _buffer; @@ -34,11 +35,11 @@ public sealed class AnimatedBackgroundControl : TextureRect private void InitializeStates() { - var rsi = _resourceCache.GetResource(_rsiPath).RSI; + _RSI ??= _resourceCache.GetResource(_rsiPath).RSI; for (var i = 0; i < States; i++) { - if (!rsi.TryGetState((i + 1).ToString(), out var state)) + if (!_RSI.TryGetState((i + 1).ToString(), out var state)) continue; _frames[i] = state.GetFrames(RsiDirection.South); @@ -47,6 +48,12 @@ public sealed class AnimatedBackgroundControl : TextureRect } } + public void SetRSI(RSI? rsi) + { + _RSI = rsi; + InitializeStates(); + } + protected override void FrameUpdate(FrameEventArgs args) { base.FrameUpdate(args); diff --git a/Content.Server/Audio/ContentAudioSystem.cs b/Content.Server/Audio/ContentAudioSystem.cs index 4890f7e26f..55805b1f01 100644 --- a/Content.Server/Audio/ContentAudioSystem.cs +++ b/Content.Server/Audio/ContentAudioSystem.cs @@ -15,7 +15,7 @@ namespace Content.Server.Audio; public sealed class ContentAudioSystem : SharedContentAudioSystem { [ValidatePrototypeId] - private const string LobbyMusicCollection = "LobbyMusicSongs"; + private const string LobbyMusicCollection = "LobbyMusicWhitePack"; [Dependency] private readonly AudioSystem _serverAudio = default!; [Dependency] private readonly IRobustRandom _robustRandom = default!; diff --git a/Content.Server/GameTicking/GameTicker.LobbyBackground.cs b/Content.Server/GameTicking/GameTicker.LobbyBackground.cs index 2090e3e31f..0a40bf7aeb 100644 --- a/Content.Server/GameTicking/GameTicker.LobbyBackground.cs +++ b/Content.Server/GameTicking/GameTicker.LobbyBackground.cs @@ -1,7 +1,6 @@ -using Content.Server.GameTicking.Prototypes; using Robust.Shared.Random; -using Robust.Shared.Utility; using System.Linq; +using Content.Shared._White; namespace Content.Server.GameTicking; @@ -11,21 +10,19 @@ public sealed partial class GameTicker public string? LobbyBackground { get; private set; } [ViewVariables] - private List? _lobbyBackgrounds; - - private static readonly string[] WhitelistedBackgroundExtensions = new string[] {"png", "jpg", "jpeg", "webp"}; + private List? _lobbyBackgrounds; private void InitializeLobbyBackground() { - _lobbyBackgrounds = _prototypeManager.EnumeratePrototypes() - .Select(x => x.Background) - .Where(x => WhitelistedBackgroundExtensions.Contains(x.Extension)) + _lobbyBackgrounds = _prototypeManager.EnumeratePrototypes() + .Select(x => x.Path) .ToList(); RandomizeLobbyBackground(); } - private void RandomizeLobbyBackground() { - LobbyBackground = _lobbyBackgrounds!.Any() ? _robustRandom.Pick(_lobbyBackgrounds!).ToString() : null; + private void RandomizeLobbyBackground() + { + LobbyBackground = _lobbyBackgrounds!.Any() ? _robustRandom.Pick(_lobbyBackgrounds!) : null; } } diff --git a/Content.Shared/_White/AnimatedLobbyScreenPrototype.cs b/Content.Shared/_White/AnimatedLobbyScreenPrototype.cs index 9b3020cb71..7629e1b798 100644 --- a/Content.Shared/_White/AnimatedLobbyScreenPrototype.cs +++ b/Content.Shared/_White/AnimatedLobbyScreenPrototype.cs @@ -5,13 +5,13 @@ namespace Content.Shared._White; /// /// This is a prototype for... /// -[Prototype("animatedLobbyScreen")] +[Prototype] public sealed partial class AnimatedLobbyScreenPrototype : IPrototype { /// [IdDataField] public string ID { get; } = default!; - [DataField("path")] - public string Path { get; private set; } = string.Empty; + [DataField(required: true)] + public string Path = default!; } diff --git a/Resources/Prototypes/SoundCollections/lobby.yml b/Resources/Prototypes/SoundCollections/lobby.yml index bc4f60faac..145a5004b0 100644 --- a/Resources/Prototypes/SoundCollections/lobby.yml +++ b/Resources/Prototypes/SoundCollections/lobby.yml @@ -32,6 +32,21 @@ - /Audio/Lobby/White/Spac_Stac.ogg - /Audio/Lobby/White/comet_haley.ogg +- type: soundCollection + id: LobbyMusicWhitePack + files: + - /Audio/Lobby/White/thunderdome.ogg + - /Audio/Lobby/White/singuloose.ogg + - /Audio/Lobby/White/lasers_rip_apart_the_bulkhead.ogg + - /Audio/Lobby/White/every_light_is_blinking_at_once.ogg + - /Audio/Lobby/White/atomicamnesiammx.ogg + - /Audio/Lobby/White/Spac_Stac.ogg + - /Audio/Lobby/White/comet_haley.ogg + - /Audio/Lobby/Songs/CirclesAroundTheSun.ogg + - /Audio/Lobby/Songs/SpaceOddity.ogg + - /Audio/Lobby/Songs/SpaceAsshole.ogg + - /Audio/Lobby/Songs/SpaceShuttle.ogg + - type: soundCollection id: LobbyMusicSS13 files: diff --git a/Resources/Prototypes/_White/AnimatedLobbyScreens/lobbyScreens.yml b/Resources/Prototypes/_White/AnimatedLobbyScreens/lobbyScreens.yml index dc8ad3a4ab..d43b426705 100644 --- a/Resources/Prototypes/_White/AnimatedLobbyScreens/lobbyScreens.yml +++ b/Resources/Prototypes/_White/AnimatedLobbyScreens/lobbyScreens.yml @@ -1,18 +1,30 @@ - type: animatedLobbyScreen - id: FourthLobbyScreen - path: Ohio/Lobby/backgrounds/papich.rsi + id: SeaLobbyScreen + path: /Textures/White/Lobby/backgrounds/sea.rsi + +- type: animatedLobbyScreen + id: RocketLobbyScreen + path: /Textures/White/Lobby/backgrounds/rocket.rsi + +- type: animatedLobbyScreen + id: CubeLobbyScreen + path: /Textures/White/Lobby/backgrounds/cube.rsi - type: animatedLobbyScreen id: MilkywayLobbyScreen - path: Ohio/Lobby/backgrounds/4.rsi - -- type: animatedLobbyScreen - id: SusLobbyScreen - path: Ohio/Lobby/backgrounds/syndicate.rsi + path: /Textures/White/Lobby/backgrounds/milkyway.rsi #- type: animatedLobbyScreen # id: NativeLobbyScreen -# path: Ohio/Lobby/backgrounds/native.rsi +# path: White/Lobby/backgrounds/native.rsi + +- type: animatedLobbyScreen + id: CentcommLobbyScreen + path: /Textures/White/Lobby/backgrounds/centcomm.rsi + +- type: animatedLobbyScreen + id: VangoghLobbyScreen + path: /Textures/White/Lobby/backgrounds/vangogh.rsi #- type: animatedLobbyScreen # id: ThirdLobbyScreen diff --git a/Resources/Textures/Ohio/Lobby/backgrounds/papich.rsi/meta.json b/Resources/Textures/Ohio/Lobby/backgrounds/papich.rsi/meta.json deleted file mode 100644 index c756a4bc71..0000000000 --- a/Resources/Textures/Ohio/Lobby/backgrounds/papich.rsi/meta.json +++ /dev/null @@ -1,98 +0,0 @@ -{ - "version": 1, - "license": null, - "copyright": null, - "size": { - "x": 498, - "y": 280 - }, - "states": [ - { - "name": "1", - "delays": [ - [ - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1 - ] - ] - } - ] -} \ No newline at end of file diff --git a/Resources/Textures/Ohio/Lobby/backgrounds/3.rsi/1.png b/Resources/Textures/White/Lobby/backgrounds/3.rsi/1.png similarity index 100% rename from Resources/Textures/Ohio/Lobby/backgrounds/3.rsi/1.png rename to Resources/Textures/White/Lobby/backgrounds/3.rsi/1.png diff --git a/Resources/Textures/Ohio/Lobby/backgrounds/3.rsi/meta.json b/Resources/Textures/White/Lobby/backgrounds/3.rsi/meta.json similarity index 100% rename from Resources/Textures/Ohio/Lobby/backgrounds/3.rsi/meta.json rename to Resources/Textures/White/Lobby/backgrounds/3.rsi/meta.json diff --git a/Resources/Textures/Ohio/Lobby/backgrounds/4.rsi/1.png b/Resources/Textures/White/Lobby/backgrounds/centcomm.rsi/1.png similarity index 100% rename from Resources/Textures/Ohio/Lobby/backgrounds/4.rsi/1.png rename to Resources/Textures/White/Lobby/backgrounds/centcomm.rsi/1.png diff --git a/Resources/Textures/Ohio/Lobby/backgrounds/4.rsi/meta.json b/Resources/Textures/White/Lobby/backgrounds/centcomm.rsi/meta.json similarity index 100% rename from Resources/Textures/Ohio/Lobby/backgrounds/4.rsi/meta.json rename to Resources/Textures/White/Lobby/backgrounds/centcomm.rsi/meta.json diff --git a/Resources/Textures/Ohio/Lobby/backgrounds/papich.rsi/1.png b/Resources/Textures/White/Lobby/backgrounds/cube.rsi/1.png similarity index 59% rename from Resources/Textures/Ohio/Lobby/backgrounds/papich.rsi/1.png rename to Resources/Textures/White/Lobby/backgrounds/cube.rsi/1.png index 0296727bb7..edd7fbdef2 100644 Binary files a/Resources/Textures/Ohio/Lobby/backgrounds/papich.rsi/1.png and b/Resources/Textures/White/Lobby/backgrounds/cube.rsi/1.png differ diff --git a/Resources/Textures/White/Lobby/backgrounds/cube.rsi/meta.json b/Resources/Textures/White/Lobby/backgrounds/cube.rsi/meta.json new file mode 100644 index 0000000000..e117b06169 --- /dev/null +++ b/Resources/Textures/White/Lobby/backgrounds/cube.rsi/meta.json @@ -0,0 +1,494 @@ +{ + "version": 1, + "license": null, + "copyright": null, + "size": { + "x": 355, + "y": 281 + }, + "states": [ + { + "name": "1", + "delays": [ + [ + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03, + 0.03 + ] + ] + } + ] +} diff --git a/Resources/Textures/Ohio/Lobby/backgrounds/milkyway.rsi/1.png b/Resources/Textures/White/Lobby/backgrounds/milkyway.rsi/1.png similarity index 100% rename from Resources/Textures/Ohio/Lobby/backgrounds/milkyway.rsi/1.png rename to Resources/Textures/White/Lobby/backgrounds/milkyway.rsi/1.png diff --git a/Resources/Textures/Ohio/Lobby/backgrounds/milkyway.rsi/meta.json b/Resources/Textures/White/Lobby/backgrounds/milkyway.rsi/meta.json similarity index 100% rename from Resources/Textures/Ohio/Lobby/backgrounds/milkyway.rsi/meta.json rename to Resources/Textures/White/Lobby/backgrounds/milkyway.rsi/meta.json diff --git a/Resources/Textures/Ohio/Lobby/backgrounds/native.rsi/1.png b/Resources/Textures/White/Lobby/backgrounds/native.rsi/1.png similarity index 100% rename from Resources/Textures/Ohio/Lobby/backgrounds/native.rsi/1.png rename to Resources/Textures/White/Lobby/backgrounds/native.rsi/1.png diff --git a/Resources/Textures/Ohio/Lobby/backgrounds/native.rsi/meta.json b/Resources/Textures/White/Lobby/backgrounds/native.rsi/meta.json similarity index 100% rename from Resources/Textures/Ohio/Lobby/backgrounds/native.rsi/meta.json rename to Resources/Textures/White/Lobby/backgrounds/native.rsi/meta.json diff --git a/Resources/Textures/White/Lobby/backgrounds/rocket.rsi/1.png b/Resources/Textures/White/Lobby/backgrounds/rocket.rsi/1.png new file mode 100644 index 0000000000..dbfc01e00a Binary files /dev/null and b/Resources/Textures/White/Lobby/backgrounds/rocket.rsi/1.png differ diff --git a/Resources/Textures/White/Lobby/backgrounds/rocket.rsi/meta.json b/Resources/Textures/White/Lobby/backgrounds/rocket.rsi/meta.json new file mode 100644 index 0000000000..3c9e5c3d28 --- /dev/null +++ b/Resources/Textures/White/Lobby/backgrounds/rocket.rsi/meta.json @@ -0,0 +1,28 @@ +{ + "version": 1, + "license": null, + "copyright": null, + "size": { + "x": 960, + "y": 540 + }, + "states": [ + { + "name": "1", + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ] + ] + } + ] +} diff --git a/Resources/Textures/White/Lobby/backgrounds/sea.rsi/1.png b/Resources/Textures/White/Lobby/backgrounds/sea.rsi/1.png new file mode 100644 index 0000000000..7304b2cd67 Binary files /dev/null and b/Resources/Textures/White/Lobby/backgrounds/sea.rsi/1.png differ diff --git a/Resources/Textures/White/Lobby/backgrounds/sea.rsi/meta.json b/Resources/Textures/White/Lobby/backgrounds/sea.rsi/meta.json new file mode 100644 index 0000000000..d176245f7e --- /dev/null +++ b/Resources/Textures/White/Lobby/backgrounds/sea.rsi/meta.json @@ -0,0 +1,213 @@ +{ + "version": 1, + "license": null, + "copyright": null, + "size": { + "x": 498, + "y": 280 + }, + "states": [ + { + "name": "1", + "delays": [ + [ + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05 + ] + ] + } + ] +} diff --git a/Resources/Textures/Ohio/Lobby/backgrounds/sus.rsi/1.png b/Resources/Textures/White/Lobby/backgrounds/sus.rsi/1.png similarity index 100% rename from Resources/Textures/Ohio/Lobby/backgrounds/sus.rsi/1.png rename to Resources/Textures/White/Lobby/backgrounds/sus.rsi/1.png diff --git a/Resources/Textures/Ohio/Lobby/backgrounds/sus.rsi/meta.json b/Resources/Textures/White/Lobby/backgrounds/sus.rsi/meta.json similarity index 100% rename from Resources/Textures/Ohio/Lobby/backgrounds/sus.rsi/meta.json rename to Resources/Textures/White/Lobby/backgrounds/sus.rsi/meta.json diff --git a/Resources/Textures/Ohio/Lobby/backgrounds/syndicate.rsi/1.png b/Resources/Textures/White/Lobby/backgrounds/syndicate.rsi/1.png similarity index 100% rename from Resources/Textures/Ohio/Lobby/backgrounds/syndicate.rsi/1.png rename to Resources/Textures/White/Lobby/backgrounds/syndicate.rsi/1.png diff --git a/Resources/Textures/Ohio/Lobby/backgrounds/syndicate.rsi/meta.json b/Resources/Textures/White/Lobby/backgrounds/syndicate.rsi/meta.json similarity index 100% rename from Resources/Textures/Ohio/Lobby/backgrounds/syndicate.rsi/meta.json rename to Resources/Textures/White/Lobby/backgrounds/syndicate.rsi/meta.json diff --git a/Resources/Textures/Ohio/Lobby/backgrounds/5.rsi/1.png b/Resources/Textures/White/Lobby/backgrounds/vangogh.rsi/1.png similarity index 100% rename from Resources/Textures/Ohio/Lobby/backgrounds/5.rsi/1.png rename to Resources/Textures/White/Lobby/backgrounds/vangogh.rsi/1.png diff --git a/Resources/Textures/Ohio/Lobby/backgrounds/5.rsi/meta.json b/Resources/Textures/White/Lobby/backgrounds/vangogh.rsi/meta.json similarity index 100% rename from Resources/Textures/Ohio/Lobby/backgrounds/5.rsi/meta.json rename to Resources/Textures/White/Lobby/backgrounds/vangogh.rsi/meta.json