From: Morb <14136326+Morb0@users.noreply.github.com>
Date: Mon, 3 Apr 2023 12:25:31 +0000 (-0700)
Subject: Use string for arrivals map cvar (#15104)
X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=fc61b9da62c90c7af0acfce3f180447bb23a10a1;p=space-station-14.git
Use string for arrivals map cvar (#15104)
---
diff --git a/Content.Server/Shuttles/Systems/ArrivalsSystem.cs b/Content.Server/Shuttles/Systems/ArrivalsSystem.cs
index e2e0175b74..7432a82a87 100644
--- a/Content.Server/Shuttles/Systems/ArrivalsSystem.cs
+++ b/Content.Server/Shuttles/Systems/ArrivalsSystem.cs
@@ -321,7 +321,7 @@ public sealed class ArrivalsSystem : EntitySystem
{
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;
}
diff --git a/Content.Shared/CCVar/CCVars.cs b/Content.Shared/CCVar/CCVars.cs
index 6b3e6ea2e7..6a4059d6b6 100644
--- a/Content.Shared/CCVar/CCVars.cs
+++ b/Content.Shared/CCVar/CCVars.cs
@@ -1064,8 +1064,8 @@ namespace Content.Shared.CCVar
///
/// The map to use for the arrivals station.
///
- public static readonly CVarDef ArrivalsMap =
- CVarDef.Create("shuttle.arrivals_map", new ResourcePath("/Maps/Misc/terminal.yml"), CVar.SERVERONLY);
+ public static readonly CVarDef ArrivalsMap =
+ CVarDef.Create("shuttle.arrivals_map", "/Maps/Misc/terminal.yml", CVar.SERVERONLY);
///
/// Cooldown between arrivals departures. This should be longer than the FTL time or it will double cycle.