Remove world loader from outpost STC terminals, bus shuttle console. (n…

…ew-frontiers-14#2339) * Remove world loader from outpost STC terminals * Disables world loader on the bus
Corvax-Frontier · Oct 27, 2024 · 43e4efb · 43e4efb
1 parent c5bf903
commit 43e4efb
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 0 deletions.
diff --git a/Content.Server/Worldgen/Components/WorldLoaderComponent.cs b/Content.Server/Worldgen/Components/WorldLoaderComponent.cs
@@ -14,5 +14,11 @@ public sealed partial class WorldLoaderComponent : Component
     /// </summary>
     [ViewVariables(VVAccess.ReadWrite)] [DataField("radius")]
     public int Radius = 128;
+
+    /// <summary>
+    ///     Frontier: if true, this loader is disabled, and will not be used
+    /// </summary>
+    [ViewVariables(VVAccess.ReadWrite)] [DataField]
+    public bool Disabled;
 }
 
diff --git a/Content.Server/Worldgen/Systems/WorldControllerSystem.cs b/Content.Server/Worldgen/Systems/WorldControllerSystem.cs
@@ -100,6 +100,9 @@ public override void Update(float frameTime)
 
         while (loaderEnum.MoveNext(out var uid, out var worldLoader, out var xform))
         {
+            if (worldLoader.Disabled) // Frontier: disable world loading
+                continue; // Frontier
+
             var mapOrNull = xform.MapUid;
             if (mapOrNull is null)
                 continue;

diff --git a/Resources/Maps/_NF/Shuttles/Bus/publicts.yml b/Resources/Maps/_NF/Shuttles/Bus/publicts.yml
@@ -447,6 +447,8 @@ entities:
     - type: Transform
       pos: 0.5,1.5
       parent: 8756
+    - type: WorldLoader
+      disabled: true
 - proto: DefibrillatorCabinetFilled
   entities:
   - uid: 27

diff --git a/Resources/Prototypes/_NF/Entities/Structures/Machines/Computers/computers.yml b/Resources/Prototypes/_NF/Entities/Structures/Machines/Computers/computers.yml
@@ -381,6 +381,9 @@
   - type: AccessReader
     access: [["StationTrafficController"]]
   - type: ActivatableUIRequiresAccess
+  - type: WorldLoader
+    disabled: true
+    radius: 0 # Just in case.
 
 - type: entity
   parent: [BaseStructureDisableToolUse, BaseStructureIndestructible, BaseStructureAccessReaderImmuneToEmag, BaseComputerShuttle, BaseComputerTraffic]