Merge pull request Goob-Station#5 from Aidenkrz/rebrand

Rebrand, Lobby Art, and Music.
Aidenkrz · Jan 12, 2025 · e87faea · e87faea
1 parent bf0f57b
commit e87faea
Show file tree

Hide file tree

Showing 83 changed files with 102 additions and 319 deletions.
diff --git a/Resources/Audio/Lobby/01 The Gamble.ogg b/Resources/Audio/Lobby/01 The Gamble.ogg
diff --git a/Resources/Audio/Lobby/02 Guilty Pleasures.ogg b/Resources/Audio/Lobby/02 Guilty Pleasures.ogg
diff --git a/Resources/Audio/Lobby/03 Jazzcuzzi.ogg b/Resources/Audio/Lobby/03 Jazzcuzzi.ogg
diff --git a/Resources/Audio/Lobby/04 The Walk.ogg b/Resources/Audio/Lobby/04 The Walk.ogg
diff --git a/Resources/Audio/Lobby/05 Velvet Bossa.ogg b/Resources/Audio/Lobby/05 Velvet Bossa.ogg
diff --git a/Resources/Audio/Lobby/06 Colors.ogg b/Resources/Audio/Lobby/06 Colors.ogg
diff --git a/Resources/Audio/Lobby/07 Midnight Jam.ogg b/Resources/Audio/Lobby/07 Midnight Jam.ogg
diff --git a/Resources/Audio/Lobby/08 Miles Ahead.ogg b/Resources/Audio/Lobby/08 Miles Ahead.ogg
diff --git a/Resources/Audio/Lobby/09 Moody.ogg b/Resources/Audio/Lobby/09 Moody.ogg
diff --git a/Resources/Audio/Lobby/10 Flying Away.ogg b/Resources/Audio/Lobby/10 Flying Away.ogg
diff --git a/Resources/Audio/Lobby/11 Take It Easy.ogg b/Resources/Audio/Lobby/11 Take It Easy.ogg
diff --git a/Resources/Audio/Lobby/434387_Time_Lapse_of_Clouds.ogg b/Resources/Audio/Lobby/434387_Time_Lapse_of_Clouds.ogg
diff --git a/Resources/Audio/Lobby/DOS=HIGH,_UMB.ogg b/Resources/Audio/Lobby/DOS=HIGH,_UMB.ogg
diff --git a/Resources/Audio/Lobby/a_different_reality_lagoona_remix.xm.ogg b/Resources/Audio/Lobby/a_different_reality_lagoona_remix.xm.ogg
diff --git a/Resources/Audio/Lobby/aggravated.it.ogg b/Resources/Audio/Lobby/aggravated.it.ogg
diff --git a/Resources/Audio/Lobby/atomicamnesiammx.ogg b/Resources/Audio/Lobby/atomicamnesiammx.ogg
diff --git a/Resources/Audio/Lobby/attributions.yml b/Resources/Audio/Lobby/attributions.yml
@@ -1,14 +1,9 @@
-- 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"]
-  license: "CC-BY-NC-SA-3.0"
-  copyright: "All songs used are produced by Danya Vodovoz, royalty free."
-  source: "https://soundcloud.com/danyavodovoz"
+- files: ["bach-toccata.ogg", "vivaldi-spring.ogg", "vivaldi-winter.ogg"]
+  license: "CC-BY-NC-4.0"
+  copyright: "Gregor Quendel"
+  source: "https://freemusicarchive.org"
 
-- files: ["atomicamnesiammx.ogg"]
-  license: "CC-BY-NC-SA-3.0"
-  copyright: "Atomic Amnesia MMX by Phillip Dyer. Converted from MP3 to OGG."
-  source: "https://soundcloud.com/3kliksphilip/atomic-amnesia-mmx-1"
-
-- files: ["Monument.ogg"]
-  license: "CC-BY-NC-SA-3.0"
-  copyright: "Monument by Six Umbrellas."
-  source: "https://sixumbrellas.bandcamp.com/album/the-psychedelic-and"
+- files: ["vivaldi-credo-et-carnatust.ogg"]
+  license: "CC-BY-NC-4.0"
+  copyright: "Advent Chamber Orchestra"
+  source: "https://freemusicarchive.org"
diff --git a/Resources/Audio/Lobby/autumnal_equinox.xm.ogg b/Resources/Audio/Lobby/autumnal_equinox.xm.ogg
diff --git a/Resources/Audio/Lobby/Monument.ogg → Resources/Audio/Lobby/bach-toccata.ogg b/Resources/Audio/Lobby/Monument.ogg → Resources/Audio/Lobby/bach-toccata.ogg
diff --git a/Resources/Audio/Lobby/comet_haley.ogg b/Resources/Audio/Lobby/comet_haley.ogg
diff --git a/Resources/Audio/Lobby/drozerix_-_alone.xm.ogg b/Resources/Audio/Lobby/drozerix_-_alone.xm.ogg
diff --git a/Resources/Audio/Lobby/drozerix_-_leisurely_voice.xm.ogg b/Resources/Audio/Lobby/drozerix_-_leisurely_voice.xm.ogg
diff --git a/Resources/Audio/Lobby/endless_space.ogg b/Resources/Audio/Lobby/endless_space.ogg
diff --git a/Resources/Audio/Lobby/every_light_is_blinking_at_once.ogg b/Resources/Audio/Lobby/every_light_is_blinking_at_once.ogg
diff --git a/Resources/Audio/Lobby/flip-flap.txt b/Resources/Audio/Lobby/flip-flap.txt
diff --git a/Resources/Audio/Lobby/hackers.ogg b/Resources/Audio/Lobby/hackers.ogg
diff --git a/Resources/Audio/Lobby/marhaba.ogg b/Resources/Audio/Lobby/marhaba.ogg
diff --git a/Resources/Audio/Lobby/melcom-cyberpunk.it.ogg b/Resources/Audio/Lobby/melcom-cyberpunk.it.ogg
diff --git a/Resources/Audio/Lobby/midori_-_conundrum_final.it.ogg b/Resources/Audio/Lobby/midori_-_conundrum_final.it.ogg
diff --git a/Resources/Audio/Lobby/mod.flip-flap.ogg b/Resources/Audio/Lobby/mod.flip-flap.ogg
diff --git a/Resources/Audio/Lobby/psirius_-_nights_of_orion.xm.ogg b/Resources/Audio/Lobby/psirius_-_nights_of_orion.xm.ogg
diff --git a/Resources/Audio/Lobby/psirius_-_nymphs_of_the_forest.mptm.ogg b/Resources/Audio/Lobby/psirius_-_nymphs_of_the_forest.mptm.ogg
diff --git a/Resources/Audio/Lobby/superposition.ogg b/Resources/Audio/Lobby/superposition.ogg
diff --git a/Resources/Audio/Lobby/vivaldi-credo-et-carnatust.ogg b/Resources/Audio/Lobby/vivaldi-credo-et-carnatust.ogg
diff --git a/Resources/Audio/Lobby/vivaldi-spring.ogg b/Resources/Audio/Lobby/vivaldi-spring.ogg
diff --git a/Resources/Audio/Lobby/vivaldi-winter.ogg b/Resources/Audio/Lobby/vivaldi-winter.ogg
diff --git a/Resources/Audio/StationEvents/attribution.txt b/Resources/Audio/StationEvents/attribution.txt
diff --git a/Resources/Audio/StationEvents/attributions.yml b/Resources/Audio/StationEvents/attributions.yml
@@ -1,14 +1,4 @@
-- files: ["running_out.ogg"]
+- files: ["hallofthemountainking.ogg.ogg"]
   license: "CC-BY-3.0"
-  copyright: "Created by Bolgarich"
-  source: "https://www.youtube.com/watch?v=SzEp2nv6oZ4"
-
-- files: ["clearly_nuclear.ogg"]
-  license: "CC-BY-3.0"
-  copyright: "Created by mryikes"
-  source: "https://www.youtube.com/watch?v=chix8uz-oUQ"
-
-- files: ["chip_nightmare.ogg"]
-  license: "CC-BY-SA-4.0"
-  copyright: "Created by BasedUser on top of chip-meltdown.mod by Reanimator (Thom)."
-  source: "http://ygg.baseduser.eu.org/chip-nightmare_ss14.ogg"
+  copyright: "Created by Kevin MacLeod"
+  source: "https://www.youtube.com/watch?v=2RDX5sVEfs4"
diff --git a/Resources/Audio/StationEvents/chip_nightmare.ogg b/Resources/Audio/StationEvents/chip_nightmare.ogg
diff --git a/Resources/Audio/StationEvents/clearly_nuclear.ogg b/Resources/Audio/StationEvents/clearly_nuclear.ogg
diff --git a/Resources/Audio/StationEvents/countdown.ogg b/Resources/Audio/StationEvents/countdown.ogg
diff --git a/Resources/Audio/StationEvents/hallofthemountainking.ogg b/Resources/Audio/StationEvents/hallofthemountainking.ogg
diff --git a/Resources/Audio/StationEvents/running_out.ogg b/Resources/Audio/StationEvents/running_out.ogg
diff --git a/Resources/Prototypes/SoundCollections/NukeMusic.yml b/Resources/Prototypes/SoundCollections/NukeMusic.yml
@@ -1,7 +1,4 @@
 - type: soundCollection
   id: NukeMusic
   files:
-    - /Audio/StationEvents/running_out.ogg
-    - /Audio/StationEvents/countdown.ogg
-    - /Audio/StationEvents/clearly_nuclear.ogg
-    - /Audio/StationEvents/chip_nightmare.ogg
+    - /Audio/StationEvents/hallofthemountainking.ogg
diff --git a/Resources/Prototypes/SoundCollections/lobby.yml b/Resources/Prototypes/SoundCollections/lobby.yml
@@ -1,23 +1,8 @@
 - type: soundCollection
   id: LobbyMusic
   files:
-    #- /Audio/Lobby/434387_Time_Lapse_of_Clouds.ogg
-    - /Audio/Lobby/a_different_reality_lagoona_remix.xm.ogg
-    - /Audio/Lobby/aggravated.it.ogg
-    - /Audio/Lobby/autumnal_equinox.xm.ogg
-    - /Audio/Lobby/comet_haley.ogg
-    #- /Audio/Lobby/drozerix_-_alone.xm.ogg
-    - /Audio/Lobby/drozerix_-_leisurely_voice.xm.ogg
-    - /Audio/Lobby/endless_space.ogg
-    - /Audio/Lobby/marhaba.ogg
-    - /Audio/Lobby/melcom-cyberpunk.it.ogg
-    - /Audio/Lobby/midori_-_conundrum_final.it.ogg
-    - /Audio/Lobby/mod.flip-flap.ogg
-    - /Audio/Lobby/psirius_-_nights_of_orion.xm.ogg
-    #- /Audio/Lobby/psirius_-_nymphs_of_the_forest.mptm.ogg
-    - /Audio/Lobby/superposition.ogg
-    - /Audio/Lobby/hackers.ogg
-    - /Audio/Lobby/every_light_is_blinking_at_once.ogg
-    - /Audio/Lobby/DOS=HIGH,_UMB.ogg
-    - /Audio/Lobby/atomicamnesiammx.ogg
-    - /Audio/Lobby/Monument.ogg
+    - /Audio/Lobby/bach-toccata.ogg
+    - /Audio/Lobby/vivaldi-credo-et-carnatust.ogg
+    - /Audio/Lobby/vivaldi-spring.ogg
+    - /Audio/Lobby/vivaldi-winter.ogg
+
diff --git a/Resources/Prototypes/lobbyscreens.yml b/Resources/Prototypes/lobbyscreens.yml
@@ -1,43 +1,15 @@
 - type: lobbyBackground
-  id: Robotics
-  background: /Textures/LobbyScreens/robotics.webp
+  id: NightWatch
+  background: /Textures/LobbyScreens/nightwatch.webp
 
 - type: lobbyBackground
-  id: Supermatter
-  background: /Textures/LobbyScreens/supermatter.webp
+  id: LibraryGuidingThePeople
+  background: /Textures/LobbyScreens/library-guiding-the-people.webp
 
 - type: lobbyBackground
-  id: Warden
-  background: /Textures/LobbyScreens/warden.webp
+  id: SchoolOfAthens
+  background: /Textures/LobbyScreens/school-of-athens.webp
 
 - type: lobbyBackground
-  id: Pharmacy
-  background: /Textures/LobbyScreens/pharmacy.webp
-
-- type: lobbyBackground
-  id: SSXIV
-  background: /Textures/LobbyScreens/ssxiv.webp
-
-- type: lobbyBackground
-  id: Susstation
-  background: /Textures/LobbyScreens/susstation.webp
-
-- type: lobbyBackground
-  id: SkellyVsTheRev
-  background: /Textures/LobbyScreens/skellyvstherev.webp
-
-- type: lobbyBackground
-  id: Doomed
-  background: /Textures/LobbyScreens/doomed.webp
-
-- type: lobbyBackground
-  id: Blueprint
-  background: /Textures/LobbyScreens/blueprint.webp
-
-- type: lobbyBackground
-  id: TerminalStation
-  background: /Textures/LobbyScreens/terminalstation.webp
-
-- type: lobbyBackground
-  id: JustAWeekAway
-  background: /Textures/LobbyScreens/justaweekaway.webp
+  id: LastSupper
+  background: /Textures/LobbyScreens/last-supper.webp
diff --git a/Resources/Textures/LobbyScreens/PutLobbyScreensHere.txt b/Resources/Textures/LobbyScreens/PutLobbyScreensHere.txt
diff --git a/Resources/Textures/LobbyScreens/attributions.yml b/Resources/Textures/LobbyScreens/attributions.yml
@@ -1,44 +1,19 @@
-- files: ["supermatter.webp", "robotics.webp"]
-  license: "CC-BY-NC-SA-3.0"
-  copyright: "Veritius#2351 (257233913951289344) on discord / @Veritius on GitHub"
-  source: "https://github.com/Veritius"
-
-- files: ["warden.webp", "pharmacy.webp"]
-  license: "CC-BY-NC-SA-3.0"
-  copyright: "Solbusaur#4343 (220208697429852160) on discord"
-  source: "https://github.com/space-wizards/space-station-14"
-
-- files: ["ssxiv.webp"]
-  license: "CC-BY-NC-SA-3.0"
-  copyright: "Abyssal#4842 on discord / @aby_doodles on Twitter"
-  source: "https://twitter.com/aby_doodles"
-
-- files: ["susstation.webp"]
-  license: "CC-BY-NC-SA-3.0"
-  copyright: "Alekshhh github"
-  source: "https://github.com/space-wizards/space-station-14"
-
-- files: ["skellyvstherev.webp"]
-  license: "CC-BY-SA-4.0"
-  copyright: "Hannah 'FairlySadPanda' Dawson 2024"
-  source: "https://github.com/FairlySadPanda"
-
-- files: ["doomed.webp"]
-  license: "CC-BY-NC-SA-3.0"
-  copyright: "brainfood1183 github"
-  source: "https://github.com/space-wizards/space-station-14"
+- files: ["nightwatch.webp"]
+  license: "CC-BY-SA-3.0"
+  copyright: "Piras314"
+  source: "https://goobstation.com"
 
-- files: ["blueprint.webp"]
-  license: "CC-BY-NC-SA-3.0"
-  copyright: "data_redacted on discord"
-  source: "https://github.com/space-wizards/space-station-14"
+- files: ["library-guiding-the-people.webp"]
+  license: "CC-BY-SA-3.0"
+  copyright: "Piras314"
+  source: "https://goobstation.com"
 
-- files: ["terminalstation.webp"]
+- files: ["school-of-athens.webp"]
   license: "CC-BY-SA-3.0"
-  copyright: "aserovich on discord"
-  source: "https://github.com/space-wizards/space-station-14"
+  copyright: "Piras314"
+  source: "https://goobstation.com"
 
-- files: ["justaweekaway.webp"]
+- files: ["last-supper.webp"]
   license: "CC-BY-SA-3.0"
-  copyright: "plantyfern on discord"
-  source: "https://github.com/space-wizards/space-station-14"
+  copyright: "Piras314"
+  source: "https://goobstation.com"
diff --git a/Resources/Textures/LobbyScreens/blueprint.png.yml b/Resources/Textures/LobbyScreens/blueprint.png.yml
diff --git a/Resources/Textures/LobbyScreens/blueprint.webp b/Resources/Textures/LobbyScreens/blueprint.webp
diff --git a/Resources/Textures/LobbyScreens/doomed.webp b/Resources/Textures/LobbyScreens/doomed.webp
diff --git a/Resources/Textures/LobbyScreens/justaweekaway.yml b/Resources/Textures/LobbyScreens/justaweekaway.yml
diff --git a/Resources/Textures/LobbyScreens/last-supper.webp b/Resources/Textures/LobbyScreens/last-supper.webp
diff --git a/...ces/Textures/LobbyScreens/doomed.webp.yml → ...extures/LobbyScreens/last-supper.webp.yml b/...ces/Textures/LobbyScreens/doomed.webp.yml → ...extures/LobbyScreens/last-supper.webp.yml
diff --git a/Resources/Textures/LobbyScreens/library-guiding-the-people.webp b/Resources/Textures/LobbyScreens/library-guiding-the-people.webp
diff --git a/...s/Textures/LobbyScreens/robotics.webp.yml → ...reens/library-guiding-the-people.webp.yml b/...s/Textures/LobbyScreens/robotics.webp.yml → ...reens/library-guiding-the-people.webp.yml
diff --git a/Resources/Textures/LobbyScreens/nightwatch.webp b/Resources/Textures/LobbyScreens/nightwatch.webp
diff --git a/...ures/LobbyScreens/skellyvstherev.webp.yml → ...Textures/LobbyScreens/nightwatch.webp.yml b/...ures/LobbyScreens/skellyvstherev.webp.yml → ...Textures/LobbyScreens/nightwatch.webp.yml
diff --git a/Resources/Textures/LobbyScreens/pharmacy.webp b/Resources/Textures/LobbyScreens/pharmacy.webp
diff --git a/Resources/Textures/LobbyScreens/pharmacy.webp.yml b/Resources/Textures/LobbyScreens/pharmacy.webp.yml
diff --git a/Resources/Textures/LobbyScreens/robotics.webp b/Resources/Textures/LobbyScreens/robotics.webp
diff --git a/Resources/Textures/LobbyScreens/school-of-athens.webp b/Resources/Textures/LobbyScreens/school-of-athens.webp
diff --git a/...rces/Textures/LobbyScreens/ssxiv.webp.yml → ...es/LobbyScreens/school-of-athens.webp.yml b/...rces/Textures/LobbyScreens/ssxiv.webp.yml → ...es/LobbyScreens/school-of-athens.webp.yml
diff --git a/Resources/Textures/LobbyScreens/skellyvstherev.webp b/Resources/Textures/LobbyScreens/skellyvstherev.webp
diff --git a/Resources/Textures/LobbyScreens/ssxiv.webp b/Resources/Textures/LobbyScreens/ssxiv.webp
diff --git a/Resources/Textures/LobbyScreens/supermatter.webp b/Resources/Textures/LobbyScreens/supermatter.webp
diff --git a/Resources/Textures/LobbyScreens/supermatter.webp.yml b/Resources/Textures/LobbyScreens/supermatter.webp.yml
diff --git a/Resources/Textures/LobbyScreens/susstation.webp b/Resources/Textures/LobbyScreens/susstation.webp
diff --git a/Resources/Textures/LobbyScreens/susstation.webp.yml b/Resources/Textures/LobbyScreens/susstation.webp.yml
diff --git a/Resources/Textures/LobbyScreens/terminalstation.webp b/Resources/Textures/LobbyScreens/terminalstation.webp
diff --git a/Resources/Textures/LobbyScreens/terminalstation.webp.yml b/Resources/Textures/LobbyScreens/terminalstation.webp.yml
diff --git a/Resources/Textures/LobbyScreens/warden.webp b/Resources/Textures/LobbyScreens/warden.webp
diff --git a/Resources/Textures/LobbyScreens/warden.webp.yml b/Resources/Textures/LobbyScreens/warden.webp.yml
diff --git a/Resources/Textures/Logo/icon-license.txt b/Resources/Textures/Logo/icon-license.txt
@@ -1,4 +1,5 @@
 The files below are licensed under Creative Commons Attribution-NonCommercial-ShareAlike 4.0 International.
+Produced by Cheeki @cowpolice on Discord.
 
 icon.ico
 icon/icon-16x16.png

diff --git a/Resources/Textures/Logo/icon.ico b/Resources/Textures/Logo/icon.ico
diff --git a/Resources/Textures/Logo/icon/icon-128x128.png b/Resources/Textures/Logo/icon/icon-128x128.png
diff --git a/Resources/Textures/Logo/icon/icon-16x16.png b/Resources/Textures/Logo/icon/icon-16x16.png
diff --git a/Resources/Textures/Logo/icon/icon-24x24.png b/Resources/Textures/Logo/icon/icon-24x24.png
diff --git a/Resources/Textures/Logo/icon/icon-256x256.png b/Resources/Textures/Logo/icon/icon-256x256.png
diff --git a/Resources/Textures/Logo/icon/icon-32x32.png b/Resources/Textures/Logo/icon/icon-32x32.png
diff --git a/Resources/Textures/Logo/icon/icon-48x48.png b/Resources/Textures/Logo/icon/icon-48x48.png
diff --git a/Resources/Textures/Logo/icon/icon-64x64.png b/Resources/Textures/Logo/icon/icon-64x64.png