Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into upstream

Browse Source 
# Conflicts:
#	Content.Client/_Ohio/UI/AnimatedBackgroundControl.cs
#	Resources/Prototypes/_White/AnimatedLobbyScreens/lobbyScreens.yml
This commit is contained in:
Cinka
2024-03-17 15:51:30 +03:00
parent fdee5c808a 0377fc7091
commit 2d24788571
187 changed files with 2301 additions and 292 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
Resources/Textures/Ohio/Lobby/backgrounds/papich.rsi/1.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 15 MiB

98
Resources/Textures/Ohio/Lobby/backgrounds/papich.rsi/meta.json Normal file
View File

@@ -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
]
]
}
]
}

BIN
Resources/Textures/Ohio/Lobby/backgrounds/syndicate.rsi/1.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 14 MiB

349
Resources/Textures/Ohio/Lobby/backgrounds/syndicate.rsi/meta.json Normal file
View File

@@ -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
]
]
}
]
}