tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use string for arrivals map cvar (#15104)

Browse Source
This commit is contained in:
Morb
2023-04-03 05:25:31 -07:00
committed by GitHub
parent 43f35a32f0
commit fc61b9da62
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Content.Server/Shuttles/Systems/ArrivalsSystem.cs
View File

@@ -321,7 +321,7 @@ public sealed class ArrivalsSystem : EntitySystem
{ {
var mapId = _mapManager.CreateMap(); var mapId = _mapManager.CreateMap();
if (!_loader.TryLoad(mapId, _cfgManager.GetCVar(CCVars.ArrivalsMap).ToString(), out var uids)) if (!_loader.TryLoad(mapId, _cfgManager.GetCVar(CCVars.ArrivalsMap), out var uids))
{ {
return; return;
} }

4
Content.Shared/CCVar/CCVars.cs
View File

@@ -1064,8 +1064,8 @@ namespace Content.Shared.CCVar
/// <summary> /// <summary>
/// The map to use for the arrivals station. /// The map to use for the arrivals station.
/// </summary> /// </summary>
public static readonly CVarDef<ResourcePath> ArrivalsMap = public static readonly CVarDef<string> ArrivalsMap =
CVarDef.Create("shuttle.arrivals_map", new ResourcePath("/Maps/Misc/terminal.yml"), CVar.SERVERONLY); CVarDef.Create("shuttle.arrivals_map", "/Maps/Misc/terminal.yml", CVar.SERVERONLY);
/// <summary> /// <summary>
/// Cooldown between arrivals departures. This should be longer than the FTL time or it will double cycle. /// Cooldown between arrivals departures. This should be longer than the FTL time or it will double cycle.