Merge branch 'master' of https://github.com/new-frontiers-14/frontier…

…-station-14 into PIRATE-BOOTIES

.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/mapchecker/config.py

@@ -38,13 +38,16 @@
         "Plastitanium",  # Plastitanium walls should only be appearing on security ships.
         "Kammerer", # Opportunity
         "HighSecDoor",
+		"ShuttleGun",
     ],
     "Syndicate": [
         "Plastitanium",  # And also on blackmarket ships cause syndicate.
-	"ButtonFrameCautionSecurity",  # Decal.
+		"ButtonFrameCautionSecurity",  # Decal.
+		"ShuttleGun",
     ],
 	"BlackMarket": [
         "Plastitanium",  # And also on blackmarket ships cause syndicate.
         "ButtonFrameCautionSecurity",  # Decal.
+		"ShuttleGun",
 	]
 }

.github/mapchecker/whitelist.yml

@@ -17,3 +17,7 @@ Trade: true
 # the intention for this list to become empty in separate PR's.
 #DartX:
 #  - HighSecDoor
+Rogue:
+  - ShuttleGunFriendship
+Bottleneck:
+  - PosterLegitPDAAd

.vscode/launch.json

@@ -50,6 +50,16 @@
                 "Client"
             ],
             "preLaunchTask": "build"
+        },
+        // Frontier begin
+        {
+            "name": "Server/Client (Release)",
+            "configurations": [
+                "Server",
+                "Client"
+            ],
+            "preLaunchTask": "build-release"
         }
+        // Frontier end
     ]
-}
+}

.vscode/tasks.json

@@ -21,6 +21,26 @@
             },
             "problemMatcher": "$msCompile"
         },
+        // Frontier begin
+        {
+            "label": "build-release",
+            "command": "dotnet",
+            "type": "shell",
+            "args": [
+                "build",
+                "--configuration=Release", // Build in release mode. Note: --, not /. /configuration doesn't work, because Microsoft.
+                "/property:GenerateFullPaths=true", // Ask dotnet build to generate full paths for file names.
+                "/consoleloggerparameters:NoSummary" // Do not generate summary otherwise it leads to duplicate errors in Problems panel
+            ],
+            "group": {
+                "kind": "build"
+            },
+            "presentation": {
+                "reveal": "silent"
+            },
+            "problemMatcher": "$msCompile"
+        },
+        // Frontier end
         {
             "label": "build-yaml-linter",
             "command": "dotnet",