Skip to content

Commit b3632f6

Browse files
icons, lobby screen, music
1 parent 187a00e commit b3632f6

File tree

18 files changed

+104
-185
lines changed

18 files changed

+104
-185
lines changed
Binary file not shown.

Resources/Audio/Lobby/attributions.yml

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,3 +68,14 @@
6868
license: "CC-BY-NC-SA-3.0"
6969
copyright: "every light is blinking at once by Alexander Divine."
7070
source: "https://soundcloud.com/alexanderdivine/every-light-is-blinking-at-once"
71+
72+
# Nuclear 14
73+
- files: ["a_kiss_to_build_a_dream_on.ogg"]
74+
license: "CC-BY-NC-SA-4.0"
75+
copyright: "A kiss to build a dream on by Louis Armstrong."
76+
source: "https://archive.org/details/fallout_2_soundtrack/00+(Intro)+A+Kiss+To+Build+A+Dream+On.mp3"
77+
78+
- files: ["fallout_3_title.ogg", "fallout_4_title.ogg", "fallout_4_commonwealth.ogg"]
79+
license: "CC-BY-NC-SA-4.0"
80+
copyright: "Main Title and Commonwealth by Inon Zur."
81+
source: "https://archive.org/details/fallout3_gamestop_preorder_ost" # and https://archive.org/details/fallout_4_soundtrack_score/01+Fallout+4+Main+Theme.mp3
1.58 MB
Binary file not shown.
3.21 MB
Binary file not shown.
2.15 MB
Binary file not shown.

Resources/IgnoredPrototypes/ignoredPrototypes.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@
88
# - /Prototypes/Catalog/uplink_catalog.yml
99

1010
- /Prototypes/Access
11-
- /Prototypes/lobbyscreens.yml
11+
# - /Prototypes/lobbyscreens.yml
1212
- /Prototypes/radio_channels.yml
1313
- /Prototypes/round_announcements.yml
1414
- /Prototypes/SoundCollections/announcements.yml
1515
# - /Prototypes/Entities/Objects/Consumable
1616
# - /Prototypes/Entities/Objects/Weapons/Guns
17-
# - /Prototypes/Entities/Objects/Weapons/Melee
17+
# - /Prototypes/Entities/Objects/Weapons/Melee
Lines changed: 18 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,21 @@
11
- type: soundCollection
22
id: LobbyMusic
33
files:
4-
- /Audio/Lobby/thunderdome.ogg
5-
- /Audio/Lobby/absconditus.ogg
6-
- /Audio/Lobby/space_asshole.ogg
7-
- /Audio/Lobby/endless_space.ogg
8-
- /Audio/Lobby/singuloose.ogg
9-
- /Audio/Lobby/comet_haley.ogg
10-
- /Audio/Lobby/title2.ogg
11-
- /Audio/Lobby/title3.ogg
12-
- /Audio/Lobby/mod.flip-flap.ogg
13-
- /Audio/Lobby/Spac_Stac.ogg
14-
- /Audio/Lobby/pwmur.ogg
15-
- /Audio/Lobby/lasers_rip_apart_the_bulkhead.ogg
16-
- /Audio/Lobby/every_light_is_blinking_at_once.ogg
17-
- /Audio/Lobby/atomicamnesiammx.ogg
4+
# - /Audio/Lobby/thunderdome.ogg
5+
# - /Audio/Lobby/absconditus.ogg
6+
# - /Audio/Lobby/space_asshole.ogg
7+
# - /Audio/Lobby/endless_space.ogg
8+
# - /Audio/Lobby/singuloose.ogg
9+
# - /Audio/Lobby/comet_haley.ogg
10+
# - /Audio/Lobby/title2.ogg
11+
# - /Audio/Lobby/title3.ogg
12+
# - /Audio/Lobby/mod.flip-flap.ogg
13+
# - /Audio/Lobby/Spac_Stac.ogg
14+
# - /Audio/Lobby/pwmur.ogg
15+
# - /Audio/Lobby/lasers_rip_apart_the_bulkhead.ogg
16+
# - /Audio/Lobby/every_light_is_blinking_at_once.ogg
17+
# - /Audio/Lobby/atomicamnesiammx.ogg
18+
- /Audio/Lobby/a_kiss_to_build_a_dream_on.ogg
19+
- /Audio/Lobby/fallout_3_title.ogg
20+
- /Audio/Lobby/fallout_4_title.ogg
21+
- /Audio/Lobby/fallout_4_commonwealth.ogg

Resources/Prototypes/lobbyscreens.yml

Lines changed: 36 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,43 +1,47 @@
1-
- type: lobbyBackground
2-
id: Robotics
3-
background: /Textures/LobbyScreens/robotics.webp
1+
# - type: lobbyBackground
2+
# id: Robotics
3+
# background: /Textures/LobbyScreens/robotics.webp
44

5-
- type: lobbyBackground
6-
id: Supermatter
7-
background: /Textures/LobbyScreens/supermatter.webp
5+
# - type: lobbyBackground
6+
# id: Supermatter
7+
# background: /Textures/LobbyScreens/supermatter.webp
88

9-
- type: lobbyBackground
10-
id: Warden
11-
background: /Textures/LobbyScreens/warden.webp
9+
# - type: lobbyBackground
10+
# id: Warden
11+
# background: /Textures/LobbyScreens/warden.webp
1212

13-
- type: lobbyBackground
14-
id: Pharmacy
15-
background: /Textures/LobbyScreens/pharmacy.webp
13+
# - type: lobbyBackground
14+
# id: Pharmacy
15+
# background: /Textures/LobbyScreens/pharmacy.webp
1616

17-
- type: lobbyBackground
18-
id: SSXIV
19-
background: /Textures/LobbyScreens/ssxiv.webp
17+
# - type: lobbyBackground
18+
# id: SSXIV
19+
# background: /Textures/LobbyScreens/ssxiv.webp
2020

21-
- type: lobbyBackground
22-
id: Susstation
23-
background: /Textures/LobbyScreens/susstation.webp
21+
# - type: lobbyBackground
22+
# id: Susstation
23+
# background: /Textures/LobbyScreens/susstation.webp
2424

25-
- type: lobbyBackground
26-
id: SkellyVsTheRev
27-
background: /Textures/LobbyScreens/skellyvstherev.webp
25+
# - type: lobbyBackground
26+
# id: SkellyVsTheRev
27+
# background: /Textures/LobbyScreens/skellyvstherev.webp
2828

29-
- type: lobbyBackground
30-
id: Doomed
31-
background: /Textures/LobbyScreens/doomed.webp
29+
# - type: lobbyBackground
30+
# id: Doomed
31+
# background: /Textures/LobbyScreens/doomed.webp
3232

33-
- type: lobbyBackground
34-
id: Blueprint
35-
background: /Textures/LobbyScreens/blueprint.webp
33+
# - type: lobbyBackground
34+
# id: Blueprint
35+
# background: /Textures/LobbyScreens/blueprint.webp
3636

37-
- type: lobbyBackground
38-
id: Behonker
39-
background: /Textures/LobbyScreens/behonker.webp
37+
# - type: lobbyBackground
38+
# id: Behonker
39+
# background: /Textures/LobbyScreens/behonker.webp
40+
41+
# - type: lobbyBackground
42+
# id: TerminalStation
43+
# background: /Textures/LobbyScreens/terminalstation.webp
4044

4145
- type: lobbyBackground
42-
id: TerminalStation
43-
background: /Textures/LobbyScreens/terminalstation.webp
46+
id: N14Vault
47+
background: /Textures/Nuclear14/LobbyScreens/n14vault.png
635 Bytes
Loading
-385 Bytes
Loading
-449 Bytes
Loading
1.93 KB
Loading
-490 Bytes
Loading
-43 Bytes
Loading
18 Bytes
Loading

Resources/Textures/Logo/logo.png

-1.97 KB
Loading

Resources/Textures/Logo/logo.svg

Lines changed: 37 additions & 137 deletions
Loading
Loading

0 commit comments

Comments
 (0)