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

ART! #894

Merged
merged 4 commits into from
Jan 22, 2024
Merged

ART! #894

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
12 changes: 8 additions & 4 deletions Resources/Prototypes/_NF/lobbyscreens.yml
Original file line number Diff line number Diff line change
@@ -1,11 +1,15 @@
- type: lobbyBackground
id: RisingRed
background: /Textures/_NF/LobbyScreens/risingred.png

- type: lobbyBackground
id: BingGuss
background: /Textures/_NF/LobbyScreens/bingguss.png

- type: lobbyBackground
id: Janigang
background: /Textures/_NF/LobbyScreens/janigang.png

- type: lobbyBackground
id: Xeeenoooossss
background: /Textures/_NF/LobbyScreens/xeeenoooossss.png

- type: lobbyBackground
id: Secrun
background: /Textures/_NF/LobbyScreens/secrun.png
19 changes: 12 additions & 7 deletions Resources/Textures/_NF/LobbyScreens/attributuions.yml
Original file line number Diff line number Diff line change
@@ -1,14 +1,19 @@
- files: ["risingred.png"]
license: "CC0-1.0"
copyright: "stikyt (268746891003428874) on Discord / @sTiKyt on GitHub / @sTiKyt on Telegram"
source: "https://github.com/new-frontiers-14/frontier-station-14"

- files: ["bingguss.png"]
license: "CC0-1.0"
license: "CC-BY-NC-SA-4.0"
copyright: "gentlebutter (588410099190726656) on Discord"
source: "https://cdn.discordapp.com/attachments/1128094390087340114/1171973024011001936/Lobby-art-frontier_clean.png?ex=655e9fef&is=654c2aef&hm=a9c42fc6f803bc0f8307247520a480a5d59dde5f7b196fff0b9045988e5886d8&"

- files: ["janigang.png"]
license: "CC0-1.0"
license: "CC-BY-NC-SA-4.0"
copyright: "GhostPrince (115894681304301569) on Discord"
source: "https://discord.com/channels/1123826877245694004/1128094390087340114/1191491599855788154"

- files: ["xeeenoooossss.png"]
license: "CC BY-NC-SA 4.0"
copyright: "gentlebutter (588410099190726656) on Discord"
source: "https://discord.com/channels/1123826877245694004/1128094390087340114/1197490518951727144"

- files: ["secrun.png"]
license: "CC-BY-NC-SA-4.0"
copyright: "GhostPrince (115894681304301569) on Discord"
source: "https://discord.com/channels/1123826877245694004/1128094390087340114/1196033832017743922"
Binary file removed Resources/Textures/_NF/LobbyScreens/risingred.png
Binary file not shown.
Binary file added Resources/Textures/_NF/LobbyScreens/secrun.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.
2 changes: 2 additions & 0 deletions Resources/Textures/_NF/LobbyScreens/xeeenoooossss.png.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
sample:
filter: false
Loading