UseDelay + ItemCooldown merge (#22502)

Content.Server/Singularity/Components/RadiationCollectorComponent.cs

@@ -13,32 +13,21 @@ public sealed partial class RadiationCollectorComponent : Component
     /// <summary>
     ///     How much joules will collector generate for each rad.
     /// </summary>
-    [DataField("chargeModifier")]
+    [DataField]
     [ViewVariables(VVAccess.ReadWrite)]
     public float ChargeModifier = 30000f;
 
     /// <summary>
-    ///     Cooldown time between users interaction.
+    ///     Is the machine enabled.
     /// </summary>
-    [DataField("cooldown")]
-    [ViewVariables(VVAccess.ReadWrite)]
-    public TimeSpan Cooldown = TimeSpan.FromSeconds(0.81f);
-
-    /// <summary>
-    ///     Was machine activated by user?
-    /// </summary>
-    [ViewVariables(VVAccess.ReadOnly)]
+    [DataField]
+    [ViewVariables]
     public bool Enabled;
 
-    /// <summary>
-    ///     Timestamp when machine can be deactivated again.
-    /// </summary>
-    public TimeSpan CoolDownEnd;
-
     /// <summary>
     ///     List of gases that will react to the radiation passing through the collector
     /// </summary>
-    [DataField("radiationReactiveGases")]
+    [DataField]
     [ViewVariables(VVAccess.ReadWrite)]
     public List<RadiationReactiveGas>? RadiationReactiveGases;
 }
@@ -50,15 +39,15 @@ public sealed partial class RadiationCollectorComponent : Component
 public sealed partial class RadiationReactiveGas
 {
     /// <summary>
-    ///     The reactant gas 
+    ///     The reactant gas
     /// </summary>
-    [DataField("reactantPrototype", required: true)]
-    public Gas Reactant = Gas.Plasma;
+    [DataField(required: true)]
+    public Gas ReactantPrototype;
 
     /// <summary>
     ///     Multipier for the amount of power produced by the radiation collector when using this gas
     /// </summary>
-    [DataField("powerGenerationEfficiency")]
+    [DataField]
     public float PowerGenerationEfficiency = 1f;
 
     /// <summary>
@@ -67,7 +56,7 @@ public sealed partial class RadiationReactiveGas
     /// /// <remarks>
     ///     Set to zero if the reactant does not deplete
     /// </remarks>
-    [DataField("reactantBreakdownRate")]
+    [DataField]
     public float ReactantBreakdownRate = 1f;
 
     /// <summary>
@@ -76,12 +65,12 @@ public sealed partial class RadiationReactiveGas
     /// <remarks>
     ///     Leave null if the reactant no byproduct gas is to be formed
     /// </remarks>
-    [DataField("byproductPrototype")]
-    public Gas? Byproduct = null;
+    [DataField]
+    public Gas? Byproduct;
 
     /// <summary>
     ///     The molar ratio of the byproduct gas generated from the reactant gas
     /// </summary>
-    [DataField("molarRatio")]
+    [DataField]
     public float MolarRatio = 1f;
 }