]> git.smokeofanarchy.ru Git - space-station-14.git/commitdiff
Use string for arrivals map cvar (#15104)
authorMorb <14136326+Morb0@users.noreply.github.com>
Mon, 3 Apr 2023 12:25:31 +0000 (05:25 -0700)
committerGitHub <noreply@github.com>
Mon, 3 Apr 2023 12:25:31 +0000 (22:25 +1000)
Content.Server/Shuttles/Systems/ArrivalsSystem.cs
Content.Shared/CCVar/CCVars.cs

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