Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

more new year lobby arts #1689

Merged
merged 2 commits into from
Dec 27, 2023
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
24 changes: 22 additions & 2 deletions Resources/Prototypes/Corvax/lobbyscreens.yml
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,27 @@
- type: lobbyBackground
id: NewYearSave
background: /Textures/Corvax/LobbyScreens/new-year-save.png

- type: lobbyBackground
id: NewYearComfort
background: /Textures/Corvax/LobbyScreens/new-year-comfort.png
background: /Textures/Corvax/LobbyScreens/new-year-comfort.png

- type: lobbyBackground
id: NewYearParty
background: /Textures/Corvax/LobbyScreens/new-year-party.png

- type: lobbyBackground
id: NewYearPine
background: /Textures/Corvax/LobbyScreens/new-year-pine.png

- type: lobbyBackground
id: NewYearExplosion
background: /Textures/Corvax/LobbyScreens/new-year-explosion.png

- type: lobbyBackground
id: SpaceNuke
background: /Textures/Corvax/LobbyScreens/space-nuke.png

- type: lobbyBackground
id: NewYearPenguins
background: /Textures/Corvax/LobbyScreens/new-year-penguins.png
21 changes: 18 additions & 3 deletions Resources/Textures/Corvax/LobbyScreens/attributions.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
copyright: "Vetochka (Вета Игрит)#1118 (532579764762837022) on discord"
source: "https://github.com/space-syndicate/space-station-14"

- files: ["lizard-bar.png"]
- files: ["lizard-bar.png", "new-year-explosion.png"]
license: "CC-BY-SA-3.0"
copyright: "mosley#6223 (498508581210161164) on discord"
source: "https://github.com/space-syndicate/space-station-14"
Expand Down Expand Up @@ -63,7 +63,7 @@
copyright: "bib#5784 (807870054598967296) on discord"
source: "https://github.com/space-syndicate/space-station-14"

- files: ["regular-shift.png", "engineers-chill.png", "singulord-cage.png", "xenosattack.png", "new-year-comfort.png"]
- files: ["regular-shift.png", "engineers-chill.png", "singulord-cage.png", "xenosattack.png", "new-year-comfort.png", "new-year-penguins.png"]
license: "CC-BY-SA-3.0"
copyright: "Gasper_horned#9372 (428967480057397260) on discord"
source: "https://github.com/space-syndicate/space-station-14"
Expand Down Expand Up @@ -146,4 +146,19 @@
- files: ["new-year-save.png"]
license: "CC-BY-NC-SA-3.0"
copyright: "phelcka(1097623862990077972) on discord"
source: "https://github.com/space-syndicate/space-station-14"
source: "https://github.com/space-syndicate/space-station-14"

- files: ["space-nuke.png"]
license: "CC-BY-NC-SA-3.0"
copyright: "FioDoSicH#0944(552047248200957973) on discord"
source: "https://github.com/space-syndicate/space-station-14"

- files: ["new-year-pine.png"]
license: "CC-BY-NC-SA-3.0"
copyright: "kawoshechka(764422772158890014) on discord"
source: "https://github.com/space-syndicate/space-station-14"

- files: ["new-year-party.png"]
license: "CC-BY-NC-SA-3.0"
copyright: "thevictorplumber(324927825524031510) on discord"
source: "https://github.com/space-syndicate/space-station-14"
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: false
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: false
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: false
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: false
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/Corvax/LobbyScreens/space-nuke.png.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
sample:
filter: false
Loading