Merge branch 'master' into Porting-Things-Part-1

README.md

@@ -1,6 +1,6 @@
 # Einstein Engines
 
-<p align="center"><img src="https://raw.githubusercontent.com/Simple-Station/Einstein-Engines/master/Resources/Textures/Logo/logo.png" width="1080px" /></p>
+<p align="center"><img src="https://raw.githubusercontent.com/Simple-Station/Einstein-Engines/master/Resources/Textures/Logo/splashlogo.png" width="1080px" /></p>
 
 ---
 

Resources/Prototypes/lobbyscreens.yml

@@ -1,39 +1,35 @@
-- type: lobbyBackground
-  id: MedbayMadness
-  background: /Textures/LobbyScreens/MedbayMadness.png
-
 - type: lobbyBackground
-  id: Revenant
-  background: /Textures/LobbyScreens/revenant.png
+  id: Robotics
+  background: /Textures/LobbyScreens/robotics.webp
 
 - type: lobbyBackground
-  id: Oracle
-  background: /Textures/LobbyScreens/oracle.png
+  id: Supermatter
+  background: /Textures/LobbyScreens/supermatter.webp
 
 - type: lobbyBackground
-  id: aBadShift
-  background: /Textures/LobbyScreens/aBadShift.png
+  id: Warden
+  background: /Textures/LobbyScreens/warden.webp
 
 - type: lobbyBackground
-  id: Bar
-  background: /Textures/LobbyScreens/Bar.png
+  id: Pharmacy
+  background: /Textures/LobbyScreens/pharmacy.webp
 
 - type: lobbyBackground
-  id: CodeDeltaGamma
-  background: /Textures/LobbyScreens/CodeDeltaGamma.png
+  id: SSXIV
+  background: /Textures/LobbyScreens/ssxiv.webp
 
 - type: lobbyBackground
-  id: CupOfVelta
-  background: /Textures/LobbyScreens/CupOfVelta.png
+  id: Susstation
+  background: /Textures/LobbyScreens/susstation.webp
 
 - type: lobbyBackground
-  id: Epistemics
-  background: /Textures/LobbyScreens/Epistemics.png
+  id: SkellyVsTheRev
+  background: /Textures/LobbyScreens/skellyvstherev.webp
 
 - type: lobbyBackground
-  id: Singulo
-  background: /Textures/LobbyScreens/Singulo.png
+  id: Doomed
+  background: /Textures/LobbyScreens/doomed.webp
 
 - type: lobbyBackground
-  id: TechnologicalProgress
-  background: /Textures/LobbyScreens/DeltaV__Technological_Progress_by_threlo.png
+  id: Blueprint
+  background: /Textures/LobbyScreens/blueprint.webp

Resources/Textures/LobbyScreens/attributions.yml

@@ -1,49 +1,34 @@
-- files: ["MedbayMadness.png"]
-  license: "CC-BY-4.0"
-  copyright: "Kimikyu#0001 on discord / @vkimikyu on Twitter"
-  source: "https://twitter.com/vkimikyu"
-
-- files: ["revenant.png"]
-  license: "CC-BY-4.0"
-  copyright: "Leonardo DaBepis#4869 on discord / @leonardo-dabepis on Tumblr"
-  source: "https://leonardo-dabepis.tumblr.com/"
-
-- files: ["oracle.png"]
-  license: "CC-BY-4.0"
-  copyright: "Leonardo DaBepis#4869 on discord / @leonardo-dabepis on Tumblr"
-  source: "https://leonardo-dabepis.tumblr.com/"
-
-- files: ["aBadShift.png"]
-  license: "CC-BY-4.0"
-  copyright: "art by user DEminerDG / @desmondeccho on Instagram"
-  source: "https://www.instagram.com/desmondeccho/"
-
-- files: ["Bar.png"]
-  license: "CC0-1.0"
-  copyright: "justani on discord / @itjustani on Tumblr"
-  source: "https://itjustani.carrd.co/"
-
-- files: ["CodeDeltaGamma.png"]
-  license: "CC0-1.0"
-  copyright: "ps3moira @ DeltaV"
-  source: "https://discord.gg/deltav"
-
-- files: ["CupOfVelta.png"]
-  license: "CC0-1.0"
-  copyright: "TJohnson @ DeltaV"
-  source: "https://discord.gg/deltav"
-
-- files: ["Epistemics.png"]
-  license: "CC0-1.0"
-  copyright: "Luckass on discord / v7 @ DeltaV"
-  source: "https://discord.gg/deltav"
-
-- files: ["Singulo.png"]
-  license: "CC0-1.0"
-  copyright: "iced0ver on discord / UBlueberry @ DeltaV"
-  source: "https://discord.gg/deltav"
-
-- files: ["DeltaV__Technological_Progress_by_threlo.png"]
-  license: "Custom"
-  copyright: "CC-BY-NC-ND-4.0 / threlo on discord / @threlo on itaku"
-  source: "https://linktr.ee/threlo"
+- files: ["supermatter.webp", "robotics.webp"]
+  license: "CC-BY-NC-SA-3.0"
+  copyright: "Veritius#2351 (257233913951289344) on discord / @Veritius on GitHub"
+  source: "https://github.com/Veritius"
+
+- files: ["warden.webp", "pharmacy.webp"]
+  license: "CC-BY-NC-SA-3.0"
+  copyright: "Solbusaur#4343 (220208697429852160) on discord"
+  source: "https://github.com/space-wizards/space-station-14"
+
+- files: ["ssxiv.webp"]
+  license: "CC-BY-NC-SA-3.0"
+  copyright: "Abyssal#4842 on discord / @aby_doodles on Twitter"
+  source: "https://twitter.com/aby_doodles"
+
+- files: ["susstation.webp"]
+  license: "CC-BY-NC-SA-3.0"
+  copyright: "Alekshhh github"
+  source: "https://github.com/space-wizards/space-station-14"
+
+- files: ["skellyvstherev.webp"]
+  license: "CC-BY-SA-4.0"
+  copyright: "Hannah 'FairlySadPanda' Dawson 2024"
+  source: "https://github.com/FairlySadPanda"
+
+- files: ["doomed.webp"]
+  license: "CC-BY-NC-SA-3.0"
+  copyright: "brainfood1183 github"
+  source: "https://github.com/space-wizards/space-station-14"
+
+- files: ["blueprint.webp"]
+  license: "CC-BY-NC-SA-3.0"
+  copyright: "data_redacted on discord"
+  source: "https://github.com/space-wizards/space-station-14"

Resources/Textures/LobbyScreens/blueprint.png.yml

@@ -0,0 +1,2 @@
+sample:
+  filter: true

Resources/Textures/LobbyScreens/doomed.webp.yml

@@ -0,0 +1,2 @@
+sample:
+  filter: true

Resources/Textures/LobbyScreens/robotics.webp.yml

@@ -0,0 +1,2 @@
+sample:
+  filter: true

Resources/Textures/LobbyScreens/skellyvstherev.webp.yml

@@ -0,0 +1,2 @@
+sample:
+  filter: true

Resources/Textures/LobbyScreens/ssxiv.webp.yml

@@ -0,0 +1,2 @@
+sample:
+  filter: true

Resources/Textures/LobbyScreens/supermatter.webp.yml

@@ -0,0 +1,2 @@
+sample:
+  filter: true

Resources/Textures/LobbyScreens/susstation.webp.yml

@@ -0,0 +1,2 @@
+sample:
+  filter: true

Resources/Textures/LobbyScreens/warden.webp.yml

@@ -0,0 +1,2 @@
+sample:
+  filter: false

Resources/Textures/Logo/icon-license.txt

@@ -1,4 +1,5 @@
-The files below are licensed under CC-BY-SA 4.0 by the author who can be found at https://leonardo-dabepis.tumblr.com/
+The files below are licensed under CC-BY-SA 4.0 by the author, Nova, https://github.com/stellar-novas / @stellar_novas on Discord.
+Monaspace Krypton was used for text in the following files under the SIL Open Font License, Version 1.1. https://github.com/githubnext/monaspace.
 
 icon.ico
 icon.svg
@@ -11,4 +12,4 @@ icon/icon-128x128.png
 icon/icon-256x256.png
 logo.svg
 logo.png
-slashlogo.png
+slashlogo.png