]> git.smokeofanarchy.ru Git - space-station-14.git/commitdiff
Add Jani lobby background (#28724)
authorPsychpsyo <60073468+Psychpsyo@users.noreply.github.com>
Sat, 8 Jun 2024 23:29:51 +0000 (01:29 +0200)
committerGitHub <noreply@github.com>
Sat, 8 Jun 2024 23:29:51 +0000 (19:29 -0400)
* Add jani lobby background

* Actually make new lobby screen functional

* Fix license

Resources/Prototypes/lobbyscreens.yml
Resources/Textures/LobbyScreens/attributions.yml
Resources/Textures/LobbyScreens/janishootout.webp [new file with mode: 0644]
Resources/Textures/LobbyScreens/janishootout.webp.yml [new file with mode: 0644]

index decee65b243605ca5a6a5392876eaaf07ad7196d..e83cfaf4854eb525e299bb277ef1488d9da79974 100644 (file)
@@ -44,4 +44,8 @@
 
 - type: lobbyBackground
   id: JustAWeekAway
-  background: /Textures/LobbyScreens/justaweekaway.webp
\ No newline at end of file
+  background: /Textures/LobbyScreens/justaweekaway.webp
+
+- type: lobbyBackground
+  id: JaniShootout
+  background: /Textures/LobbyScreens/janishootout.webp
\ No newline at end of file
index 1e35162cbfb3db84770c25ab7a22cd56580ea518..52a3ee77731d1311bc871d9f62ae54434183c528 100644 (file)
@@ -46,4 +46,9 @@
 - files: ["justaweekaway.webp"]
   license: "CC-BY-SA-3.0"
   copyright: "plantyfern on discord"
+  source: "https://github.com/space-wizards/space-station-14"
+
+- files: ["janishootout.webp"]
+  license: "CC0-1.0"
+  copyright: "psychpsyo on Github/Twitter"
   source: "https://github.com/space-wizards/space-station-14"
\ No newline at end of file
diff --git a/Resources/Textures/LobbyScreens/janishootout.webp b/Resources/Textures/LobbyScreens/janishootout.webp
new file mode 100644 (file)
index 0000000..5dbca0a
Binary files /dev/null and b/Resources/Textures/LobbyScreens/janishootout.webp differ
diff --git a/Resources/Textures/LobbyScreens/janishootout.webp.yml b/Resources/Textures/LobbyScreens/janishootout.webp.yml
new file mode 100644 (file)
index 0000000..dabd660
--- /dev/null
@@ -0,0 +1,2 @@
+sample:
+  filter: true