diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 5ba87815bbb..a30829a5dee 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -1,16 +1,3 @@
# Last match in file takes precedence.
-/Content.*/ @DebugOk
-/Content.*/SimpleStation14/ @DEATHB4DEFEAT
-
-/Resources/ @DebugOk
-/Resources/ConfigPresets/ @DebugOk
-/Resources/*.yml @DebugOk @Colin-Tel
-/Resources/*/SimpleStation14/ @DEATHB4DEFEAT
-/Resources/Maps/ @IamVelcroboy
-/Resources/Prototypes/Maps/ @IamVelcroboy
-
-/Tools/ @DebugOk
-
-/* @DebugOk # Standalone files in root, shouldn't apply to subdirectories
-/.github/ @DebugOk # Workflows, codeowners, templates, etc
+# TODO
diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
index 09c9e76b193..7ff9017cb0d 100644
--- a/.github/ISSUE_TEMPLATE/config.yml
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -1,7 +1,4 @@
contact_links:
- name: Report a Security Vulnerability
url: https://github.com/space-wizards/space-station-14/blob/master/SECURITY.md
- about: Please report security vulnerabilities privately so we can fix them before they are publicly disclosed.
- - name: Request a Feature
- url: https://discord.gg/rGvu9hKffJ
- about: Submit feature requests on our Discord server (https://discord.gg/rGvu9hKffJ).
+ about: Please report security vulnerabilities to the Space Wizards privately so they can fix them before they are publicly disclosed.
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
new file mode 100644
index 00000000000..aba549332f5
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -0,0 +1,27 @@
+---
+name: Request a Feature
+about: "Template for noting future planned features. Please ask for approval in the Discord if you aren't an organization Member before posting a feature request"
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+
+
+# Description
+
+
+I want Goldfish crackers
+
+# Media
+
+
+
diff --git a/.github/ISSUE_TEMPLATE/issue_report.md b/.github/ISSUE_TEMPLATE/issue_report.md
index 9bc805b74e1..ab821811973 100644
--- a/.github/ISSUE_TEMPLATE/issue_report.md
+++ b/.github/ISSUE_TEMPLATE/issue_report.md
@@ -1,20 +1,55 @@
---
name: Report an Issue
-about: "..."
+about: "Any general issues you have during play or with the codebase"
title: ''
labels: ''
assignees: ''
---
-## Description
-
+
-**Reproduction**
-
+# Description
+
-**Screenshots**
-
+Description
-**Additional context**
-
+# Reproduction
+
+
+1. Open game
+2. Game doesn't open
+
+# Expected behavior
+
+
+1. Open game
+2. Game opens
+
+# Media
+
+
+
+
+# Additional context
+
+
+There's a ghost in my computer
diff --git a/.github/ISSUE_TEMPLATE/toolshed-feature-request.md b/.github/ISSUE_TEMPLATE/toolshed-feature-request.md
deleted file mode 100644
index dae84c3e255..00000000000
--- a/.github/ISSUE_TEMPLATE/toolshed-feature-request.md
+++ /dev/null
@@ -1,18 +0,0 @@
----
-name: Toolshed feature request
-about: Suggest a feature for Toolshed (for game admins/developers)
-title: "[TOOLSHED REQUEST]"
-labels: Toolshed
-assignees: moonheart08
-
----
-
-**Is your feature request related to a problem/bug? Please describe.**
-A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
-
-**Describe the command you'd like**
-A clear and concise description of what you want and what it should do.
-If you're a technical user (i.e. programmer) including type signatures is helpful.
-
-**Additional context**
-Add any other context or screenshots about the feature request here.
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index a397604185a..5d3ce070bca 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -1,43 +1,62 @@
-
-
+
-## About the PR
-
+# Description
-## Why / Balance
-
+
+Some example prompts to consider:
+How might this affect the game? The codebase?
+What might be some alternatives to this?
+How/Who does this benefit/hurt [the game/codebase]?
+-->
-## Media
-
-- [ ] I have added screenshots/videos to this PR showcasing its changes ingame, **or** this PR does not require an ingame showcase
+- [ ] Task
+- [x] Completed Task
+
+---
-## Breaking changes
-**Changelog**
+
Media
+
+
+
+
+
+
+
+---
+
+# Changelog
+
-
+- remove: Removed fun :(
diff --git a/.github/labeler.yml b/.github/labeler.yml
index 32936a6180a..694c83b6025 100644
--- a/.github/labeler.yml
+++ b/.github/labeler.yml
@@ -1,6 +1,15 @@
"Changes: C#":
- "**/*.cs"
+"Changes: Config":
+ - "**/*.toml"
+ - "**/*.config"
+ - "*.json"
+ - ".github/*.yml"
+ - ".github/*.json"
+ - ".vscode/*.json"
+ - ".editorconfig"
+
"Changes: Documentation":
- "**/*.xml"
- "**/*.md"
@@ -22,3 +31,6 @@
"Changes: YML":
- any: ["**/*.yml"]
all: ["!Resources/Maps/**/*.yml", "!Resources/Prototypes/Maps/**/*.yml"]
+
+"Changes: Workflow":
+ - ".github/workflows/*.yml"
diff --git a/.github/workflows/changelog.yml b/.github/workflows/changelog.yml
index 70821e5e59a..a44cac2cd1a 100644
--- a/.github/workflows/changelog.yml
+++ b/.github/workflows/changelog.yml
@@ -11,7 +11,7 @@ env:
jobs:
changelog:
- runs-on: self-hosted
+ runs-on: ubuntu-latest
if: github.event.pull_request.merged == true
permissions:
contents: write
diff --git a/LEGAL.md b/LEGAL.md
index 2e6c6e9df31..2df3c39add1 100644
--- a/LEGAL.md
+++ b/LEGAL.md
@@ -2,15 +2,15 @@
## Copyright
-The Authors retain all copyright to their respective work here submitted.
+The Authors retain all copyright to their respective work submitted here.
## Code license
-Content contributed to this repository after commit 87c70a89a67d0521a56388e6b1c3f2cb947943e4 is licensed under the GNU Affero General Public License version 3.0, unless otherwise stated. See `LICENSE-AGPLv3.txt`.
+Content contributed to this repository after commit 87c70a89a67d0521a56388e6b1c3f2cb947943e4 is licensed under the GNU Affero General Public License version 3.0 unless otherwise stated. See [LICENSE-AGPLv3](https://github.com/Simple-Station/Einstein-Engines/blob/master/LICENSE-AGPLv3.txt).
-Content contributed to this repository before commit 87c70a89a67d0521a56388e6b1c3f2cb947943e4 is licensed under the MIT license, unless otherwise stated. See `LICENSE-MIT.txt`.
+Content contributed to this repository before commit 87c70a89a67d0521a56388e6b1c3f2cb947943e4 is licensed under the MIT license unless otherwise stated. See [LICENSE-MIT](https://github.com/Simple-Station/Einstein-Engines/blob/master/LICENSE-MIT.txt).
-[87c70a89a67d0521a56388e6b1c3f2cb947943e4](https://github.com/DeltaV-Station/Delta-v/commit/87c70a89a67d0521a56388e6b1c3f2cb947943e4) was pushed on February 17th 2024 at 21:48 UTC
+[87c70a89a67d0521a56388e6b1c3f2cb947943e4](https://github.com/Simple-Station/Einstein-Engines/commit/87c70a89a67d0521a56388e6b1c3f2cb947943e4) was pushed on February 17th 2024 at 21:48 UTC
## Warranty
diff --git a/README.md b/README.md
index 9b58cc0a1e6..6bbeefb5b28 100644
--- a/README.md
+++ b/README.md
@@ -1,48 +1,81 @@
-## Einstein Engines
+# Einstein Engines
-Einstein Engines is a hard fork of [Space Station 14](https://github.com/space-wizards/space-station-14), built around the ideals and design inspirations of the Baystation family of servers, with a focus on having modular code that anyone can use to make the RP server of their dreams. Our founding organization is based on a democratic system whereby our mutual contributors and downstreams have a say in what code goes into their own upstream. If you are a representative of a former downstream of DeltaV, I would like to invite you to contact us for an opportunity to represent your fork in this new upstream.
+
-Space Station 14 is a remake of SS13 that runs on [Robust Toolbox](https://github.com/space-wizards/RobustToolbox), a homegrown engine written in C#.
+---
-As a Hard Fork, any code sourced from a different upstream cannot ever be merged directly here, and must instead be ported. All code present in this repository is subject to change as desired by the council of maintainers.
+Einstein Engines is a hard fork of [Space Station 14](https://github.com/space-wizards/space-station-14) built around the ideals and design inspirations of the Baystation family of servers from Space Station 13 with a focus on having modular code that anyone can use to make the RP server of their dreams.
+Our founding organization is based on a democratic system whereby our mutual contributors and downstreams have a say in what code goes into their own upstream.
+If you are a representative of a former downstream of Delta-V, we would like to invite you to contact us for an opportunity to represent your fork in this new upstream.
-## "Official Server Policy"
-#### No Official Servers will ever be made for Einstein-Engines.
+Space Station 14 is inspired heavily by Space Station 13 and runs on [Robust Toolbox](https://github.com/space-wizards/Robust-Toolbox), a homegrown engine written in C#.
-In order to prevent a potential conflict of interest, we will never open any server directly using the Einstein-Engines upstream itself. Any server claiming to be an official representation of this fork is not endorsed in any way by this organization. We however would like to invite anyone wishing to create a server to make a fork of Einstein-Engines.
+As a hard fork, any code sourced from a different upstream cannot ever be merged directly here, and must instead be ported.
+All code present in this repository is subject to change as desired by the council of maintainers.
-## Links
-
-#### Einstein Engines & Simplestation 14
-[Website](https://simplestation.org/) | [Wiki](Pending) | [Discord](https://discord.gg/49KeKwXc8g)
+## Official Server Policy
-#### Space Station 14
+**No official servers will ever be made for Einstein-Engines**.
-[Website](https://spacestation14.io/) | [Discord](https://discord.ss14.io/) | [Forum](https://forum.spacestation14.io/) | [Steam](https://store.steampowered.com/app/1255460/Space_Station_14/) | [Standalone Download](https://spacestation14.io/about/nightlies/)
+In order to prevent a potential conflict of interest, we will never open any server directly using the Einstein Engines codebase itself.
+Any server claiming to be an official representation of this fork is not endorsed in any way by this organization.
+We however would like to invite anyone wishing to create a server to make a fork of Einstein Engines.
-## Documentation/Wiki
+## Links
-The [docs site](https://docs.spacestation14.io/) has documentation on SS14s content, engine, game design and more. It has lots of resources for new contributors to the project.
+[Website](https://simplestation.org) | [Discord](https://discord.gg/X4QEXxUrsJ) | [Steam](https://store.steampowered.com/app/2585480/Space_Station_Multiverse/) | [Standalone](https://spacestationmultiverse.com/downloads/)
## Contributing
-We are happy to accept contributions from anybody. Since this repository is its own upstream, there is no code in this repository that is restricted from modification, and no markers are required to indicate where changes are made.
+We are happy to accept contributions from anybody, come join our Discord if you want to help.
+We've got a [list of issues](https://github.com/Simple-Station/Einstein-Engines/issues) that need to be done and anybody can pick them up. Don't be afraid to ask for help in Discord either!
+
+We are currently accepting translations of the game on our main repository.
+If you would like to translate the game into another language check the #contributor-general channel in our Discord.
## Building
-1. Clone this repo.
-2. Run `RUN_THIS.py` to init submodules and download the engine.
-3. Compile the solution.
+Refer to [the Space Wizards' guide](https://docs.spacestation14.com/en/general-development/setup/setting-up-a-development-environment.html) on setting up a development environment for general information, but keep in mind that Einstein Engines is not the same and many things may not apply.
+We provide some scripts shown below to make the job easier.
+
+### Build dependencies
+
+> - Git
+> - DOTNET SDK 7.0 or higher
+> - python 3.7 or higher
+
+
+### Windows
+
+> 1. Clone this repository
+> 2. Run `RUN_THIS.py` to init submodules and download the engine, or run `git submodule update --init --recursive` in a terminal
+> 3. Run the `Scripts/bat/run1buildDebug.bat`
+> 4. Run the `Scripts/bat/run2configDev.bat` if you need other configurations run other config scripts
+> 5. Run both the `Scripts/bat/run3server.bat` and `Scripts/bat/run4client.bat`
+> 6. Connect to localhost and play
+
+### Linux
+
+> 1. Clone this repository
+> 2. Run `RUN_THIS.py` to init submodules and download the engine, or run `git submodule update --init --recursive` in a terminal
+> 3. Run the `Scripts/sh/run1buildDebug.sh`
+> 4. Run the `Scripts/sh/run2configDev.sh` if you need other configurations run other config scripts
+> 5. Run both the `Scripts/sh/run3server.bat` and `scripts/sh/run4client.sh`
+> 6. Connect to localhost and play
+
+### MacOS
-[More detailed instructions on building the project.](https://docs.spacestation14.com/en/general-development/setup.html)
+> I don't know anybody using MacOS to test this, but it's probably roughly the same steps as Linux
## License
-Content contributed to this repository after commit 87c70a89a67d0521a56388e6b1c3f2cb947943e4 is licensed under the GNU Affero General Public License version 3.0, unless otherwise stated. See `LICENSE-AGPLv3.txt`.
-Content contributed to this repository before commit 87c70a89a67d0521a56388e6b1c3f2cb947943e4 is licensed under the MIT license, unless otherwise stated. See `LICENSE-MIT.txt`.
+Content contributed to this repository after commit 87c70a89a67d0521a56388e6b1c3f2cb947943e4 (`17 February 2024 23:00:00 UTC`) is licensed under the GNU Affero General Public License version 3.0 unless otherwise stated.
+See [LICENSE-AGPLv3](https://github.com/Simple-Station/Einstein-Engines/blob/master/LICENSE-AGPLv3.txt).
-[87c70a89a67d0521a56388e6b1c3f2cb947943e4](https://github.com/DeltaV-Station/Delta-v/commit/87c70a89a67d0521a56388e6b1c3f2cb947943e4) was pushed on February 17th 2024 at 21:48 UTC
+Content contributed to this repository before commit 87c70a89a67d0521a56388e6b1c3f2cb947943e4 (`17 February 2024 23:00:00 UTC`) is licensed under the MIT license unless otherwise stated.
+See [LICENSE-MIT](https://github.com/Simple-Station/Einstein-Engines/blob/master/LICENSE-MIT.txt).
-Most assets are licensed under [CC-BY-SA 3.0](https://creativecommons.org/licenses/by-sa/3.0/) unless stated otherwise. Assets have their license and the copyright in the metadata file. [Example](https://github.com/DeltaV-Station/Delta-v/blob/master/Resources/Textures/Objects/Tools/crowbar.rsi/meta.json).
+Most assets are licensed under [CC-BY-SA 3.0](https://creativecommons.org/licenses/by-sa/3.0/) unless stated otherwise. Assets have their license and the copyright in the metadata file.
+[Example](https://github.com/Simple-Station/Einstein-Engines/blob/master/Resources/Textures/Objects/Tools/crowbar.rsi/meta.json).
Note that some assets are licensed under the non-commercial [CC-BY-NC-SA 3.0](https://creativecommons.org/licenses/by-nc-sa/3.0/) or similar non-commercial licenses and will need to be removed if you wish to use this project commercially.
diff --git a/Resources/Prototypes/Entities/Clothing/Uniforms/base_clothinguniforms.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/base_clothinguniforms.yml
index 9a5e0211f36..9f98e396ca9 100644
--- a/Resources/Prototypes/Entities/Clothing/Uniforms/base_clothinguniforms.yml
+++ b/Resources/Prototypes/Entities/Clothing/Uniforms/base_clothinguniforms.yml
@@ -62,3 +62,5 @@
- type: Tag #DeltaV, needed for species with nonhuman legs/can only wear skirts
tags:
- Skirt
+ - ClothMade
+ - WhitelistChameleon
diff --git a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml
index 9a8c1c2a5c9..d98207da371 100644
--- a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml
+++ b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml
@@ -276,11 +276,6 @@
controlsLocked: true
randomMode: false
mode: SensorCords
- - type: Tag
- tags:
- - ClothMade
- - WhitelistChameleon
- - PrisonUniform
- type: entity
parent: ClothingUniformSkirtBase
diff --git a/Resources/Prototypes/lobbyscreens.yml b/Resources/Prototypes/lobbyscreens.yml
index bd5fe50e99d..5d78c30c0f8 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 97fa15cccc7..00000000000
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 111ae6307d5..00000000000
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 81c4ccb1812..00000000000
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 a2c8d339ff4..00000000000
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 99bc7f987dc..00000000000
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 aae76e7feee..00000000000
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 5bbbdb12c65..00000000000
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 eb4951ae1ad..00000000000
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 c0866c3374a..0e890ec893c 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 00000000000..5c43e233050
--- /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 00000000000..50f88f55a21
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 00000000000..58a7313b238
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 00000000000..dabd6601f78
--- /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 4674b9d4034..00000000000
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 00000000000..0ee24d88be4
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 0b413711fb2..00000000000
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 00000000000..43d32581cfa
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 00000000000..dabd6601f78
--- /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 00000000000..09bcf5b2f71
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 00000000000..dabd6601f78
--- /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 00000000000..32e248f8021
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 00000000000..dabd6601f78
--- /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 00000000000..d5fb190ae6c
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 00000000000..dabd6601f78
--- /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 00000000000..c30abb46704
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 00000000000..dabd6601f78
--- /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 00000000000..997bd6701c0
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 00000000000..51ff40335ef
--- /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 7cf7e10c1c6..585694e728e 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 3d8f808c8e1..d47c6011446 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..99315583c6f 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 c51db1a5e81..a858e42c0a4 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..dd06c6101fe 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..67f3b4ec712 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..4c3d0f84b02 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..4641a115dbb 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..531d78609fa 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..d14b0314ee7 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..4c3d0f84b02 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 733930fae3d..6885a736a6d 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 c5f5b5e6074..41be5508aed 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..c6eadc64204 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
