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

Content.Client/DoAfter/DoAfterComponent.cs

@@ -3,7 +3,7 @@ using Content.Shared.DoAfter;
 
 namespace Content.Client.DoAfter
 {
-    [RegisterComponent, Access(typeof(DoAfterSystem))]
+    [RegisterComponent, Friend(typeof(DoAfterSystem))]
     public sealed class DoAfterComponent : SharedDoAfterComponent
     {
         public readonly Dictionary<byte, ClientDoAfter> DoAfters = new();

Content.Client/Explosion/TriggerOnProximityComponent.cs

@@ -2,5 +2,5 @@ using Content.Shared.Explosion;
 
 namespace Content.Client.Explosion;
 
-[RegisterComponent, Access(typeof(TriggerSystem))]
+[RegisterComponent, Friend(typeof(TriggerSystem))]
 public sealed class TriggerOnProximityComponent : SharedTriggerOnProximityComponent {}

Content.Client/Flash/FlashableComponent.cs

@@ -5,7 +5,7 @@ using Robust.Shared.GameObjects;
 namespace Content.Client.Flash
 {
     [ComponentReference(typeof(SharedFlashableComponent))]
-    [RegisterComponent, Access(typeof(FlashSystem))]
+    [RegisterComponent, Friend(typeof(FlashSystem))]
     public sealed class FlashableComponent : SharedFlashableComponent
     {
     }

Content.Client/Hands/HandsComponent.cs

@@ -4,7 +4,7 @@ namespace Content.Client.Hands
 {
     [RegisterComponent]
     [ComponentReference(typeof(SharedHandsComponent))]
-    [Access(typeof(HandsSystem))]
+    [Friend(typeof(HandsSystem))]
     public sealed class HandsComponent : SharedHandsComponent
     {
         /// <summary>

Content.Client/Inventory/ClientInventoryComponent.cs

@@ -16,7 +16,7 @@ namespace Content.Client.Inventory
     /// </summary>
     [RegisterComponent]
     [ComponentReference(typeof(InventoryComponent))]
-    [Access(typeof(ClientInventorySystem))]
+    [Friend(typeof(ClientInventorySystem))]
     public sealed class ClientInventoryComponent : InventoryComponent
     {
         public Control BottomLeftButtons = default!;
@@ -34,7 +34,6 @@ namespace Content.Client.Inventory
         ///     Data about the current layers that have been added to the players sprite due to the items in each equipment slot.
         /// </summary>
         [ViewVariables]
-        [Access(typeof(ClientInventorySystem), Other = AccessPermissions.ReadWriteExecute)] // FIXME Friends
         public readonly Dictionary<string, HashSet<string>> VisualLayerKeys = new();
 
         public bool AttachedToGameHud;

Content.Client/Light/Components/HandheldLightComponent.cs

@@ -9,7 +9,7 @@ using static Robust.Client.UserInterface.Controls.BoxContainer;
 namespace Content.Client.Light.Components
 {
     [RegisterComponent]
-    [Access(typeof(HandheldLightSystem))]
+    [Friend(typeof(HandheldLightSystem))]
     public sealed class HandheldLightComponent : SharedHandheldLightComponent, IItemStatus
     {
         public byte? Level;

Content.Client/Movement/Components/ClimbableComponent.cs

@@ -3,6 +3,6 @@ using Content.Shared.Climbing;
 namespace Content.Client.Movement.Components;
 
 [RegisterComponent]
-[Access(typeof(ClimbSystem))]
+[Friend(typeof(ClimbSystem))]
 [ComponentReference(typeof(SharedClimbableComponent))]
 public sealed class ClimbableComponent : SharedClimbableComponent { }

Content.Client/Movement/Components/ClimbingComponent.cs

@@ -3,6 +3,6 @@
 namespace Content.Client.Movement.Components;
 
 [RegisterComponent]
-[Access(typeof(ClimbSystem))]
+[Friend(typeof(ClimbSystem))]
 [ComponentReference(typeof(SharedClimbingComponent))]
 public sealed class ClimbingComponent : SharedClimbingComponent { }

Content.Client/Stack/StackComponent.cs

@@ -8,7 +8,7 @@ using Robust.Shared.Timing;
 
 namespace Content.Client.Stack
 {
-    [RegisterComponent, Access(typeof(StackSystem), typeof(StatusControl))]
+    [RegisterComponent, Friend(typeof(StackSystem), typeof(StatusControl))]
     [ComponentReference(typeof(SharedStackComponent))]
     public sealed class StackComponent : SharedStackComponent, IItemStatus
     {

Content.Client/Tools/Components/WelderComponent.cs

@@ -13,7 +13,7 @@ using Robust.Shared.ViewVariables;
 
 namespace Content.Client.Tools.Components
 {
-    [RegisterComponent, Access(typeof(ToolSystem), typeof(StatusControl))]
+    [RegisterComponent, Friend(typeof(ToolSystem), typeof(StatusControl))]
     public sealed class WelderComponent : SharedWelderComponent, IItemStatus
     {
         [ViewVariables(VVAccess.ReadWrite)]

Content.Client/Weapons/Ranged/Components/MagazineVisualsComponent.cs

@@ -5,7 +5,7 @@ namespace Content.Client.Weapons.Ranged.Components;
 /// <summary>
 /// Visualizer for gun mag presence; can change states based on ammo count or toggle visibility entirely.
 /// </summary>
-[RegisterComponent, Access(typeof(GunSystem))]
+[RegisterComponent, Friend(typeof(GunSystem))]
 public sealed class MagazineVisualsComponent : Component
 {
     /// <summary>

Content.Client/Weapons/Ranged/Components/SpentAmmoVisualsComponent.cs

@@ -2,7 +2,7 @@ using Content.Client.Weapons.Ranged.Systems;
 
 namespace Content.Client.Weapons.Ranged.Components;
 
-[RegisterComponent, Access(typeof(GunSystem))]
+[RegisterComponent, Friend(typeof(GunSystem))]
 public sealed class SpentAmmoVisualsComponent : Component
 {
     /// <summary>

Content.Server/AI/Pathfinding/GridPathfindingComponent.cs

@@ -1,7 +1,7 @@
 namespace Content.Server.AI.Pathfinding;
 
 [RegisterComponent]
-[Access(typeof(PathfindingSystem))]
+[Friend(typeof(PathfindingSystem))]
 public sealed class GridPathfindingComponent : Component, IPathfindingGraph
 {
     public Dictionary<Vector2i, PathfindingChunk> Graph = new();

Content.Server/Administration/Components/BufferingComponent.cs

@@ -2,7 +2,7 @@
 
 namespace Content.Server.Administration.Components;
 
-[RegisterComponent, Access(typeof(BufferingSystem))]
+[RegisterComponent, Friend(typeof(BufferingSystem))]
 public sealed class BufferingComponent : Component
 {
     [DataField("minBufferTime")]

Content.Server/Advertise/AdvertiseComponent.cs

@@ -3,7 +3,7 @@ using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototy
 
 namespace Content.Server.Advertise
 {
-    [RegisterComponent, Access(typeof(AdvertiseSystem))]
+    [RegisterComponent, Friend(typeof(AdvertiseSystem))]
     public sealed class AdvertiseComponent : Component
     {
         /// <summary>

Content.Server/Animals/Components/UdderComponent.cs

@@ -5,7 +5,7 @@ using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototy
 
 namespace Content.Server.Animals.Components
 {
-    [RegisterComponent, Access(typeof(UdderSystem))]
+    [RegisterComponent, Friend(typeof(UdderSystem))]
     internal sealed class UdderComponent : Component
     {
         /// <summary>

Content.Server/Atmos/Piping/Trinary/Components/GasMixerComponent.cs

@@ -4,7 +4,7 @@ using Content.Shared.Atmos;
 namespace Content.Server.Atmos.Piping.Trinary.Components
 {
     [RegisterComponent]
-    [Access(typeof(GasMixerSystem))]
+    [Friend(typeof(GasMixerSystem))]
     public sealed class GasMixerComponent : Component
     {
         [ViewVariables(VVAccess.ReadWrite)]

Content.Server/Atmos/Piping/Unary/Components/GasOutletInjectorComponent.cs

@@ -4,7 +4,7 @@ using Content.Shared.Atmos;
 namespace Content.Server.Atmos.Piping.Unary.Components
 {
     [RegisterComponent]
-    [Access(typeof(GasOutletInjectorSystem))]
+    [Friend(typeof(GasOutletInjectorSystem))]
     public sealed class GasOutletInjectorComponent : Component
     {
 

Content.Server/Atmos/Piping/Unary/Components/GasVentScrubberComponent.cs

@@ -6,7 +6,7 @@ using Content.Shared.Atmos.Piping.Unary.Components;
 namespace Content.Server.Atmos.Piping.Unary.Components
 {
     [RegisterComponent]
-    [Access(typeof(GasVentScrubberSystem))]
+    [Friend(typeof(GasVentScrubberSystem))]
     public sealed class GasVentScrubberComponent : Component
     {
         [ViewVariables(VVAccess.ReadWrite)]

Content.Server/Atmos/TileAtmosphere.cs

@@ -9,7 +9,7 @@ namespace Content.Server.Atmos
     ///     Internal Atmos class that stores data about the atmosphere in a grid.
     ///     You shouldn't use this directly, use <see cref="AtmosphereSystem"/> instead.
     /// </summary>
-    [Access(typeof(AtmosphereSystem))]
+    [Friend(typeof(AtmosphereSystem))]
     public sealed class TileAtmosphere : IGasMixtureHolder
     {
         [ViewVariables]
@@ -48,7 +48,7 @@ namespace Content.Server.Atmos
         [ViewVariables]
         public AtmosDirection AdjacentBits = AtmosDirection.Invalid;
 
-        [ViewVariables, Access(typeof(AtmosphereSystem), Other = AccessPermissions.ReadExecute)]
+        [ViewVariables]
         public MonstermosInfo MonstermosInfo;
 
         [ViewVariables]
@@ -78,7 +78,6 @@ namespace Content.Server.Atmos
         /// This can be immutable if the tile is spaced.
         /// </summary>
         [ViewVariables]
-        [Access(typeof(AtmosphereSystem), Other = AccessPermissions.ReadExecute)] // FIXME Friends
         public GasMixture? Air { get; set; }
 
         GasMixture IGasMixtureHolder.Air

Content.Server/Body/Components/BloodstreamComponent.cs

@@ -8,7 +8,7 @@ using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototy
 
 namespace Content.Server.Body.Components
 {
-    [RegisterComponent, Access(typeof(BloodstreamSystem))]
+    [RegisterComponent, Friend(typeof(BloodstreamSystem))]
     public sealed class BloodstreamComponent : Component
     {
         public static string DefaultChemicalsSolutionName = "chemicals";
@@ -129,7 +129,6 @@ namespace Content.Server.Body.Components
         ///     Internal solution for reagent storage
         /// </summary>
         [ViewVariables(VVAccess.ReadWrite)]
-        [Access(typeof(BloodstreamSystem), Other = AccessPermissions.ReadExecute)] // FIXME Friends
         public Solution ChemicalSolution = default!;
 
         /// <summary>

Content.Server/Body/Components/BrainComponent.cs

@@ -2,7 +2,7 @@
 
 namespace Content.Server.Body.Components
 {
-    [RegisterComponent, Access(typeof(BrainSystem))]
+    [RegisterComponent, Friend(typeof(BrainSystem))]
     public sealed class BrainComponent : Component
     {
     }

Content.Server/Body/Components/LungComponent.cs

@@ -5,11 +5,10 @@ using Content.Shared.Chemistry.Components;
 
 namespace Content.Server.Body.Components;
 
-[RegisterComponent, Access(typeof(LungSystem))]
+[RegisterComponent, Friend(typeof(LungSystem))]
 public sealed class LungComponent : Component
 {
     [DataField("air")]
-    [Access(typeof(LungSystem), Other = AccessPermissions.ReadExecute)] // FIXME Friends
     public GasMixture Air { get; set; } = new()
     {
         Volume = 6,
@@ -17,6 +16,5 @@ public sealed class LungComponent : Component
     };
 
     [ViewVariables]
-    [Access(typeof(LungSystem), Other = AccessPermissions.ReadExecute)] // FIXME Friends
     public Solution LungSolution = default!;
 }

Content.Server/Body/Components/MetabolizerComponent.cs

@@ -9,7 +9,7 @@ namespace Content.Server.Body.Components
     /// <summary>
     ///     Handles metabolizing various reagents with given effects.
     /// </summary>
-    [RegisterComponent, Access(typeof(MetabolizerSystem))]
+    [RegisterComponent, Friend(typeof(MetabolizerSystem))]
     public sealed class MetabolizerComponent : Component
     {
         public float AccumulatedFrametime = 0.0f;
@@ -40,7 +40,6 @@ namespace Content.Server.Body.Components
         ///     List of metabolizer types that this organ is. ex. Human, Slime, Felinid, w/e.
         /// </summary>
         [DataField("metabolizerTypes", customTypeSerializer:typeof(PrototypeIdHashSetSerializer<MetabolizerTypePrototype>))]
-        [Access(typeof(MetabolizerSystem), Other = AccessPermissions.ReadExecute)] // FIXME Friends
         public HashSet<string>? MetabolizerTypes = null;
 
         /// <summary>

Content.Server/Body/Components/RespiratorComponent.cs

@@ -3,7 +3,7 @@ using Content.Shared.Damage;
 
 namespace Content.Server.Body.Components
 {
-    [RegisterComponent, Access(typeof(RespiratorSystem))]
+    [RegisterComponent, Friend(typeof(RespiratorSystem))]
     public sealed class RespiratorComponent : Component
     {
         /// <summary>

Content.Server/Body/Components/StomachComponent.cs

@@ -3,7 +3,7 @@ using Content.Shared.FixedPoint;
 
 namespace Content.Server.Body.Components
 {
-    [RegisterComponent, Access(typeof(StomachSystem))]
+    [RegisterComponent, Friend(typeof(StomachSystem))]
     public sealed class StomachComponent : Component
     {
         public float AccumulatedFrameTime;

Content.Server/Body/Components/ThermalRegulatorComponent.cs

@@ -3,7 +3,7 @@ using Content.Server.Body.Systems;
 namespace Content.Server.Body.Components;
 
 [RegisterComponent]
-[Access(typeof(ThermalRegulatorSystem))]
+[Friend(typeof(ThermalRegulatorSystem))]
 public sealed class ThermalRegulatorComponent : Component
 {
     /// <summary>

Content.Server/Botany/Components/LogComponent.cs

@@ -6,7 +6,7 @@ namespace Content.Server.Botany.Components;
 // TODO: This should probably be merged with SliceableFood somehow or made into a more generic Choppable.
 
 [RegisterComponent]
-[Access(typeof(LogSystem))]
+[Friend(typeof(LogSystem))]
 public sealed class LogComponent : Component
 {
     [DataField("spawnedPrototype", customTypeSerializer: typeof(PrototypeIdSerializer<EntityPrototype>))]

Content.Server/Botany/Components/ProduceComponent.cs

@@ -4,7 +4,7 @@ using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototy
 namespace Content.Server.Botany.Components;
 
 [RegisterComponent]
-[Access(typeof(BotanySystem))]
+[Friend(typeof(BotanySystem))]
 public sealed class ProduceComponent : Component
 {
     [DataField("targetSolution")] public string SolutionName { get; set; } = "food";

Content.Server/Botany/Components/SeedComponent.cs

@@ -3,7 +3,7 @@ using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototy
 
 namespace Content.Server.Botany.Components
 {
-    [RegisterComponent, Access(typeof(BotanySystem))]
+    [RegisterComponent, Friend(typeof(BotanySystem))]
     public sealed class SeedComponent : Component
     {
         /// <summary>

Content.Server/Botany/Components/SeedExtractorComponent.cs

@@ -3,7 +3,7 @@ using Content.Server.Botany.Systems;
 namespace Content.Server.Botany.Components;
 
 [RegisterComponent]
-[Access(typeof(SeedExtractorSystem))]
+[Friend(typeof(SeedExtractorSystem))]
 public sealed class SeedExtractorComponent : Component
 {
     // TODO: Upgradeable machines.

Content.Server/Botany/SeedPrototype.cs

@@ -63,7 +63,7 @@ public struct SeedChemQuantity
 
 // TODO reduce the number of friends to a reasonable level. Requires ECS-ing things like plant holder component.
 [Virtual, DataDefinition]
-[Access(typeof(BotanySystem), typeof(PlantHolderSystem), typeof(SeedExtractorSystem), typeof(PlantHolderComponent))]
+[Friend(typeof(BotanySystem), typeof(PlantHolderSystem), typeof(SeedExtractorSystem), typeof(PlantHolderComponent))]
 public class SeedData
 {
     #region Tracking

Content.Server/Cargo/Components/CargoTelepadComponent.cs

@@ -11,7 +11,7 @@ namespace Content.Server.Cargo.Components
     /// <summary>
     /// Handles teleporting in requested cargo after the specified delay.
     /// </summary>
-    [RegisterComponent, Access(typeof(CargoSystem))]
+    [RegisterComponent, Friend(typeof(CargoSystem))]
     public sealed class CargoTelepadComponent : SharedCargoTelepadComponent
     {
         [DataField("delay")]

Content.Server/Chemistry/Components/SolutionManager/SolutionContainerManagerComponent.cs

@@ -4,12 +4,11 @@ using Content.Shared.Chemistry.Components;
 namespace Content.Server.Chemistry.Components.SolutionManager
 {
     [RegisterComponent]
-    [Access(typeof(SolutionContainerSystem))]
+    [Friend(typeof(SolutionContainerSystem))]
     public sealed class SolutionContainerManagerComponent : Component
     {
         [ViewVariables]
         [DataField("solutions")]
-        [Access(typeof(SolutionContainerSystem), Other = AccessPermissions.ReadExecute)] // FIXME Friends
         public readonly Dictionary<string, Solution> Solutions = new();
     }
 }

Content.Server/Climbing/Components/ClimbingComponent.cs

@@ -4,7 +4,7 @@ namespace Content.Server.Climbing.Components;
 
 [RegisterComponent]
 [ComponentReference(typeof(SharedClimbingComponent))]
-[Access(typeof(ClimbSystem))]
+[Friend(typeof(ClimbSystem))]
 public sealed class ClimbingComponent : SharedClimbingComponent
 {
     [ViewVariables(VVAccess.ReadWrite)]

Content.Server/Climbing/Components/GlassTableComponent.cs

@@ -7,7 +7,7 @@ namespace Content.Server.Climbing.Components;
 ///     This is a really entity-specific behavior, so opted to make it
 ///     not very generalized with regards to naming.
 /// </summary>
-[RegisterComponent, Access(typeof(ClimbSystem))]
+[RegisterComponent, Friend(typeof(ClimbSystem))]
 public sealed class GlassTableComponent : Component
 {
     /// <summary>

Content.Server/Construction/Components/ConstructionComponent.cs

@@ -3,7 +3,7 @@ using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototy
 
 namespace Content.Server.Construction.Components
 {
-    [RegisterComponent, Access(typeof(ConstructionSystem))]
+    [RegisterComponent, Friend(typeof(ConstructionSystem))]
     public sealed class ConstructionComponent : Component
     {
         [DataField("graph", required:true, customTypeSerializer:typeof(PrototypeIdSerializer<ConstructionGraphPrototype>))]

Content.Server/Conveyor/ConveyorComponent.cs

@@ -5,7 +5,7 @@ using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototy
 namespace Content.Server.Conveyor
 {
     [RegisterComponent]
-    [Access(typeof(ConveyorSystem))]
+    [Friend(typeof(ConveyorSystem))]
     public sealed class ConveyorComponent : Component
     {
         /// <summary>

Content.Server/Damage/Components/DamageOtherOnHitComponent.cs

@@ -3,7 +3,7 @@ using Content.Shared.Damage;
 
 namespace Content.Server.Damage.Components
 {
-    [Access(typeof(DamageOtherOnHitSystem))]
+    [Friend(typeof(DamageOtherOnHitSystem))]
     [RegisterComponent]
     public sealed class DamageOtherOnHitComponent : Component
     {

Content.Server/DeviceNetwork/Components/ApcNetworkComponent.cs

@@ -4,7 +4,7 @@ using Content.Server.NodeContainer.Nodes;
 namespace Content.Server.DeviceNetwork.Components
 {
     [RegisterComponent]
-    [Access(typeof(ApcNetworkSystem))]
+    [Friend(typeof(ApcNetworkSystem))]
     [ComponentProtoName("ApcNetworkConnection")]
     public sealed class ApcNetworkComponent : Component
     {

Content.Server/DeviceNetwork/Components/DeviceNetworkComponent.cs

@@ -5,7 +5,7 @@ using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototy
 namespace Content.Server.DeviceNetwork.Components
 {
     [RegisterComponent]
-    [Access(typeof(DeviceNetworkSystem), typeof(DeviceNet))]
+    [Friend(typeof(DeviceNetworkSystem), typeof(DeviceNet))]
     public sealed class DeviceNetworkComponent : Component
     {
         public enum DeviceNetIdDefaults

Content.Server/DeviceNetwork/Components/Devices/ApcNetSwitchComponent.cs

@@ -3,7 +3,7 @@
 namespace Content.Server.DeviceNetwork.Components.Devices
 {
     [RegisterComponent]
-    [Access(typeof(ApcNetSwitchSystem))]
+    [Friend(typeof(ApcNetSwitchSystem))]
     public sealed class ApcNetSwitchComponent : Component
     {
         [ViewVariables] public bool State;

Content.Server/Dice/DiceComponent.cs

@@ -2,7 +2,7 @@ using Content.Shared.Sound;
 
 namespace Content.Server.Dice
 {
-    [RegisterComponent, Access(typeof(DiceSystem))]
+    [RegisterComponent, Friend(typeof(DiceSystem))]
     public sealed class DiceComponent : Component
     {
         [ViewVariables]

Content.Server/DoAfter/DoAfterComponent.cs

@@ -2,7 +2,7 @@ using Content.Shared.DoAfter;
 
 namespace Content.Server.DoAfter
 {
-    [RegisterComponent, Access(typeof(DoAfterSystem))]
+    [RegisterComponent, Friend(typeof(DoAfterSystem))]
     public sealed class DoAfterComponent : SharedDoAfterComponent
     {
         public readonly Dictionary<DoAfter, byte> DoAfters = new();

Content.Server/Electrocution/Components/ElectrocutionComponent.cs

@@ -4,7 +4,7 @@
     /// Component for virtual electrocution entities (representing an in-progress shock).
     /// </summary>
     [RegisterComponent]
-    [Access(typeof(ElectrocutionSystem))]
+    [Friend(typeof(ElectrocutionSystem))]
     public sealed class ElectrocutionComponent : Component
     {
         [DataField("timeLeft")] public float TimeLeft { get; set; }

Content.Server/Explosion/Components/ClusterGrenadeComponent.cs

@@ -5,7 +5,7 @@ using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototy
 
 namespace Content.Server.Explosion.Components
 {
-    [RegisterComponent, Access(typeof(ClusterGrenadeSystem))]
+    [RegisterComponent, Friend(typeof(ClusterGrenadeSystem))]
     public sealed class ClusterGrenadeComponent : Component
     {
         public Container GrenadesContainer = default!;

Content.Server/Explosion/Components/ExplosionResistanceComponent.cs

@@ -12,7 +12,7 @@ namespace Content.Server.Explosion.Components;
 ///     significantly reduce the damage, but shouldn't be silly overpowered in regular combat.
 /// </remarks>
 [RegisterComponent]
-[Access(typeof(ExplosionSystem))]
+[Friend(typeof(ExplosionSystem))]
 public sealed class ExplosionResistanceComponent : Component
 {
     /// <summary>

Content.Server/Extinguisher/FireExtinguisherComponent.cs

@@ -3,7 +3,7 @@ using Content.Shared.Sound;
 namespace Content.Server.Extinguisher;
 
 [RegisterComponent]
-[Access(typeof(FireExtinguisherSystem))]
+[Friend(typeof(FireExtinguisherSystem))]
 public sealed class FireExtinguisherComponent : Component
 {
     [DataField("refillSound")] public SoundSpecifier RefillSound = new SoundPathSpecifier("/Audio/Effects/refill.ogg");

Content.Server/Flash/Components/FlashComponent.cs

@@ -2,7 +2,7 @@ using Content.Shared.Sound;
 
 namespace Content.Server.Flash.Components
 {
-    [RegisterComponent, Access(typeof(FlashSystem))]
+    [RegisterComponent, Friend(typeof(FlashSystem))]
     public sealed class FlashComponent : Component
     {
         [DataField("duration")]

Content.Server/Flash/Components/FlashImmunityComponent.cs

@@ -1,6 +1,6 @@
 namespace Content.Server.Flash.Components
 {
-    [RegisterComponent, Access(typeof(FlashSystem))]
+    [RegisterComponent, Friend(typeof(FlashSystem))]
     public sealed class FlashImmunityComponent : Component
     {
         [ViewVariables(VVAccess.ReadWrite)]

Content.Server/Flash/Components/FlashableComponent.cs

@@ -3,7 +3,7 @@ using Content.Shared.Flash;
 namespace Content.Server.Flash.Components
 {
     [ComponentReference(typeof(SharedFlashableComponent))]
-    [RegisterComponent, Access(typeof(FlashSystem))]
+    [RegisterComponent, Friend(typeof(FlashSystem))]
     public sealed class FlashableComponent : SharedFlashableComponent
     {
     }

Content.Server/Fluids/Components/AbsorbentComponent.cs

@@ -7,7 +7,7 @@ namespace Content.Server.Fluids.Components;
 /// <summary>
 /// For entities that can clean up puddles
 /// </summary>
-[RegisterComponent, Access(typeof(MoppingSystem))]
+[RegisterComponent, Friend(typeof(MoppingSystem))]
 public sealed class AbsorbentComponent : Component
 {
     public const string SolutionName = "absorbed";

Content.Server/Fluids/Components/EvaporationComponent.cs

@@ -4,7 +4,7 @@ using Content.Shared.FixedPoint;
 namespace Content.Server.Fluids.Components
 {
     [RegisterComponent]
-    [Access(typeof(EvaporationSystem))]
+    [Friend(typeof(EvaporationSystem))]
     public sealed class EvaporationComponent : Component
     {
         /// <summary>

Content.Server/Fluids/Components/FluidSpreaderComponent.cs

@@ -4,7 +4,7 @@ using Content.Shared.Chemistry.Components;
 namespace Content.Server.Fluids.Components;
 
 [RegisterComponent]
-[Access(typeof(FluidSpreaderSystem))]
+[Friend(typeof(FluidSpreaderSystem))]
 public sealed class FluidSpreaderComponent : Component
 {
     [ViewVariables]

Content.Server/Fluids/Components/PuddleComponent.cs

@@ -8,7 +8,7 @@ namespace Content.Server.Fluids.Components
     /// Puddle on a floor
     /// </summary>
     [RegisterComponent]
-    [Access(typeof(PuddleSystem))]
+    [Friend(typeof(PuddleSystem))]
     public sealed class PuddleComponent : Component
     {
         public const string DefaultSolutionName = "puddle";

Content.Server/Fluids/Components/SprayComponent.cs

@@ -7,7 +7,7 @@ using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototy
 namespace Content.Server.Fluids.Components;
 
 [RegisterComponent]
-[Access(typeof(SpraySystem))]
+[Friend(typeof(SpraySystem))]
 public sealed class SprayComponent : Component
 {
     public const string SolutionName = "spray";
@@ -32,6 +32,5 @@ public sealed class SprayComponent : Component
     [DataField("impulse")] public float Impulse;
 
     [DataField("spraySound", required: true)]
-    [Access(typeof(SpraySystem), Other = AccessPermissions.ReadExecute)] // FIXME Friends
     public SoundSpecifier SpraySound { get; } = default!;
 }

Content.Server/Gatherable/Components/GatherableComponent.cs

@@ -3,7 +3,7 @@ using Content.Shared.Whitelist;
 namespace Content.Server.Gatherable.Components;
 
 [RegisterComponent]
-[Access(typeof(GatherableSystem))]
+[Friend(typeof(GatherableSystem))]
 public sealed class GatherableComponent : Component
 {
     /// <summary>
@@ -11,7 +11,7 @@ public sealed class GatherableComponent : Component
     ///     Supports multiple tags.
     /// </summary>
     [ViewVariables]
-    [DataField("whitelist", required: true)]
+    [DataField("whitelist", required: true)] 
     public EntityWhitelist? ToolWhitelist;
 
     /// <summary>
@@ -27,6 +27,6 @@ public sealed class GatherableComponent : Component
     ///       Tag1: LootTableID1
     ///       Tag2: LootTableID2
     /// </summary>
-    [DataField("loot")]
+    [DataField("loot")] 
     public Dictionary<string, string>? MappedLoot = new();
 }

Content.Server/Ghost/Roles/Components/GhostRoleComponent.cs

@@ -3,7 +3,7 @@ using Robust.Server.Player;
 
 namespace Content.Server.Ghost.Roles.Components
 {
-    [Access(typeof(GhostRoleSystem))]
+    [Friend(typeof(GhostRoleSystem))]
     public abstract class GhostRoleComponent : Component
     {
         [DataField("name")] public string _roleName = "Unknown";
@@ -21,7 +21,6 @@ namespace Content.Server.Ghost.Roles.Components
         // We do this so updating RoleName and RoleDescription in VV updates the open EUIs.
 
         [ViewVariables(VVAccess.ReadWrite)]
-        [Access(typeof(GhostRoleSystem), Other = AccessPermissions.ReadWriteExecute)] // FIXME Friends
         public string RoleName
         {
             get => _roleName;
@@ -33,7 +32,6 @@ namespace Content.Server.Ghost.Roles.Components
         }
 
         [ViewVariables(VVAccess.ReadWrite)]
-        [Access(typeof(GhostRoleSystem), Other = AccessPermissions.ReadWriteExecute)] // FIXME Friends
         public string RoleDescription
         {
             get => _roleDescription;
@@ -45,7 +43,6 @@ namespace Content.Server.Ghost.Roles.Components
         }
 
         [ViewVariables(VVAccess.ReadWrite)]
-        [Access(typeof(GhostRoleSystem), Other = AccessPermissions.ReadWriteExecute)] // FIXME Friends
         public string RoleRules
         {
             get => _roleRules;

Content.Server/Gravity/GravityGeneratorComponent.cs

@@ -4,7 +4,7 @@ using Content.Shared.Gravity;
 namespace Content.Server.Gravity
 {
     [RegisterComponent]
-    [Access(typeof(GravityGeneratorSystem))]
+    [Friend(typeof(GravityGeneratorSystem))]
     public sealed class GravityGeneratorComponent : SharedGravityGeneratorComponent
     {
         // 1% charge per second.

Content.Server/HealthExaminable/HealthExaminableComponent.cs

@@ -4,7 +4,7 @@ using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototy
 
 namespace Content.Server.HealthExaminable;
 
-[RegisterComponent, Access(typeof(HealthExaminableSystem))]
+[RegisterComponent, Friend(typeof(HealthExaminableSystem))]
 public sealed class HealthExaminableComponent : Component
 {
     public List<FixedPoint2> Thresholds = new()

Content.Server/Interaction/Components/InteractionPopupComponent.cs

@@ -2,7 +2,7 @@ using Content.Shared.Sound;
 
 namespace Content.Server.Interaction.Components;
 
-[RegisterComponent, Access(typeof(InteractionPopupSystem))]
+[RegisterComponent, Friend(typeof(InteractionPopupSystem))]
 public sealed class InteractionPopupComponent : Component
 {
     /// <summary>

Content.Server/Kitchen/Components/ExtractableComponent.cs

@@ -7,7 +7,7 @@ namespace Content.Server.Kitchen.Components
     /// Tag component that denotes an entity as Extractable
     /// </summary>
     [RegisterComponent]
-    [Access(typeof(ReagentGrinderSystem))]
+    [Friend(typeof(ReagentGrinderSystem))]
     public sealed class ExtractableComponent : Component
     {
         [ViewVariables]

Content.Server/Kitchen/Components/KitchenSpikeComponent.cs

@@ -4,7 +4,7 @@ using Content.Shared.Kitchen.Components;
 
 namespace Content.Server.Kitchen.Components
 {
-    [RegisterComponent, Access(typeof(KitchenSpikeSystem))]
+    [RegisterComponent, Friend(typeof(KitchenSpikeSystem))]
     public sealed class KitchenSpikeComponent : SharedKitchenSpikeComponent
     {
         public List<string>? PrototypesToSpawn;

Content.Server/Kudzu/SpreaderComponent.cs

@@ -5,7 +5,7 @@ namespace Content.Server.Kudzu;
 /// ONLY USE THIS FOR ANCHORED OBJECTS. An error will be logged if not anchored/static.
 /// Currently does not support growing in space.
 /// </summary>
-[RegisterComponent, Access(typeof(SpreaderSystem))]
+[RegisterComponent, Friend(typeof(SpreaderSystem))]
 public sealed class SpreaderComponent : Component
 {
     /// <summary>

Content.Server/Light/Components/EmergencyLightComponent.cs

@@ -6,7 +6,7 @@ namespace Content.Server.Light.Components
     /// <summary>
     ///     Component that represents an emergency light, it has an internal battery that charges when the power is on.
     /// </summary>
-    [RegisterComponent, Access(typeof(EmergencyLightSystem))]
+    [RegisterComponent, Friend(typeof(EmergencyLightSystem))]
     public sealed class EmergencyLightComponent : SharedEmergencyLightComponent
     {
         [ViewVariables]

Content.Server/Light/Components/HandheldLightComponent.cs

@@ -8,7 +8,7 @@ namespace Content.Server.Light.Components
     ///     Component that represents a powered handheld light source which can be toggled on and off.
     /// </summary>
     [RegisterComponent]
-    [Access(typeof(HandheldLightSystem))]
+    [Friend(typeof(HandheldLightSystem))]
     public sealed class HandheldLightComponent : SharedHandheldLightComponent
     {
         [ViewVariables(VVAccess.ReadWrite)] [DataField("wattage")] public float Wattage { get; set; } = .8f;

Content.Server/Light/Components/LightBulbComponent.cs

@@ -7,7 +7,7 @@ namespace Content.Server.Light.Components
     /// <summary>
     ///     Component that represents a light bulb. Can be broken, or burned, which turns them mostly useless.
     /// </summary>
-    [RegisterComponent, Access(typeof(LightBulbSystem))]
+    [RegisterComponent, Friend(typeof(LightBulbSystem))]
     public sealed class LightBulbComponent : Component
     {
         [DataField("color")]

Content.Server/Light/Components/LitOnPoweredComponent.cs

@@ -8,7 +8,7 @@ namespace Content.Server.Light.Components
     ///     Enables or disables a pointlight depending on the powered
     ///     state of an entity.
     /// </summary>
-    [RegisterComponent, Access(typeof(PoweredLightSystem))]
+    [RegisterComponent, Friend(typeof(PoweredLightSystem))]
     public sealed class LitOnPoweredComponent : Component
     {
     }

Content.Server/Light/Components/MatchstickComponent.cs

@@ -5,7 +5,7 @@ using Content.Server.Light.EntitySystems;
 namespace Content.Server.Light.Components
 {
     [RegisterComponent]
-    [Access(typeof(MatchstickSystem))]
+    [Friend(typeof(MatchstickSystem))]
     public sealed class MatchstickComponent : Component
     {
         /// <summary>

Content.Server/Light/Components/PoweredLightComponent.cs

@@ -12,7 +12,7 @@ namespace Content.Server.Light.Components
     /// <summary>
     ///     Component that represents a wall light. It has a light bulb that can be replaced when broken.
     /// </summary>
-    [RegisterComponent, Access(typeof(PoweredLightSystem))]
+    [RegisterComponent, Friend(typeof(PoweredLightSystem))]
     public sealed class PoweredLightComponent : Component
     {
         [DataField("burnHandSound")]

Content.Server/MachineLinking/Components/SignalReceiverComponent.cs

@@ -3,7 +3,7 @@ using Content.Server.MachineLinking.System;
 namespace Content.Server.MachineLinking.Components
 {
     [RegisterComponent]
-    [Access(typeof(SignalLinkerSystem))]
+    [Friend(typeof(SignalLinkerSystem))]
     public sealed class SignalReceiverComponent : Component
     {
         [DataField("inputs")]

Content.Server/MachineLinking/Components/SignalTransmitterComponent.cs

@@ -19,7 +19,7 @@ namespace Content.Server.MachineLinking.Components
     }
 
     [RegisterComponent]
-    [Access(typeof(SignalLinkerSystem))]
+    [Friend(typeof(SignalLinkerSystem))]
     public sealed class SignalTransmitterComponent : Component
     {
         /// <summary>
@@ -32,7 +32,6 @@ namespace Content.Server.MachineLinking.Components
         public float TransmissionRange = 30f;
 
         [DataField("outputs")]
-        [Access(typeof(SignalLinkerSystem), Other = AccessPermissions.ReadExecute)] // FIXME Friends
         public Dictionary<string, List<PortIdentifier>> Outputs = new();
     }
 }

Content.Server/Medical/CrewMonitoring/CrewMonitoringConsoleComponent.cs

@@ -3,7 +3,7 @@ using Content.Shared.Medical.SuitSensor;
 namespace Content.Server.Medical.CrewMonitoring
 {
     [RegisterComponent]
-    [Access(typeof(CrewMonitoringConsoleSystem))]
+    [Friend(typeof(CrewMonitoringConsoleSystem))]
     public sealed class CrewMonitoringConsoleComponent : Component
     {
         /// <summary>

Content.Server/Medical/SuitSensors/SuitSensorComponent.cs

@@ -7,7 +7,7 @@ namespace Content.Server.Medical.SuitSensors
     ///     If enabled, will report to crew monitoring console owners position and status.
     /// </summary>
     [RegisterComponent]
-    [Access(typeof(SuitSensorSystem))]
+    [Friend(typeof(SuitSensorSystem))]
     public sealed class SuitSensorComponent : Component
     {
         /// <summary>

Content.Server/Mind/Components/MindComponent.cs

@@ -3,14 +3,13 @@ namespace Content.Server.Mind.Components
     /// <summary>
     ///     Stores a <see cref="Server.Mind.Mind"/> on a mob.
     /// </summary>
-    [RegisterComponent, Access(typeof(MindSystem))]
+    [RegisterComponent, Friend(typeof(MindSystem))]
     public sealed class MindComponent : Component
     {
         /// <summary>
         ///     The mind controlling this mob. Can be null.
         /// </summary>
         [ViewVariables]
-        [Access(typeof(MindSystem), Other = AccessPermissions.ReadWriteExecute)] // FIXME Friends
         public Mind? Mind { get; set; }
 
         /// <summary>

Content.Server/Mind/Mind.cs

@@ -72,8 +72,7 @@ namespace Content.Server.Mind
         ///     The time of death for this Mind.
         ///     Can be null - will be null if the Mind is not considered "dead".
         /// </summary>
-        [ViewVariables]
+        [ViewVariables] public TimeSpan? TimeOfDeath { get; set; } = null;
-        public TimeSpan? TimeOfDeath { get; set; } = null;
 
         /// <summary>
         ///     The component currently owned by this mind.

Content.Server/Nuke/NukeComponent.cs

@@ -13,7 +13,7 @@ namespace Content.Server.Nuke
     ///     To activate it, user needs to insert an authorization disk and enter a secret code.
     /// </summary>
     [RegisterComponent]
-    [Access(typeof(NukeSystem))]
+    [Friend(typeof(NukeSystem))]
     public sealed class NukeComponent : SharedNukeComponent
     {
         /// <summary>

Content.Server/Nutrition/Components/CigarComponent.cs

@@ -5,7 +5,7 @@ namespace Content.Server.Nutrition.Components
     /// <summary>
     ///     A disposable, single-use smokable.
     /// </summary>
-    [RegisterComponent, Access(typeof(SmokingSystem))]
+    [RegisterComponent, Friend(typeof(SmokingSystem))]
     public sealed class CigarComponent : Component
     {
     }

Content.Server/Nutrition/Components/DrinkComponent.cs

@@ -7,7 +7,7 @@ using System.Threading;
 namespace Content.Server.Nutrition.Components
 {
     [RegisterComponent]
-    [Access(typeof(DrinkSystem))]
+    [Friend(typeof(DrinkSystem))]
     public sealed class DrinkComponent : Component
     {
         [DataField("solution")]

Content.Server/Nutrition/Components/FoodComponent.cs

@@ -8,7 +8,7 @@ using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototy
 
 namespace Content.Server.Nutrition.Components
 {
-    [RegisterComponent, Access(typeof(FoodSystem))]
+    [RegisterComponent, Friend(typeof(FoodSystem))]
     public sealed class FoodComponent : Component
     {
         [DataField("solution")]

Content.Server/Nutrition/Components/ForcefeedOnCollideComponent.cs

@@ -5,7 +5,7 @@ namespace Content.Server.Nutrition.Components
     /// <summary>
     ///     A food item with this component will be forcefully fed to anyone
     /// </summary>
-    [RegisterComponent, Access(typeof(ForcefeedOnCollideSystem))]
+    [RegisterComponent, Friend(typeof(ForcefeedOnCollideSystem))]
     public sealed class ForcefeedOnCollideComponent : Component
     {
         /// <summary>

Content.Server/Nutrition/Components/IngestionBlockerComponent.cs

@@ -7,7 +7,7 @@ namespace Content.Server.Nutrition.EntitySystems;
 ///     In the event that more head-wear & mask functionality is added (like identity systems, or raising/lowering of
 ///     masks), then this component might become redundant.
 /// </remarks>
-[RegisterComponent, Access(typeof(FoodSystem), typeof(DrinkSystem))]
+[RegisterComponent, Friend(typeof(FoodSystem), typeof(DrinkSystem))]
 public sealed class IngestionBlockerComponent : Component
 {
     /// <summary>

Content.Server/Nutrition/Components/SliceableFoodComponent.cs

@@ -3,7 +3,7 @@ using Content.Shared.Sound;
 
 namespace Content.Server.Nutrition.Components
 {
-    [RegisterComponent, Access(typeof(SliceableFoodSystem))]
+    [RegisterComponent, Friend(typeof(SliceableFoodSystem))]
     internal sealed class SliceableFoodComponent : Component
     {
         [DataField("slice")]

Content.Server/Nutrition/Components/SmokableComponent.cs

@@ -4,7 +4,7 @@ using Content.Shared.Smoking;
 
 namespace Content.Server.Nutrition.Components
 {
-    [RegisterComponent, Access(typeof(SmokingSystem))]
+    [RegisterComponent, Friend(typeof(SmokingSystem))]
     public sealed class SmokableComponent : Component
     {
         [DataField("solution")]

Content.Server/Nutrition/Components/UtensilComponent.cs

@@ -3,7 +3,7 @@ using Content.Shared.Sound;
 
 namespace Content.Server.Nutrition.Components
 {
-    [RegisterComponent, Access(typeof(UtensilSystem))]
+    [RegisterComponent, Friend(typeof(UtensilSystem))]
     public sealed class UtensilComponent : Component
     {
         [DataField("types")]

Content.Server/Plants/Components/PottedPlantHideComponent.cs

@@ -9,7 +9,7 @@ namespace Content.Server.Plants.Components
     ///     Gently rustle after each interaction with plant.
     /// </summary>
     [RegisterComponent]
-    [Access(typeof(PottedPlantHideSystem))]
+    [Friend(typeof(PottedPlantHideSystem))]
     public sealed class PottedPlantHideComponent : Component
     {
         [DataField("rustleSound")]

Content.Server/Plants/Components/RandomPottedPlantComponent.cs

@@ -3,7 +3,7 @@ using Content.Server.Plants.Systems;
 namespace Content.Server.Plants.Components
 {
     [RegisterComponent]
-    [Access(typeof(RandomPottedPlantSystem))]
+    [Friend(typeof(RandomPottedPlantSystem))]
     public sealed class RandomPottedPlantComponent : Component
     {
         [ViewVariables(VVAccess.ReadOnly)]

Content.Server/PneumaticCannon/PneumaticCannonComponent.cs

@@ -7,7 +7,7 @@ namespace Content.Server.PneumaticCannon
 {
     // TODO: ideally, this and most of the actual firing code doesn't need to exist, and guns can be flexible enough
     // to handle shooting things that aren't ammo (just firing any entity)
-    [RegisterComponent, Access(typeof(PneumaticCannonSystem))]
+    [RegisterComponent, Friend(typeof(PneumaticCannonSystem))]
     public sealed class PneumaticCannonComponent : Component
     {
         [ViewVariables]

Content.Server/Pointing/Components/RoguePointingArrowComponent.cs

@@ -4,7 +4,7 @@ using Content.Shared.Pointing.Components;
 namespace Content.Server.Pointing.Components
 {
     [RegisterComponent]
-    [Access(typeof(RoguePointingSystem))]
+    [Friend(typeof(RoguePointingSystem))]
     public sealed class RoguePointingArrowComponent : SharedRoguePointingArrowComponent
     {
         [ViewVariables]

Content.Server/Power/Components/ApcComponent.cs

@@ -6,7 +6,7 @@ using Content.Shared.Sound;
 namespace Content.Server.Power.Components;
 
 [RegisterComponent]
-[Access(typeof(ApcSystem))]
+[Friend(typeof(ApcSystem))]
 public sealed class ApcComponent : BaseApcNetComponent
 {
     [DataField("onReceiveMessageSound")]

Content.Server/Power/Components/CableComponent.cs

@@ -9,7 +9,7 @@ namespace Content.Server.Power.Components
     ///     Allows the attached entity to be destroyed by a cutting tool, dropping a piece of cable.
     /// </summary>
     [RegisterComponent]
-    [Access(typeof(CableSystem))]
+    [Friend(typeof(CableSystem))]
     public sealed class CableComponent : Component
     {
         [DataField("cableDroppedOnCutPrototype", customTypeSerializer: typeof(PrototypeIdSerializer<EntityPrototype>))]

Content.Server/Power/Components/ExtensionCableProviderComponent.cs

@@ -3,7 +3,7 @@
 namespace Content.Server.Power.Components
 {
     [RegisterComponent]
-    [Access(typeof(ExtensionCableSystem))]
+    [Friend(typeof(ExtensionCableSystem))]
     public sealed class ExtensionCableProviderComponent : Component
     {
         /// <summary>

Content.Server/Power/Components/ExtensionCableReceiverComponent.cs

@@ -3,7 +3,7 @@
 namespace Content.Server.Power.Components
 {
     [RegisterComponent]
-    [Access(typeof(ExtensionCableSystem))]
+    [Friend(typeof(ExtensionCableSystem))]
     public sealed class ExtensionCableReceiverComponent : Component
     {
         [ViewVariables]

Content.Server/RandomAppearance/RandomAppearanceComponent.cs

@@ -4,7 +4,7 @@ using Robust.Shared.Serialization;
 namespace Content.Server.RandomAppearance;
 
 [RegisterComponent]
-[Access(typeof(RandomAppearanceSystem))]
+[Friend(typeof(RandomAppearanceSystem))]
 public sealed class RandomAppearanceComponent : Component, ISerializationHooks
 {
     [DataField("spriteStates")]

Content.Server/Recycling/Components/RecyclableComponent.cs

@@ -3,7 +3,7 @@ using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototy
 
 namespace Content.Server.Recycling.Components
 {
-    [RegisterComponent, Access(typeof(RecyclerSystem))]
+    [RegisterComponent, Friend(typeof(RecyclerSystem))]
     public sealed class RecyclableComponent : Component
     {
         /// <summary>

Content.Server/Recycling/Components/RecyclerComponent.cs

@@ -5,7 +5,7 @@ namespace Content.Server.Recycling.Components
 {
     // TODO: Add sound and safe beep
     [RegisterComponent]
-    [Access(typeof(RecyclerSystem))]
+    [Friend(typeof(RecyclerSystem))]
     public sealed class RecyclerComponent : Component
     {
         [Dependency] private readonly IEntityManager _entMan = default!;

Content.Server/Remotes/DoorRemoteComponent.cs

@@ -1,7 +1,7 @@
 namespace Content.Server.Remotes
 {
     [RegisterComponent]
-    [Access(typeof(DoorRemoteSystem))]
+    [Friend(typeof(DoorRemoteSystem))]
     public sealed class DoorRemoteComponent : Component
     {
         public OperatingMode Mode = OperatingMode.OpenClose;

Content.Server/Resist/ResistLockerComponent.cs

@@ -3,7 +3,7 @@ using System.Threading;
 namespace Content.Server.Resist;
 
 [RegisterComponent]
-[Access(typeof(ResistLockerSystem))]
+[Friend(typeof(ResistLockerSystem))]
 public sealed class ResistLockerComponent : Component
 {
     /// <summary>

Content.Server/Shuttles/Components/ThrusterComponent.cs

@@ -4,7 +4,7 @@ using Content.Shared.Damage;
 namespace Content.Server.Shuttles.Components
 {
     [RegisterComponent]
-    [Access(typeof(ThrusterSystem))]
+    [Friend(typeof(ThrusterSystem))]
     public sealed class ThrusterComponent : Component
     {
         /// <summary>

Content.Server/Singularity/Components/RadiationCollectorComponent.cs

@@ -6,7 +6,7 @@ namespace Content.Server.Singularity.Components
     ///     Generates electricity from radiation.
     /// </summary>
     [RegisterComponent]
-    [Access(typeof(RadiationCollectorSystem))]
+    [Friend(typeof(RadiationCollectorSystem))]
     public sealed class RadiationCollectorComponent : Component
     {
         /// <summary>