Move grenade components to shared (#22691)

* Moves FlashComponent.cs, FlashOnTriggerComponent.cs, and SmokeOnTriggerComponent.cs to Shared

* Moves ExplodeOnTriggerComponent.cs, OnUseTimerTriggerComponent.cs, ActiveTimerTriggerComponent.cs, and SmokeOnTriggerComponent.cs to Shared

* Delete .run/Content Server+Client.run.xml

HOW DID THIS GET IN HERE ITS NOT AHHHH

* Update Content.Client/Explosion/SmokeOnTriggerSystem.cs

Co-authored-by: DrSmugleaf <DrSmugleaf@users.noreply.github.com>

* Update Content.Shared/Explosion/Components/ActiveTimerTriggerComponent.cs

Co-authored-by: DrSmugleaf <DrSmugleaf@users.noreply.github.com>

* Update Content.Shared/Explosion/Components/OnUseTimerTriggerComponent.cs

Co-authored-by: DrSmugleaf <DrSmugleaf@users.noreply.github.com>

* Update Content.Shared/Explosion/Components/OnUseTimerTriggerComponent.cs

Co-authored-by: DrSmugleaf <DrSmugleaf@users.noreply.github.com>

* Update Content.Shared/Explosion/EntitySystems/SharedTriggerSystem.cs

Co-authored-by: DrSmugleaf <DrSmugleaf@users.noreply.github.com>

* Update Content.Shared/Explosion/EntitySystems/SharedSmokeOnTriggerSystem.cs

Co-authored-by: DrSmugleaf <DrSmugleaf@users.noreply.github.com>

* Update ExplodeOnTriggerComponent.cs

* Revert "Delete .run/Content Server+Client.run.xml"

This reverts commit 29ee05f57de60eab5c92158d8eba5e3acba483c2.

* Fix?

* cannot figure out how to get this to go back please forgive

* Fixes a network issue

* leftovers

* Fixes

---------

Co-authored-by: DrSmugleaf <DrSmugleaf@users.noreply.github.com>
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>

.run/Content Server+Client.run.xml

@@ -1,4 +1,4 @@
-<component name="ProjectRunConfigurationManager">
+<component name="ProjectRunConfigurationManager">
   <configuration default="false" name="Content Server+Client" type="CompoundRunConfigurationType">
     <toRun name="Content.Client" type="DotNetProject" />
     <toRun name="Content.Server" type="DotNetProject" />

Content.Client/Explosion/ClusterGrenadeVisualizerSystem.cs

@@ -1,4 +1,5 @@
 using Content.Shared.Explosion;
+using Content.Shared.Explosion.Components;
 using Robust.Client.GameObjects;
 
 namespace Content.Client.Explosion;

Content.Client/Explosion/ExplosionOverlay.cs

@@ -1,5 +1,5 @@
 using System.Numerics;
-using Content.Shared.Explosion;
+using Content.Shared.Explosion.Components;
 using JetBrains.Annotations;
 using Robust.Client.Graphics;
 using Robust.Shared.Enums;

Content.Client/Explosion/ExplosionOverlaySystem.cs

@@ -1,4 +1,5 @@
 using Content.Shared.Explosion;
+using Content.Shared.Explosion.Components;
 using Robust.Client.Graphics;
 using Robust.Client.ResourceManagement;
 using Robust.Shared.GameStates;

Content.Client/Explosion/SmokeOnTriggerSystem.cs

@@ -0,0 +1,7 @@
+using Content.Shared.Explosion.EntitySystems;
+
+namespace Content.Client.Explosion;
+
+public sealed class SmokeOnTriggerSystem : SharedSmokeOnTriggerSystem
+{
+}

Content.Client/Explosion/TriggerOnProximityComponent.cs

@@ -1,4 +1,5 @@
 using Content.Shared.Explosion;
+using Content.Shared.Explosion.Components;
 
 namespace Content.Client.Explosion;
 

Content.IntegrationTests/Tests/Payload/ModularGrenadeTests.cs

@@ -1,5 +1,6 @@
 using Content.IntegrationTests.Tests.Interaction;
 using Content.Server.Explosion.Components;
+using Content.Shared.Explosion.Components;
 using Robust.Shared.Containers;
 using Robust.Shared.GameObjects;
 

Content.Server/Defusable/Systems/DefusableSystem.cs

@@ -8,6 +8,8 @@ using Content.Shared.Construction.Components;
 using Content.Shared.Database;
 using Content.Shared.Defusable;
 using Content.Shared.Examine;
+using Content.Shared.Explosion.Components;
+using Content.Shared.Explosion.Components.OnTrigger;
 using Content.Shared.Popups;
 using Content.Shared.Verbs;
 using Content.Shared.Wires;

Content.Server/Explosion/Components/ActiveTimerTriggerComponent.cs

@@ -1,25 +0,0 @@
-using Robust.Shared.Audio;
-
-namespace Content.Server.Explosion.Components;
-
-/// <summary>
-///     Component for tracking active trigger timers. A timers can activated by some other component, e.g. <see cref="OnUseTimerTriggerComponent"/>.
-/// </summary>
-[RegisterComponent]
-public sealed partial class ActiveTimerTriggerComponent : Component
-{
-    [DataField("timeRemaining")]
-    public float TimeRemaining;
-
-    [DataField("user")]
-    public EntityUid? User;
-
-    [DataField("beepInterval")]
-    public float BeepInterval;
-
-    [DataField("timeUntilBeep")]
-    public float TimeUntilBeep;
-
-    [DataField("beepSound")]
-    public SoundSpecifier? BeepSound;
-}

Content.Server/Explosion/Components/TriggerOnProximityComponent.cs

@@ -1,5 +1,6 @@
 using Content.Server.Explosion.EntitySystems;
 using Content.Shared.Explosion;
+using Content.Shared.Explosion.Components;
 using Content.Shared.Physics;
 using Robust.Shared.Physics.Collision.Shapes;
 using Robust.Shared.Physics.Components;

Content.Server/Explosion/EntitySystems/ClusterGrenadeSystem.cs

@@ -8,6 +8,8 @@ using Robust.Shared.Containers;
 using Robust.Shared.Random;
 using Content.Server.Weapons.Ranged.Systems;
 using System.Numerics;
+using Content.Shared.Explosion.Components;
+using Content.Shared.Flash.Components;
 using Robust.Server.Containers;
 using Robust.Server.GameObjects;
 

Content.Server/Explosion/EntitySystems/ExplosionSystem.GridMap.cs

@@ -1,6 +1,7 @@
 using System.Numerics;
 using Content.Shared.Atmos;
 using Content.Shared.Explosion;
+using Content.Shared.Explosion.Components;
 using Robust.Shared.Map;
 using Robust.Shared.Map.Components;
 

Content.Server/Explosion/EntitySystems/ExplosionSystem.Processing.cs

@@ -3,6 +3,7 @@ using System.Numerics;
 using Content.Shared.CCVar;
 using Content.Shared.Damage;
 using Content.Shared.Explosion;
+using Content.Shared.Explosion.Components;
 using Content.Shared.Maps;
 using Content.Shared.Physics;
 using Content.Shared.Projectiles;

Content.Server/Explosion/EntitySystems/ExplosionSystem.TileFill.cs

@@ -2,6 +2,7 @@ using System.Linq;
 using System.Numerics;
 using Content.Shared.Administration;
 using Content.Shared.Explosion;
+using Content.Shared.Explosion.Components;
 using Robust.Shared.Map;
 using Robust.Shared.Physics.Components;
 using Robust.Shared.Timing;

Content.Server/Explosion/EntitySystems/ExplosionSystem.Visuals.cs

@@ -1,4 +1,5 @@
 using Content.Shared.Explosion;
+using Content.Shared.Explosion.Components;
 using Robust.Server.GameObjects;
 using Robust.Shared.GameStates;
 using Robust.Shared.Map;

Content.Server/Explosion/EntitySystems/SmokeOnTriggerSystem.cs

@@ -1,7 +1,9 @@
-using Content.Server.Explosion.Components;
+using Content.Shared.Explosion.Components;
 using Content.Server.Fluids.EntitySystems;
 using Content.Shared.Chemistry.Components;
 using Content.Shared.Coordinates.Helpers;
+using Content.Shared.Explosion.Components.OnTrigger;
+using Content.Shared.Explosion.EntitySystems;
 using Content.Shared.Maps;
 using Robust.Shared.Map;
 
@@ -10,7 +12,7 @@ namespace Content.Server.Explosion.EntitySystems;
 /// <summary>
 /// Handles creating smoke when <see cref="SmokeOnTriggerComponent"/> is triggered.
 /// </summary>
-public sealed class SmokeOnTriggerSystem : EntitySystem
+public sealed class SmokeOnTriggerSystem : SharedSmokeOnTriggerSystem
 {
     [Dependency] private readonly IMapManager _mapMan = default!;
     [Dependency] private readonly SmokeSystem _smoke = default!;

Content.Server/Explosion/EntitySystems/TriggerSystem.Mobstate.cs

@@ -1,4 +1,5 @@
 using Content.Server.Explosion.Components;
+using Content.Shared.Explosion.Components;
 using Content.Shared.Implants;
 using Content.Shared.Interaction.Events;
 using Content.Shared.Mobs;

Content.Server/Explosion/EntitySystems/TriggerSystem.OnUse.cs

@@ -1,6 +1,7 @@
 using Content.Server.Explosion.Components;
 using Content.Server.Sticky.Events;
 using Content.Shared.Examine;
+using Content.Shared.Explosion.Components;
 using Content.Shared.Interaction.Events;
 using Content.Shared.Popups;
 using Content.Shared.Verbs;

Content.Server/Explosion/EntitySystems/TriggerSystem.cs

@@ -3,11 +3,13 @@ using Content.Server.Body.Systems;
 using Content.Server.Chemistry.Containers.EntitySystems;
 using Content.Server.Explosion.Components;
 using Content.Server.Flash;
-using Content.Server.Flash.Components;
+using Content.Shared.Flash.Components;
 using Content.Server.Radio.EntitySystems;
 using Content.Shared.Chemistry.Components;
 using Content.Shared.Chemistry.Components.SolutionManager;
 using Content.Shared.Database;
+using Content.Shared.Explosion.Components;
+using Content.Shared.Explosion.Components.OnTrigger;
 using Content.Shared.Implants.Components;
 using Content.Shared.Interaction;
 using Content.Shared.Mobs;

Content.Server/Flash/Components/FlashOnTriggerComponent.cs

@@ -1,12 +0,0 @@
-namespace Content.Server.Flash.Components
-{
-    /// <summary>
-    /// Upon being triggered will flash in an area around it.
-    /// </summary>
-    [RegisterComponent]
-    internal sealed partial class FlashOnTriggerComponent : Component
-    {
-        [DataField("range")] internal float Range = 1.0f;
-        [DataField("duration")] internal float Duration = 8.0f;
-    }
-}

Content.Server/Flash/FlashSystem.cs

@@ -7,6 +7,7 @@ using Content.Shared.Charges.Components;
 using Content.Shared.Charges.Systems;
 using Content.Shared.Eye.Blinding.Components;
 using Content.Shared.Flash;
+using Content.Shared.Flash.Components;
 using Content.Shared.IdentityManagement;
 using Content.Shared.Interaction;
 using Content.Shared.Interaction.Events;

Content.Server/Nutrition/EntitySystems/CreamPieSystem.cs

@@ -5,6 +5,7 @@ using Content.Server.Fluids.EntitySystems;
 using Content.Server.Nutrition.Components;
 using Content.Server.Popups;
 using Content.Shared.Containers.ItemSlots;
+using Content.Shared.Explosion.Components;
 using Content.Shared.Interaction;
 using Content.Shared.Nutrition.Components;
 using Content.Shared.Nutrition.EntitySystems;

Content.Shared/Administration/SpawnExplosionEuiMsg.cs

@@ -2,6 +2,7 @@ using Content.Shared.Eui;
 using Robust.Shared.Serialization;
 using Robust.Shared.Map;
 using Content.Shared.Explosion;
+using Content.Shared.Explosion.Components;
 
 namespace Content.Shared.Administration;
 

Content.Shared/Explosion/Components/ActiveTimerTriggerComponent.cs

@@ -0,0 +1,21 @@
+using Robust.Shared.Audio;
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Explosion.Components;
+
+/// <summary>
+///     Component for tracking active trigger timers. A timers can activated by some other component, e.g. <see cref="OnUseTimerTriggerComponent"/>.
+/// </summary>
+[RegisterComponent, NetworkedComponent]
+public sealed partial class ActiveTimerTriggerComponent : Component
+{
+    [DataField] public float TimeRemaining;
+
+    [DataField] public EntityUid? User;
+
+    [DataField] public float BeepInterval;
+
+    [DataField] public float TimeUntilBeep;
+
+    [DataField] public SoundSpecifier? BeepSound;
+}

Content.Shared/Explosion/Components/ExplosionVisualsComponent.cs

@@ -2,7 +2,7 @@ using Robust.Shared.GameStates;
 using Robust.Shared.Map;
 using Robust.Shared.Serialization;
 
-namespace Content.Shared.Explosion;
+namespace Content.Shared.Explosion.Components;
 
 /// <summary>
 ///     Component that is used to send explosion overlay/visual data to an abstract explosion entity.

Content.Shared/Explosion/Components/OnTrigger/ExplodeOnTriggerComponent.cs

@@ -1,9 +1,11 @@
-namespace Content.Server.Explosion.Components;
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Explosion.Components.OnTrigger;
 
 /// <summary>
 /// Explode using the entity's <see cref="ExplosiveComponent"/> if Triggered.
 /// </summary>
-[RegisterComponent]
+[RegisterComponent, NetworkedComponent]
 public sealed partial class ExplodeOnTriggerComponent : Component
 {
 }

Content.Shared/Explosion/Components/OnTrigger/SmokeOnTriggerComponent.cs

@@ -1,14 +1,15 @@
-using Content.Server.Explosion.EntitySystems;
 using Content.Shared.Chemistry.Components;
+using Content.Shared.Explosion.EntitySystems;
+using Robust.Shared.GameStates;
 using Robust.Shared.Prototypes;
 
-namespace Content.Server.Explosion.Components;
+namespace Content.Shared.Explosion.Components.OnTrigger;
 
 /// <summary>
 /// Creates a smoke cloud when triggered, with an optional solution to include in it.
 /// No sound is played incase a grenade is stealthy, use <see cref="SoundOnTriggerComponent"/> if you want a sound.
 /// </summary>
-[RegisterComponent, Access(typeof(SmokeOnTriggerSystem))]
+[RegisterComponent, NetworkedComponent, Access(typeof(SharedSmokeOnTriggerSystem))]
 public sealed partial class SmokeOnTriggerComponent : Component
 {
     /// <summary>

Content.Shared/Explosion/Components/OnUseTimerTriggerComponent.cs

@@ -1,57 +1,49 @@
 using Robust.Shared.Audio;
+using Robust.Shared.GameStates;
 
-namespace Content.Server.Explosion.Components
+namespace Content.Shared.Explosion.Components
 {
-    [RegisterComponent]
+    [RegisterComponent, NetworkedComponent]
     public sealed partial class OnUseTimerTriggerComponent : Component
     {
-        [DataField("delay")]
+        [DataField] public float Delay = 1f;
-        public float Delay = 1f;
 
         /// <summary>
         ///     If not null, a user can use verbs to configure the delay to one of these options.
         /// </summary>
-        [DataField("delayOptions")]
+        [DataField] public List<float>? DelayOptions = null;
-        public List<float>? DelayOptions = null;
 
         /// <summary>
         ///     If not null, this timer will periodically play this sound while active.
         /// </summary>
-        [DataField("beepSound")]
+        [DataField] public SoundSpecifier? BeepSound;
-        public SoundSpecifier? BeepSound;
 
         /// <summary>
         ///     Time before beeping starts. Defaults to a single beep interval. If set to zero, will emit a beep immediately after use.
         /// </summary>
-        [DataField("initialBeepDelay")]
+        [DataField] public float? InitialBeepDelay;
-        public float? InitialBeepDelay;
 
-        [DataField("beepInterval")]
+        [DataField] public float BeepInterval = 1;
-        public float BeepInterval = 1;
 
         /// <summary>
         ///     Whether the timer should instead be activated through a verb in the right-click menu
         /// </summary>
-        [DataField("useVerbInstead")]
+        [DataField] public bool UseVerbInstead = false;
-        public bool UseVerbInstead = false;
 
         /// <summary>
         ///     Should timer be started when it was stuck to another entity.
         ///     Used for C4 charges and similar behaviour.
         /// </summary>
-        [DataField("startOnStick")]
+        [DataField] public bool StartOnStick;
-        public bool StartOnStick;
 
         /// <summary>
         ///     Allows changing the start-on-stick quality.
         /// </summary>
-        [DataField("canToggleStartOnStick")]
+        [DataField("canToggleStartOnStick")] public bool AllowToggleStartOnStick;
-        public bool AllowToggleStartOnStick;
 
         /// <summary>
         ///     Whether you can examine the item to see its timer or not.
         /// </summary>
-        [DataField("examinable")]
+        [DataField] public bool Examinable = true;
-        public bool Examinable = true;
     }
 }

Content.Shared/Explosion/Components/SharedClusterGrenadeComponent.cs

@@ -1,6 +1,6 @@
 using Robust.Shared.Serialization;
 
-namespace Content.Shared.Explosion
+namespace Content.Shared.Explosion.Components
 {
     [Serializable, NetSerializable]
     public enum ClusterGrenadeVisuals : byte

Content.Shared/Explosion/Components/SharedTriggerOnProximityComponent.cs

@@ -1,6 +1,6 @@
 using Robust.Shared.GameStates;
 
-namespace Content.Shared.Explosion;
+namespace Content.Shared.Explosion.Components;
 
 [NetworkedComponent]
 public abstract partial class SharedTriggerOnProximityComponent : Component

Content.Shared/Explosion/EntitySystems/SharedSmokeOnTriggerSystem.cs

@@ -0,0 +1,6 @@
+namespace Content.Shared.Explosion.EntitySystems;
+
+public abstract class SharedSmokeOnTriggerSystem : EntitySystem
+{
+	
+}

Content.Shared/Explosion/EntitySystems/SharedTriggerSystem.cs

@@ -0,0 +1,6 @@
+namespace Content.Shared.Explosion.EntitySystems;
+
+public abstract class SharedTriggerSystem : EntitySystem
+{
+	
+}

Content.Shared/Flash/Components/FlashComponent.cs

@@ -1,8 +1,10 @@
+using Content.Shared.Flash;
 using Robust.Shared.Audio;
+using Robust.Shared.GameStates;
 
-namespace Content.Server.Flash.Components
+namespace Content.Shared.Flash.Components
 {
-    [RegisterComponent, Access(typeof(FlashSystem))]
+    [RegisterComponent, NetworkedComponent, Access(typeof(SharedFlashSystem))]
     public sealed partial class FlashComponent : Component
     {
 

Content.Shared/Flash/Components/FlashOnTriggerComponent.cs

@@ -0,0 +1,13 @@
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Flash.Components;
+
+/// <summary>
+/// Upon being triggered will flash in an area around it.
+/// </summary>
+[RegisterComponent, NetworkedComponent]
+public sealed partial class FlashOnTriggerComponent : Component
+{
+    [DataField] public float Range = 1.0f;
+    [DataField] public float Duration = 8.0f;
+}

Resources/Prototypes/Entities/Objects/Devices/Electronics/triggers.yml

@@ -24,9 +24,10 @@
       delay: 5
       delayOptions: [3, 5, 10, 15, 30]
       initialBeepDelay: 0
-      beepSound: /Audio/Machines/Nuke/general_beep.ogg
+      beepSound:
-      params:
+        path: /Audio/Machines/Nuke/general_beep.ogg
-        volume: -2
+        params:
+          volume: -2
     - type: StaticPrice
       price: 40
 

Resources/Prototypes/Entities/Objects/Misc/subdermal_implants.yml

@@ -252,9 +252,10 @@
     - type: OnUseTimerTrigger
       delay: 7
       initialBeepDelay: 0
-      beepSound: /Audio/Machines/Nuke/general_beep.ogg
+      beepSound:
-      params:
+        path: /Audio/Machines/Nuke/general_beep.ogg
-        volume: -2
+        params:
+          volume: -2
     - type: ExplodeOnTrigger
     - type: GibOnTrigger
       deleteItems: true

Resources/Prototypes/Entities/Objects/Specific/Janitorial/janitor.yml

@@ -253,9 +253,10 @@
   - type: OnUseTimerTrigger
     useVerbInstead: true
     beepInterval: .25
-    beepSound: /Audio/Items/Janitor/floor_sign_beep.ogg
+    beepSound:
-    params:
+      path: /Audio/Items/Janitor/floor_sign_beep.ogg
-      volume: 1
+      params:
+        volume: 1
     examinable: false
   - type: Tag
     tags: # ignore "WhitelistChameleon" tag

Resources/Prototypes/Entities/Objects/Weapons/Bombs/funny.yml

@@ -24,9 +24,10 @@
           Blunt: 5
     - type: OnUseTimerTrigger
       delay: 120
-      beepSound: /Audio/Machines/Nuke/general_beep.ogg
+      beepSound:
-      params:
+        path: /Audio/Machines/Nuke/general_beep.ogg
-        volume: -2
+        params:
+          volume: -2
     - type: ExplodeOnTrigger
     - type: Explosive
       explosionType: Default

Resources/Prototypes/Entities/Objects/Weapons/Bombs/ied.yml

@@ -22,7 +22,8 @@
     initialBeepDelay: 0
     beepSound:
       path: /Audio/Weapons/Guns/MagOut/pistol_magout.ogg
-      volume: 1
+      params:
+        volume: 1
   - type: RandomTimerTrigger
     min: 0
     max: 60

Resources/Prototypes/Entities/Objects/Weapons/security.yml

@@ -179,7 +179,6 @@
       sound:
         path: /Audio/Weapons/flash.ogg
     - type: FlashOnTrigger
-      repeating: true
       range: 3
     - type: TriggerOnProximity
       enabled: true