Merge remote-tracking branch 'upstream/master' into upstream

# Conflicts: # Content.Client/Access/AccessOverlay.cs # Content.Client/Access/UI/IdCardConsoleBoundUserInterface.cs # Content.Client/Access/UI/IdCardConsoleWindow.xaml # Content.Client/Access/UI/IdCardConsoleWindow.xaml.cs # Content.Client/Chemistry/UI/InjectorStatusControl.cs # Content.Client/StatusIcon/StatusIconOverlay.cs # Content.Client/Stylesheets/StyleNano.cs # Content.Client/UserInterface/Systems/Chat/ChatUIController.cs # Content.Client/UserInterface/Systems/Chat/Widgets/ChatBox.xaml # Content.Server/Access/Systems/IdCardConsoleSystem.cs # Content.Server/Administration/Commands/AGhost.cs # Content.Server/Chemistry/EntitySystems/ReagentDispenserSystem.cs # Content.Server/Connection/ConnectionManager.cs # Content.Server/DeviceLinking/Systems/SignalTimerSystem.cs # Content.Server/Disposal/Unit/EntitySystems/DisposalUnitSystem.cs # Content.Server/GameTicking/GameTicker.RoundFlow.cs # Content.Server/GameTicking/GameTicker.Spawning.cs # Content.Server/Humanoid/Systems/HumanoidAppearanceSystem.cs # Content.Server/Resist/EscapeInventorySystem.cs # Content.Server/Shuttles/Systems/EmergencyShuttleSystem.cs # Content.Shared/Access/Components/IdCardConsoleComponent.cs # Content.Shared/Anomaly/SharedAnomalySystem.cs # Content.Shared/Bed/Sleep/SharedSleepingSystem.cs # Content.Shared/Humanoid/SharedHumanoidAppearanceSystem.cs # Content.Shared/Lock/LockSystem.cs # Content.Shared/RCD/Systems/RCDSystem.cs # Content.Shared/Roles/JobPrototype.cs # Content.Shared/StatusIcon/StatusIconPrototype.cs # Content.Shared/Weapons/Melee/SharedMeleeWeaponSystem.cs # Resources/Audio/Machines/attributions.yml # Resources/Locale/en-US/rcd/components/rcd-component.ftl # Resources/Maps/reach.yml # Resources/Prototypes/Catalog/Cargo/cargo_vending.yml # Resources/Prototypes/Catalog/Fills/Lockers/heads.yml # Resources/Prototypes/Catalog/Fills/Lockers/security.yml # Resources/Prototypes/Catalog/ReagentDispensers/beverage.yml # Resources/Prototypes/Catalog/VendingMachines/Inventories/boozeomat.yml # Resources/Prototypes/Catalog/VendingMachines/Inventories/cola.yml # Resources/Prototypes/Catalog/VendingMachines/Inventories/lawdrobe.yml # Resources/Prototypes/Catalog/VendingMachines/Inventories/pwrgame.yml # Resources/Prototypes/Catalog/VendingMachines/Inventories/shamblersjuice.yml # Resources/Prototypes/Catalog/VendingMachines/Inventories/soda.yml # Resources/Prototypes/Catalog/VendingMachines/Inventories/spaceup.yml # Resources/Prototypes/Catalog/VendingMachines/Inventories/starkist.yml # Resources/Prototypes/Catalog/VendingMachines/Inventories/theater.yml # Resources/Prototypes/DeviceLinking/sink_ports.yml # Resources/Prototypes/Entities/Clothing/Back/duffel.yml # Resources/Prototypes/Entities/Clothing/Belt/base_clothingbelt.yml # Resources/Prototypes/Entities/Clothing/Neck/misc.yml # Resources/Prototypes/Entities/Clothing/OuterClothing/base_clothingouter.yml # Resources/Prototypes/Entities/Clothing/OuterClothing/wintercoats.yml # Resources/Prototypes/Entities/Mobs/Customization/Markings/gauze.yml # Resources/Prototypes/Entities/Objects/Devices/Electronics/door.yml # Resources/Prototypes/Entities/Objects/Magic/books.yml # Resources/Prototypes/Entities/Objects/Materials/Sheets/glass.yml # Resources/Prototypes/Entities/Objects/Materials/Sheets/metal.yml # Resources/Prototypes/Entities/Objects/Materials/Sheets/other.yml # Resources/Prototypes/Entities/Objects/Misc/tiles.yml # Resources/Prototypes/Entities/Objects/Specific/Medical/morgue.yml # Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/shotgun.yml # Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml # Resources/Prototypes/Entities/Structures/Doors/Airlocks/airlocks.yml # Resources/Prototypes/Entities/Structures/Doors/Airlocks/base_assembly.yml # Resources/Prototypes/Entities/Structures/Doors/Airlocks/base_structureairlocks.yml # Resources/Prototypes/Entities/Structures/Doors/Airlocks/highsec.yml # Resources/Prototypes/Entities/Structures/Doors/Firelocks/firelock.yml # Resources/Prototypes/Entities/Structures/Doors/Firelocks/frame.yml # Resources/Prototypes/Entities/Structures/Doors/MaterialDoors/material_doors.yml # Resources/Prototypes/Entities/Structures/Doors/SecretDoor/secret_door.yml # Resources/Prototypes/Entities/Structures/Doors/Windoors/assembly.yml # Resources/Prototypes/Entities/Structures/Lighting/base_lighting.yml # Resources/Prototypes/Entities/Structures/Machines/lathe.yml # Resources/Prototypes/Entities/Structures/Power/cable_terminal.yml # Resources/Prototypes/Entities/Structures/Storage/Tanks/base_structuretanks.yml # Resources/Prototypes/Entities/Structures/Walls/grille.yml # Resources/Prototypes/Recipes/Construction/Graphs/structures/shutter.yml # Resources/Prototypes/Recipes/Crafting/Graphs/improvised/flowercrown.yml # Resources/Prototypes/Recipes/Crafting/improvised.yml # Resources/Prototypes/Roles/Jobs/Security/detective.yml # Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml # Resources/Prototypes/Roles/Jobs/Security/security_officer.yml # Resources/Prototypes/Roles/Jobs/Security/warden.yml # Resources/Prototypes/StatusEffects/health.yml # Resources/Prototypes/Voice/speech_emotes.yml # Resources/Prototypes/lobbyscreens.yml # Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertchaplain.rsi/equipped-OUTERCLOTHING-body-slim.png # Resources/Textures/Decals/bricktile.rsi/white_box.png # Resources/Textures/Objects/Misc/books.rsi/meta.json # Resources/migration.yml
2024-04-13 11:29:33 +07:00
parent 81be800071 28e5db7be5
commit d2d501dbc0
918 changed files with 18886 additions and 12471 deletions
--- a/Content.Shared/Access/Components/AccessComponent.cs
+++ b/Content.Shared/Access/Components/AccessComponent.cs
@@ -20,17 +20,17 @@ public sealed partial class AccessComponent : Component
    [AutoNetworkedField]
    public bool Enabled = true;

-    [DataField(customTypeSerializer: typeof(PrototypeIdHashSetSerializer<AccessLevelPrototype>))]
+    [DataField]
    [Access(typeof(SharedAccessSystem), Other = AccessPermissions.ReadExecute)] // FIXME Friends
    [AutoNetworkedField]
-    public HashSet<string> Tags = new();
+    public HashSet<ProtoId<AccessLevelPrototype>> Tags = new();

    /// <summary>
    /// Access Groups. These are added to the tags during map init. After map init this will have no effect.
    /// </summary>
-    [DataField(readOnly: true, customTypeSerializer: typeof(PrototypeIdHashSetSerializer<AccessGroupPrototype>))]
+    [DataField(readOnly: true)]
    [AutoNetworkedField]
-    public HashSet<string> Groups = new();
+    public HashSet<ProtoId<AccessGroupPrototype>> Groups = new();
 }

 /// <summary>
@@ -47,9 +47,9 @@ public struct GetAdditionalAccessEvent
 }

 [ByRefEvent]
-public record struct GetAccessTagsEvent(HashSet<string> Tags, IPrototypeManager PrototypeManager)
+public record struct GetAccessTagsEvent(HashSet<ProtoId<AccessLevelPrototype>> Tags, IPrototypeManager PrototypeManager)
 {
-    public void AddGroup(string group)
+    public void AddGroup(ProtoId<AccessGroupPrototype> group)
    {
        if (!PrototypeManager.TryIndex<AccessGroupPrototype>(group, out var groupPrototype))
            return;
--- a/Content.Shared/Access/Components/AccessOverriderComponent.cs
+++ b/Content.Shared/Access/Components/AccessOverriderComponent.cs
@@ -25,9 +25,9 @@ public sealed partial class AccessOverriderComponent : Component
    [Serializable, NetSerializable]
    public sealed class WriteToTargetAccessReaderIdMessage : BoundUserInterfaceMessage
    {
-        public readonly List<string> AccessList;
+        public readonly List<ProtoId<AccessLevelPrototype>> AccessList;

-        public WriteToTargetAccessReaderIdMessage(List<string> accessList)
+        public WriteToTargetAccessReaderIdMessage(List<ProtoId<AccessLevelPrototype>> accessList)
        {
            AccessList = accessList;
        }
@@ -48,15 +48,15 @@ public sealed partial class AccessOverriderComponent : Component
        public readonly string PrivilegedIdName;
        public readonly bool IsPrivilegedIdPresent;
        public readonly bool IsPrivilegedIdAuthorized;
-        public readonly string[]? TargetAccessReaderIdAccessList;
-        public readonly string[]? AllowedModifyAccessList;
-        public readonly string[]? MissingPrivilegesList;
+        public readonly ProtoId<AccessLevelPrototype>[]? TargetAccessReaderIdAccessList;
+        public readonly ProtoId<AccessLevelPrototype>[]? AllowedModifyAccessList;
+        public readonly ProtoId<AccessLevelPrototype>[]? MissingPrivilegesList;

        public AccessOverriderBoundUserInterfaceState(bool isPrivilegedIdPresent,
            bool isPrivilegedIdAuthorized,
-            string[]? targetAccessReaderIdAccessList,
-            string[]? allowedModifyAccessList,
-            string[]? missingPrivilegesList,
+            ProtoId<AccessLevelPrototype>[]? targetAccessReaderIdAccessList,
+            ProtoId<AccessLevelPrototype>[]? allowedModifyAccessList,
+            ProtoId<AccessLevelPrototype>[]? missingPrivilegesList,
            string privilegedIdName,
            string targetLabel,
            Color targetLabelColor)
--- a/Content.Shared/Access/Components/AccessReaderComponent.cs
+++ b/Content.Shared/Access/Components/AccessReaderComponent.cs
@@ -1,5 +1,6 @@
 using Content.Shared.StationRecords;
 using Robust.Shared.GameStates;
+using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization;
 using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype.Set;

@@ -23,15 +24,15 @@ public sealed partial class AccessReaderComponent : Component
    /// The set of tags that will automatically deny an allowed check, if any of them are present.
    /// </summary>
    [ViewVariables(VVAccess.ReadWrite)]
-    [DataField(customTypeSerializer: typeof(PrototypeIdHashSetSerializer<AccessLevelPrototype>))]
-    public HashSet<string> DenyTags = new();
+    [DataField]
+    public HashSet<ProtoId<AccessLevelPrototype>> DenyTags = new();

    /// <summary>
    /// List of access groups that grant access to this reader. Only a single matching group is required to gain access.
    /// A group matches if it is a subset of the set being checked against.
    /// </summary>
    [DataField("access")] [ViewVariables(VVAccess.ReadWrite)]
-    public List<HashSet<string>> AccessLists = new();
+    public List<HashSet<ProtoId<AccessLevelPrototype>>> AccessLists = new();

    /// <summary>
    /// A list of <see cref="StationRecordKey"/>s that grant access. Only a single matching key is required to gain
@@ -88,9 +89,9 @@ public sealed class AccessReaderComponentState : ComponentState
 {
    public bool Enabled;

-    public HashSet<string> DenyTags;
+    public HashSet<ProtoId<AccessLevelPrototype>> DenyTags;

-    public List<HashSet<string>> AccessLists;
+    public List<HashSet<ProtoId<AccessLevelPrototype>>> AccessLists;

    public List<(NetEntity, uint)> AccessKeys;

@@ -98,7 +99,7 @@ public sealed class AccessReaderComponentState : ComponentState

    public int AccessLogLimit;

-    public AccessReaderComponentState(bool enabled, HashSet<string> denyTags, List<HashSet<string>> accessLists, List<(NetEntity, uint)> accessKeys, Queue<AccessRecord> accessLog, int accessLogLimit)
+    public AccessReaderComponentState(bool enabled, HashSet<ProtoId<AccessLevelPrototype>> denyTags, List<HashSet<ProtoId<AccessLevelPrototype>>> accessLists, List<(NetEntity, uint)> accessKeys, Queue<AccessRecord> accessLog, int accessLogLimit)
    {
        Enabled = enabled;
        DenyTags = denyTags;
@@ -108,3 +109,10 @@ public sealed class AccessReaderComponentState : ComponentState
        AccessLogLimit = accessLogLimit;
    }
 }
+
+public sealed class AccessReaderConfigurationChangedEvent : EntityEventArgs
+{
+    public AccessReaderConfigurationChangedEvent()
+    {
+    }
+}
--- a/Content.Shared/Access/Components/IdCardConsoleComponent.cs
+++ b/Content.Shared/Access/Components/IdCardConsoleComponent.cs
@@ -27,16 +27,12 @@ public sealed partial class IdCardConsoleComponent : Component
    {
        public readonly string FullName;
        public readonly string JobTitle;
-        public readonly List<string> AccessList;
-        public readonly string JobPrototype;
+        public readonly List<ProtoId<AccessLevelPrototype>> AccessList;
+        public readonly ProtoId<AccessLevelPrototype> JobPrototype;
        public readonly string? SelectedIcon; //WD-EDIT
-
-        public WriteToTargetIdMessage(
-            string fullName,
-            string jobTitle,
-            List<string> accessList,
-            string jobPrototype,
-            string? selectedIcon) //WD-EDIT (selectedIcon)
+        
+        public WriteToTargetIdMessage(string fullName, string jobTitle, List<ProtoId<AccessLevelPrototype>> accessList, ProtoId<AccessLevelPrototype> jobPrototype,
+            string? selectedIcon)
        {
            FullName = fullName;
            JobTitle = jobTitle;
@@ -150,20 +146,20 @@ public sealed partial class IdCardConsoleComponent : Component
        public readonly string TargetIdName;
        public readonly string? TargetIdFullName;
        public readonly string? TargetIdJobTitle;
-        public readonly string[]? TargetIdAccessList;
-        public readonly string[]? AllowedModifyAccessList;
-        public readonly string TargetIdJobPrototype;
+        public readonly List<ProtoId<AccessLevelPrototype>>? TargetIdAccessList;
+        public readonly List<ProtoId<AccessLevelPrototype>>? AllowedModifyAccessList;
+        public readonly ProtoId<AccessLevelPrototype> TargetIdJobPrototype;
        public readonly string? TargetIdJobIcon; //WD-EDIT
-
+        
        public IdCardConsoleBoundUserInterfaceState(
            bool isPrivilegedIdPresent,
            bool isPrivilegedIdAuthorized,
            bool isTargetIdPresent,
            string? targetIdFullName,
            string? targetIdJobTitle,
-            string[]? targetIdAccessList,
-            string[]? allowedModifyAccessList,
-            string targetIdJobPrototype,
+            List<ProtoId<AccessLevelPrototype>>? targetIdAccessList,
+            List<ProtoId<AccessLevelPrototype>>? allowedModifyAccessList,
+            ProtoId<AccessLevelPrototype> targetIdJobPrototype,
            string privilegedIdName,
            string targetIdName,
            string? targetIdJobIcon) // #WD EDIT (targetIdJobIcon)