diff --git a/Resources/Audio/Lobby/Patricia_Taxxon_-_Chipshop.ogg b/Resources/Audio/Lobby/Patricia_Taxxon_-_Chipshop.ogg new file mode 100644 index 0000000000..6ac7c01e7f Binary files /dev/null and b/Resources/Audio/Lobby/Patricia_Taxxon_-_Chipshop.ogg differ diff --git a/Resources/Audio/Lobby/Patricia_Taxxon_-_Minute.ogg b/Resources/Audio/Lobby/Patricia_Taxxon_-_Minute.ogg new file mode 100644 index 0000000000..7d8dcd596b Binary files /dev/null and b/Resources/Audio/Lobby/Patricia_Taxxon_-_Minute.ogg differ diff --git a/Resources/Audio/Lobby/attributions.yml b/Resources/Audio/Lobby/attributions.yml index e37196494f..e5130c5399 100644 --- a/Resources/Audio/Lobby/attributions.yml +++ b/Resources/Audio/Lobby/attributions.yml @@ -58,6 +58,16 @@ copyright: "Flip Flap by X-ceed is licensed under a short but clear license (see flip-flap.txt in this directory) and is free for non-commercial use. It was converted from MOD to WAV using Schism Tracker, in 16 Bit, Non-Interpolated mode, no output equalizer settings, Ramp volume at start of sample enabled. From there it was converted to OGG Vorbis with `ffmpeg -i flip-flap.wav -q 2.9 flip-flap-renc.ogg` (quality scale chosen to match size of the OGG file being replaced). Non-interpolated mode was chosen as the module has a high enough sample rate to balance it out, but seems muffled in other interpolation modes. If 'Ramp volume at start of sample' is not enabled, a clicking phenomenon results." source: "http://aminet.net/package/mods/xceed/Flipflap" +- files: ["Patricia_Taxxon_-_Chipshop.ogg"] + license: "CC-BY-SA-3.0" + copyright: "Chipshop by Patricia Taxxon off the album 'Bicycle'" + source: "https://patriciataxxon.bandcamp.com/track/chipshop" + +- files: ["Patricia_Taxxon_-_Minute.ogg"] + license: "CC-BY-SA-3.0" + copyright: "Minute by Patricia Taxxon off the album 'Aeroplane'" + source: "https://patriciataxxon.bandcamp.com/track/minute" + - files: ["psirius_-_nights_of_orion.xm.ogg"] license: "CC-BY-NC-SA-4.0" copyright: "Nights of Orion by Psirius" diff --git a/Resources/Prototypes/SoundCollections/lobby.yml b/Resources/Prototypes/SoundCollections/lobby.yml index 263ea38645..d596925f91 100644 --- a/Resources/Prototypes/SoundCollections/lobby.yml +++ b/Resources/Prototypes/SoundCollections/lobby.yml @@ -13,8 +13,10 @@ - /Audio/Lobby/melcom-cyberpunk.it.ogg - /Audio/Lobby/midori_-_conundrum_final.it.ogg - /Audio/Lobby/mod.flip-flap.ogg + - /Audio/Lobby/Patricia_Taxxon_-_Minute.ogg + - /Audio/Lobby/Patricia_Taxxon_-_Chipshop.ogg - /Audio/Lobby/psirius_-_nights_of_orion.xm.ogg - #- /Audio/Lobby/psirius_-_nymphs_of_the_forest.mptm.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 diff --git a/Resources/Prototypes/lobbyscreens.yml b/Resources/Prototypes/lobbyscreens.yml index bd5fe50e99..4471c334fc 100644 --- a/Resources/Prototypes/lobbyscreens.yml +++ b/Resources/Prototypes/lobbyscreens.yml @@ -37,3 +37,7 @@ - type: lobbyBackground id: TechnologicalProgress background: /Textures/LobbyScreens/DeltaV__Technological_Progress_by_threlo.png + +- type: lobbyBackground + id: OperatorPlush + background: /Textures/LobbyScreens/OperatorPlush.webp diff --git a/Resources/Textures/LobbyScreens/OperatorPlush.webp b/Resources/Textures/LobbyScreens/OperatorPlush.webp new file mode 100644 index 0000000000..96de660030 Binary files /dev/null and b/Resources/Textures/LobbyScreens/OperatorPlush.webp differ diff --git a/Resources/Textures/LobbyScreens/attributions.yml b/Resources/Textures/LobbyScreens/attributions.yml index c0866c3374..406461b7d9 100644 --- a/Resources/Textures/LobbyScreens/attributions.yml +++ b/Resources/Textures/LobbyScreens/attributions.yml @@ -47,3 +47,8 @@ license: "Custom" copyright: "CC-BY-NC-ND-4.0 / threlo on discord / @threlo on itaku" source: "https://linktr.ee/threlo" + +- files: ["OperatorPlush.webp"] + license: "CC-BY-4.0" + copyright: "Commission adapted to fit the format by Leonardo_DaBepis on discord / @leonardo-dabepis on Tumblr. Template was filled in by Adeinitas @ DeltaV" + source: "https://leonardo-dabepis.tumblr.com/"