-
Notifications
You must be signed in to change notification settings - Fork 146
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' of https://github.com/Simple-Station/Einstein-E…
…ngines into fix-cl
- Loading branch information
Showing
87 changed files
with
2,915 additions
and
2,154 deletions.
There are no files selected for viewing
Validating CODEOWNERS rules …
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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 |
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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 :( |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -10,7 +10,7 @@ jobs: | |
runs-on: ubuntu-latest | ||
# Hey there fork dev! If you like to include your own contributors in this then you can probably just change this to your own repo | ||
# Do this in dump_github_contributors.ps1 too into your own repo | ||
if: github.repository == 'DeltaV-Station/Delta-v' | ||
if: github.repository == 'Simple-Station/Einstein-Engines' | ||
|
||
steps: | ||
- uses: actions/[email protected] | ||
|
@@ -47,6 +47,6 @@ jobs: | |
with: | ||
commit-message: Update Credits | ||
title: Update Credits | ||
body: This is an automated Pull Request. This PR updates the github contributors in the credits section. | ||
author: DeltaV-Bot <[email protected]> | ||
body: This is an automated Pull Request. This PR updates the GitHub contributors in the credits section. | ||
author: ${{ vars.CHANGELOG_USER }} <${{ vars.CHANGELOG_EMAIL }}> | ||
branch: automated/credits-${{env.NOW}} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -9,7 +9,7 @@ on: | |
jobs: | ||
yaml-schema-validation: | ||
name: YAML RGA schema validator | ||
if: github.actor != 'PJBot' && github.event.pull_request.draft == false && github.actor != 'DeltaV-Bot' | ||
if: github.actor != 'PJBot' && github.event.pull_request.draft == false && github.actor != 'DeltaV-Bot' && github.actor != 'SimpleStation14' | ||
runs-on: ubuntu-latest | ||
steps: | ||
- uses: actions/[email protected] | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -9,7 +9,7 @@ on: | |
jobs: | ||
yaml-schema-validation: | ||
name: YAML map schema validator | ||
if: github.actor != 'PJBot' && github.event.pull_request.draft == false && github.actor != 'DeltaV-Bot' | ||
if: github.actor != 'PJBot' && github.event.pull_request.draft == false && github.actor != 'DeltaV-Bot' && github.actor != 'SimpleStation14' | ||
runs-on: ubuntu-latest | ||
steps: | ||
- uses: actions/[email protected] | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -10,7 +10,7 @@ on: | |
jobs: | ||
build: | ||
name: YAML Linter | ||
if: github.actor != 'PJBot' && github.event.pull_request.draft == false && github.actor != 'DeltaV-Bot' | ||
if: github.actor != 'PJBot' && github.event.pull_request.draft == false && github.actor != 'DeltaV-Bot' && github.actor != 'SimpleStation14' | ||
runs-on: ubuntu-latest | ||
steps: | ||
- uses: actions/[email protected] | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.