Remove Cicada-3301 lobby music & Pivo lobby art (Rxup#677)

nomad0260 · Jul 6, 2024 · 625a279 · 625a279
1 parent 571a01f
commit 625a279
Show file tree

Hide file tree

Showing 7 changed files with 0 additions and 18 deletions.
diff --git a/Resources/Audio/Lobby/Cicada-3301-The-Instar-Emergence.ogg b/Resources/Audio/Lobby/Cicada-3301-The-Instar-Emergence.ogg
diff --git a/Resources/Audio/Lobby/attributions.yml b/Resources/Audio/Lobby/attributions.yml
@@ -103,9 +103,3 @@
   license: "CC-BY-3.0"
   copyright: "Get Up N' Fight! by NeXsard. Converted from mp4 to OGG"
   source: "https://youtu.be/3k4vZvCZ9dg"
-
-- files: [Cicada-3301-The-Instar-Emergence.ogg]
-  license: "Custom"
-  copyright: "The Instar Emergence by Cicada 3301 enthusiasts. Converted from mp4 to OGG"
-  source: "https://youtu.be/4jmnAA_foUI"
-
diff --git a/Resources/Prototypes/SoundCollections/lobby.yml b/Resources/Prototypes/SoundCollections/lobby.yml
@@ -22,5 +22,4 @@
     - /Audio/Lobby/atomicamnesiammx.ogg
     - /Audio/Lobby/Get-Up-N-FIGHT.ogg
     - /Audio/Lobby/Changed-berserk-ost-level-1-fight-music-_Extend_-Trim.ogg
-    - /Audio/Lobby/Cicada-3301-The-Instar-Emergence.ogg
     - /Audio/Corvax/Lobby/service.ogg # Corvax-LobbyMusic
diff --git a/Resources/Prototypes/_Backmen/lobbyscreens.yml b/Resources/Prototypes/_Backmen/lobbyscreens.yml
@@ -1,7 +1,3 @@
-- type: lobbyBackground
-  id: pivo
-  background: /Textures/Backmen/LobbyScreens/pivo.png
-
 - type: lobbyBackground
   id: twix
   background: /Textures/Backmen/LobbyScreens/twix.png

diff --git a/Resources/Textures/Backmen/LobbyScreens/attributions.yml b/Resources/Textures/Backmen/LobbyScreens/attributions.yml
@@ -28,11 +28,6 @@
   copyright: "Ast#5705 on discord"
   source: "Corvax discord server"
 
- - files: ["pivo.png"]
-  license: "CC-BY-NC-SA-3.0"
-  copyright: "Kiryusha"
-  source: "Backmen discord server"
-
  - files: ["twix.png"]
   license: "CC-BY-NC-SA-3.0"
   copyright: "sosiska_v_smekte AKA Sosiska discord"

diff --git a/Resources/Textures/Backmen/LobbyScreens/pivo.png b/Resources/Textures/Backmen/LobbyScreens/pivo.png
diff --git a/Resources/Textures/Backmen/LobbyScreens/pivo.yml b/Resources/Textures/Backmen/LobbyScreens/pivo.yml