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

stuff

Browse Source
This commit is contained in:
BIGZi0348
2024-12-28 18:22:04 +03:00
parent b9f7f147ca
commit eb43311fb5
2 changed files with 15 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

@@ -23,8 +23,8 @@ public sealed class WhiteCVars
* Bullet trails * Bullet trails
*/ */
public static readonly CVarDef<bool> EnableLightsGlowing = public static readonly CVarDef<bool> EnableLightsGlowing =
CVarDef.Create("white.enable_lights_glowing", true, CVar.CLIENTONLY | CVar.ARCHIVE); CVarDef.Create("white.enable_lights_glowing", true, CVar.CLIENTONLY | CVar.ARCHIVE);
/* /*
* Offer Indicator * Offer Indicator
@@ -207,9 +207,9 @@ public sealed class WhiteCVars
public static readonly CVarDef<float> JukeboxVolume = public static readonly CVarDef<float> JukeboxVolume =
CVarDef.Create("white.jukebox_volume", 0f, CVar.CLIENTONLY | CVar.ARCHIVE); CVarDef.Create("white.jukebox_volume", 0f, CVar.CLIENTONLY | CVar.ARCHIVE);
/* /*
* Chat * Chat
*/ */
public static readonly CVarDef<string> SeparatedChatSize = public static readonly CVarDef<string> SeparatedChatSize =
CVarDef.Create("white.chat_size_separated", "0.6;0", CVar.CLIENTONLY | CVar.ARCHIVE); CVarDef.Create("white.chat_size_separated", "0.6;0", CVar.CLIENTONLY | CVar.ARCHIVE);
@@ -231,9 +231,9 @@ public sealed class WhiteCVars
CVarDef.Create("white.admin.deadChatAdmin", false, CVar.CLIENT | CVar.REPLICATED | CVar.ARCHIVE); CVarDef.Create("white.admin.deadChatAdmin", false, CVar.CLIENT | CVar.REPLICATED | CVar.ARCHIVE);
/* /*
* End of round stats * End of round stats
*/ */
/// <summary> /// <summary>
/// The amount of blood lost required to trigger the BloodLost end of round stat. /// The amount of blood lost required to trigger the BloodLost end of round stat.
@@ -313,7 +313,7 @@ public sealed class WhiteCVars
/// <summary> /// <summary>
/// Should load a ERT map? /// Should load a ERT map?
/// </summary> /// </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 = public static readonly CVarDef<bool> LogChatActions =
CVarDef.Create("white.log_to_chat", true, CVar.CLIENT | CVar.ARCHIVE | CVar.REPLICATED); CVarDef.Create("white.log_to_chat", true, CVar.CLIENT | CVar.ARCHIVE | CVar.REPLICATED);
@@ -345,11 +345,11 @@ public sealed class WhiteCVars
*/ */
// Applies Projectile and Melee damage. // Applies Projectile and Melee damage.
public static readonly CVarDef<float> DamageModifier = public static readonly CVarDef<float> DamageModifier =
CVarDef.Create("damage.modifier", 1.0f, CVar.REPLICATED); CVarDef.Create("damage.modifier", 1.0f, CVar.REPLICATED);
// Applies ALL damage, EVEN walls and etc. // Applies ALL damage, EVEN walls and etc.
public static readonly CVarDef<float> DamageGetModifier = public static readonly CVarDef<float> DamageGetModifier =
CVarDef.Create("damage.get_modifier", 1.0f, CVar.REPLICATED); CVarDef.Create("damage.get_modifier", 1.0f, CVar.REPLICATED);
public static readonly CVarDef<bool> AutoKickVpnUsers = public static readonly CVarDef<bool> AutoKickVpnUsers =