Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Lobby art contest #140

Merged
merged 4 commits into from
Oct 9, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 24 additions & 8 deletions Resources/Prototypes/lobbyscreens.yml
Original file line number Diff line number Diff line change
@@ -1,12 +1,4 @@
- type: lobbyBackground
id: 2
background: /Textures/LobbyScreens/2.png

- type: lobbyBackground
id: Phil
background: /Textures/LobbyScreens/phil.png

- type: lobbyBackground
id: MedbayMadness
background: /Textures/LobbyScreens/MedbayMadness.png

Expand All @@ -21,3 +13,27 @@
- type: lobbyBackground
id: aBadShift
background: /Textures/LobbyScreens/aBadShift.png

- type: lobbyBackground
id: Bar
background: /Textures/LobbyScreens/Bar.png

- type: lobbyBackground
id: CodeDeltaGamma
background: /Textures/LobbyScreens/CodeDeltaGamma.png

- type: lobbyBackground
id: CupOfVelta
background: /Textures/LobbyScreens/CupOfVelta.png

- type: lobbyBackground
id: Epistemics
background: /Textures/LobbyScreens/Epistemics.png

- type: lobbyBackground
id: Singulo
background: /Textures/LobbyScreens/Singulo.png

- type: lobbyBackground
id: TechnologicalProgress
background: /Textures/LobbyScreens/DeltaV__Technological_Progress_by_threlo.png
Binary file removed Resources/Textures/LobbyScreens/2.png
Binary file not shown.
2 changes: 0 additions & 2 deletions Resources/Textures/LobbyScreens/2.png.yml

This file was deleted.

Binary file added Resources/Textures/LobbyScreens/Bar.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Resources/Textures/LobbyScreens/CupOfVelta.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Resources/Textures/LobbyScreens/Epistemics.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Resources/Textures/LobbyScreens/Singulo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
37 changes: 31 additions & 6 deletions Resources/Textures/LobbyScreens/attributions.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,3 @@
- files: ["phil.png"]
license: "CC-BY-4.0"
copyright: "Leonardo DaBepis#4869 on discord / @leonardo-dabepis on Tumblr"
source: "https://leonardo-dabepis.tumblr.com/"

- files: ["MedbayMadness.png"]
license: "CC-BY-4.0"
copyright: "Kimikyu#0001 on discord / @vkimikyu on Twitter"
Expand All @@ -17,8 +12,38 @@
license: "CC-BY-4.0"
copyright: "Leonardo DaBepis#4869 on discord / @leonardo-dabepis on Tumblr"
source: "https://leonardo-dabepis.tumblr.com/"

- files: ["aBadShift.png"]
license: "CC-BY-4.0"
copyright: "art by user DEminerDG / @desmondeccho on Instagram"
source: "https://www.instagram.com/desmondeccho/"

- files: ["Bar.png"]
license: "CC0-1.0"
copyright: "justani on discord / @itjustani on Tumblr"
source: "https://itjustani.carrd.co/"

- files: ["CodeDeltaGamma.png"]
license: "CC0-1.0"
copyright: "ps3moira @ DeltaV"
source: "https://discord.gg/deltav"

- files: ["CupOfVelta.png"]
license: "CC0-1.0"
copyright: "TJohnson @ DeltaV"
source: "https://discord.gg/deltav"

- files: ["Epistemics.png"]
license: "CC0-1.0"
copyright: "Luckass on discord / v7 @ DeltaV"
source: "https://discord.gg/deltav"

- files: ["Singulo.png"]
license: "CC0-1.0"
copyright: "iced0ver on discord / UBlueberry @ DeltaV"
source: "https://discord.gg/deltav"

- files: ["DeltaV__Technological_Progress_by_threlo.png"]
license: "Custom"
copyright: "CC-BY-NC-ND-4.0 / threlo on discord / @threlo on itaku"
source: "https://linktr.ee/threlo"
Binary file removed Resources/Textures/LobbyScreens/phil.png
Binary file not shown.