Cleaning up!

Content.Server/StationEvents/BasicStationEventSchedulerSystem.cs

@@ -73,7 +73,7 @@ public override void Update(float frameTime)
                 NextEventComponent? nextEventComponent = null;
                 if (Resolve(uid, ref nextEventComponent, false)) // If there is a nextEventComponent use the stashed event instead of running it directly.
                 {
-                    ResetTimer(eventScheduler);
+                    ResetTimer(eventScheduler); // Time needs to be reset ahead of time since we need to chose events based on the next time it will run.
                     TimeSpan nextEventTime = _timing.CurTime + TimeSpan.FromSeconds(eventScheduler.TimeUntilNextEvent);
                     if (!_event.TryGenerateRandomEvent(eventScheduler.ScheduledGameRules, out string? generatedEvent, nextEventTime) || generatedEvent == null)
                         continue;

Content.Server/StationEvents/EventManagerSystem.cs

@@ -69,7 +69,7 @@ public bool TryGenerateRandomEvent(EntityTableSelector limitedEventsTable, out s
     }
     // DeltaV - end overloaded for backwards compatiblity
 
-    // DeltaV - seperate event generation method
+    // DeltaV - separate event generation method
     public bool TryGenerateRandomEvent(EntityTableSelector limitedEventsTable, out string? randomLimitedEvent, TimeSpan? eventRunTime) // Event time checks compared to eventRunTime
                                                                                                                                        // unless its null in which case current time is used
     {
@@ -93,11 +93,10 @@ public bool TryGenerateRandomEvent(EntityTableSelector limitedEventsTable, out s
             Log.Warning("A requested event is not available!");
             return false;
         }
-        // End snippet from upstreams RunRandomEvent
 
         return true;
     }
-    // DeltaV - end seperate event generation method
+    // DeltaV - end separate event generation method
 
     // DeltaV - overloaded for backwards compatiblity
     public bool TryBuildLimitedEvents(EntityTableSelector limitedEventsTable, out Dictionary<EntityPrototype, StationEventComponent> limitedEvents)

Content.Server/StationEvents/RampingStationEventSchedulerSystem.cs

@@ -1,10 +1,10 @@
 using Content.Server.GameTicking;
 using Content.Server.GameTicking.Rules;
 using Content.Server.StationEvents.Components;
-using Content.Shared.DeltaV.StationEvents;
+using Content.Shared.DeltaV.StationEvents; // DeltaV
 using Content.Shared.GameTicking.Components;
 using Robust.Shared.Random;
-using Robust.Shared.Timing;
+using Robust.Shared.Timing; // DeltaV
 
 namespace Content.Server.StationEvents;
 

Content.Shared/DeltaV/Abilities/Psionics/PrecognitionPowerComponent.cs

@@ -2,25 +2,24 @@
 using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
 
-namespace Content.Shared.Abilities.Psionics
+namespace Content.Shared.Abilities.Psionics;
+
+[RegisterComponent]
+public sealed partial class PrecognitionPowerComponent : Component
 {
-    [RegisterComponent]
-    public sealed partial class PrecognitionPowerComponent : Component
-    {
-        [DataField("randomResultChance")]
-        public float RandomResultChance = 0.2F;
+    [DataField("randomResultChance")]
+    public float RandomResultChance = 0.2F;
 
-        [DataField("doAfter")]
-        public DoAfterId? DoAfter;
+    [DataField("doAfter")]
+    public DoAfterId? DoAfter;
 
-        [DataField("useDelay")]
-        public TimeSpan UseDelay = TimeSpan.FromSeconds(5);
+    [DataField("useDelay")]
+    public TimeSpan UseDelay = TimeSpan.FromSeconds(5);
 
-        [DataField("PrecognitionActionId",
-        customTypeSerializer: typeof(PrototypeIdSerializer<EntityPrototype>))]
-        public string? PrecognitionActionId = "ActionPrecognition";
+    [DataField("PrecognitionActionId",
+    customTypeSerializer: typeof(PrototypeIdSerializer<EntityPrototype>))]
+    public string? PrecognitionActionId = "ActionPrecognition";
 
-        [DataField("PrecognitionActionEntity")]
-        public EntityUid? PrecognitionActionEntity;
-    }
+    [DataField("PrecognitionActionEntity")]
+    public EntityUid? PrecognitionActionEntity;
 }

Content.Shared/DeltaV/Abilities/Psionics/PrecognitionResultComponent.cs

@@ -1,12 +1,11 @@
-namespace Content.Shared.Abilities.Psionics
+namespace Content.Shared.Abilities.Psionics;
+
+[RegisterComponent]
+public sealed partial class PrecognitionResultComponent : Component
 {
-    [RegisterComponent]
-    public sealed partial class PrecognitionResultComponent : Component
-    {
-        [DataField("message")]
-        public string Message = default!;
+    [DataField("message")]
+    public string Message = default!;
 
-        [DataField("randomResultWeight")]
-        public float Weight = default!;
-    }
+    [DataField("randomResultWeight")]
+    public float Weight = default!;
 }

Resources/Prototypes/GameRules/roundstart.yml

@@ -297,7 +297,7 @@
   id: BasicStationEventScheduler
   parent: BaseGameRule
   components:
-  - type: NextEvent # Deltav
+  - type: NextEvent # DeltaV: Queue Event
   - type: BasicStationEventScheduler
     minMaxEventTiming: # DeltaV
       min: 300 # DeltaV - 5 mins, was 3
@@ -320,7 +320,7 @@
   id: SpaceTrafficControlEventScheduler # iff we make a selector for EntityTables that can respect StationEventComp restrictions, or somehow impliment them otherwise in said tables,
   parent: BaseGameRule                  # we can remerge this with the other schedulers, but it will silently fail due to that limitation without a separate scheduler to balance atm.
   components:
-  - type: NextEvent # Deltav
+  - type: NextEvent # DeltaV: Queue Event
   - type: BasicStationEventScheduler
     minimumTimeUntilFirstEvent: 2700 # 45 mins #shows up like half way through shift.
     minMaxEventTiming:
@@ -333,7 +333,7 @@
   id: SpaceTrafficControlFriendlyEventScheduler
   parent: BaseGameRule
   components:
-  - type: NextEvent # Deltav
+  - type: NextEvent # DeltaV: Queue Event
   - type: BasicStationEventScheduler
     minimumTimeUntilFirstEvent: 1200 # 20 mins
     minMaxEventTiming: