Merge remote-tracking branch 'origin/master'

Author: Marty

.editorconfig

@@ -77,6 +77,8 @@ csharp_style_expression_bodied_methods = false:suggestion
 #csharp_style_expression_bodied_operators = false:silent
 csharp_style_expression_bodied_properties = true:suggestion
 
+csharp_style_namespace_declarations = file_scoped:suggestion
+
 # Pattern matching preferences
 #csharp_style_pattern_matching_over_as_with_null_check = true:suggestion
 #csharp_style_pattern_matching_over_is_with_cast_check = true:suggestion

.github/Schemas/mapfile_requirements.txt

@@ -0,0 +1 @@
+pyyaml==6.0.2

.github/Schemas/rga.yml

@@ -0,0 +1,20 @@
+# If this gets updated, make sure to also update https://github.com/space-wizards/RobustToolboxSpecifications
+
+list(include('attribution'), min=1)
+---
+attribution:
+  files: list(str())
+  license: license()
+  copyright: str()
+  source: url()
+
+# Example
+# - files: ["deprecated.png"]
+#   license: "MIT"
+#   copyright: "created by 20kdc"
+#   source: "https://github.com/ParadiseSS13/Paradise"
+# 
+# - files: ["arcadeblue2.png", "boxing.png", "carpetclown.png", "carpetoffice.png", "gym.png", "metaldiamond.png"]
+#   license: "CC-BY-NC-SA-3.0"
+#   copyright: "by WALPVRGIS for Goonstation, taken at commit 236551b95a5b24917c72f3069223026b2dc4e690 from floors.dmi"
+#   source: "https://github.com/goonstation/goonstation"

.github/Schemas/rga_requirements.txt

@@ -0,0 +1,2 @@
+validators
+pyyaml==6.0.2

.github/Schemas/rga_validators.py

@@ -0,0 +1,29 @@
+from yamale.validators import Validator
+import validators
+
+class License(Validator):
+    tag = "license"
+    licenses = [
+        "CC-BY-3.0",
+        "CC-BY-4.0",
+        "CC-BY-SA-3.0",
+        "CC-BY-SA-4.0",
+        "CC-BY-NC-3.0",
+        "CC-BY-NC-4.0",
+        "CC-BY-NC-SA-3.0",
+        "CC-BY-NC-SA-4.0",
+        "CC-BY-ND-4.0",
+        "CC0-1.0",
+        "MIT",
+        "Custom" # implies that the license is described in the copyright field.
+        ]
+
+    def _is_valid(self, value):
+        return value in self.licenses
+
+class Url(Validator):
+    tag = "url"
+
+    def _is_valid(self, value):
+        # Source field is required to ensure its not neglected, but there may be no applicable URL
+        return (value == "NA") or validators.url(value)

.github/workflows/validate-rgas.yml

@@ -35,7 +35,7 @@ jobs:
       uses: space-wizards/submodule-dependency@v0.1.5
     - uses: PaulRitter/yaml-schema-validator@v1
       with:
-        schema: RobustToolbox/Schemas/rga.yml
+        schema: .github/Schemas/rga.yml
         path_pattern: .*attributions.ya?ml$
         validators_path: RobustToolbox/Schemas/rga_validators.py
-        validators_requirements: RobustToolbox/Schemas/rga_requirements.txt
+        validators_requirements: .github/Schemas/rga_requirements.txt

.github/workflows/validate_mapfiles.yml

@@ -37,4 +37,4 @@ jobs:
         schema: RobustToolbox/Schemas/mapfile.yml
         path_pattern: .*Resources/Maps/.*
         validators_path: RobustToolbox/Schemas/mapfile_validators.py
-        validators_requirements: RobustToolbox/Schemas/mapfile_requirements.txt
+        validators_requirements: .github/Schemas/mapfile_requirements.txt

Content.Benchmarks/SpawnEquipDeleteBenchmark.cs

@@ -17,6 +17,7 @@
 using Robust.Shared.Analyzers;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Map;
+using Robust.Shared.Prototypes;
 
 namespace Content.Benchmarks;
 
@@ -27,9 +28,11 @@ namespace Content.Benchmarks;
 [Virtual, MemoryDiagnoser]
 public class SpawnEquipDeleteBenchmark
 {
+    private static readonly EntProtoId Mob = "MobHuman";
+    private static readonly ProtoId<StartingGearPrototype> CaptainStartingGear = "CaptainGear";
+
     private TestPair _pair = default!;
     private StationSpawningSystem _spawnSys = default!;
-    private const string Mob = "MobHuman";
     private StartingGearPrototype _gear = default!;
     private EntityUid _entity;
     private EntityCoordinates _coords;
@@ -48,7 +51,7 @@ public async Task SetupAsync()
         var mapData = await _pair.CreateTestMap();
         _coords = mapData.GridCoords;
         _spawnSys = server.System<StationSpawningSystem>();
-        _gear = server.ProtoMan.Index<StartingGearPrototype>("CaptainGear");
+        _gear = server.ProtoMan.Index(CaptainStartingGear);
     }
 
     [GlobalCleanup]

Content.Client/Access/UI/GroupedAccessLevelChecklist.xaml.cs

@@ -20,6 +20,8 @@ namespace Content.Client.Access.UI;
 [GenerateTypedNameReferences]
 public sealed partial class GroupedAccessLevelChecklist : BoxContainer
 {
+    private static readonly ProtoId<AccessGroupPrototype> GeneralAccessGroup = "General";
+
     [Dependency] private readonly IPrototypeManager _protoManager = default!;
 
     private bool _isMonotone;
@@ -68,7 +70,7 @@ private void ArrangeAccessControls()
 
         // Ensure that the 'general' access group is added to handle
         // misc. access levels that aren't associated with any group
-        if (_protoManager.TryIndex<AccessGroupPrototype>("General", out var generalAccessProto))
+        if (_protoManager.TryIndex(GeneralAccessGroup, out var generalAccessProto))
             _groupedAccessLevels.TryAdd(generalAccessProto, new());
 
         // Assign known access levels with their associated groups

Content.Client/Administration/UI/ManageSolutions/EditSolutionsWindow.xaml

@@ -19,6 +19,21 @@ SPDX-License-Identifier: MIT
             <OptionButton Name="SolutionOption" HorizontalExpand="True"/>
         </BoxContainer>
 
+        <BoxContainer Orientation="Horizontal" HorizontalExpand="True" Margin="0 4">
+            <Button Name="VVButton"
+                    Text="{Loc 'admin-solutions-window-vv-button'}"
+                    ToolTip="{Loc 'admin-solutions-window-vv-button-tooltip'}"
+                    Disabled="True"
+                    HorizontalExpand="True"
+                    StyleClasses="OpenRight"/>
+            <Button Name="SolutionButton"
+                    Text="{Loc 'admin-solutions-window-solution-button'}"
+                    ToolTip="{Loc 'admin-solutions-window-solution-button-tooltip'}"
+                    Disabled="True"
+                    HorizontalExpand="True"
+                    StyleClasses="OpenLeft"/>
+        </BoxContainer>
+
         <!-- The total volume / capacity of the solution -->
         <BoxContainer Name="VolumeBox" Orientation="Vertical" HorizontalExpand="True" Margin="0 4"/>