Merge branch 'master-ru' of https://gitlab.workbench.network/Workbench-Team/space-station-14 into arumoon-server

# Conflicts:
#	Content.Server/Shuttles/Systems/EmergencyShuttleSystem.Console.cs
#	Content.Shared/Access/Systems/AccessReaderSystem.cs
#	Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml
#	Resources/Prototypes/Entities/Mobs/Customization/Markings/tattoos.yml
#	Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks-cartons.yml
#	Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/tin.yml
#	Resources/Prototypes/Entities/Objects/Consumable/Food/snacks.yml
#	Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml
#	Resources/Prototypes/Entities/Structures/Holographic/projections.yml
#	Resources/Textures/Clothing/Uniforms/Jumpsuit/security.rsi/meta.json
#	Resources/Textures/Structures/Machines/smartfridge.rsi/meta.json
#	Resources/Textures/Structures/Machines/smartfridge.rsi/panel.png

Author: MilenVolf

.github/CODEOWNERS

@@ -8,8 +8,8 @@
 /Resources/ServerInfo/ @crazybrain23
 /Resources/ServerInfo/Guidebook/ServerRules/ @crazybrain23
 
-/Resources/Prototypes/Maps/** @Emisse @ArtisticRoomba
-/Resources/Maps/** @Emisse @ArtisticRoomba
+/Resources/Prototypes/Maps/** @Emisse @ArtisticRoomba @spanky-spanky
+/Resources/Maps/** @Emisse @ArtisticRoomba @spanky-spanky
 
 /Resources/Prototypes/Body/ @DrSmugleaf # suffering
 /Resources/Prototypes/Entities/Mobs/Player/ @DrSmugleaf

.github/workflows/publish-testing.yml

@@ -34,7 +34,7 @@ jobs:
       run: dotnet build Content.Packaging --configuration Release --no-restore /m
 
     - name: Package server
-      run: dotnet run --project Content.Packaging server --platform win-x64 --platform win-arm64 --platform linux-x64 --platform linux-arm64 --platform osx-x64 --platform-osx-arm64
+      run: dotnet run --project Content.Packaging server --platform win-x64 --platform win-arm64 --platform linux-x64 --platform linux-arm64 --platform osx-x64 --platform osx-arm64
 
     - name: Package client
       run: dotnet run --project Content.Packaging client --no-wipe-release

.github/workflows/publish.yml

@@ -41,7 +41,7 @@ jobs:
       run: dotnet build Content.Packaging --configuration Release --no-restore /m
 
     - name: Package server
-      run: dotnet run --project Content.Packaging server --platform win-x64 --platform win-arm64 --platform linux-x64 --platform linux-arm64 --platform osx-x64 --platform-osx-arm64
+      run: dotnet run --project Content.Packaging server --platform win-x64 --platform win-arm64 --platform linux-x64 --platform linux-arm64 --platform osx-x64 --platform osx-arm64
 
     - name: Package client
       run: dotnet run --project Content.Packaging client --no-wipe-release

.github/workflows/test-packaging.yml

@@ -60,7 +60,7 @@ jobs:
         run: dotnet build Content.Packaging --configuration Release --no-restore /m
 
       - name: Package server
-        run: dotnet run --project Content.Packaging server --platform win-x64 --platform linux-x64 --platform osx-x64 --platform linux-arm64
+        run: dotnet run --project Content.Packaging server --platform win-x64 --platform win-arm64 --platform linux-x64 --platform linux-arm64 --platform osx-x64 --platform osx-arm64
 
       - name: Package client
         run: dotnet run --project Content.Packaging client --no-wipe-release

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

@@ -29,7 +29,7 @@ public void SetAccessLevels(IPrototypeManager protoManager, List<ProtoId<AccessL
 
             foreach (var access in accessLevels)
             {
-                if (!protoManager.TryIndex(access, out var accessLevel))
+                if (!protoManager.Resolve(access, out var accessLevel))
                 {
                     continue;
                 }

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

@@ -57,21 +57,21 @@ private void ArrangeAccessControls()
 
         foreach (var accessGroup in _accessGroups)
         {
-            if (!_protoManager.TryIndex(accessGroup, out var accessGroupProto))
+            if (!_protoManager.Resolve(accessGroup, out var accessGroupProto))
                 continue;
 
             _groupedAccessLevels.Add(accessGroupProto, new());
         }
 
         // Ensure that the 'general' access group is added to handle
         // misc. access levels that aren't associated with any group
-        if (_protoManager.TryIndex(GeneralAccessGroup, out var generalAccessProto))
+        if (_protoManager.Resolve(GeneralAccessGroup, out var generalAccessProto))
             _groupedAccessLevels.TryAdd(generalAccessProto, new());
 
         // Assign known access levels with their associated groups
         foreach (var accessLevel in _accessLevels)
         {
-            if (!_protoManager.TryIndex(accessLevel, out var accessLevelProto))
+            if (!_protoManager.Resolve(accessLevel, out var accessLevelProto))
                 continue;
 
             var assigned = false;

Content.Client/Access/UI/IdCardConsoleBoundUserInterface.cs

@@ -4,6 +4,7 @@
 using Content.Shared.CCVar;
 using Content.Shared.Containers.ItemSlots;
 using Content.Shared.CrewManifest;
+using Content.Shared.Roles;
 using Robust.Shared.Configuration;
 using Robust.Shared.Prototypes;
 using static Content.Shared.Access.Components.IdCardConsoleComponent;
@@ -74,7 +75,7 @@ protected override void UpdateState(BoundUserInterfaceState state)
             _window?.UpdateState(castState);
         }
 
-        public void SubmitData(string newFullName, string newJobTitle, List<ProtoId<AccessLevelPrototype>> newAccessList, string newJobPrototype)
+        public void SubmitData(string newFullName, string newJobTitle, List<ProtoId<AccessLevelPrototype>> newAccessList, ProtoId<JobPrototype> newJobPrototype)
         {
             if (newFullName.Length > _maxNameLength)
                 newFullName = newFullName[.._maxNameLength];

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

@@ -123,7 +123,7 @@ private void SelectJobPreset(OptionButton.ItemSelectedEventArgs args)
 
             foreach (var group in job.AccessGroups)
             {
-                if (!_prototypeManager.TryIndex(group, out AccessGroupPrototype? groupPrototype))
+                if (!_prototypeManager.Resolve(group, out AccessGroupPrototype? groupPrototype))
                 {
                     continue;
                 }

Content.Client/Administration/UI/BanPanel/BanPanel.xaml.cs

@@ -316,8 +316,9 @@ private void AddRoleCheckbox(string group, string role, GridContainer roleGroupI
         };
 
         // This is adding the icon before the role name
-        // Yeah, this is sus, but having to split the functions up and stuff is worse imo.
-        if (_protoMan.TryIndex<JobPrototype>(role, out var jobPrototype) && _protoMan.TryIndex(jobPrototype.Icon, out var iconProto))
+        // TODO: This should not be using raw strings for prototypes as it means it won't be validated at all.
+        // I know the ban manager is doing the same thing, but that should not leak into UI code.
+        if (_protoMan.TryIndex<JobPrototype>(role, out var jobPrototype) && _protoMan.Resolve(jobPrototype.Icon, out var iconProto))
         {
             var jobIconTexture = new TextureRect
             {

Content.Client/Atmos/AlignAtmosPipeLayers.cs

@@ -134,7 +134,7 @@ private void UpdateHijackedPlacer(AtmosPipeLayer layer, ScreenCoordinates mouseS
 
         var newProtoId = altPrototypes[(int)layer];
 
-        if (!_protoManager.TryIndex(newProtoId, out var newProto))
+        if (!_protoManager.Resolve(newProtoId, out var newProto))
             return;
 
         if (newProto.Type != ConstructionType.Structure)