Merge branch 'master' into upstream1709

AdventureTimeSS14 · Sep 19, 2024 · a9a8c8c · a9a8c8c
2 parents caaddcc + e3dce3b
commit a9a8c8c
Show file tree

Hide file tree

Showing 7 changed files with 32 additions and 0 deletions.
diff --git a/Resources/Changelog/1ChangelogADT.yml b/Resources/Changelog/1ChangelogADT.yml
@@ -3073,3 +3073,15 @@ Entries:
         type: Add}
     time: '2024-09-16T20:58:52Z'
     id: 362
+  - author: Friskis
+    changes:
+      - {message: 'Добавлен тенкодовый акцент. Он не доступен  Вульпам, Таярам, Ящеровидным
+          и Ниан.', type: Add}
+    time: '2024-09-18T10:01:24Z'
+    id: 363
+  - author: eddiemercury
+    changes:
+      - {message: 'Руководство NanoTrasen дополнило список изображений, транслируемых
+          в комнате ожидания, двумя тематическими картинами.', type: Add}
+    time: '2024-09-19T01:08:46Z'
+    id: 364
diff --git a/Resources/Prototypes/ADT/lobbyscreens.yml b/Resources/Prototypes/ADT/lobbyscreens.yml
@@ -10,4 +10,10 @@
   id: NOGORLEX
   background: /Textures/ADT/LobbyScreens/NOGORLEX.webp
 
+- type: lobbyBackground
+  id: detective
+  background: /Textures/ADT/LobbyScreens/detective.webp
 
+- type: lobbyBackground
+  id: starbow
+  background: /Textures/ADT/LobbyScreens/starbow.webp
diff --git a/Resources/Textures/ADT/LobbyScreens/attributions.yml b/Resources/Textures/ADT/LobbyScreens/attributions.yml
@@ -12,3 +12,13 @@
   license: "CC-BY-NC-SA-3.0"
   copyright: "bobeeprum (937412086080897084) on discord"
   source: "https://github.com/AdventureTimeSS14/space_station_ADT"
+
+- files: ["detective.webp"]
+  license: "CC-BY-NC-SA-3.0"
+  copyright: "byiron4ik (811553879954817075) on discord"
+  source: "https://github.com/AdventureTimeSS14/space_station_ADT"
+
+- files: ["starbow.webp"]
+  license: "CC-BY-NC-SA-3.0"
+  copyright: "doner4037 (756430621022224444) on discord"
+  source: "https://github.com/AdventureTimeSS14/space_station_ADT"
diff --git a/Resources/Textures/ADT/LobbyScreens/detective.webp b/Resources/Textures/ADT/LobbyScreens/detective.webp
diff --git a/Resources/Textures/ADT/LobbyScreens/detective.webp.yml b/Resources/Textures/ADT/LobbyScreens/detective.webp.yml
@@ -0,0 +1,2 @@
+sample:
+  filter: true
diff --git a/Resources/Textures/ADT/LobbyScreens/starbow.webp b/Resources/Textures/ADT/LobbyScreens/starbow.webp
diff --git a/Resources/Textures/ADT/LobbyScreens/starbow.webp.yml b/Resources/Textures/ADT/LobbyScreens/starbow.webp.yml
@@ -0,0 +1,2 @@
+sample:
+  filter: true