Merge branch 'master' into replace-sounds-with-sound-specifier

# Conflicts:
#	Content.Server/Actions/Actions/DisarmAction.cs
#	Content.Server/Actions/Actions/ScreamAction.cs
#	Content.Server/Arcade/Components/SpaceVillainArcadeComponent.cs
#	Content.Server/Damage/Components/DamageOnHighSpeedImpactComponent.cs
#	Content.Server/Explosion/Components/FlashExplosiveComponent.cs
#	Content.Server/Physics/Controllers/MoverController.cs
#	Content.Server/Portal/Components/PortalComponent.cs
#	Content.Server/Portal/Components/TeleporterComponent.cs
#	Content.Server/Projectiles/Components/ProjectileComponent.cs
#	Content.Server/Singularity/Components/EmitterComponent.cs
#	Content.Server/Sound/EmitSoundSystem.cs
#	Content.Server/Stunnable/Components/StunbatonComponent.cs
#	Content.Server/Tools/Components/MultitoolComponent.cs
#	Content.Server/Weapon/Ranged/Barrels/Components/ServerBatteryBarrelComponent.cs
#	Content.Shared/Gravity/GravityComponent.cs
#	Content.Shared/Light/Component/SharedExpendableLightComponent.cs
#	Content.Shared/Maps/ContentTileDefinition.cs
#	Content.Shared/Slippery/SlipperyComponent.cs
#	Content.Shared/Standing/StandingStateComponent.cs
#	Resources/Prototypes/Entities/Objects/Fun/bike_horn.yml

Content.Shared/Light/Component/SharedExpendableLightComponent.cs

@@ -1,4 +1,3 @@
-#nullable enable
 using System;
 using Content.Shared.Sound;
 using Robust.Shared.Serialization;

Content.Shared/Light/Component/SharedHandheldLightComponent.cs

@@ -1,15 +1,14 @@
-#nullable enable
 using System;
-using Content.Shared.NetIDs;
 using Robust.Shared.GameObjects;
+using Robust.Shared.GameStates;
 using Robust.Shared.Serialization;
 
 namespace Content.Shared.Light.Component
 {
+    [NetworkedComponent()]
     public abstract class SharedHandheldLightComponent : Robust.Shared.GameObjects.Component
     {
         public sealed override string Name => "HandheldLight";
-        public sealed override uint? NetID => ContentNetIDs.HANDHELD_LIGHT;
 
         protected abstract bool HasCell { get; }
 
@@ -20,7 +19,7 @@ namespace Content.Shared.Light.Component
         {
             public byte? Charge { get; }
 
-            public HandheldLightComponentState(byte? charge) : base(ContentNetIDs.HANDHELD_LIGHT)
+            public HandheldLightComponentState(byte? charge)
             {
                 Charge = charge;
             }

Content.Shared/Light/Component/SharedLightBehaviourComponent.cs

@@ -1,5 +1,4 @@
-#nullable enable
-namespace Content.Shared.Light.Component
+namespace Content.Shared.Light.Component
 {
     /// <summary>
     /// A component which applies a specific behaviour to a PointLightComponent on its owner.

Content.Shared/Light/SharedPoweredLightVisuals.cs

@@ -1,4 +1,3 @@
-#nullable enable
 using System;
 using Robust.Shared.Serialization;