From 43e4efb82cb91b8806b5982272ec75e4ca1e7bb4 Mon Sep 17 00:00:00 2001
From: Whatstone <166147148+whatston3@users.noreply.github.com>
Date: Sat, 26 Oct 2024 20:04:15 -0400
Subject: [PATCH] Remove world loader from outpost STC terminals, bus shuttle
 console. (#2339)

* Remove world loader from outpost STC terminals

* Disables world loader on the bus
---
 Content.Server/Worldgen/Components/WorldLoaderComponent.cs  | 6 ++++++
 Content.Server/Worldgen/Systems/WorldControllerSystem.cs    | 3 +++
 Resources/Maps/_NF/Shuttles/Bus/publicts.yml                | 2 ++
 .../Entities/Structures/Machines/Computers/computers.yml    | 3 +++
 4 files changed, 14 insertions(+)

diff --git a/Content.Server/Worldgen/Components/WorldLoaderComponent.cs b/Content.Server/Worldgen/Components/WorldLoaderComponent.cs
index e6bb7781e96..31488693929 100644
--- 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
index 19c777e1ad6..1035a3931a7 100644
--- 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
index 25499d35b42..e0b667be1c1 100644
--- 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
index 01a3a01a92d..2604bc81755 100644
--- 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]