Merge branch 'master' of https://github.com/Helicaste/frontier-statio…

…n-14

.editorconfig

@@ -196,7 +196,7 @@ csharp_preserve_single_line_blocks = true
 #dotnet_naming_style.begins_with_i.word_separator =
 #dotnet_naming_style.begins_with_i.capitalization = pascal_case
 
-dotnet_diagnostic.IDE0055.severity = warning
+dotnet_diagnostic.ide0055.severity = warning
 
 dotnet_naming_rule.constants_rule.severity = warning
 dotnet_naming_rule.constants_rule.style = upper_camel_case_style
@@ -336,6 +336,7 @@ dotnet_naming_symbols.type_parameters_symbols.applicable_kinds = type_parameter
 
 # ReSharper properties
 resharper_braces_for_ifelse = required_for_multiline
+resharper_keep_existing_attribute_arrangement = true
 
 [*.{csproj,xml,yml,dll.config,msbuildproj,targets}]
 indent_size = 2

.github/CODEOWNERS

@@ -60,3 +60,6 @@
 /Content.*/Atmos/ @Partmedia
 /Content.*/Botany/ @Partmedia
 
+#Jezi
+/Content.*/Medical @Jezithyr
+/Content.*/Body @Jezithyr

.github/workflows/build-map-renderer.yml

@@ -13,7 +13,7 @@ jobs:
     if: github.actor != 'PJBot' && github.event.pull_request.draft == false
     strategy:
       matrix:
-        os: [ubuntu-latest, windows-latest]
+        os: [ubuntu-latest]
 
     runs-on: ${{ matrix.os }}
 

.github/workflows/build-test-debug.yml

@@ -13,7 +13,7 @@ jobs:
     if: github.actor != 'PJBot' && github.event.pull_request.draft == false
     strategy:
       matrix:
-        os: [ubuntu-latest, windows-latest]
+        os: [ubuntu-latest]
 
     runs-on: ${{ matrix.os }}
 

.github/workflows/update-credits.yml

@@ -0,0 +1,32 @@
+name: Update Contrib and Patreons in credits
+
+on:
+  workflow_dispatch:
+  schedule:
+    - cron: 0 0 * * 0
+
+jobs:
+  get_credits:
+    runs-on: ubuntu-latest
+    # Hey there fork dev! If you like to include your own contributors in this then you can probably just change this to your own repo
+    # Do this in dump_github_contributors.ps1 too into your own repo
+    if: github.repository == 'space-wizards/space-station-14'
+
+    steps:
+      - uses: actions/[email protected]
+        with:
+          ref: master
+
+      - name: Get this week's Contributors
+        shell: pwsh
+        run: Tools/dump_github_contributors.ps1 > Resources/Credits/GitHub.txt
+
+      # TODO
+      #- name: Get this week's Patreons
+      #  run: Tools/script2dumppatreons > Resources/Credits/Patrons.yml        
+
+      - name: Commit new credit files
+        uses: stefanzweifel/git-auto-commit-action@v4
+        with:
+          commit_message: Update Credits
+          commit_author: PJBot <[email protected]>

.gitignore

@@ -162,6 +162,7 @@ PublishScripts/
 # NuGet v3's project.json files produces more ignoreable files
 *.nuget.props
 *.nuget.targets
+.nuget/
 
 # Microsoft Azure Build Output
 csx/

Content.Client/Access/UI/AccessOverriderBoundUserInterface.cs

@@ -1,7 +1,7 @@
+using Content.Shared.Access;
 using Content.Shared.Access.Components;
 using Content.Shared.Access.Systems;
 using Content.Shared.Containers.ItemSlots;
-using Robust.Client.GameObjects;
 using Robust.Shared.Prototypes;
 using static Content.Shared.Access.Components.AccessOverriderComponent;
 
@@ -23,7 +23,7 @@ protected override void Open()
         {
             base.Open();
 
-            List<string> accessLevels;
+            List<ProtoId<AccessLevelPrototype>> accessLevels;
 
             if (EntMan.TryGetComponent<AccessOverriderComponent>(Owner, out var accessOverrider))
             {
@@ -33,7 +33,7 @@ protected override void Open()
 
             else
             {
-                accessLevels = new List<string>();
+                accessLevels = new List<ProtoId<AccessLevelPrototype>>();
                 _accessOverriderSystem.Log.Error($"No AccessOverrider component found for {EntMan.ToPrettyString(Owner)}!");
             }
 

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

@@ -21,7 +21,7 @@ public sealed partial class AccessOverriderWindow : DefaultWindow
         private readonly Dictionary<string, Button> _accessButtons = new();
 
         public AccessOverriderWindow(AccessOverriderBoundUserInterface owner, IPrototypeManager prototypeManager,
-            List<string> accessLevels)
+            List<ProtoId<AccessLevelPrototype>> accessLevels)
         {
             RobustXamlLoader.Load(this);
             IoCManager.InjectDependencies(this);
@@ -31,7 +31,7 @@ public AccessOverriderWindow(AccessOverriderBoundUserInterface owner, IPrototype
 
             foreach (var access in accessLevels)
             {
-                if (!prototypeManager.TryIndex<AccessLevelPrototype>(access, out var accessLevel))
+                if (!prototypeManager.TryIndex(access, out var accessLevel))
                 {
                     _logMill.Error($"Unable to find accesslevel for {access}");
                     continue;

Content.Client/Access/UI/IdCardConsoleBoundUserInterface.cs

@@ -1,8 +1,8 @@
+using Content.Shared.Access;
 using Content.Shared.Access.Components;
 using Content.Shared.Access.Systems;
 using Content.Shared.Containers.ItemSlots;
 using Content.Shared.CrewManifest;
-using Robust.Client.GameObjects;
 using Robust.Shared.Prototypes;
 using static Content.Shared.Access.Components.IdCardConsoleComponent;
 
@@ -23,7 +23,7 @@ public IdCardConsoleBoundUserInterface(EntityUid owner, Enum uiKey) : base(owner
         protected override void Open()
         {
             base.Open();
-            List<string> accessLevels;
+            List<ProtoId<AccessLevelPrototype>> accessLevels;
 
             if (EntMan.TryGetComponent<IdCardConsoleComponent>(Owner, out var idCard))
             {
@@ -32,7 +32,7 @@ protected override void Open()
             }
             else
             {
-                accessLevels = new List<string>();
+                accessLevels = new List<ProtoId<AccessLevelPrototype>>();
                 _idCardConsoleSystem.Log.Error($"No IdCardConsole component found for {EntMan.ToPrettyString(Owner)}!");
             }
 

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

@@ -28,7 +28,7 @@ public sealed partial class IdCardConsoleWindow : DefaultWindow
         private string? _lastJobProto;
 
         public IdCardConsoleWindow(IdCardConsoleBoundUserInterface owner, IPrototypeManager prototypeManager,
-            List<string> accessLevels)
+            List<ProtoId<AccessLevelPrototype>> accessLevels)
         {
             RobustXamlLoader.Load(this);
             IoCManager.InjectDependencies(this);