Merge remote-tracking branch 'origin/master' into parkstation

.envrc

@@ -1,4 +1,4 @@
-if ! has nix_direnv_version || ! nix_direnv_version 2.3.0; then
-    source_url "https://raw.githubusercontent.com/nix-community/nix-direnv/2.3.0/direnvrc" "sha256-Dmd+j63L84wuzgyjITIfSxSD57Tx7v51DMxVZOsiUD8="
+if ! has nix_direnv_version || ! nix_direnv_version 3.0.4; then
+    source_url "https://raw.githubusercontent.com/nix-community/nix-direnv/3.0.4/direnvrc" "sha256-DzlYZ33mWF/Gs8DDeyjr8mnVmQGx7ASYqA5WlxwvBG4="
 fi
 use flake

.github/CODEOWNERS

@@ -4,19 +4,19 @@
 
 
 /Content.*/ @DEATHB4DEFEAT
-/Content.*/SimpleStation14/ @Pspritechologist @DEATHB4DEFEAT
+/Content.*/Parkstation/ @Pspritechologist @DEATHB4DEFEAT
 
 
 /Resources/ @DEATHB4DEFEAT
 
-/Resources/Audio/SimpleStation14 @Pspritechologist @DEATHB4DEFEAT
+/Resources/Audio/Parkstation @Pspritechologist @DEATHB4DEFEAT
 
 /Resources/Maps/ @Pspritechologist @DEATHB4DEFEAT
 
 /Resources/Prototypes/Maps @Pspritechologist @DEATHB4DEFEAT
-/Resources/Prototypes/SimpleStation14/ @Pspritechologist @DEATHB4DEFEAT
+/Resources/Prototypes/Parkstation/ @Pspritechologist @DEATHB4DEFEAT
 
-/Resources/Textures/SimpleStation14/ @Pspritechologist @DEATHB4DEFEAT
+/Resources/Textures/Parkstation/ @Pspritechologist @DEATHB4DEFEAT
 
 *.ftl @Pspritechologist @DEATHB4DEFEAT
 

.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.

.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: ''
+
+---
+
+<!--
+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)

.github/ISSUE_TEMPLATE/issue_report.md

@@ -1,32 +1,55 @@
 ---
 name: Report an Issue
-about: "..."
+about: "Any general issues you have during play or with the codebase"
 title: ''
 labels: ''
 assignees: ''
 
 ---
 
+<!--
+This is a loose format, write this however you need to
+Remove these comments before submitting
+-->
+
 # Description
 <!--
-Explain your issue in detail.
-Issues without proper explanation are liable to be closed by maintainers.
+Explain your issue in detail
+Issues without proper explanation are liable to be closed by maintainers
 -->
 
+Description
+
 # Reproduction
 <!--
-Include the steps to reproduce if applicable.
-Try to be as descriptive as possible.
+Include the steps to reproduce if applicable
+Try to be as descriptive as possible
 -->
 
-# Screenshots
+1. Open game
+2. Game doesn't open
+
+# Expected behavior
 <!--
-If applicable, add screenshots to help explain your problem.
-A video of the reproduction would also be useful.
+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.
+Add any other context about the problem here
+Anything you think is related to the issue
 -->
+
+There's a ghost in my computer

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,20 +1,46 @@
+<!--
+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
+-->
+
 # Description
 
+<!--
+Explain this PR in as much detail as applicable
+
+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]?
+-->
+
 Description.
 
 ---
 
 # 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
+-->
+
 - [ ] Task
 - [x] Completed Task
 
 ---
 
+<!--
+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
+-->
+
 <details><summary><h1>Media</h1></summary>
 <p>
 
-<!-- ![Example Media Embed](https://example.com/thisimageisntreal.png) -->
+![Example Media Embed](https://example.com/thisimageisntreal.png)
 
 </p>
 </details>
@@ -23,10 +49,14 @@ Description.
 
 # Changelog
 
-<!-- You can add an author after the `:cl:` to change the name that appears in the changelog, ex: `:cl: Death`, it will default to your GitHub display name -->
+<!--
+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
+-->
 
 :cl:
-- add: Added fun!
-- tweak: Tweaked fun!
+- add: Added fun :D
+- tweak: Tweaked fun
 - fix: Fixed fun!
-- remove: Removed fun!
+- remove: Removed fun :(

.github/labeler.yml

@@ -1,6 +1,18 @@
-"Changes: C#":
+"Changes: Audio":
+  - "**/*.ogg"
+
+"Changes: C#":
   - "**/*.cs"
 
+"Changes: Config":
+  - "**/*.toml"
+  - "**/*.config"
+  - "*.json"
+  - ".github/*.yml"
+  - ".github/*.json"
+  - ".vscode/*.json"
+  - ".editorconfig"
+
 "Changes: Documentation":
   - "**/*.xml"
   - "**/*.md"
@@ -22,3 +34,6 @@
 "Changes: YML":
   - any: ["**/*.yml"]
     all: ["!Resources/Maps/**/*.yml", "!Resources/Prototypes/Maps/**/*.yml"]
+
+"Changes: Workflow":
+  - ".github/workflows/*.yml"

.github/workflows/build-docfx.yml

@@ -21,7 +21,7 @@ jobs:
     - name: Setup .NET Core
       uses: actions/[email protected]
       with:
-        dotnet-version: 8.0.x
+        dotnet-version: 8.0.100
 
     - name: Install dependencies
       run: dotnet restore

.github/workflows/build-map-renderer.yml

@@ -10,7 +10,7 @@ on:
 
 jobs:
   build:
-    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'
     strategy:
       matrix:
         os: [ubuntu-latest]
@@ -36,7 +36,7 @@ jobs:
       - name: Setup .NET Core
         uses: actions/[email protected]
         with:
-          dotnet-version: 8.0.x
+          dotnet-version: 8.0.100
 
       - name: Install dependencies
         run: dotnet restore

.github/workflows/build-test-debug.yml

@@ -10,7 +10,7 @@ on:
 
 jobs:
   build:
-    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'
     strategy:
       matrix:
         os: [ubuntu-latest]
@@ -36,7 +36,7 @@ jobs:
     - name: Setup .NET Core
       uses: actions/[email protected]
       with:
-        dotnet-version: 8.0.x
+        dotnet-version: 8.0.100
 
     - name: Install dependencies
       run: dotnet restore

.github/workflows/close-master-pr.yml

@@ -1,4 +1,4 @@
-name: Close PR's on master
+name: Close PRs on master
 
 on:
   pull_request_target:
@@ -12,7 +12,7 @@ jobs:
     steps:    
     - uses: superbrothers/close-pull-request@v3
       with:
-        comment: "Thank you for contributing to the Space Station 14 repository. Unfortunately, it looks like you submitted your pull request from the master branch. We suggest you follow [our git usage documentation](https://docs.spacestation14.com/en/general-development/setup/git-for-the-ss14-developer.html) \n\n You can move your current work from the master branch to another branch by doing `git branch <branch_name` and resetting the master branch."
+        comment: "Thank you for contributing to our repository. Unfortunately, it looks like you submitted your pull request from the master branch. We suggest you follow [the git usage documentation](https://docs.spacestation14.com/en/general-development/setup/git-for-the-ss14-developer.html). \n\n You can move your current work from the master branch to another branch by [branching](https://git-scm.com/docs/git-branch) from and [resetting](https://git-scm.com/docs/git-reset) the master branch."
 
     # If you prefer to just comment on the pr and not close it, uncomment the bellow and comment the above
 

.github/workflows/conflict-labeler.yml

@@ -8,7 +8,7 @@ on:
 
 jobs:
   Label:
-    if: github.actor != 'PJBot' && github.actor != 'DeltaV-Bot'
+    if: github.actor != 'PJBot' && github.actor != 'DeltaV-Bot' && github.actor != 'SimpleStation14'
     runs-on: ubuntu-latest
     steps:
       - name: Check for Merge Conflicts

.github/workflows/labeler-pr.yml

@@ -5,7 +5,7 @@ on:
 
 jobs:
   labeler:
-    if: github.actor != 'PJBot' && github.actor != 'DeltaV-Bot'
+    if: github.actor != 'PJBot' && github.actor != 'DeltaV-Bot' && github.actor != 'SimpleStation14'
     runs-on: ubuntu-latest
     steps:
     - uses: actions/labeler@v3

.github/workflows/publish.yml

@@ -22,7 +22,7 @@ jobs:
     - name: Setup .NET Core
       uses: actions/[email protected]
       with:
-        dotnet-version: 8.0.x
+        dotnet-version: 8.0.100
 
     - name: Get Engine Tag
       run: |
@@ -67,7 +67,7 @@ jobs:
         username: ${{ secrets.PUBLISH_USER }}
         key: ${{ secrets.PUBLISH_KEY }}
         port: ${{ secrets.PUBLISH_PORT }}
-        script: /home/${{ secrets.PUBLISH_USER }}/publish/push.ps1 ${{ github.sha }}
+        script: /home/deltav/publish/push.ps1 ${{ github.sha }}
 
     - name: Publish changelog (Discord)
       run: Tools/actions_changelogs_since_last_run.py

.github/workflows/test-packaging.yml

@@ -29,7 +29,7 @@ on:
 jobs:
   build:
     name: Test Packaging
-    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:
@@ -51,7 +51,7 @@ jobs:
       - name: Setup .NET Core
         uses: actions/[email protected]
         with:
-          dotnet-version: 8.0.x
+          dotnet-version: 8.0.100
 
       - name: Install dependencies
         run: dotnet restore

.github/workflows/update-credits.yml

@@ -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}}

.github/workflows/validate-rgas.yml

@@ -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]

.github/workflows/validate_mapfiles.yml

@@ -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]