diff --git a/Content.Server/StationEvents/BasicStationEventSchedulerSystem.cs b/Content.Server/StationEvents/BasicStationEventSchedulerSystem.cs index 83d52912dcf506..bdc9a47e186722 100644 --- a/Content.Server/StationEvents/BasicStationEventSchedulerSystem.cs +++ b/Content.Server/StationEvents/BasicStationEventSchedulerSystem.cs @@ -24,9 +24,6 @@ public sealed class BasicStationEventSchedulerSystem : GameRuleSystem [DataField] - public float MinimumTimeUntilFirstEvent = 200; + public float MinimumTimeUntilFirstEvent = 300f; //SS220 Event_spawn_decrease /// /// The minimum and maximum time between rule starts in seconds. /// [DataField] - public MinMax MinMaxEventTiming = new(3 * 60, 10 * 60); + public MinMax MinMaxEventTiming = new(60 * 8, 60 * 15); //SS220 Event_spawn_decrease /// /// How long until the next check for an event runs, is initially set based on MinimumTimeUntilFirstEvent & MinMaxEventTiming. diff --git a/Content.Server/StationEvents/EventManagerSystem.cs b/Content.Server/StationEvents/EventManagerSystem.cs index 6bb9b1c0d8f818..62257847111c9d 100644 --- a/Content.Server/StationEvents/EventManagerSystem.cs +++ b/Content.Server/StationEvents/EventManagerSystem.cs @@ -45,6 +45,7 @@ public void RunRandomEvent() Log.Error(errStr); return; } + // SS220 Проверка на отключенные случаные события в текущем пресете var randomEvent = PickRandomEvent(); @@ -63,6 +64,15 @@ public void RunRandomEvent() /// public void RunRandomEvent(EntityTableSelector limitedEventsTable) { + // SS220 Проверка на отключенные случаные события в текущем пресете + if (GameTicker.CurrentPreset != null && GameTicker.CurrentPreset.DisableRandomEvents) + { + var errStr = Loc.GetString("station-event-system-run-random-event-disablerandevents"); + Log.Error(errStr); + return; + } + // SS220 Проверка на отключенные случаные события в текущем пресете + if (!TryBuildLimitedEvents(limitedEventsTable, out var limitedEvents)) { Log.Warning("Provided event table could not build dict!");