Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
…n-Friendly-Chainsaw into pr/Finket/23
  • Loading branch information
DEATHB4DEFEAT committed Aug 20, 2024
2 parents 65e73ff + cc03a47 commit 50d3349
Show file tree
Hide file tree
Showing 9,382 changed files with 221,545 additions and 70,027 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
3 changes: 2 additions & 1 deletion .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ indent_style = space
tab_width = 4

# New line preferences
#end_of_line = crlf
end_of_line = crlf:suggestion
insert_final_newline = true
trim_trailing_whitespace = true

Expand Down Expand Up @@ -104,6 +104,7 @@ csharp_preferred_modifier_order = public, private, protected, internal, new, abs

# 'using' directive preferences
csharp_using_directive_placement = outside_namespace:silent
csharp_style_namespace_declarations = file_scoped:suggestion

#### C# Formatting Rules ####

Expand Down
4 changes: 2 additions & 2 deletions .envrc
Original file line number Diff line number Diff line change
@@ -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
8 changes: 4 additions & 4 deletions .github/ISSUE_TEMPLATE/config.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
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.
- name: Toolshed Feature Request
url: https://github.com/space-wizards/space-station-14/issues/new?assignees=moonheart08&labels=Toolshed&projects=&template=toolshed-feature-request.md&title=%5BTOOLSHED+REQUEST%5D
about: Suggest a feature for Toolshed (for game admins/developers)
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)
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)
43 changes: 33 additions & 10 deletions .github/ISSUE_TEMPLATE/issue_report.md
Original file line number Diff line number Diff line change
@@ -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
18 changes: 0 additions & 18 deletions .github/ISSUE_TEMPLATE/toolshed-feature-request.md

This file was deleted.

40 changes: 35 additions & 5 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -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>
Expand All @@ -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 :(
5 changes: 4 additions & 1 deletion .github/labeler.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
"Changes: C#":
"Changes: Audio":
- "**/*.ogg"

"Changes: C#":
- "**/*.cs"

"Changes: Config":
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build-docfx.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/build-map-renderer.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand All @@ -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
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/build-test-debug.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand All @@ -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
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/changelog.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,14 +35,14 @@ jobs:

- name: Install Dependencies
run: |
cd "Tools/changelog"
cd "Tools/changelogs"
npm install
shell: bash
continue-on-error: true

- name: Generate Changelog
run: |
cd "Tools/changelog"
cd "Tools/changelogs"
node changelog.js
shell: bash
continue-on-error: true
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/close-master-pr.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Close PR's on master
name: Close PRs on master

on:
pull_request_target:
Expand All @@ -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

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/conflict-labeler.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/labeler-pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
34 changes: 34 additions & 0 deletions .github/workflows/prtitlecase.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
name: PR Title Case
on:
pull_request_target:
types: [opened, edited, synchronize]

env:
GITHUB_TOKEN: ${{ secrets.BOT_TOKEN }}
PR_NUMBER: ${{ github.event.pull_request.number }}

jobs:
prtitlecase:
runs-on: ubuntu-latest
steps:
- name: Checkout Master
uses: actions/checkout@v3
with:
token: ${{ secrets.BOT_TOKEN }}

- name: Setup Node
uses: actions/setup-node@v3
with:
node-version: 18.x

- name: Install Dependencies
run: |
cd "Tools/prtitlecase"
npm install
shell: bash

- name: Change Title
run: |
cd "Tools/prtitlecase"
node index.js
shell: bash
Loading

0 comments on commit 50d3349

Please sign in to comment.