Merge branch 'master' of https://github.com/Simple-Station/Parkstatio…

…n-Friendly-Chainsaw into pr/Adrian16199/42

.editorconfig

@@ -12,6 +12,7 @@ tab_width = 4
 #end_of_line = crlf
 insert_final_newline = true
 trim_trailing_whitespace = true
+max_line_length = 120
 
 #### .NET Coding Conventions ####
 
@@ -71,7 +72,7 @@ csharp_style_expression_bodied_constructors = false:suggestion
 #csharp_style_expression_bodied_indexers = true:silent
 #csharp_style_expression_bodied_lambdas = true:silent
 #csharp_style_expression_bodied_local_functions = false:silent
-csharp_style_expression_bodied_methods = false:suggestion
+csharp_style_expression_bodied_methods = true:suggestion
 #csharp_style_expression_bodied_operators = false:silent
 csharp_style_expression_bodied_properties = true:suggestion
 
@@ -336,7 +337,11 @@ dotnet_naming_symbols.type_parameters_symbols.applicable_kinds = type_parameter
 
 # ReSharper properties
 resharper_braces_for_ifelse = required_for_multiline
+resharper_csharp_wrap_arguments_style = chop_if_long
+resharper_csharp_wrap_parameters_style = chop_if_long
 resharper_keep_existing_attribute_arrangement = true
+resharper_wrap_chained_binary_patterns = chop_if_long
+resharper_wrap_chained_method_calls = chop_if_long
 
 [*.{csproj,xml,yml,yaml,dll.config,msbuildproj,targets,props}]
 indent_size = 2

.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/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/feature_request.md

@@ -0,0 +1,27 @@
+---
+name: Request a feature
+about: "Please outline your request in Discord first if you aren't a maintainer."
+title: ''
+labels: ["Type: Feature"]
+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: "..."
+name: Report an issue
+about: "Any issues found in gameplay or the codebase"
 title: ''
-labels: ''
+labels: 'Type: Bug'
 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,36 +1,56 @@
-"Changes: C#":
-  - "**/*.cs"
+"Changes: Audio":
+  - changed-files:
+    - any-glob-to-any-file: "**/*.ogg"
+
+"Changes: C#":
+  - changed-files:
+    - any-glob-to-any-file: "**/*.cs"
 
 "Changes: Config":
-  - "**/*.toml"
-  - "**/*.config"
-  - "*.json"
-  - ".github/*.yml"
-  - ".github/*.json"
-  - ".vscode/*.json"
-  - ".editorconfig"
+- changed-files:
+  - any-glob-to-any-file:
+    - "**/*.toml"
+    - "**/*.config"
+    - "*.json"
+    - ".github/*.yml"
+    - ".github/*.json"
+    - ".vscode/*.json"
+    - ".editorconfig"
 
 "Changes: Documentation":
-  - "**/*.xml"
-  - "**/*.md"
+  - changed-files:
+    - any-glob-to-any-file:
+      - "**/*.xml"
+      - "**/*.md"
 
 "Changes: Localization":
-- 'Resources/Locale/**/*.ftl'
+  - changed-files:
+    - any-glob-to-any-file: 'Resources/Locale/**/*.ftl'
 
 "Changes: Map":
-  - "Resources/Maps/**/*.yml"
-  - "Resources/Prototypes/Maps/**/*.yml"
+  - changed-files:
+    - any-glob-to-any-file:
+      - "Resources/Maps/**/*.yml"
+      - "Resources/Prototypes/Maps/**/*.yml"
 
 "Changes: Sprite":
-  - "**/*.rsi/*.png"
-  - "**/*.rsi/*.json"
+  - changed-files:
+    - any-glob-to-any-file:
+      - "**/*.rsi/*.png"
+      - "**/*.rsi/*.json"
 
 "Changes: UI":
-  - "**/*.xaml*"
+  - changed-files:
+    - any-glob-to-any-file: "**/*.xaml*"
 
 "Changes: YML":
-  - any: ["**/*.yml"]
-    all: ["!Resources/Maps/**/*.yml", "!Resources/Prototypes/Maps/**/*.yml"]
+  - changed-files:
+    - any-glob-to-any-file:
+      - "**/*.yml"
+    - all-globs-to-all-files:
+      - "!Resources/Maps/**/*.yml"
+      - "!Resources/Prototypes/Maps/**/*.yml"
 
 "Changes: Workflow":
-  - ".github/workflows/*.yml"
+  - changed-files:
+    - any-glob-to-any-file: ".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