Skip to content

Commit

Permalink
Merge branch 'medal-fixes' of https://github.com/DangerRevolution/Ein…
Browse files Browse the repository at this point in the history
…stein-Engines into medal-fixes
  • Loading branch information
DangerRevolution committed Mar 19, 2024
2 parents 72bf70a + a055a39 commit 806db80
Show file tree
Hide file tree
Showing 56 changed files with 1,064 additions and 795 deletions.
15 changes: 1 addition & 14 deletions .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
@@ -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
5 changes: 1 addition & 4 deletions .github/ISSUE_TEMPLATE/config.yml
Original file line number Diff line number Diff line change
@@ -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.
27 changes: 27 additions & 0 deletions .github/ISSUE_TEMPLATE/feature_request.md
Original file line number Diff line number Diff line change
@@ -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: ''

---

<!--
This is a loose format, write this however you need to
Remove these comments before submitting
-->

# Description
<!--
Explain your request in as much detail as you can
-->

I want Goldfish crackers

# Media
<!--
If applicable, add images or even a video to help explain your suggestion
-->

![Example Screenshot](https://example.com/thisimageisntreal.png)
53 changes: 44 additions & 9 deletions .github/ISSUE_TEMPLATE/issue_report.md
Original file line number Diff line number Diff line change
@@ -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
<!-- Explain your issue in detail. Issues without proper explanation are liable to be closed by maintainers. -->
<!--
This is a loose format, write this however you need to
Remove these comments before submitting
-->

**Reproduction**
<!-- Include the steps to reproduce if applicable. -->
# Description
<!--
Explain your issue in detail
Issues without proper explanation are liable to be closed by maintainers
-->

**Screenshots**
<!-- If applicable, add screenshots to help explain your problem. -->
Description

**Additional context**
<!-- Add any other context about the problem here. Anything you think is related to the issue. -->
# Reproduction
<!--
Include the steps to reproduce if applicable
Try to be as descriptive as possible
-->

1. Open game
2. Game doesn't open

# Expected behavior
<!--
What should happen?
Why might this not be happening? / Possible solutions (if you know)
-->

1. Open game
2. Game opens

# Media
<!--
If applicable, add screenshots to help explain your problem
A video of the reproduction would also be useful
-->

![Example Screenshot](https://example.com/thisimageisntreal.png)

# Additional context
<!--
Add any other context about the problem here
Anything you think is related to the issue
-->

There's a ghost in my computer
18 changes: 0 additions & 18 deletions .github/ISSUE_TEMPLATE/toolshed-feature-request.md

This file was deleted.

71 changes: 45 additions & 26 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -1,43 +1,62 @@
<!-- Please read these guidelines before opening your PR: https://docs.spacestation14.io/en/getting-started/pr-guideline -->
<!-- The text between the arrows are comments - they will not be visible on your PR. -->
<!--
This is a semi-strict format, you can add/remove sections as needed but the order/format should be kept the same
Remove these comments before submitting
-->

## About the PR
<!-- What did you change in this PR? -->
# Description

## Why / Balance
<!-- Why was it changed? Link any discussions or issues here. Please discuss how this would affect game balance. -->
<!--
Explain this PR in as much detail as applicable
## Technical details
<!-- If this is a code change, summarize at high level how your new code works. This makes it easier to review. -->
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
<!--
PRs which make ingame changes (adding clothing, items, new features, etc) are required to have media attached that showcase the changes.
Small fixes/refactors are exempt.
Any media may be used in SS14 progress reports, with clear credit given.
Description.

If you're unsure whether your PR will require media, ask a maintainer.
---

Check the box below to confirm that you have in fact seen this (put an X in the brackets, like [X]):
# TODO

<!--
A list of everything you have to do before this PR is "complete"
You probably won't have to complete everything before merging but it's good to leave future references
-->

- [ ] 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
<!--
List any breaking changes, including namespace, public class/method/field changes, prototype renames; and provide instructions for fixing them. This will be pasted in #codebase-changes.
This is default collapsed, readers click to expand it and see all your media
The PR media section can get very large at times, so this is a good way to keep it clean
The title is written using HTML tags
The title must be within the <summary> tags or you won't see it
-->

**Changelog**
<details><summary><h1>Media</h1></summary>
<p>

![Example Media Embed](https://example.com/thisimageisntreal.png)

</p>
</details>

---

# Changelog

<!--
Make players aware of new features and changes that could affect how they play the game by adding a Changelog entry. Please read the Changelog guidelines located at: https://docs.spacestation14.io/en/getting-started/pr-guideline#changelog
You can add an author after the `:cl:` to change the name that appears in the changelog (ex: `:cl: Death`)
Leaving it blank will default to your GitHub display name
This includes all available types for the changelog
-->

<!--
Make sure to take this Changelog template out of the comment block in order for it to show up.
:cl:
- add: Added fun!
- remove: Removed fun!
- tweak: Changed fun!
- add: Added fun :D
- tweak: Tweaked fun
- fix: Fixed fun!
-->
- remove: Removed fun :(
12 changes: 12 additions & 0 deletions .github/labeler.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,15 @@
"Changes: C#":
- "**/*.cs"

"Changes: Config":
- "**/*.toml"
- "**/*.config"
- "*.json"
- ".github/*.yml"
- ".github/*.json"
- ".vscode/*.json"
- ".editorconfig"

"Changes: Documentation":
- "**/*.xml"
- "**/*.md"
Expand All @@ -22,3 +31,6 @@
"Changes: YML":
- any: ["**/*.yml"]
all: ["!Resources/Maps/**/*.yml", "!Resources/Prototypes/Maps/**/*.yml"]

"Changes: Workflow":
- ".github/workflows/*.yml"
2 changes: 1 addition & 1 deletion .github/workflows/changelog.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 4 additions & 4 deletions LEGAL.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
81 changes: 57 additions & 24 deletions README.md
Original file line number Diff line number Diff line change
@@ -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.
<p align="center"><img src="https://raw.githubusercontent.com/Simple-Station/Einstein-Engines/master/Resources/Textures/Logo/splashlogo.png" width="1080px" /></p>

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.
Original file line number Diff line number Diff line change
Expand Up @@ -62,3 +62,5 @@
- type: Tag #DeltaV, needed for species with nonhuman legs/can only wear skirts
tags:
- Skirt
- ClothMade
- WhitelistChameleon
Loading

0 comments on commit 806db80

Please sign in to comment.