Revert "Fix some friend access violations by allowing others access. (#8594) (#8703)

2022-06-07 13:44:31 +02:00
parent c5f7c61041
commit cecf87997b
162 changed files with 169 additions and 197 deletions
--- a/Content.Shared/Access/Components/AccessComponent.cs
+++ b/Content.Shared/Access/Components/AccessComponent.cs
@@ -7,11 +7,10 @@ namespace Content.Shared.Access.Components
    ///     Simple mutable access provider found on ID cards and such.
    /// </summary>
    [RegisterComponent]
-    [Access(typeof(AccessSystem))]
+    [Friend(typeof(AccessSystem))]
    public sealed class AccessComponent : Component
    {
        [DataField("tags", customTypeSerializer: typeof(PrototypeIdHashSetSerializer<AccessLevelPrototype>))]
-        [Access(typeof(AccessSystem), Other = AccessPermissions.ReadExecute)] // FIXME Friends
        public HashSet<string> Tags = new();

        [DataField("groups", customTypeSerializer: typeof(PrototypeIdHashSetSerializer<AccessGroupPrototype>))]
--- a/Content.Shared/Access/Components/IdCardComponent.cs
+++ b/Content.Shared/Access/Components/IdCardComponent.cs
@@ -6,15 +6,13 @@ namespace Content.Shared.Access.Components
    // TODO BUI NETWORKING if ever clients can open their own BUI's (id card console, pda), then this data should be
    // networked.
    [RegisterComponent]
-    [Access(typeof(SharedIdCardSystem), typeof(SharedPDASystem), typeof(SharedAgentIdCardSystem))]
+    [Friend(typeof(SharedIdCardSystem), typeof(SharedPDASystem), typeof(SharedAgentIdCardSystem))]
    public sealed class IdCardComponent : Component
    {
        [DataField("originalOwnerName")]
        public string OriginalOwnerName = default!;

        [DataField("fullName")]
-        [Access(typeof(SharedIdCardSystem), typeof(SharedPDASystem), typeof(SharedAgentIdCardSystem),
-            Other = AccessPermissions.ReadWrite)] // FIXME Friends
        public string? FullName;

        [DataField("jobTitle")]
--- a/Content.Shared/Actions/ActionsComponent.cs
+++ b/Content.Shared/Actions/ActionsComponent.cs
@@ -6,11 +6,10 @@ namespace Content.Shared.Actions;

 [NetworkedComponent]
 [RegisterComponent]
-[Access(typeof(SharedActionsSystem))]
+[Friend(typeof(SharedActionsSystem))]
 public sealed class ActionsComponent : Component
 {
    [ViewVariables]
-    [Access(typeof(SharedActionsSystem), Other = AccessPermissions.ReadExecute)] // FIXME Friends
    public SortedSet<ActionType> Actions = new();
 }

--- a/Content.Shared/Administration/AdminFrozenComponent.cs
+++ b/Content.Shared/Administration/AdminFrozenComponent.cs
@@ -2,7 +2,7 @@

 namespace Content.Shared.Administration;

-[RegisterComponent, Access(typeof(AdminFrozenSystem))]
+[RegisterComponent, Friend(typeof(AdminFrozenSystem))]
 [NetworkedComponent]
 public sealed class AdminFrozenComponent : Component
 {
--- a/Content.Shared/CharacterAppearance/Components/HumanoidAppearanceComponent.cs
+++ b/Content.Shared/CharacterAppearance/Components/HumanoidAppearanceComponent.cs
@@ -7,7 +7,7 @@ using Robust.Shared.Serialization;
 namespace Content.Shared.CharacterAppearance.Components
 {
    [RegisterComponent]
-    [Access(typeof(SharedHumanoidAppearanceSystem), typeof(SharedMagicMirrorComponent))]
+    [Friend(typeof(SharedHumanoidAppearanceSystem), typeof(SharedMagicMirrorComponent))]
    [NetworkedComponent]
    public sealed class HumanoidAppearanceComponent : Component
    {
--- a/Content.Shared/Chat/TypingIndicator/TypingIndicatorComponent.cs
+++ b/Content.Shared/Chat/TypingIndicator/TypingIndicatorComponent.cs
@@ -8,7 +8,7 @@ namespace Content.Shared.Chat.TypingIndicator;
 ///     Added automatically when player poses entity.
 /// </summary>
 [RegisterComponent, NetworkedComponent]
-[Access(typeof(SharedTypingIndicatorSystem))]
+[Friend(typeof(SharedTypingIndicatorSystem))]
 public sealed class TypingIndicatorComponent : Component
 {
    /// <summary>
--- a/Content.Shared/Clothing/ClothingSpeedModifierComponent.cs
+++ b/Content.Shared/Clothing/ClothingSpeedModifierComponent.cs
@@ -3,7 +3,7 @@ using Robust.Shared.Serialization;

 namespace Content.Shared.Clothing;

-[RegisterComponent, NetworkedComponent, Access(typeof(ClothingSpeedModifierSystem))]
+[RegisterComponent, NetworkedComponent, Friend(typeof(ClothingSpeedModifierSystem))]
 public sealed class ClothingSpeedModifierComponent : Component
 {
    [DataField("walkModifier", required: true)] [ViewVariables(VVAccess.ReadWrite)]
--- a/Content.Shared/Clothing/Components/AttachedClothingComponent.cs
+++ b/Content.Shared/Clothing/Components/AttachedClothingComponent.cs
@@ -8,7 +8,7 @@ namespace Content.Shared.Clothing.Components;
 ///     attached to, rather than being dumped on the floor or something like that. Intended for use with hardsuits and
 ///     hardsuit helmets.
 /// </summary>
-[Access(typeof(ToggleableClothingSystem))]
+[Friend(typeof(ToggleableClothingSystem))]
 [RegisterComponent]
 public sealed class AttachedClothingComponent : Component
 {
--- a/Content.Shared/Clothing/Components/ToggleableClothingComponent.cs
+++ b/Content.Shared/Clothing/Components/ToggleableClothingComponent.cs
@@ -11,7 +11,7 @@ namespace Content.Shared.Clothing.Components;
 ///     This component gives an item an action that will equip or un-equip some clothing. Intended for use with
 ///     hardsuits and hardsuit helmets.
 /// </summary>
-[Access(typeof(ToggleableClothingSystem))]
+[Friend(typeof(ToggleableClothingSystem))]
 [RegisterComponent]
 public sealed class ToggleableClothingComponent : Component
 {
--- a/Content.Shared/Construction/Components/AnchorableComponent.cs
+++ b/Content.Shared/Construction/Components/AnchorableComponent.cs
@@ -5,7 +5,7 @@ using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototy

 namespace Content.Shared.Construction.Components
 {
-    [RegisterComponent, Access(typeof(SharedAnchorableSystem))]
+    [RegisterComponent, Friend(typeof(SharedAnchorableSystem))]
    public sealed class AnchorableComponent : Component
    {
        [DataField("tool", customTypeSerializer: typeof(PrototypeIdSerializer<ToolQualityPrototype>))]
--- a/Content.Shared/Construction/Steps/MaterialConstructionGraphStep.cs
+++ b/Content.Shared/Construction/Steps/MaterialConstructionGraphStep.cs
@@ -25,12 +25,12 @@ namespace Content.Shared.Construction.Steps

        public override bool EntityValid(EntityUid uid, IEntityManager entityManager)
        {
-            return entityManager.TryGetComponent(uid, out SharedStackComponent? stack) && stack.StackTypeId == MaterialPrototypeId && stack.Count >= Amount;
+            return entityManager.TryGetComponent(uid, out SharedStackComponent? stack) && stack.StackTypeId.Equals(MaterialPrototypeId) && stack.Count >= Amount;
        }

        public bool EntityValid(EntityUid entity, [NotNullWhen(true)] out SharedStackComponent? stack)
        {
-            if (IoCManager.Resolve<IEntityManager>().TryGetComponent(entity, out SharedStackComponent? otherStack) && otherStack.StackTypeId == MaterialPrototypeId && otherStack.Count >= Amount)
+            if (IoCManager.Resolve<IEntityManager>().TryGetComponent(entity, out SharedStackComponent? otherStack) && otherStack.StackTypeId.Equals(MaterialPrototypeId) && otherStack.Count >= Amount)
                stack = otherStack;
            else
                stack = null;
--- a/Content.Shared/Containers/ItemSlot/ItemSlotsComponent.cs
+++ b/Content.Shared/Containers/ItemSlot/ItemSlotsComponent.cs
@@ -13,7 +13,7 @@ namespace Content.Shared.Containers.ItemSlots
    ///     insert/eject interactions.
    /// </summary>
    [RegisterComponent]
-    [Access(typeof(ItemSlotsSystem))]
+    [Friend(typeof(ItemSlotsSystem))]
    public sealed class ItemSlotsComponent : Component
    {
        /// <summary>
@@ -60,7 +60,7 @@ namespace Content.Shared.Containers.ItemSlots
    ///     insert/eject sounds.
    /// </summary>
    [DataDefinition]
-    [Access(typeof(ItemSlotsSystem))]
+    [Friend(typeof(ItemSlotsSystem))]
    public sealed class ItemSlot
    {
        [DataField("whitelist")]
@@ -86,7 +86,6 @@ namespace Content.Shared.Containers.ItemSlots
        ///     of the currently held or currently inserted entity instead.
        /// </remarks>
        [DataField("name", readOnly: true)]
-        [Access(typeof(ItemSlotsSystem), Other = AccessPermissions.ReadWriteExecute)] // FIXME Friends
        public string Name = string.Empty;

        /// <summary>
@@ -98,7 +97,6 @@ namespace Content.Shared.Containers.ItemSlots
        ///     when mapping.
        /// </remarks>
        [DataField("startingItem", readOnly: true, customTypeSerializer: typeof(PrototypeIdSerializer<EntityPrototype>))]
-        [Access(typeof(ItemSlotsSystem), Other = AccessPermissions.ReadWriteExecute)] // FIXME Friends
        public string? StartingItem;

        /// <summary>
--- a/Content.Shared/Crayon/SharedCrayonComponent.cs
+++ b/Content.Shared/Crayon/SharedCrayonComponent.cs
@@ -3,7 +3,7 @@ using Robust.Shared.Serialization;

 namespace Content.Shared.Crayon
 {
-    [NetworkedComponent, ComponentProtoName("Crayon"), Access(typeof(SharedCrayonSystem))]
+    [NetworkedComponent, ComponentProtoName("Crayon"), Friend(typeof(SharedCrayonSystem))]
    public abstract class SharedCrayonComponent : Component
    {
        public string SelectedState { get; set; } = string.Empty;
--- a/Content.Shared/Damage/Components/DamageableComponent.cs
+++ b/Content.Shared/Damage/Components/DamageableComponent.cs
@@ -16,7 +16,7 @@ namespace Content.Shared.Damage
    /// </remarks>
    [RegisterComponent]
    [NetworkedComponent()]
-    [Access(typeof(DamageableSystem))]
+    [Friend(typeof(DamageableSystem))]
    public sealed class DamageableComponent : Component
    {
        /// <summary>
@@ -24,7 +24,6 @@ namespace Content.Shared.Damage
        ///     If null, all damage types will be supported.
        /// </summary>
        [DataField("damageContainer", customTypeSerializer: typeof(PrototypeIdSerializer<DamageContainerPrototype>))]
-        [Access(typeof(DamageableSystem), Other = AccessPermissions.ReadExecute)] // FIXME Friends
        public string? DamageContainerID;

        /// <summary>
@@ -47,7 +46,6 @@ namespace Content.Shared.Damage
        /// </remarks>
        [DataField("damage")]
        [ViewVariables(VVAccess.ReadWrite)]
-        [Access(typeof(DamageableSystem), Other = AccessPermissions.ReadExecute)] // FIXME Friends
        public DamageSpecifier Damage = new();

        /// <summary>
@@ -62,9 +60,7 @@ namespace Content.Shared.Damage
        /// <summary>
        ///     The sum of all damages in the DamageableComponent.
        /// </summary>
-        [ViewVariables]
-        [Access(typeof(DamageableSystem), Other = AccessPermissions.ReadExecute)] // FIXME Friends
-        public FixedPoint2 TotalDamage;
+        [ViewVariables] public FixedPoint2 TotalDamage;

        // Really these shouldn't be here. OnExplosion() and RadiationAct() should be handled elsewhere.
        [ViewVariables]
--- a/Content.Shared/Decals/DecalGridComponent.cs
+++ b/Content.Shared/Decals/DecalGridComponent.cs
@@ -1,7 +1,7 @@
 namespace Content.Shared.Decals
 {
    [RegisterComponent]
-    [Access(typeof(SharedDecalSystem))]
+    [Friend(typeof(SharedDecalSystem))]
    public sealed class DecalGridComponent : Component
    {
        [DataField("chunkCollection", serverOnly: true)]
--- a/Content.Shared/Electrocution/InsulatedComponent.cs
+++ b/Content.Shared/Electrocution/InsulatedComponent.cs
@@ -3,7 +3,7 @@ using Robust.Shared.Serialization;

 namespace Content.Shared.Electrocution
 {
-    [Access(typeof(SharedElectrocutionSystem))]
+    [Friend(typeof(SharedElectrocutionSystem))]
    [RegisterComponent, NetworkedComponent]
    public sealed class InsulatedComponent : Component
    {
--- a/Content.Shared/Flash/SharedFlashableComponent.cs
+++ b/Content.Shared/Flash/SharedFlashableComponent.cs
@@ -3,7 +3,7 @@ using Robust.Shared.Serialization;

 namespace Content.Shared.Flash
 {
-    [NetworkedComponent, Access(typeof(SharedFlashSystem))]
+    [NetworkedComponent, Friend(typeof(SharedFlashSystem))]
    public abstract class SharedFlashableComponent : Component
    {
        public float Duration { get; set; }
--- a/Content.Shared/Foldable/FoldableComponent.cs
+++ b/Content.Shared/Foldable/FoldableComponent.cs
@@ -11,7 +11,7 @@ namespace Content.Shared.Foldable;
 /// </remarks>
 [RegisterComponent]
 [NetworkedComponent]
-[Access(typeof(SharedFoldableSystem))]
+[Friend(typeof(SharedFoldableSystem))]
 public sealed class FoldableComponent : Component
 {
    [DataField("folded")]
--- a/Content.Shared/Follower/Components/FollowedComponent.cs
+++ b/Content.Shared/Follower/Components/FollowedComponent.cs
@@ -6,7 +6,7 @@ namespace Content.Shared.Follower.Components;
 /// <summary>
 ///     Attached to entities that are currently being followed by a ghost.
 /// </summary>
-[RegisterComponent, Access(typeof(FollowerSystem))]
+[RegisterComponent, Friend(typeof(FollowerSystem))]
 [NetworkedComponent]
 public sealed class FollowedComponent : Component
 {
--- a/Content.Shared/Follower/Components/FollowerComponent.cs
+++ b/Content.Shared/Follower/Components/FollowerComponent.cs
@@ -3,7 +3,7 @@ using Robust.Shared.GameStates;
 namespace Content.Shared.Follower.Components;

 [RegisterComponent]
-[Access(typeof(FollowerSystem))]
+[Friend(typeof(FollowerSystem))]
 [NetworkedComponent]
 public sealed class FollowerComponent : Component
 {
--- a/Content.Shared/Friction/TileFrictionModifier.cs
+++ b/Content.Shared/Friction/TileFrictionModifier.cs
@@ -1,7 +1,7 @@
 namespace Content.Shared.Friction
 {
    [RegisterComponent]
-    [Access(typeof(SharedTileFrictionController))]
+    [Friend(typeof(SharedTileFrictionController))]
    public sealed class TileFrictionModifierComponent : Component
    {
        /// <summary>
--- a/Content.Shared/Instruments/SharedInstrumentComponent.cs
+++ b/Content.Shared/Instruments/SharedInstrumentComponent.cs
@@ -4,7 +4,7 @@ using Robust.Shared.Serialization;

 namespace Content.Shared.Instruments;

-[NetworkedComponent, Access(typeof(SharedInstrumentSystem))]
+[NetworkedComponent, Friend(typeof(SharedInstrumentSystem))]
 public abstract class SharedInstrumentComponent : Component
 {
    [ViewVariables]
@@ -26,7 +26,6 @@ public abstract class SharedInstrumentComponent : Component
    public bool RespectMidiLimits { get; set; } = true;

    [ViewVariables(VVAccess.ReadWrite)]
-    [Access(typeof(SharedInstrumentSystem), Other = AccessPermissions.ReadWrite)] // FIXME Friends
    public bool DirtyRenderer { get; set; }
 }

--- a/Content.Shared/Jittering/JitteringComponent.cs
+++ b/Content.Shared/Jittering/JitteringComponent.cs
@@ -3,7 +3,7 @@ using Robust.Shared.Serialization;

 namespace Content.Shared.Jittering
 {
-    [Access(typeof(SharedJitteringSystem))]
+    [Friend(typeof(SharedJitteringSystem))]
    [RegisterComponent, NetworkedComponent]
    public sealed class JitteringComponent : Component
    {
--- a/Content.Shared/Light/Component/RgbLightControllerComponent.cs
+++ b/Content.Shared/Light/Component/RgbLightControllerComponent.cs
@@ -12,7 +12,7 @@ namespace Content.Shared.Light.Component;
 /// </remarks>
 [NetworkedComponent]
 [RegisterComponent]
-[Access(typeof(SharedRgbLightControllerSystem))]
+[Friend(typeof(SharedRgbLightControllerSystem))]
 public sealed class RgbLightControllerComponent : Robust.Shared.GameObjects.Component
 {
    [DataField("cycleRate")]
--- a/Content.Shared/Movement/Components/MovementSpeedModifierComponent.cs
+++ b/Content.Shared/Movement/Components/MovementSpeedModifierComponent.cs
@@ -4,7 +4,7 @@ using Robust.Shared.GameStates;
 namespace Content.Shared.Movement.Components
 {
    [RegisterComponent]
-    [NetworkedComponent, Access(typeof(MovementSpeedModifierSystem))]
+    [NetworkedComponent, Friend(typeof(MovementSpeedModifierSystem))]
    public sealed class MovementSpeedModifierComponent : Component
    {
        public const float DefaultBaseWalkSpeed = 3.0f;
--- a/Content.Shared/Nutrition/Components/CreamPieComponent.cs
+++ b/Content.Shared/Nutrition/Components/CreamPieComponent.cs
@@ -3,7 +3,7 @@ using Content.Shared.Sound;

 namespace Content.Shared.Nutrition.Components
 {
-    [Access(typeof(SharedCreamPieSystem))]
+    [Friend(typeof(SharedCreamPieSystem))]
    [RegisterComponent]
    public sealed class CreamPieComponent : Component
    {
--- a/Content.Shared/Nutrition/Components/CreamPiedComponent.cs
+++ b/Content.Shared/Nutrition/Components/CreamPiedComponent.cs
@@ -3,7 +3,7 @@ using Robust.Shared.Serialization;

 namespace Content.Shared.Nutrition.Components
 {
-    [Access(typeof(SharedCreamPieSystem))]
+    [Friend(typeof(SharedCreamPieSystem))]
    [RegisterComponent]
    public sealed class CreamPiedComponent : Component
    {
--- a/Content.Shared/Pinpointer/PinpointerComponent.cs
+++ b/Content.Shared/Pinpointer/PinpointerComponent.cs
@@ -8,7 +8,7 @@ namespace Content.Shared.Pinpointer
    /// </summary>
    [RegisterComponent]
    [NetworkedComponent]
-    [Access(typeof(SharedPinpointerSystem))]
+    [Friend(typeof(SharedPinpointerSystem))]
    public sealed class PinpointerComponent : Component
    {
        // TODO: Type serializer oh god
--- a/Content.Shared/Placeable/PlaceableSurfaceComponent.cs
+++ b/Content.Shared/Placeable/PlaceableSurfaceComponent.cs
@@ -4,7 +4,7 @@ using Robust.Shared.Serialization;
 namespace Content.Shared.Placeable
 {
    [RegisterComponent, NetworkedComponent]
-    [Access(typeof(PlaceableSurfaceSystem))]
+    [Friend(typeof(PlaceableSurfaceSystem))]
    public sealed class PlaceableSurfaceComponent : Component
    {
        [ViewVariables]
--- a/Content.Shared/Pulling/Components/PullableComponent.cs
+++ b/Content.Shared/Pulling/Components/PullableComponent.cs
@@ -7,7 +7,7 @@ namespace Content.Shared.Pulling.Components
 {
    // Before you try to add another type than SharedPullingStateManagementSystem, consider the can of worms you may be opening!
    [NetworkedComponent()]
-    [Access(typeof(SharedPullingStateManagementSystem))]
+    [Friend(typeof(SharedPullingStateManagementSystem))]
    [RegisterComponent]
    public sealed class SharedPullableComponent : Component
    {
@@ -26,7 +26,6 @@ namespace Content.Shared.Pulling.Components

        public bool BeingPulled => Puller != null;

-        [Access(typeof(SharedPullingStateManagementSystem), Other = AccessPermissions.ReadExecute)] // FIXME Friends
        public EntityCoordinates? MovingTo { get; set; }

        public override ComponentState GetComponentState()
--- a/Content.Shared/Pulling/Components/SharedPullerComponent.cs
+++ b/Content.Shared/Pulling/Components/SharedPullerComponent.cs
@@ -1,7 +1,7 @@
 namespace Content.Shared.Pulling.Components
 {
    [RegisterComponent]
-    [Access(typeof(SharedPullingStateManagementSystem))]
+    [Friend(typeof(SharedPullingStateManagementSystem))]
    public sealed class SharedPullerComponent : Component
    {
        // Before changing how this is updated, please see SharedPullerSystem.RefreshMovementSpeed
--- a/Content.Shared/Stacks/SharedStackComponent.cs
+++ b/Content.Shared/Stacks/SharedStackComponent.cs
@@ -4,7 +4,7 @@ using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototy

 namespace Content.Shared.Stacks
 {
-    [NetworkedComponent, Access(typeof(SharedStackSystem))]
+    [NetworkedComponent, Friend(typeof(SharedStackSystem))]
    public abstract class SharedStackComponent : Component, ISerializationHooks
    {
        [ViewVariables(VVAccess.ReadWrite)]
--- a/Content.Shared/Standing/StandingStateComponent.cs
+++ b/Content.Shared/Standing/StandingStateComponent.cs
@@ -3,7 +3,7 @@ using Robust.Shared.GameStates;

 namespace Content.Shared.Standing
 {
-    [Access(typeof(StandingStateSystem))]
+    [Friend(typeof(StandingStateSystem))]
    [RegisterComponent, NetworkedComponent]
    public sealed class StandingStateComponent : Component
    {
--- a/Content.Shared/StatusEffect/StatusEffectsComponent.cs
+++ b/Content.Shared/StatusEffect/StatusEffectsComponent.cs
@@ -5,7 +5,7 @@ namespace Content.Shared.StatusEffect
 {
    [RegisterComponent]
    [NetworkedComponent]
-    [Access(typeof(StatusEffectsSystem))]
+    [Friend(typeof(StatusEffectsSystem))]
    public sealed class StatusEffectsComponent : Component
    {
        [ViewVariables]
--- a/Content.Shared/StepTrigger/StepTriggerComponent.cs
+++ b/Content.Shared/StepTrigger/StepTriggerComponent.cs
@@ -5,7 +5,7 @@ namespace Content.Shared.StepTrigger;

 [RegisterComponent]
 [NetworkedComponent]
-[Access(typeof(StepTriggerSystem))]
+[Friend(typeof(StepTriggerSystem))]
 public sealed class StepTriggerComponent : Component
 {
    /// <summary>
@@ -41,7 +41,7 @@ public sealed class StepTriggerComponent : Component
 }

 [RegisterComponent]
-[Access(typeof(StepTriggerSystem))]
+[Friend(typeof(StepTriggerSystem))]
 public sealed class StepTriggerActiveComponent : Component
 {

--- a/Content.Shared/Storage/Components/ItemCounterComponent.cs
+++ b/Content.Shared/Storage/Components/ItemCounterComponent.cs
@@ -16,7 +16,7 @@ namespace Content.Shared.Storage.Components
    ///      tags: [Cigarette]
    /// </code>
    [RegisterComponent]
-    [Access(typeof(SharedItemCounterSystem))]
+    [Friend(typeof(SharedItemCounterSystem))]
    public sealed class ItemCounterComponent : Component
    {
        [DataField("count", required: true)]
--- a/Content.Shared/Storage/Components/ItemMapperComponent.cs
+++ b/Content.Shared/Storage/Components/ItemMapperComponent.cs
@@ -4,7 +4,7 @@ using Robust.Shared.Serialization;
 namespace Content.Shared.Storage.Components
 {
    [RegisterComponent]
-    [Access(typeof(SharedItemMapperSystem))]
+    [Friend(typeof(SharedItemMapperSystem))]
    public sealed class ItemMapperComponent : Component, ISerializationHooks
    {
        [DataField("mapLayers")] public readonly Dictionary<string, SharedMapLayerData> MapLayers = new();
--- a/Content.Shared/Stunnable/KnockedDownComponent.cs
+++ b/Content.Shared/Stunnable/KnockedDownComponent.cs
@@ -6,7 +6,7 @@ namespace Content.Shared.Stunnable
 {
    [RegisterComponent]
    [NetworkedComponent]
-    [Access(typeof(SharedStunSystem))]
+    [Friend(typeof(SharedStunSystem))]
    public sealed class KnockedDownComponent : Component
    {
        [DataField("helpInterval")]
--- a/Content.Shared/Stunnable/SlowedDownComponent.cs
+++ b/Content.Shared/Stunnable/SlowedDownComponent.cs
@@ -5,7 +5,7 @@ namespace Content.Shared.Stunnable
 {
    [RegisterComponent]
    [NetworkedComponent]
-    [Access(typeof(SharedStunSystem))]
+    [Friend(typeof(SharedStunSystem))]
    public sealed class SlowedDownComponent : Component
    {
        public float SprintSpeedModifier { get; set; } = 0.5f;
--- a/Content.Shared/Stunnable/StunnedComponent.cs
+++ b/Content.Shared/Stunnable/StunnedComponent.cs
@@ -2,7 +2,7 @@ using Robust.Shared.GameStates;

 namespace Content.Shared.Stunnable
 {
-    [Access(typeof(SharedStunSystem))]
+    [Friend(typeof(SharedStunSystem))]
    [RegisterComponent, NetworkedComponent]
    public sealed class StunnedComponent : Component
    {
--- a/Content.Shared/SubFloor/SubFloorHideComponent.cs
+++ b/Content.Shared/SubFloor/SubFloorHideComponent.cs
@@ -10,7 +10,7 @@ namespace Content.Shared.SubFloor
    /// <seealso cref="P:Content.Shared.Maps.ContentTileDefinition.IsSubFloor" />
    [NetworkedComponent]
    [RegisterComponent]
-    [Access(typeof(SharedSubFloorHideSystem))]
+    [Friend(typeof(SharedSubFloorHideSystem))]
    public sealed class SubFloorHideComponent : Component
    {
        /// <summary>
@@ -47,7 +47,6 @@ namespace Content.Shared.SubFloor
        ///     The entities this subfloor is revealed by.
        /// </summary>
        [ViewVariables]
-        [Access(typeof(SharedSubFloorHideSystem), Other = AccessPermissions.ReadWriteExecute)] // FIXME Friends
        public HashSet<EntityUid> RevealedBy { get; set; } = new();
    }
 }
--- a/Content.Shared/Tag/TagComponent.cs
+++ b/Content.Shared/Tag/TagComponent.cs
@@ -3,12 +3,11 @@ using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototy

 namespace Content.Shared.Tag
 {
-    [RegisterComponent, Access(typeof(TagSystem))]
+    [RegisterComponent, Friend(typeof(TagSystem))]
    public sealed class TagComponent : Component, ISerializationHooks
    {
        [ViewVariables]
        [DataField("tags", customTypeSerializer: typeof(PrototypeIdHashSetSerializer<TagPrototype>))]
-        [Access(typeof(TagSystem), Other = AccessPermissions.ReadExecute)] // FIXME Friends
        public readonly HashSet<string> Tags = new();
    }
 }