Revert "Explosion refactor TEST MERG (#6995)" (#7005)

Content.Server/Nuke/NukeComponent.cs

@@ -1,9 +1,7 @@
 using Content.Shared.Containers.ItemSlots;
-using Content.Shared.Explosion;
 using Content.Shared.Nuke;
 using Content.Shared.Sound;
 using Robust.Shared.Audio;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
 
 namespace Content.Server.Nuke
 {
@@ -38,6 +36,13 @@ namespace Content.Server.Nuke
         [DataField("diskSlot")]
         public ItemSlot DiskSlot = new();
 
+        /// <summary>
+        ///     Annihilation radius in which  all human players will be gibed
+        /// </summary>
+        [DataField("blastRadius")]
+        [ViewVariables(VVAccess.ReadWrite)]
+        public int BlastRadius = 200;
+
         /// <summary>
         ///     After this time nuke will play last alert sound
         /// </summary>
@@ -62,48 +67,6 @@ namespace Content.Server.Nuke
         [DataField("disarmSound")]
         public SoundSpecifier DisarmSound = new SoundPathSpecifier("/Audio/Misc/notice2.ogg");
 
-        // These datafields here are duplicates of those in explosive component. But I'm hesitant to use explosive
-        // component, just in case at some point, somehow, when grenade crafting added in someone manages to wire up a
-        // proximity trigger or something to the nuke and set it off prematurely. I want to make sure they MEAN to set of
-        // the nuke.
-        #region ExplosiveComponent
-        /// <summary>
-        ///     The explosion prototype. This determines the damage types, the tile-break chance, and some visual
-        ///     information (e.g., the light that the explosion gives off).
-        /// </summary>
-        [ViewVariables(VVAccess.ReadWrite)]
-        [DataField("explosionType", required: true, customTypeSerializer: typeof(PrototypeIdSerializer<ExplosionPrototype>))]
-        public string ExplosionType = default!;
-
-        /// <summary>
-        ///     The maximum intensity the explosion can have on a single time. This limits the maximum damage and tile
-        ///     break chance the explosion can achieve at any given location.
-        /// </summary>
-        [ViewVariables(VVAccess.ReadWrite)]
-        [DataField("maxIntensity")]
-        public float MaxIntensity = 100;
-
-        /// <summary>
-        ///     How quickly the intensity drops off as you move away from the epicenter.
-        /// </summary>
-        [ViewVariables(VVAccess.ReadWrite)]
-        [DataField("intensitySlope")]
-        public float IntensitySlope = 5;
-
-        /// <summary>
-        ///     The total intensity of this explosion. The radius of the explosion scales like the cube root of this
-        ///     number (see <see cref="ExplosionSystem.RadiusToIntensity"/>).
-        /// </summary>
-        [ViewVariables(VVAccess.ReadWrite)]
-        [DataField("totalIntensity")]
-        public float TotalIntensity = 100000;
-
-        /// <summary>
-        ///     Avoid somehow double-triggering this explosion.
-        /// </summary>
-        public bool Exploded;
-        #endregion
-
         /// <summary>
         ///     Time until explosion in seconds.
         /// </summary>