Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'WD-core/master' into upstream-core

Browse Source
This commit is contained in:
BIGZi0348
2024-12-28 19:11:33 +03:00
parent 85c3345f6e 317a78a23d
commit 850900448e
2 changed files with 15 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Content.Server/_White/ERTRecruitment/ERTRecruitmentRule.cs
View File

@@ -7,6 +7,7 @@ using Content.Server._White.GhostRecruitment;
using Content.Server.GameTicking.Components;
using Content.Shared.Administration.Logs;
using Content.Shared.Database;
using Content.Shared._White;
using Content.Shared._White.GhostRecruitment;
using JetBrains.Annotations;
using Robust.Server.GameObjects;
@@ -147,7 +148,8 @@ public sealed class ERTRecruitmentRule : StationEventSystem<ERTRecruitmentRuleCo
private void OnRoundStart(RoundStartingEvent ev)
{
//if (_cfgManager.GetCVar(WhiteCVars.LoadErtMap))
// Disabled in dev - Resources/ConfigPresets/Build/development.toml
if (_cfgManager.GetCVar(WhiteCVars.LoadErtMap))
SpawnMap();
}

2
Content.Shared/_White/WhiteCVars.cs
View File

@@ -313,7 +313,7 @@ public sealed class WhiteCVars
/// <summary>
/// Should load a ERT map?
/// </summary>
public static readonly CVarDef<bool> LoadErtMap = CVarDef.Create("white.ert_load", false, CVar.SERVERONLY);
public static readonly CVarDef<bool> LoadErtMap = CVarDef.Create("white.ert_load", true, CVar.SERVERONLY);
public static readonly CVarDef<bool> LogChatActions =
CVarDef.Create("white.log_to_chat", true, CVar.CLIENT | CVar.ARCHIVE | CVar.REPLICATED);