UseDelay + ItemCooldown merge (#22502)

Content.Shared/Timing/UseDelayComponent.cs

@@ -1,28 +1,36 @@
 using Robust.Shared.GameStates;
+using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom;
 
 namespace Content.Shared.Timing;
 
 /// <summary>
 /// Timer that creates a cooldown each time an object is activated/used
 /// </summary>
-[RegisterComponent, NetworkedComponent, AutoGenerateComponentState(true)]
+/// <remarks>
+/// Currently it only supports a single delay per entity, this means that for things that have two delay interactions they will share one timer, so this can cause issues. For example, the bible has a delay when opening the storage UI and when applying it's interaction effect, and they share the same delay.
+/// </remarks>
+[RegisterComponent]
+[NetworkedComponent, AutoGenerateComponentState]
+[Access(typeof(UseDelaySystem))]
 public sealed partial class UseDelayComponent : Component
 {
-    [AutoNetworkedField]
-    public TimeSpan LastUseTime;
-
-    [AutoNetworkedField]
-    public TimeSpan? DelayEndTime;
-
-    [DataField, AutoNetworkedField]
-    [ViewVariables(VVAccess.ReadWrite)]
-    public TimeSpan Delay = TimeSpan.FromSeconds(1);
+    /// <summary>
+    /// When the delay starts.
+    /// </summary>
+    [ViewVariables(VVAccess.ReadWrite), DataField(customTypeSerializer: typeof(TimeOffsetSerializer)), AutoNetworkedField]
+    public TimeSpan DelayStartTime;
 
     /// <summary>
-    ///     Stores remaining delay pausing (and eventually, serialization).
+    /// When the delay ends.
+    /// </summary>
+    [ViewVariables(VVAccess.ReadWrite), DataField(customTypeSerializer: typeof(TimeOffsetSerializer)), AutoNetworkedField]
+    public TimeSpan DelayEndTime;
+
+    /// <summary>
+    /// Default delay time
     /// </summary>
     [DataField]
-    public TimeSpan? RemainingDelay;
-
-    public bool ActiveDelay => DelayEndTime != null;
+    [ViewVariables(VVAccess.ReadWrite)]
+    [AutoNetworkedField]
+    public TimeSpan Delay = TimeSpan.FromSeconds(1);
 }