diff --git a/Resources/Prototypes/lobbyscreens.yml b/Resources/Prototypes/lobbyscreens.yml index bd5fe50e99d..152f9c8b5b2 100644 --- a/Resources/Prototypes/lobbyscreens.yml +++ b/Resources/Prototypes/lobbyscreens.yml @@ -1,39 +1,45 @@ - type: lobbyBackground - id: MedbayMadness - background: /Textures/LobbyScreens/MedbayMadness.png + id: HorizonPlaceholder + background: /Textures/LobbyScreens/horizon-lobby-2ba.png -- type: lobbyBackground - id: Revenant - background: /Textures/LobbyScreens/revenant.png +# Horizon - Everything below is deprecated Delta-V stuff -- type: lobbyBackground - id: Oracle - background: /Textures/LobbyScreens/oracle.png +#- type: lobbyBackground +# id: MedbayMadness +# background: /Textures/LobbyScreens/MedbayMadness.png -- type: lobbyBackground - id: aBadShift - background: /Textures/LobbyScreens/aBadShift.png +#- type: lobbyBackground +# id: Revenant +# background: /Textures/LobbyScreens/revenant.png -- type: lobbyBackground - id: Bar - background: /Textures/LobbyScreens/Bar.png +#- type: lobbyBackground +# id: Oracle +# background: /Textures/LobbyScreens/oracle.png -- type: lobbyBackground - id: CodeDeltaGamma - background: /Textures/LobbyScreens/CodeDeltaGamma.png +#- type: lobbyBackground +# id: aBadShift +# background: /Textures/LobbyScreens/aBadShift.png -- type: lobbyBackground - id: CupOfVelta - background: /Textures/LobbyScreens/CupOfVelta.png +#- type: lobbyBackground +# id: Bar +# background: /Textures/LobbyScreens/Bar.png -- type: lobbyBackground - id: Epistemics - background: /Textures/LobbyScreens/Epistemics.png +#- type: lobbyBackground +# id: CodeDeltaGamma +# background: /Textures/LobbyScreens/CodeDeltaGamma.png -- type: lobbyBackground - id: Singulo - background: /Textures/LobbyScreens/Singulo.png +#- type: lobbyBackground +# id: CupOfVelta +# background: /Textures/LobbyScreens/CupOfVelta.png -- type: lobbyBackground - id: TechnologicalProgress - background: /Textures/LobbyScreens/DeltaV__Technological_Progress_by_threlo.png +#- type: lobbyBackground +# id: Epistemics +# background: /Textures/LobbyScreens/Epistemics.png + +#- type: lobbyBackground +# id: Singulo +# background: /Textures/LobbyScreens/Singulo.png + +#- type: lobbyBackground +# id: TechnologicalProgress +# background: /Textures/LobbyScreens/DeltaV__Technological_Progress_by_threlo.png diff --git a/Resources/Textures/LobbyScreens/Bar.png b/Resources/Textures/LobbyScreens/DeltaV/Bar.png similarity index 100% rename from Resources/Textures/LobbyScreens/Bar.png rename to Resources/Textures/LobbyScreens/DeltaV/Bar.png diff --git a/Resources/Textures/LobbyScreens/CodeDeltaGamma.png b/Resources/Textures/LobbyScreens/DeltaV/CodeDeltaGamma.png similarity index 100% rename from Resources/Textures/LobbyScreens/CodeDeltaGamma.png rename to Resources/Textures/LobbyScreens/DeltaV/CodeDeltaGamma.png diff --git a/Resources/Textures/LobbyScreens/CupOfVelta.png b/Resources/Textures/LobbyScreens/DeltaV/CupOfVelta.png similarity index 100% rename from Resources/Textures/LobbyScreens/CupOfVelta.png rename to Resources/Textures/LobbyScreens/DeltaV/CupOfVelta.png diff --git a/Resources/Textures/LobbyScreens/DeltaV__Technological_Progress_by_threlo.png b/Resources/Textures/LobbyScreens/DeltaV/DeltaV__Technological_Progress_by_threlo.png similarity index 100% rename from Resources/Textures/LobbyScreens/DeltaV__Technological_Progress_by_threlo.png rename to Resources/Textures/LobbyScreens/DeltaV/DeltaV__Technological_Progress_by_threlo.png diff --git a/Resources/Textures/LobbyScreens/Epistemics.png b/Resources/Textures/LobbyScreens/DeltaV/Epistemics.png similarity index 100% rename from Resources/Textures/LobbyScreens/Epistemics.png rename to Resources/Textures/LobbyScreens/DeltaV/Epistemics.png diff --git a/Resources/Textures/LobbyScreens/MedbayMadness.png b/Resources/Textures/LobbyScreens/DeltaV/MedbayMadness.png similarity index 100% rename from Resources/Textures/LobbyScreens/MedbayMadness.png rename to Resources/Textures/LobbyScreens/DeltaV/MedbayMadness.png diff --git a/Resources/Textures/LobbyScreens/Singulo.png b/Resources/Textures/LobbyScreens/DeltaV/Singulo.png similarity index 100% rename from Resources/Textures/LobbyScreens/Singulo.png rename to Resources/Textures/LobbyScreens/DeltaV/Singulo.png diff --git a/Resources/Textures/LobbyScreens/aBadShift.png b/Resources/Textures/LobbyScreens/DeltaV/aBadShift.png similarity index 100% rename from Resources/Textures/LobbyScreens/aBadShift.png rename to Resources/Textures/LobbyScreens/DeltaV/aBadShift.png diff --git a/Resources/Textures/LobbyScreens/DeltaV/attributions.yml b/Resources/Textures/LobbyScreens/DeltaV/attributions.yml new file mode 100644 index 00000000000..c0866c3374a --- /dev/null +++ b/Resources/Textures/LobbyScreens/DeltaV/attributions.yml @@ -0,0 +1,49 @@ +- 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" diff --git a/Resources/Textures/LobbyScreens/oracle.png b/Resources/Textures/LobbyScreens/DeltaV/oracle.png similarity index 100% rename from Resources/Textures/LobbyScreens/oracle.png rename to Resources/Textures/LobbyScreens/DeltaV/oracle.png diff --git a/Resources/Textures/LobbyScreens/revenant.png b/Resources/Textures/LobbyScreens/DeltaV/revenant.png similarity index 100% rename from Resources/Textures/LobbyScreens/revenant.png rename to Resources/Textures/LobbyScreens/DeltaV/revenant.png diff --git a/Resources/Textures/LobbyScreens/room.png.yml b/Resources/Textures/LobbyScreens/DeltaV/room.png.yml similarity index 100% rename from Resources/Textures/LobbyScreens/room.png.yml rename to Resources/Textures/LobbyScreens/DeltaV/room.png.yml diff --git a/Resources/Textures/LobbyScreens/Templates/attributions.yml b/Resources/Textures/LobbyScreens/Templates/attributions.yml new file mode 100644 index 00000000000..1428e7250bc --- /dev/null +++ b/Resources/Textures/LobbyScreens/Templates/attributions.yml @@ -0,0 +1,4 @@ +- files: ["horizon-lobby-bluewhite.png"] + license: "CC-BY-SA 4.0" + copyright: "Stardust Reverie Collection" + source: "https://cohost.org/stardustreverie" diff --git a/Resources/Textures/LobbyScreens/Templates/horizon-lobby-bluewhite.png b/Resources/Textures/LobbyScreens/Templates/horizon-lobby-bluewhite.png new file mode 100644 index 00000000000..7e00cdfc8a6 Binary files /dev/null and b/Resources/Textures/LobbyScreens/Templates/horizon-lobby-bluewhite.png differ diff --git a/Resources/Textures/LobbyScreens/attributions.yml b/Resources/Textures/LobbyScreens/attributions.yml index c0866c3374a..7130536cd70 100644 --- a/Resources/Textures/LobbyScreens/attributions.yml +++ b/Resources/Textures/LobbyScreens/attributions.yml @@ -1,49 +1,4 @@ -- 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: ["horizon-lobby-2ba.png"] + license: "CC-BY-SA 4.0" + copyright: "Stardust Reverie Collection" + source: "https://cohost.org/stardustreverie" diff --git a/Resources/Textures/LobbyScreens/horizon-lobby-2ba.png b/Resources/Textures/LobbyScreens/horizon-lobby-2ba.png new file mode 100644 index 00000000000..7e00cdfc8a6 Binary files /dev/null and b/Resources/Textures/LobbyScreens/horizon-lobby-2ba.png differ diff --git a/Resources/Textures/Logo/horizon-wide-teal.svg b/Resources/Textures/Logo/horizon-wide-teal.svg new file mode 100644 index 00000000000..cec86acee63 --- /dev/null +++ b/Resources/Textures/Logo/horizon-wide-teal.svg @@ -0,0 +1,335 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + HORIZON + + + + + + + + + diff --git a/Resources/Textures/Logo/icon-license.txt b/Resources/Textures/Logo/icon-license.txt index 7cf7e10c1c6..3a97bfc8a04 100644 --- a/Resources/Textures/Logo/icon-license.txt +++ b/Resources/Textures/Logo/icon-license.txt @@ -1,4 +1,12 @@ -The files below are licensed under CC-BY-SA 4.0 by the author who can be found at https://leonardo-dabepis.tumblr.com/ +Created by the Stardust Reverie Collection +for Horizon Station + +// horizonstation.org // + +Font: SAIBA-45 by Formless Labs, licensed under GPL3 +https://github.com/YuurinBee/SAIBA-45/tree/main + +The files below are licensed under CC-BY-SA 4.0 for Horizon Station: icon.ico icon.svg @@ -11,4 +19,4 @@ icon/icon-128x128.png icon/icon-256x256.png logo.svg logo.png -slashlogo.png \ No newline at end of file +splashlogo.png diff --git a/Resources/Textures/Logo/icon.ico b/Resources/Textures/Logo/icon.ico index 3d8f808c8e1..9bd6868f090 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 e90db5caf5c..f4c38ddbf35 100644 --- a/Resources/Textures/Logo/icon.svg +++ b/Resources/Textures/Logo/icon.svg @@ -2,341 +2,234 @@ + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:krita="http://krita.org/namespaces/svg/krita"> + units="px" /> + id="defs2854"> + - - - - - - - - - - - - + inkscape:collect="always" + id="linearGradient5293"> + id="stop5289" /> - - - - + id="stop5291" /> - - - - - - - - - - - - - - - - - - - - - - - - - - + xlink:href="#linearGradient5293" + id="linearGradient5295" + x1="19.167456" + y1="125.48515" + x2="186.97073" + y2="125.48515" + gradientUnits="userSpaceOnUse" /> + id="clipPath2320"> - - + style="display:none;fill:#000000;stroke:#000000;stroke-width:0.782755;stroke-linecap:round" + id="rect2322" + width="141.98215" + height="94.130898" + x="14.394704" + y="0.16499102" /> + id="lpe_path-effect2324" + style="fill:#000000;stroke:#000000;stroke-width:0.782755;stroke-linecap:round" + class="powerclip" + d="M 20.162484,29.388389 H 293.08348 V 139.35279 H 20.162484 Z M 14.394704,0.16499102 V 94.295889 H 156.37685 V 0.16499102 Z" /> - - - - - - + - - - - - - - + style="display:inline"> + style="fill:#000000;stroke-width:0.264583" + id="path3545" + d="" /> + style="fill:#000000;stroke-width:0.264583" + id="path3291" + d="" /> + H + + + + + + + + + + + + diff --git a/Resources/Textures/Logo/icon/icon-128x128.png b/Resources/Textures/Logo/icon/icon-128x128.png index c51db1a5e81..8b5653b6acf 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 99f61befffb..ff78652c654 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 ab81fefda50..9b6a834351a 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 0e851712ef0..fd59e143ef9 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 b79376a5941..23ae0b09531 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 7b2e47a8977..85bf891be1a 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 483de1e8c21..5c537e348e8 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 0e851712ef0..73dbda20265 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 deleted file mode 100644 index 733930fae3d..00000000000 --- a/Resources/Textures/Logo/logo.svg +++ /dev/null @@ -1,342 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Resources/Textures/Logo/splashlogo.png b/Resources/Textures/Logo/splashlogo.png index c5f5b5e6074..2a4c373ba67 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 4aed08c44da..decf724de2c 100644 --- a/Resources/manifest.yml +++ b/Resources/manifest.yml @@ -1,5 +1,6 @@ -defaultWindowTitle: Delta-v +defaultWindowTitle: Horizon Station windowIconSet: /Textures/Logo/icon splashLogo: /Textures/Logo/splashlogo.png -# PJB PLEASE \ No newline at end of file +# PJB PLEASE +# Horizon note -- previous comment found under Delta-V logo