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 readded, Updated the Arcadis Station credits, also readded lobby music. #119

Merged
merged 6 commits into from
Dec 21, 2024
Merged
Show file tree
Hide file tree
Changes from 2 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
10 changes: 10 additions & 0 deletions Resources/Audio/Lobby/attributions.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
- files: ["01 The Gamble.ogg", "02 Guilty Pleasures.ogg", "03 Jazzcuzzi.ogg", "04 The Walk.ogg", "05 Velvet Bossa.ogg", "06 Colors.ogg", "07 Midnight Jam.ogg", "08 Miles Ahead.ogg", "09 Moody.ogg", "10 Flying Away.ogg", "11 Take It Easy.ogg"]

Check failure on line 1 in Resources/Audio/Lobby/attributions.yml

View workflow job for this annotation

GitHub Actions / YAML RGA schema validator

[/Resources/Audio/Lobby/attributions.yml] 4.license: 'Creative Commons Attribution license (reuse allowed)' is not a license.
license: "CC-BY-NC-SA-3.0"
copyright: "All songs used are produced by Danya Vodovoz, royalty free."
source: "https://soundcloud.com/danyavodovoz"
Expand All @@ -12,3 +12,13 @@
license: "CC-BY-NC-SA-3.0"
copyright: "Monument by Six Umbrellas."
source: "https://sixumbrellas.bandcamp.com/album/the-psychedelic-and"

- files: ["singularity.ogg", "synth_pop_beat.ogg", "phororemix.ogg"]
license: "CC-BY-NC-SA-3.0"
copyright: "Musamli on Youtube."
source: "https://www.youtube.com/@musamli"

- files: ["cool_alien_music.ogg"]
license: "Creative Commons Attribution license (reuse allowed)"
copyright: "Wee Free Music on Youtube."
source: "https://www.youtube.com/watch?v=i65dRdZOhKU"
Binary file added Resources/Audio/Lobby/cool_alien_music.ogg
Binary file not shown.
Binary file added Resources/Audio/Lobby/phororemix.ogg
Binary file not shown.
Binary file added Resources/Audio/Lobby/singularity.ogg
Binary file not shown.
Binary file added Resources/Audio/Lobby/synth_pop_beat.ogg
Binary file not shown.
15 changes: 9 additions & 6 deletions Resources/Credits/Arcadis_station.txt
Original file line number Diff line number Diff line change
@@ -1,8 +1,11 @@
Gulo - NTPD, some merc items, Toweg, the void and a few shuttles.
SethDiedAgain137 - Many shuttles (that are AWESOME), the flesh cult items
Gulo - NTPD, some merc items, Toweg, the void and a few shuttles, Lobby art.
SethDiedAgain137 - Many shuttles (that are AWESOME), the flesh cult items.
Federal Bureau of Investigation - ERPDrobe
TheDoctor1977 - Works on the lore, Many shuttles, keeps me (gulo) working >:(
Madformoose - worked on some shuttles
CreatorBot01 - January station, some shuttles
Jack2 - Works on the lore
Carmello - Admin (maybe)
Madformoose - worked on some shuttles. o7
CreatorBot01 - January station, some shuttles.
Jack2 - Works on the lore.
Carmello - Admin (maybe).
Eris - Being the github hero, multiple items fixes and changes.
p.r.ospector - Lobby art (meth.webp). (p.r.ospector on discord)
quri1q - The Arcadis Station logo and art. (quri1q on discord)
14 changes: 13 additions & 1 deletion Resources/Prototypes/lobbyscreens.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,4 +40,16 @@

- type: lobbyBackground
id: JustAWeekAway
background: /Textures/LobbyScreens/justaweekaway.webp
background: /Textures/LobbyScreens/justaweekaway.webp

- type: lobbyBackground
id: Piratecaptainlobby
background: /Textures/LobbyScreens/Piratecaptain.webp

- type: lobbyBackground
id: huntedart
background: /Textures/LobbyScreens/Hunted.webp

- type: lobbyBackground
id: methart
background: /Textures/LobbyScreens/meth.webp
Binary file added Resources/Textures/LobbyScreens/Hunted.webp
Binary file not shown.
2 changes: 2 additions & 0 deletions Resources/Textures/LobbyScreens/Hunted.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
sample:
filter: true
Binary file not shown.
2 changes: 2 additions & 0 deletions Resources/Textures/LobbyScreens/Piratecaptain.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
sample:
filter: false
17 changes: 16 additions & 1 deletion Resources/Textures/LobbyScreens/attributions.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,4 +41,19 @@
- files: ["justaweekaway.webp"]
license: "CC-BY-SA-3.0"
copyright: "plantyfern on discord"
source: "https://github.com/space-wizards/space-station-14"
source: "https://github.com/space-wizards/space-station-14"

- files: ["Piratecaptain.webp"]
license: "CC-BY-NC-SA-3.0"
copyright: "guloveos on discord"
source: "https://www.youtube.com/watch?v=AuKR2fQbMBk"

- files: ["Hunted.webp"]
license: "CC-BY-NC-SA-3.0"
copyright: "guloveos on discord"
source: "https://www.youtube.com/watch?v=AuKR2fQbMBk"

- files: ["meth.webp"]
license: "CC-BY-NC-SA-3.0"
copyright: "p.r.ospector on discord (oh also they wanted me to put by kai)"
source: "https://github.com/The-Arcadis-Team/arc-station-14"
Binary file added Resources/Textures/LobbyScreens/meth.webp
Binary file not shown.
2 changes: 2 additions & 0 deletions Resources/Textures/LobbyScreens/meth.webp.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
sample:
filter: false
Loading