diff --git a/README.md b/README.md index 13b07015f7..6bbeefb5b2 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # Einstein Engines -
+ --- diff --git a/Resources/Prototypes/lobbyscreens.yml b/Resources/Prototypes/lobbyscreens.yml index bd5fe50e99..5d78c30c0f 100644 --- a/Resources/Prototypes/lobbyscreens.yml +++ b/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 diff --git a/Resources/Textures/LobbyScreens/Bar.png b/Resources/Textures/LobbyScreens/Bar.png deleted file mode 100644 index 97fa15cccc..0000000000 Binary files a/Resources/Textures/LobbyScreens/Bar.png and /dev/null differ diff --git a/Resources/Textures/LobbyScreens/CodeDeltaGamma.png b/Resources/Textures/LobbyScreens/CodeDeltaGamma.png deleted file mode 100644 index 111ae6307d..0000000000 Binary files a/Resources/Textures/LobbyScreens/CodeDeltaGamma.png and /dev/null differ diff --git a/Resources/Textures/LobbyScreens/CupOfVelta.png b/Resources/Textures/LobbyScreens/CupOfVelta.png deleted file mode 100644 index 81c4ccb181..0000000000 Binary files a/Resources/Textures/LobbyScreens/CupOfVelta.png and /dev/null differ diff --git a/Resources/Textures/LobbyScreens/DeltaV__Technological_Progress_by_threlo.png b/Resources/Textures/LobbyScreens/DeltaV__Technological_Progress_by_threlo.png deleted file mode 100644 index a2c8d339ff..0000000000 Binary files a/Resources/Textures/LobbyScreens/DeltaV__Technological_Progress_by_threlo.png and /dev/null differ diff --git a/Resources/Textures/LobbyScreens/Epistemics.png b/Resources/Textures/LobbyScreens/Epistemics.png deleted file mode 100644 index 99bc7f987d..0000000000 Binary files a/Resources/Textures/LobbyScreens/Epistemics.png and /dev/null differ diff --git a/Resources/Textures/LobbyScreens/MedbayMadness.png b/Resources/Textures/LobbyScreens/MedbayMadness.png deleted file mode 100644 index aae76e7fee..0000000000 Binary files a/Resources/Textures/LobbyScreens/MedbayMadness.png and /dev/null differ diff --git a/Resources/Textures/LobbyScreens/Singulo.png b/Resources/Textures/LobbyScreens/Singulo.png deleted file mode 100644 index 5bbbdb12c6..0000000000 Binary files a/Resources/Textures/LobbyScreens/Singulo.png and /dev/null differ diff --git a/Resources/Textures/LobbyScreens/aBadShift.png b/Resources/Textures/LobbyScreens/aBadShift.png deleted file mode 100644 index eb4951ae1a..0000000000 Binary files a/Resources/Textures/LobbyScreens/aBadShift.png and /dev/null differ diff --git a/Resources/Textures/LobbyScreens/attributions.yml b/Resources/Textures/LobbyScreens/attributions.yml index c0866c3374..0e890ec893 100644 --- a/Resources/Textures/LobbyScreens/attributions.yml +++ b/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" diff --git a/Resources/Textures/LobbyScreens/blueprint.png.yml b/Resources/Textures/LobbyScreens/blueprint.png.yml new file mode 100644 index 0000000000..5c43e23305 --- /dev/null +++ b/Resources/Textures/LobbyScreens/blueprint.png.yml @@ -0,0 +1,2 @@ +sample: + filter: true diff --git a/Resources/Textures/LobbyScreens/blueprint.webp b/Resources/Textures/LobbyScreens/blueprint.webp new file mode 100644 index 0000000000..50f88f55a2 Binary files /dev/null and b/Resources/Textures/LobbyScreens/blueprint.webp differ diff --git a/Resources/Textures/LobbyScreens/doomed.webp b/Resources/Textures/LobbyScreens/doomed.webp new file mode 100644 index 0000000000..58a7313b23 Binary files /dev/null and b/Resources/Textures/LobbyScreens/doomed.webp differ diff --git a/Resources/Textures/LobbyScreens/doomed.webp.yml b/Resources/Textures/LobbyScreens/doomed.webp.yml new file mode 100644 index 0000000000..dabd6601f7 --- /dev/null +++ b/Resources/Textures/LobbyScreens/doomed.webp.yml @@ -0,0 +1,2 @@ +sample: + filter: true diff --git a/Resources/Textures/LobbyScreens/oracle.png b/Resources/Textures/LobbyScreens/oracle.png deleted file mode 100644 index 4674b9d403..0000000000 Binary files a/Resources/Textures/LobbyScreens/oracle.png and /dev/null differ diff --git a/Resources/Textures/LobbyScreens/pharmacy.webp b/Resources/Textures/LobbyScreens/pharmacy.webp new file mode 100644 index 0000000000..0ee24d88be Binary files /dev/null and b/Resources/Textures/LobbyScreens/pharmacy.webp differ diff --git a/Resources/Textures/LobbyScreens/room.png.yml b/Resources/Textures/LobbyScreens/pharmacy.webp.yml similarity index 100% rename from Resources/Textures/LobbyScreens/room.png.yml rename to Resources/Textures/LobbyScreens/pharmacy.webp.yml diff --git a/Resources/Textures/LobbyScreens/revenant.png b/Resources/Textures/LobbyScreens/revenant.png deleted file mode 100644 index 0b413711fb..0000000000 Binary files a/Resources/Textures/LobbyScreens/revenant.png and /dev/null differ diff --git a/Resources/Textures/LobbyScreens/robotics.webp b/Resources/Textures/LobbyScreens/robotics.webp new file mode 100644 index 0000000000..43d32581cf Binary files /dev/null and b/Resources/Textures/LobbyScreens/robotics.webp differ diff --git a/Resources/Textures/LobbyScreens/robotics.webp.yml b/Resources/Textures/LobbyScreens/robotics.webp.yml new file mode 100644 index 0000000000..dabd6601f7 --- /dev/null +++ b/Resources/Textures/LobbyScreens/robotics.webp.yml @@ -0,0 +1,2 @@ +sample: + filter: true diff --git a/Resources/Textures/LobbyScreens/skellyvstherev.webp b/Resources/Textures/LobbyScreens/skellyvstherev.webp new file mode 100644 index 0000000000..09bcf5b2f7 Binary files /dev/null and b/Resources/Textures/LobbyScreens/skellyvstherev.webp differ diff --git a/Resources/Textures/LobbyScreens/skellyvstherev.webp.yml b/Resources/Textures/LobbyScreens/skellyvstherev.webp.yml new file mode 100644 index 0000000000..dabd6601f7 --- /dev/null +++ b/Resources/Textures/LobbyScreens/skellyvstherev.webp.yml @@ -0,0 +1,2 @@ +sample: + filter: true diff --git a/Resources/Textures/LobbyScreens/ssxiv.webp b/Resources/Textures/LobbyScreens/ssxiv.webp new file mode 100644 index 0000000000..32e248f802 Binary files /dev/null and b/Resources/Textures/LobbyScreens/ssxiv.webp differ diff --git a/Resources/Textures/LobbyScreens/ssxiv.webp.yml b/Resources/Textures/LobbyScreens/ssxiv.webp.yml new file mode 100644 index 0000000000..dabd6601f7 --- /dev/null +++ b/Resources/Textures/LobbyScreens/ssxiv.webp.yml @@ -0,0 +1,2 @@ +sample: + filter: true diff --git a/Resources/Textures/LobbyScreens/supermatter.webp b/Resources/Textures/LobbyScreens/supermatter.webp new file mode 100644 index 0000000000..d5fb190ae6 Binary files /dev/null and b/Resources/Textures/LobbyScreens/supermatter.webp differ diff --git a/Resources/Textures/LobbyScreens/supermatter.webp.yml b/Resources/Textures/LobbyScreens/supermatter.webp.yml new file mode 100644 index 0000000000..dabd6601f7 --- /dev/null +++ b/Resources/Textures/LobbyScreens/supermatter.webp.yml @@ -0,0 +1,2 @@ +sample: + filter: true diff --git a/Resources/Textures/LobbyScreens/susstation.webp b/Resources/Textures/LobbyScreens/susstation.webp new file mode 100644 index 0000000000..c30abb4670 Binary files /dev/null and b/Resources/Textures/LobbyScreens/susstation.webp differ diff --git a/Resources/Textures/LobbyScreens/susstation.webp.yml b/Resources/Textures/LobbyScreens/susstation.webp.yml new file mode 100644 index 0000000000..dabd6601f7 --- /dev/null +++ b/Resources/Textures/LobbyScreens/susstation.webp.yml @@ -0,0 +1,2 @@ +sample: + filter: true diff --git a/Resources/Textures/LobbyScreens/warden.webp b/Resources/Textures/LobbyScreens/warden.webp new file mode 100644 index 0000000000..997bd6701c Binary files /dev/null and b/Resources/Textures/LobbyScreens/warden.webp differ diff --git a/Resources/Textures/LobbyScreens/warden.webp.yml b/Resources/Textures/LobbyScreens/warden.webp.yml new file mode 100644 index 0000000000..51ff40335e --- /dev/null +++ b/Resources/Textures/LobbyScreens/warden.webp.yml @@ -0,0 +1,2 @@ +sample: + filter: false diff --git a/Resources/Textures/Logo/icon-license.txt b/Resources/Textures/Logo/icon-license.txt index 7cf7e10c1c..585694e728 100644 --- a/Resources/Textures/Logo/icon-license.txt +++ b/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 \ No newline at end of file +slashlogo.png diff --git a/Resources/Textures/Logo/icon.ico b/Resources/Textures/Logo/icon.ico index 3d8f808c8e..d47c601144 100644 Binary files a/Resources/Textures/Logo/icon.ico and b/Resources/Textures/Logo/icon.ico differ diff --git a/Resources/Textures/Logo/icon.svg b/Resources/Textures/Logo/icon.svg index e90db5caf5..99315583c6 100644 --- a/Resources/Textures/Logo/icon.svg +++ b/Resources/Textures/Logo/icon.svg @@ -2,19 +2,18 @@ diff --git a/Resources/Textures/Logo/icon/icon-128x128.png b/Resources/Textures/Logo/icon/icon-128x128.png index c51db1a5e8..a858e42c0a 100644 Binary files a/Resources/Textures/Logo/icon/icon-128x128.png and b/Resources/Textures/Logo/icon/icon-128x128.png differ diff --git a/Resources/Textures/Logo/icon/icon-16x16.png b/Resources/Textures/Logo/icon/icon-16x16.png index 99f61befff..dd06c6101f 100644 Binary files a/Resources/Textures/Logo/icon/icon-16x16.png and b/Resources/Textures/Logo/icon/icon-16x16.png differ diff --git a/Resources/Textures/Logo/icon/icon-24x24.png b/Resources/Textures/Logo/icon/icon-24x24.png index ab81fefda5..67f3b4ec71 100644 Binary files a/Resources/Textures/Logo/icon/icon-24x24.png and b/Resources/Textures/Logo/icon/icon-24x24.png differ diff --git a/Resources/Textures/Logo/icon/icon-256x256.png b/Resources/Textures/Logo/icon/icon-256x256.png index 0e851712ef..4c3d0f84b0 100644 Binary files a/Resources/Textures/Logo/icon/icon-256x256.png and b/Resources/Textures/Logo/icon/icon-256x256.png differ diff --git a/Resources/Textures/Logo/icon/icon-32x32.png b/Resources/Textures/Logo/icon/icon-32x32.png index b79376a594..4641a115db 100644 Binary files a/Resources/Textures/Logo/icon/icon-32x32.png and b/Resources/Textures/Logo/icon/icon-32x32.png differ diff --git a/Resources/Textures/Logo/icon/icon-48x48.png b/Resources/Textures/Logo/icon/icon-48x48.png index 7b2e47a897..531d78609f 100644 Binary files a/Resources/Textures/Logo/icon/icon-48x48.png and b/Resources/Textures/Logo/icon/icon-48x48.png differ diff --git a/Resources/Textures/Logo/icon/icon-64x64.png b/Resources/Textures/Logo/icon/icon-64x64.png index 483de1e8c2..d14b0314ee 100644 Binary files a/Resources/Textures/Logo/icon/icon-64x64.png and b/Resources/Textures/Logo/icon/icon-64x64.png differ diff --git a/Resources/Textures/Logo/logo.png b/Resources/Textures/Logo/logo.png index 0e851712ef..4c3d0f84b0 100644 Binary files a/Resources/Textures/Logo/logo.png and b/Resources/Textures/Logo/logo.png differ diff --git a/Resources/Textures/Logo/logo.svg b/Resources/Textures/Logo/logo.svg index 733930fae3..6885a736a6 100644 --- a/Resources/Textures/Logo/logo.svg +++ b/Resources/Textures/Logo/logo.svg @@ -2,19 +2,18 @@ diff --git a/Resources/Textures/Logo/splashlogo.png b/Resources/Textures/Logo/splashlogo.png index c5f5b5e607..41be5508ae 100644 Binary files a/Resources/Textures/Logo/splashlogo.png and b/Resources/Textures/Logo/splashlogo.png differ diff --git a/Resources/manifest.yml b/Resources/manifest.yml index 4aed08c44d..c6eadc6420 100644 --- a/Resources/manifest.yml +++ b/Resources/manifest.yml @@ -1,5 +1,3 @@ -defaultWindowTitle: Delta-v +defaultWindowTitle: Einstein Engines windowIconSet: /Textures/Logo/icon splashLogo: /Textures/Logo/splashlogo.png - -# PJB PLEASE \ No newline at end of file