diff --git a/Resources/Audio/Lobby/roomishere.ogg b/Resources/Audio/Lobby/roomishere.ogg new file mode 100644 index 0000000000..70c7957e9d Binary files /dev/null and b/Resources/Audio/Lobby/roomishere.ogg differ diff --git a/Resources/Audio/Lobby/saveheaven.ogg b/Resources/Audio/Lobby/saveheaven.ogg new file mode 100644 index 0000000000..a11e3bdddd Binary files /dev/null and b/Resources/Audio/Lobby/saveheaven.ogg differ diff --git a/Resources/Prototypes/SoundCollections/lobby.yml b/Resources/Prototypes/SoundCollections/lobby.yml index ae3b2910b8..9610e96558 100644 --- a/Resources/Prototypes/SoundCollections/lobby.yml +++ b/Resources/Prototypes/SoundCollections/lobby.yml @@ -1,5 +1,5 @@ - type: soundCollection - id: LobbyMusic + id: LobbyMusicOld files: - /Audio/Lobby/thunderdome.ogg - /Audio/Lobby/absconditus.ogg @@ -16,4 +16,9 @@ - /Audio/Lobby/pwmur.ogg - /Audio/Lobby/lasers_rip_apart_the_bulkhead.ogg - /Audio/Lobby/every_light_is_blinking_at_once.ogg - - /Audio/Lobby/vibe_ace.ogg + +- type: soundCollection + id: LobbyMusic + files: + - /Audio/Lobby/saveheaven.ogg + - /Audio/Lobby/roomishere.ogg diff --git a/Resources/Prototypes/lobbyscreens.yml b/Resources/Prototypes/lobbyscreens.yml index 0aec6d6231..7210914026 100644 --- a/Resources/Prototypes/lobbyscreens.yml +++ b/Resources/Prototypes/lobbyscreens.yml @@ -1,19 +1,27 @@ -- type: lobbyBackground - id: Robotics - background: /Textures/LobbyScreens/robotics.png +#- type: lobbyBackground +# id: Robotics +# background: /Textures/LobbyScreens/robotics.png +# +#- type: lobbyBackground +# id: Supermatter +# background: /Textures/LobbyScreens/supermatter.png +# +#- type: lobbyBackground +# id: Warden +# background: /Textures/LobbyScreens/warden.png +# +#- type: lobbyBackground +# id: Pharmacy +# background: /Textures/LobbyScreens/pharmacy.png +# +#- type: lobbyBackground +# id: SSXIV +# background: /Textures/LobbyScreens/ssxiv.png - type: lobbyBackground - id: Supermatter - background: /Textures/LobbyScreens/supermatter.png + id: DeadlySpace + background: /Textures/LobbyScreens/dead-in-space.png - type: lobbyBackground - id: Warden - background: /Textures/LobbyScreens/warden.png - -- type: lobbyBackground - id: Pharmacy - background: /Textures/LobbyScreens/pharmacy.png - -- type: lobbyBackground - id: SSXIV - background: /Textures/LobbyScreens/ssxiv.png + id: Planets + background: /Textures/LobbyScreens/planets.png diff --git a/Resources/Textures/LobbyScreens/dead-in-space.png b/Resources/Textures/LobbyScreens/dead-in-space.png new file mode 100644 index 0000000000..449dbb8f48 Binary files /dev/null and b/Resources/Textures/LobbyScreens/dead-in-space.png differ diff --git a/Resources/Textures/LobbyScreens/dead-in-space.png.yml b/Resources/Textures/LobbyScreens/dead-in-space.png.yml new file mode 100644 index 0000000000..51ff40335e --- /dev/null +++ b/Resources/Textures/LobbyScreens/dead-in-space.png.yml @@ -0,0 +1,2 @@ +sample: + filter: false diff --git a/Resources/Textures/LobbyScreens/planets.png b/Resources/Textures/LobbyScreens/planets.png new file mode 100644 index 0000000000..51b350fc6e Binary files /dev/null and b/Resources/Textures/LobbyScreens/planets.png differ diff --git a/Resources/Textures/LobbyScreens/planets.png.yml b/Resources/Textures/LobbyScreens/planets.png.yml new file mode 100644 index 0000000000..5c43e23305 --- /dev/null +++ b/Resources/Textures/LobbyScreens/planets.png.yml @@ -0,0 +1,2 @@ +sample: + filter: true