diff --git a/Content.Client/_Ohio/UI/AnimatedBackgroundControl.cs b/Content.Client/_Ohio/UI/AnimatedBackgroundControl.cs index e75c4a6db2..cedba1cbf3 100644 --- a/Content.Client/_Ohio/UI/AnimatedBackgroundControl.cs +++ b/Content.Client/_Ohio/UI/AnimatedBackgroundControl.cs @@ -57,7 +57,7 @@ public sealed class AnimatedBackgroundControl : TextureRect if (delays.Length == 0) continue; - _timer[i] += args.DeltaSeconds * 0.20f; + _timer[i] += args.DeltaSeconds; var currentFrameIndex = _frameCounter[i]; diff --git a/Resources/Audio/Lobby/itachi.ogg b/Resources/Audio/Lobby/itachi.ogg new file mode 100644 index 0000000000..74733274d3 Binary files /dev/null and b/Resources/Audio/Lobby/itachi.ogg differ diff --git a/Resources/Prototypes/SoundCollections/lobby.yml b/Resources/Prototypes/SoundCollections/lobby.yml index f83003f686..2036af166f 100644 --- a/Resources/Prototypes/SoundCollections/lobby.yml +++ b/Resources/Prototypes/SoundCollections/lobby.yml @@ -8,6 +8,7 @@ - /Audio/Lobby/lasers_rip_apart_the_bulkhead.ogg - /Audio/Lobby/every_light_is_blinking_at_once.ogg - /Audio/Lobby/atomicamnesiammx.ogg + - /Audio/Lobby/itachi.ogg # - /Audio/Lobby/absconditus.ogg # - /Audio/Lobby/space_asshole.ogg # - /Audio/Lobby/endless_space.ogg diff --git a/Resources/Prototypes/_White/AnimatedLobbyScreens/lobbyScreens.yml b/Resources/Prototypes/_White/AnimatedLobbyScreens/lobbyScreens.yml index 1aa7e431b4..dc8ad3a4ab 100644 --- a/Resources/Prototypes/_White/AnimatedLobbyScreens/lobbyScreens.yml +++ b/Resources/Prototypes/_White/AnimatedLobbyScreens/lobbyScreens.yml @@ -1,19 +1,19 @@ - type: animatedLobbyScreen id: FourthLobbyScreen + path: Ohio/Lobby/backgrounds/papich.rsi + +- type: animatedLobbyScreen + id: MilkywayLobbyScreen path: Ohio/Lobby/backgrounds/4.rsi +- type: animatedLobbyScreen + id: SusLobbyScreen + path: Ohio/Lobby/backgrounds/syndicate.rsi + #- type: animatedLobbyScreen # id: NativeLobbyScreen # path: Ohio/Lobby/backgrounds/native.rsi -#- type: animatedLobbyScreen -# id: MilkywayLobbyScreen -# path: Ohio/Lobby/backgrounds/milkyway.rsi - -#- type: animatedLobbyScreen -# id: SusLobbyScreen -# path: Ohio/Lobby/backgrounds/sus.rsi - #- type: animatedLobbyScreen # id: ThirdLobbyScreen # path: Ohio/Lobby/backgrounds/3.rsi diff --git a/Resources/Textures/Ohio/Lobby/backgrounds/papich.rsi/1.png b/Resources/Textures/Ohio/Lobby/backgrounds/papich.rsi/1.png new file mode 100644 index 0000000000..0296727bb7 Binary files /dev/null and b/Resources/Textures/Ohio/Lobby/backgrounds/papich.rsi/1.png differ diff --git a/Resources/Textures/Ohio/Lobby/backgrounds/papich.rsi/meta.json b/Resources/Textures/Ohio/Lobby/backgrounds/papich.rsi/meta.json new file mode 100644 index 0000000000..c756a4bc71 --- /dev/null +++ b/Resources/Textures/Ohio/Lobby/backgrounds/papich.rsi/meta.json @@ -0,0 +1,98 @@ +{ + "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/syndicate.rsi/1.png b/Resources/Textures/Ohio/Lobby/backgrounds/syndicate.rsi/1.png new file mode 100644 index 0000000000..2a339c5d7c Binary files /dev/null and b/Resources/Textures/Ohio/Lobby/backgrounds/syndicate.rsi/1.png differ diff --git a/Resources/Textures/Ohio/Lobby/backgrounds/syndicate.rsi/meta.json b/Resources/Textures/Ohio/Lobby/backgrounds/syndicate.rsi/meta.json new file mode 100644 index 0000000000..225291e7e6 --- /dev/null +++ b/Resources/Textures/Ohio/Lobby/backgrounds/syndicate.rsi/meta.json @@ -0,0 +1,349 @@ +{ + "version": 1, + "license": null, + "copyright": null, + "size": { + "x": 374, + "y": 211 + }, + "states": [ + { + "name": "1", + "delays": [ + [ + 0.03, + 0.04, + 0.03, + 0.03, + 0.04, + 0.03, + 0.03, + 0.04, + 0.03, + 0.03, + 0.1, + 0.04, + 0.06, + 0.04, + 0.03, + 0.03, + 0.04, + 0.03, + 0.03, + 0.04, + 0.03, + 0.1, + 0.03, + 0.07, + 0.07, + 0.13, + 0.03, + 0.04, + 0.03, + 0.03, + 0.04, + 0.03, + 0.03, + 0.04, + 0.06, + 0.04, + 0.03, + 0.03, + 0.04, + 0.03, + 0.03, + 0.04, + 0.03, + 0.03, + 0.04, + 0.03, + 0.03, + 0.04, + 0.03, + 0.03, + 0.04, + 0.03, + 0.03, + 0.04, + 0.03, + 0.03, + 0.04, + 0.03, + 0.03, + 0.04, + 0.03, + 0.03, + 0.04, + 0.03, + 0.03, + 0.04, + 0.03, + 0.03, + 0.04, + 0.03, + 0.03, + 0.04, + 0.03, + 0.03, + 0.04, + 0.03, + 0.03, + 0.04, + 0.03, + 0.03, + 0.04, + 0.03, + 0.03, + 0.04, + 0.03, + 0.03, + 0.04, + 0.03, + 0.03, + 0.04, + 0.03, + 0.03, + 0.04, + 0.03, + 0.03, + 0.04, + 0.03, + 0.03, + 0.04, + 0.03, + 0.03, + 0.04, + 0.03, + 0.03, + 0.04, + 0.03, + 0.03, + 0.04, + 0.03, + 0.03, + 0.04, + 0.03, + 0.03, + 0.04, + 0.03, + 0.03, + 0.04, + 0.03, + 0.03, + 0.04, + 0.03, + 0.03, + 0.04, + 0.03, + 0.03, + 0.04, + 0.03, + 0.03, + 0.04, + 0.03, + 0.03, + 0.04, + 0.03, + 0.03, + 0.04, + 0.03, + 0.03, + 0.04, + 0.03, + 0.03, + 0.04, + 0.06, + 0.04, + 0.03, + 0.03, + 0.04, + 0.03, + 0.03, + 0.04, + 0.03, + 0.03, + 0.04, + 0.06, + 0.04, + 0.03, + 0.03, + 0.04, + 0.03, + 0.03, + 0.04, + 0.03, + 0.03, + 0.04, + 0.03, + 0.03, + 0.04, + 0.03, + 0.03, + 0.04, + 0.03, + 0.03, + 0.04, + 0.03, + 0.03, + 0.04, + 0.03, + 0.03, + 0.04, + 0.03, + 0.03, + 0.04, + 0.03, + 0.03, + 0.04, + 0.03, + 0.03, + 0.04, + 0.03, + 0.03, + 0.04, + 0.03, + 0.03, + 0.04, + 0.03, + 0.03, + 0.07, + 0.03, + 0.04, + 0.03, + 0.03, + 0.04, + 0.03, + 0.03, + 0.04, + 0.03, + 0.03, + 0.04, + 0.03, + 0.03, + 0.04, + 0.03, + 0.03, + 0.04, + 0.03, + 0.03, + 0.04, + 0.03, + 0.03, + 0.04, + 0.03, + 0.03, + 0.04, + 0.03, + 0.03, + 0.04, + 0.03, + 0.03, + 0.04, + 0.03, + 0.03, + 0.04, + 0.03, + 0.03, + 0.04, + 0.03, + 0.03, + 0.04, + 0.03, + 0.03, + 0.04, + 0.03, + 0.03, + 0.04, + 0.03, + 0.03, + 0.04, + 0.03, + 0.03, + 0.04, + 0.03, + 0.03, + 0.04, + 0.03, + 0.1, + 0.03, + 0.04, + 0.03, + 0.03, + 0.04, + 0.03, + 0.03, + 0.04, + 0.03, + 0.03, + 0.04, + 0.03, + 0.03, + 0.04, + 0.03, + 0.03, + 0.04, + 0.03, + 0.03, + 0.04, + 0.03, + 0.03, + 0.04, + 0.03, + 0.03, + 0.04, + 0.03, + 0.03, + 0.04, + 0.03, + 0.03, + 0.04, + 0.06, + 0.04, + 0.03, + 0.03, + 0.07, + 0.03, + 0.04, + 0.03, + 0.03, + 0.04, + 0.03, + 0.03, + 0.04, + 0.03, + 0.03, + 0.04, + 0.03, + 0.03, + 0.04, + 0.03, + 0.03, + 0.04, + 0.03, + 0.03, + 0.04, + 0.03, + 0.03, + 0.04, + 0.03, + 0.03, + 0.04, + 0.03, + 0.03, + 0.04, + 0.03, + 0.03, + 0.04, + 0.03, + 0.13, + 0.04, + 0.03, + 0.03, + 0.04, + 0.03, + 0.03 + ] + ] + } + ] +} \ No newline at end of file