Merge pull request #312 from ekrixi-14/evil-branch-DO_NOT_USE-DO_NOT_USE

Pull upstream to latest-ish master

.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 ####
 
@@ -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,27 +318,32 @@ 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

.github/CODEOWNERS

@@ -15,6 +15,7 @@
 /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
 
@@ -23,19 +24,20 @@
 /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.*/Anomaly/ @EmoGarbage404
+/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
+/Resources/Prototypes/Entities/Structures/Specific/anomalies.yml @EmoGarbage404 @TheShuEd
 /Resources/Prototypes/Research/ @EmoGarbage404
 
 /Content.*/Forensics/ @ficcialfaint

.github/labeler.yml

@@ -1,15 +1,18 @@
-"sprites":
-- '**/*.rsi/*.png'
+"sprites":
+- changed-files:
+  - any-glob-to-any-file: '**/*.rsi/*.png'
 
 "map":
-- 'Resources/Maps/*.yml'
-- 'Resources/Prototypes/Maps/*.yml'
+- changed-files:
+  - any-glob-to-any-file:
+    - 'Resources/Maps/*.yml'
+    - 'Resources/Prototypes/Maps/*.yml'
 
 "ui":
-- '**/*.xaml*'
+- changed-files:
+  - any-glob-to-any-file: '**/*.xaml*'
 
 "no C#":
-- all: ["!**/*.cs"]
-
-"ctv pr":
-- base-branch: ["cross-the-veil"]
+- changed-files:
+  # Equiv to any-glob-to-all as long as this has one matcher. If ALL changed files are not C# files, then apply label.
+  - all-globs-to-all-files: "!**/*.cs"

.github/workflows/check-crlf.yml

@@ -0,0 +1,15 @@
+name: CRLF Check
+
+on:
+  pull_request:
+    types: [ opened, reopened, synchronize, ready_for_review ]
+
+jobs:
+  build:
+    name: CRLF Check
+    if: github.event.pull_request.draft == false
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/[email protected]
+    - name: Check for CRLF
+      run: Tools/check_crlf.py

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

.github/workflows/conflict-labeler.yml

@@ -1,18 +1,20 @@
 name: Check Merge Conflicts
 
 on:
-  push:
-    branches:
-      - master
   pull_request_target:
+    types:
+      - opened
+      - synchronize
+      - reopened
+      - ready_for_review
 
 jobs:
   Label:
-    if: github.actor != 'PJBot'
+    if: ( github.event.pull_request.draft == false ) && ( github.actor != 'PJBot' )
     runs-on: ubuntu-latest
     steps:
       - name: Check for Merge Conflicts
-        uses: ike709/actions-label-merge-conflict@9eefdd17e10566023c46d2dc6dc04fcb8ec76142
+        uses: eps1lon/actions-label-merge-conflict@v3.0.0
         with:
           dirtyLabel: "Merge Conflict"
           repoToken: "${{ secrets.GITHUB_TOKEN }}"

.github/workflows/labeler-pr.yml

@@ -6,11 +6,12 @@ on:
 jobs:
   labeler:
     if: github.actor != 'PJBot'
+    permissions:
+      contents: read
+      pull-requests: write
     runs-on: ubuntu-latest
     permissions:
       contents: read
       pull-requests: write
     steps:
-    - uses: actions/labeler@v3
-      with:
-        repo-token: "${{ secrets.GITHUB_TOKEN }}"
+    - uses: actions/labeler@v5

.github/workflows/labeler-untriaged.yml

@@ -0,0 +1,13 @@
+name: "Labels: Untriaged"
+
+on:
+  issues:
+    types: [opened]
+
+jobs:
+  add_label:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions-ecosystem/action-add-labels@v1
+      with:
+        labels: "Status: Untriaged"