Merge branch 'master' of https://github.com/Lokey82/frontier-station-14

.editorconfig

@@ -1,4 +1,5 @@
 root = true
+
 [*]
 
 charset = utf-8
@@ -12,6 +13,7 @@ tab_width = 4
 #end_of_line = crlf
 insert_final_newline = true
 trim_trailing_whitespace = true
+max_line_length = 120
 
 #### .NET Coding Conventions ####
 
@@ -127,7 +129,7 @@ csharp_indent_braces = false
 csharp_indent_switch_labels = true
 
 # Space preferences
-csharp_space_after_cast = true
+csharp_space_after_cast = false
 csharp_space_after_colon_in_inheritance_clause = true
 csharp_space_after_comma = true
 csharp_space_after_dot = false
@@ -277,7 +279,7 @@ dotnet_naming_style.t_upper_camel_case_style.capitalization = pascal_case
 dotnet_naming_style.t_upper_camel_case_style.required_prefix = T
 dotnet_naming_style.upper_camel_case_style.capitalization = pascal_case
 
-dotnet_naming_symbols.constants_symbols.applicable_accessibilities = public,internal,protected,protected_internal,private_protected
+dotnet_naming_symbols.constants_symbols.applicable_accessibilities = public, internal, protected, protected_internal, private_protected
 dotnet_naming_symbols.constants_symbols.applicable_kinds = field
 dotnet_naming_symbols.constants_symbols.required_modifiers = const
 
@@ -316,29 +318,37 @@ dotnet_naming_symbols.private_static_fields_symbols.required_modifiers = static
 
 dotnet_naming_symbols.private_static_readonly_symbols.applicable_accessibilities = private
 dotnet_naming_symbols.private_static_readonly_symbols.applicable_kinds = field
-dotnet_naming_symbols.private_static_readonly_symbols.required_modifiers = static,readonly
+dotnet_naming_symbols.private_static_readonly_symbols.required_modifiers = static, readonly
 
 dotnet_naming_symbols.property_symbols.applicable_accessibilities = *
 dotnet_naming_symbols.property_symbols.applicable_kinds = property
 
-dotnet_naming_symbols.public_fields_symbols.applicable_accessibilities = public,internal,protected,protected_internal,private_protected
+dotnet_naming_symbols.public_fields_symbols.applicable_accessibilities = public, internal, protected, protected_internal, private_protected
 dotnet_naming_symbols.public_fields_symbols.applicable_kinds = field
 
-dotnet_naming_symbols.static_readonly_symbols.applicable_accessibilities = public,internal,protected,protected_internal,private_protected
+dotnet_naming_symbols.static_readonly_symbols.applicable_accessibilities = public, internal, protected, protected_internal, private_protected
 dotnet_naming_symbols.static_readonly_symbols.applicable_kinds = field
-dotnet_naming_symbols.static_readonly_symbols.required_modifiers = static,readonly
+dotnet_naming_symbols.static_readonly_symbols.required_modifiers = static, readonly
 
 dotnet_naming_symbols.types_and_namespaces_symbols.applicable_accessibilities = *
-dotnet_naming_symbols.types_and_namespaces_symbols.applicable_kinds = namespace,class,struct,enum,delegate
+dotnet_naming_symbols.types_and_namespaces_symbols.applicable_kinds = namespace, class, struct, enum, delegate
 
 dotnet_naming_symbols.type_parameters_symbols.applicable_accessibilities = *
 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
+resharper_csharp_trailing_comma_in_multiline_lists = true
+
+[*.{csproj,xml,yml,yaml,dll.config,msbuildproj,targets,props}]
+indent_size = 2
 
-[*.{csproj,xml,yml,yaml,dll.config,msbuildproj,targets}]
+[nuget.config]
 indent_size = 2
 
 [{*.yaml,*.yml}]

.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

@@ -2,64 +2,63 @@
 
 # Sorting by path instead of by who added it one day :(
 # this isn't how codeowners rules work pls read the first comment instead of trying to force a sorting order
-/Resources/ConfigPresets/WizardsDen/  @Chief-Engineer
+#/Resources/ConfigPresets/WizardsDen/  @Chief-Engineer
 
 # Moony's Gargantuan List Of Things She Cares About, or MGLOTSCA for short.
 # You need to add your name to these entries, not make a new one, if you care about them.
-/Content.*/Toolshed/ @moonheart08
-**/Toolshed/** @moonheart08
-*Command.cs @moonheart08
-/Content.*/Administration/ @moonheart08 @DrSmugleaf @Chief-Engineer
-/Content.*/Station/ @moonheart08
-/Content.*/Maps/ @moonheart08
-/Content.*/GameTicking/ @moonheart08 @EmoGarbage404
-/Resources/ServerInfo/ @moonheart08 @Chief-Engineer
-/Resources/ServerInfo/Guidebook/ @moonheart08 @EmoGarbage404
-/Resources/engineCommandPerms.yml @moonheart08 @Chief-Engineer
-/Resources/clientCommandPerms.yml @moonheart08 @Chief-Engineer
+#/Content.*/Toolshed/ @moonheart08
+#**/Toolshed/** @moonheart08
+#*Command.cs @moonheart08
+#/Content.*/Administration/ @moonheart08 @DrSmugleaf @Chief-Engineer
+#/Content.*/Station/ @moonheart08
+#/Content.*/Maps/ @moonheart08
+#/Content.*/GameTicking/ @moonheart08 @EmoGarbage404
+#/Resources/ServerInfo/ @moonheart08 @Chief-Engineer
+#/Resources/ServerInfo/Guidebook/ @moonheart08 @EmoGarbage404
+#/Resources/ServerInfo/Guidebook/ServerRules/ @Chief-Engineer
+#/Resources/engineCommandPerms.yml @moonheart08 @Chief-Engineer
+#/Resources/clientCommandPerms.yml @moonheart08 @Chief-Engineer
 
-/Resources/Prototypes/Maps/ @Emisse
+#/Resources/Prototypes/Maps/ @Emisse
 
-/Resources/Prototypes/Body/ @DrSmugleaf # suffering
-/Resources/Prototypes/Entities/Mobs/Player/ @DrSmugleaf
-/Resources/Prototypes/Entities/Mobs/Species/ @DrSmugleaf
-/Content.*/Body/ @DrSmugleaf
-/Content.YAMLLinter @DrSmugleaf
+#/Resources/Prototypes/Body/ @DrSmugleaf # suffering
+#/Resources/Prototypes/Entities/Mobs/Player/ @DrSmugleaf
+#/Resources/Prototypes/Entities/Mobs/Species/ @DrSmugleaf
+#/Resources/Prototypes/Guidebook/rules.yml @Chief-Engineer
+#/Content.*/Body/ @DrSmugleaf
+#/Content.YAMLLinter @DrSmugleaf
+#/Content.Shared/Damage/ @DrSmugleaf
 
-/Content.*/Verbs/ @ElectroJr
-/Content.Client/ContextMenu/ @ElectroJr
-/Content.Shared/Damage/ @ElectroJr @DrSmugleaf
-/Content.Shared/Containers/ItemSlot/ @ElectroJr
-/Content.*/PowerCell/ @ElectroJr
-/Content.*/Doors/ @ElectroJr
-/Content.*/Interaction/ @ElectroJr
-/Content.*/Hands/ @ElectroJr
-/Content.*/Actions/ @ElectroJr
-/Content.*/Explosion/ @ElectroJr
+#/Content.*/Anomaly/ @EmoGarbage404 @TheShuEd
+#/Content.*/Lathe/ @EmoGarbage404
+#/Content.*/Materials/ @EmoGarbage404
+#/Content.*/Mech/ @EmoGarbage404
+#/Content.*/Research/ @EmoGarbage404
+#/Content.*/Stack/ @EmoGarbage404
+#/Content.*/Xenoarchaeology/ @EmoGarbage404
+#/Content.*/Zombies/ @EmoGarbage404
+#/Resources/Prototypes/Entities/Structures/Specific/anomalies.yml @EmoGarbage404 @TheShuEd
+#/Resources/Prototypes/Research/ @EmoGarbage404
 
-/Content.*/Anomaly/ @EmoGarbage404
-/Content.*/Lathe/ @EmoGarbage404
-/Content.*/Materials/ @EmoGarbage404
-/Content.*/Mech/ @EmoGarbage404
-/Content.*/Research/ @EmoGarbage404
-/Content.*/Stack/ @EmoGarbage404
-/Content.*/Xenoarchaeology/ @EmoGarbage404
-/Content.*/Zombies/ @EmoGarbage404
-/Resources/Prototypes/Entities/Structures/Specific/anomalies.yml @EmoGarbage404
-/Resources/Prototypes/Research/ @EmoGarbage404
-
-/Content.*/Forensics/ @ficcialfaint
+#/Content.*/Forensics/ @ficcialfaint
 
 # SKREEEE
-/Content.*.Database/ @PJB3005 @DrSmugleaf
-/Content.Shared.Database/Log*.cs @PJB3005 @DrSmugleaf @Chief-Engineer
-/Pow3r/ @PJB3005
-/Content.Server/Power/Pow3r/ @PJB3005
+#/Content.*.Database/ @PJB3005 @DrSmugleaf
+#/Content.Shared.Database/Log*.cs @PJB3005 @DrSmugleaf @Chief-Engineer
+#/Pow3r/ @PJB3005
+#/Content.Server/Power/Pow3r/ @PJB3005
 
 # notafet
-/Content.*/Atmos/ @Partmedia
-/Content.*/Botany/ @Partmedia
+#/Content.*/Atmos/ @Partmedia
+#/Content.*/Botany/ @Partmedia
 
 #Jezi
-/Content.*/Medical @Jezithyr
-/Content.*/Body @Jezithyr
+#/Content.*/Medical @Jezithyr
+#/Content.*/Body @Jezithyr
+
+# Sloth
+#/Content.*/Audio @metalgearsloth
+#/Content.*/Movement @metalgearsloth
+#/Content.*/NPC @metalgearsloth
+#/Content.*/Shuttles @metalgearsloth
+#/Content.*/Weapons @metalgearsloth

.github/CODEOWNERS.txt

@@ -0,0 +1,94 @@
+# Last match in file takes precedence.
+
+# Sorting by path instead of by who added it one day :(
+# this isn't how codeowners rules work pls read the first comment instead of trying to force a sorting order
+#/Resources/ConfigPresets/WizardsDen/  @Chief-Engineer
+
+# Moony's Gargantuan List Of Things She Cares About, or MGLOTSCA for short.
+# You need to add your name to these entries, not make a new one, if you care about them.
+#/Content.*/Toolshed/ @moonheart08
+#**/Toolshed/** @moonheart08
+#*Command.cs @moonheart08
+#/Content.*/Administration/ @moonheart08 @DrSmugleaf @Chief-Engineer
+#/Content.*/Station/ @moonheart08
+#/Content.*/Maps/ @moonheart08
+#/Content.*/GameTicking/ @moonheart08 @EmoGarbage404
+#/Resources/ServerInfo/ @moonheart08 @Chief-Engineer
+#/Resources/ServerInfo/Guidebook/ @moonheart08 @EmoGarbage404
+#/Resources/engineCommandPerms.yml @moonheart08 @Chief-Engineer
+#/Resources/clientCommandPerms.yml @moonheart08 @Chief-Engineer
+
+#/Resources/Prototypes/Maps/ @Emisse
+
+#/Resources/Prototypes/Body/ @DrSmugleaf # suffering
+#/Resources/Prototypes/Entities/Mobs/Player/ @DrSmugleaf
+#/Resources/Prototypes/Entities/Mobs/Species/ @DrSmugleaf
+#/Content.*/Body/ @DrSmugleaf
+#/Content.YAMLLinter @DrSmugleaf
+#/Content.Shared/Damage/ @DrSmugleaf
+
+#/Content.*/Anomaly/ @EmoGarbage404
+#/Content.*/Lathe/ @EmoGarbage404
+#/Content.*/Materials/ @EmoGarbage404
+#/Content.*/Mech/ @EmoGarbage404
+#/Content.*/Research/ @EmoGarbage404
+#/Content.*/Stack/ @EmoGarbage404
+#/Content.*/Xenoarchaeology/ @EmoGarbage404
+#/Content.*/Zombies/ @EmoGarbage404
+#/Resources/Prototypes/Entities/Structures/Specific/anomalies.yml @EmoGarbage404
+#/Resources/Prototypes/Research/ @EmoGarbage404
+
+#/Content.*/Forensics/ @ficcialfaint
+
+# SKREEEE
+#/Content.*.Database/ @PJB3005 @DrSmugleaf
+#/Content.Shared.Database/Log*.cs @PJB3005 @DrSmugleaf @Chief-Engineer
+#/Pow3r/ @PJB3005
+#/Content.Server/Power/Pow3r/ @PJB3005
+
+# notafet
+#/Content.*/Atmos/ @Partmedia
+#/Content.*/Botany/ @Partmedia
+
+#Jezi
+#/Content.*/Medical @Jezithyr
+#/Content.*/Body @Jezithyr
+
+## Frontier goes here:
+
+# Config files
+/Resources/ConfigPresets/* @Cheackraze
+
+# Mapchecker
+/.github/mapchecker/* @TsjipTsjip
+/.github/workflows/frontier-mapchecker.yml @TsjipTsjip
+
+# All maps
+/Resources/Maps/_NF/* @MagnusCrowe
+/Resources/Prototypes/_NF/Shipyard/* @MagnusCrowe
+
+# Bluespace Events
+/Resources/Maps/_NF/Bluespace/asteroidbunker.yml @MagnusCrowe @FoxxoTrystan
+/Resources/Maps/_NF/Bluespace/asteroidvault.yml @MagnusCrowe @FoxxoTrystan
+
+# Shuttles
+# McCargo
+/Resources/Maps/_NF/Shuttles/mccargo.yml @MagnusCrowe @dvir001
+/Resources/Prototypes/_NF/Shipyard/mccargo.yml @MagnusCrowe @dvir001
+# McDelivery
+/Resources/Maps/_NF/Shuttles/mcdelivery.yml @MagnusCrowe @dvir001
+/Resources/Prototypes/_NF/Shipyard/mcdelivery.yml @MagnusCrowe @dvir001
+# Hunter
+/Resources/Maps/_NF/Shuttles/hunter.yml @MagnusCrowe @FoxxoTrystan
+/Resources/Prototypes/_NF/Shipyard/hunter.yml @MagnusCrowe @FoxxoTrystan
+# Infiltrator
+/Resources/Maps/_NF/Shuttles/infiltrator.yml @MagnusCrowe @FoxxoTrystan
+/Resources/Prototypes/_NF/Shipyard/infiltrator.yml @MagnusCrowe @FoxxoTrystan
+
+# Races - Trystan wanted a ping on this
+/Resources/Prototypes/Entities/Mobs/Player/* @FoxxoTrystan
+/Resources/Prototypes/Entities/Mobs/Species/* @FoxxoTrystan
+/Resources/Prototypes/DeltaV/Entities/Mobs/Species/* @FoxxoTrystan
+/Resources/Prototypes/DeltaV/Entities/Mobs/Player/* @FoxxoTrystan
+/Resources/Prototypes/_Nyano/Entities/Mobs/Species/* @FoxxoTrystan
+/Resources/Prototypes/_Nyano/Entities/Mobs/Player/* @FoxxoTrystan

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,40 +1,34 @@
-<!-- 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. -->
+<!-- Guidelines: https://docs.spacestation14.io/en/getting-started/pr-guideline -->
 
 ## About the PR
-<!-- What did you change in this PR? -->
+<!-- What did you change? -->
+<!-- If this is a code change, summarize at high level how your new code works. This makes it easier to review. -->
 
 ## Why / Balance
-<!-- Why was it changed? Link any discussions or issues here. Please discuss how this would affect game balance. -->
+<!-- Discuss how this would affect game balance or explain why it was changed. Link any relevant discussions or issues. -->
 
-## Technical details
-<!-- If this is a code change, summarize at high level how your new code works. This makes it easier to review. -->
+## How to test
+<!-- Describe the way it can be tested -->
 
 ## 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.
-
-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]):
--->
+<!-- Attach media if the PR makes ingame changes (clothing, items, features, etc). 
+Small fixes/refactors are exempt. Media may be used in SS14 progress reports with credit. -->
 
-- [ ] I have added screenshots/videos to this PR showcasing its changes ingame, **or** this PR does not require an ingame showcase
+## Requirements
+<!-- Confirm the following by placing an X in the brackets [X]: -->
+- [ ] I have read and am following the [Pull Request and Changelog Guidelines](https://docs.spacestation14.com/en/general-development/codebase-info/pull-request-guidelines.html).
+- [ ] I have added media to this PR or it does not require an ingame showcase.
+<!-- You should understand that not following the above may get your PR closed at maintainer’s discretion -->
 
 ## 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.
--->
+<!-- List any breaking changes, including namespaces, public class/method/field changes, prototype renames; and provide instructions for fixing them.
+This will be posted in #codebase-changes. -->
 
 **Changelog**
+<!-- Add a Changelog entry to make players aware of new features or changes that could affect gameplay.
+Make sure to read the guidelines and take this Changelog template out of the comment block in order for it to show up.
+Changelog must have a :cl: symbol, so the bot recognizes the changes and adds them to the game's 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
--->
-
-<!--
-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!