narcolepsy updates

Content.Server/Traits/Assorted/NarcolepsySystem.cs

@@ -18,7 +18,7 @@ public sealed class NarcolepsySystem : EntitySystem
     [Dependency] private readonly SharedPopupSystem _popups = default!;  // DeltaV Narcolepsy port from EE
     [Dependency] private readonly StatusEffectsSystem _statusEffects = default!;
     [Dependency] private readonly IRobustRandom _random = default!;
-    [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
+    [Dependency] private readonly IPrototypeManager _prototypeManager = default!; // DeltaV
 
     /// <inheritdoc/>
     public override void Initialize()
@@ -32,7 +32,7 @@ private void SetupNarcolepsy(EntityUid uid, NarcolepsyComponent component, Compo
         PrepareNextIncident((uid, component));
     }
 
-    private void OnSleepChanged(Entity<NarcolepsyComponent> ent, ref SleepStateChangedEvent args)
+    private void OnSleepChanged(Entity<NarcolepsyComponent> ent, ref SleepStateChangedEvent args) // DeltaV
     {
         // When falling asleep while an incident is nigh, force it to happen immediately.
         if (args.FellAsleep)
@@ -47,15 +47,15 @@ private void OnSleepChanged(Entity<NarcolepsyComponent> ent, ref SleepStateChang
         }
     }
 
-    public void AdjustNarcolepsyTimer(EntityUid uid, float setTime, NarcolepsyComponent? narcolepsy = null)
+    public void AdjustNarcolepsyTimer(EntityUid uid, float setTime, NarcolepsyComponent? narcolepsy = null) // DeltaV changed int to float
     {
         if (!Resolve(uid, ref narcolepsy, false) || narcolepsy.NextIncidentTime > setTime)
             return;
 
         narcolepsy.NextIncidentTime = setTime;
     }
 
-    public override void Update(float frameTime)
+    public override void Update(float frameTime)  // Begin DeltaV
     {
         base.Update(frameTime);
 
@@ -120,6 +120,6 @@ private void DoWakeupPopup(EntityUid ent)
     private void DoWarningPopup(EntityUid ent)
     {
         _popups.PopupEntity(GetRandomWarning(),ent,ent);
-    }
+    } // End DeltaV
 
 }

Content.Shared/Bed/Sleep/SleepingComponent.cs

@@ -35,9 +35,11 @@ public sealed partial class SleepingComponent : Component
     /// <summary>                     // DeltaV begin port Narcolepsy from EE
     ///     The moment this entity went to sleep. Initialized on MapInit.
     /// </summary>
-    [DataField("SleepingSince", customTypeSerializer: typeof(TimeOffsetSerializer)), ViewVariables(VVAccess.ReadWrite)] // # DeltaV begin Narcolepsy port from EE
-    [AutoPausedField]
-    public TimeSpan SleepingSince;   // DeltaV end port Narcolepsy from EE
+    ///
+    /// DeltaV: The moment this entity went to sleep. Initialized on MapInit.
+    ///
+    [DataField(customTypeSerializer: typeof(TimeOffsetSerializer)), AutoPausedField]
+    public TimeSpan SleepingSince;
 
     /// <summary>
     /// Sound to play when another player attempts to wake this entity.

Resources/Prototypes/DeltaV/Datasets/narcolepsywakeup.yml → Resources/Prototypes/_DV/Datasets/narcolepsywakeup.yml

@@ -1,5 +1,5 @@
 - type: localizedDataset
-  id: NarcolepsyWakeupDataset
+  id: NarcolepsyWakeup
   values:
     prefix: narcolepsy-wakeup-
     count: 3

Resources/Prototypes/DeltaV/Datasets/narcolepsywarning.yml → Resources/Prototypes/_DV/Datasets/narcolepsywarning.yml

@@ -1,5 +1,5 @@
 - type: localizedDataset
-  id: NarcolepsyWarningDataset
+  id: NarcolepsyWarning
   values:
     prefix: narcolepsy-warning-
     count: 5