Skip to content
Merged
Show file tree
Hide file tree
Changes from all 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
Binary file not shown.
Binary file modified Resources/Audio/_NF/Announcements/RoundEnd/snake_frontierfm.ogg
Binary file not shown.
3 changes: 2 additions & 1 deletion Resources/Prototypes/SoundCollections/announcements.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,10 @@
- /Audio/Announcements/RoundEnd/disappointed.ogg
- /Audio/Announcements/RoundEnd/notevenpaidforthis.ogg
- /Audio/_NF/Announcements/RoundEnd/snake_frontierfm.ogg # Frontier
- /Audio/_NF/Announcements/RoundEnd/honkannounce.ogg # Frontier

- type: soundCollection
id: PowerOn
files:
- /Audio/_NF/Announcements/PocketSizedAndy/andy1_power_onnf.ogg # Frontier

30 changes: 29 additions & 1 deletion Resources/Prototypes/_NF/lobbyscreens.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
- type: lobbyBackground
id: HandsomeKiller
background: /Textures/_NF/LobbyScreens/handsomekiller.webp

- type: lobbyBackground
id: CaughtUp
background: /Textures/_NF/LobbyScreens/caughtup.webp
Expand All @@ -42,6 +42,34 @@
id: Paramedicrash
background: /Textures/_NF/LobbyScreens/paramedicrash.webp

- type: lobbyBackground
id: APlantyfulShipyard
background: /Textures/_NF/LobbyScreens/aplantfulshipyard.webp

- type: lobbyBackground
id: SmokeBreak
background: /Textures/_NF/LobbyScreens/smokebreak.webp

- type: lobbyBackground
id: HarpyGenocide
background: /Textures/_NF/LobbyScreens/harpygenocide.webp

- type: lobbyBackground
id: Medics
background: /Textures/_NF/LobbyScreens/medics.webp

- type: lobbyBackground
id: PlayWithCat
background: /Textures/_NF/LobbyScreens/playwithcat.webp

- type: lobbyBackground
id: Pirate
background: /Textures/_NF/LobbyScreens/pirate.webp

- type: lobbyBackground
id: Spacemoff
background: /Textures/_NF/LobbyScreens/spacemoff.webp

# - type: lobbyBackground
# id: StaresBlankly
# background: /Textures/_NF/LobbyScreens/staresblankly.webp
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
sample:
filter: true
35 changes: 35 additions & 0 deletions Resources/Textures/_NF/LobbyScreens/attributions.yml
Original file line number Diff line number Diff line change
Expand Up @@ -62,3 +62,38 @@
license: "CC-BY-NC-SA-3.0"
copyright: "Wendy Ribston Pippin, on Discord as wendyribstonofpippin"
source: "https://github.com/wendyribstonpippin"

- files: ["aplantfulshipyard.webp"]
license: "CC-BY-NC-SA-4.0"
copyright: "Jacob, on Discord as jacobspetskinwalker (143421905179901952) and (Tumblr https://jacobsdot.tumblr.com/)"
source: "https://discord.com/channels/1123826877245694004/1245127769847762954/1408694577879322729"

- files: ["smokebreak.webp"]
license: "CC-BY-NC-SA-4.0"
copyright: "Commission from (Discord) johnnyhotsauce1 (108005482500751360) made by doner4037 (756430621022224444). Received approval of both."
source: "https://discord.com/channels/1123826877245694004/1245127769847762954/1365363828145262675"

- files: ["harpygenocide.webp"]
license: "CC-BY-NC-SA-4.0"
copyright: "Commission from (Discord) ra.y (282329143431921665) made by doner4037 (756430621022224444). Received approval of both."
source: "https://discord.com/channels/1123826877245694004/1245127769847762954/1454593217923121152"

- files: ["medics.webp"]
license: "CC-BY-NC-SA-4.0"
copyright: "Commission from (Discord) ra.y (282329143431921665) made by doner4037 (756430621022224444). Received approval of both. Edited for use as Lobby Art by ra.Y"
source: "https://discord.com/channels/1123826877245694004/1245127769847762954/1454593217923121152"

- files: ["playwithcat.webp"]
license: "CC-BY-NC-SA-4.0"
copyright: "Commission from (Discord) ra.y (282329143431921665) made by trashboi.exe (249199516912189440). Received approval of both."
source: "https://discord.com/channels/1123826877245694004/1245127769847762954/1283092174191460363"

- files: ["pirate.webp"]
license: "CC-BY-NC-SA-4.0"
copyright: "For (Discord) werebat (234543618218524672) made by 0bashie (311706695527038976). Received approval of both."
source: "https://discord.com/channels/1123826877245694004/1245127769847762954/1437656399709732909"

- files: ["spacemoff.webp"]
license: "CC-BY-NC-SA-4.0"
copyright: "Commission from (Discord) voltron9241 (289017733088018432) made by doner4037 (756430621022224444). Received approval of both. Edited for use as Lobby Art by ra.Y"
source: "https://discord.com/channels/1123826877245694004/1245127769847762954/1426870742238105660"
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 2 additions & 0 deletions Resources/Textures/_NF/LobbyScreens/harpygenocide.webp.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
sample:
filter: true
Binary file added Resources/Textures/_NF/LobbyScreens/medics.webp
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 2 additions & 0 deletions Resources/Textures/_NF/LobbyScreens/medics.webp.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
sample:
filter: true
Binary file added Resources/Textures/_NF/LobbyScreens/pirate.webp
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 2 additions & 0 deletions Resources/Textures/_NF/LobbyScreens/pirate.webp.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
sample:
filter: true
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 2 additions & 0 deletions Resources/Textures/_NF/LobbyScreens/playwithcat.webp.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
sample:
filter: true
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 2 additions & 0 deletions Resources/Textures/_NF/LobbyScreens/smokebreak.webp.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
sample:
filter: true
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 2 additions & 0 deletions Resources/Textures/_NF/LobbyScreens/spacemoff.webp.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
sample:
filter: true
Loading