Merge branch 'master' into buckle-locker-fix-1262

Content.Server/GameObjects/Components/Access/AccessComponent.cs

@@ -1,11 +1,10 @@
+#nullable enable
 using System.Collections.Generic;
 using Content.Server.Interfaces;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Serialization;
 using Robust.Shared.ViewVariables;
 
-#nullable enable
-
 namespace Content.Server.GameObjects.Components.Access
 {
     /// <summary>

Content.Server/GameObjects/Components/Access/AccessReaderComponent.cs

@@ -1,3 +1,4 @@
+#nullable enable
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -11,8 +12,6 @@ using Robust.Shared.Interfaces.GameObjects;
 using Robust.Shared.Serialization;
 using Robust.Shared.ViewVariables;
 
-#nullable enable
-
 namespace Content.Server.GameObjects.Components.Access
 {
     /// <summary>
@@ -69,7 +68,6 @@ namespace Content.Server.GameObjects.Components.Access
             return _accessLists.Count == 0 || _accessLists.Any(a => a.IsSubsetOf(accessTags));
         }
 
-        [CanBeNull]
         public static ICollection<string> FindAccessTags(IEntity entity)
         {
             if (entity.TryGetComponent(out IAccess accessComponent))

Content.Server/GameObjects/Components/Access/PresetIdCardComponent.cs

@@ -1,3 +1,4 @@
+#nullable enable
 using Content.Shared.Jobs;
 using Robust.Server.Interfaces.GameObjects;
 using Robust.Shared.GameObjects;
@@ -5,8 +6,6 @@ using Robust.Shared.IoC;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization;
 
-#nullable enable
-
 namespace Content.Server.GameObjects.Components.Access
 {
     [RegisterComponent]