NFSD Outpost (New) - Split NFSD away from Frontier Outpost (#840)

* First version of NFSD station, wip * More things for NFSD, layout done * Move NFSD station to separate folder * Make it spawn in-game. * Atmos and stuff. * More work on NFSD outpost, phase 3 basically done * Try make it load roundstart? Station records do not work yet tho. * Blanket-whitelist NFSD outpost for now in mapchecker * Finalise phase 4 for NFSD Outpost * Warp point * Downsize NFSD on frontier outpost * Make the intertia damping over 9000 * Add meteor shields * Fix some missing decals * Re-add anchor to NFSD (Saving grid overrides this) * Add rotational/translational anchors to all POI grids and Frontier * Alert! The detective detector detects detectives * Update station proto * Fix merge conflict properly this time * No overflowjobs for NFSD outpost --------- Co-authored-by: Dvir <[email protected]>
new-frontiers-14 · Jan 27, 2024 · 49c4969 · 49c4969
1 parent 79dfed4
commit 49c4969
Show file tree

Hide file tree

Showing 19 changed files with 24,935 additions and 8,101 deletions.
diff --git a/.github/mapchecker/whitelist.yml b/.github/mapchecker/whitelist.yml
@@ -1,5 +1,6 @@
 # POI's
 Frontier: true
+nfsd: true
 
 anomalouslab:
   - WallPlastitaniumIndestructible

diff --git a/Content.Server/_NF/GameRule/NfAdventureRuleSystem.cs b/Content.Server/_NF/GameRule/NfAdventureRuleSystem.cs
@@ -122,6 +122,7 @@ private void OnStartup(RoundStartingEvent ev)
         var lab = "/Maps/_NF/POI/anomalouslab.yml";
         var church = "Maps/_NF/POI/beacon.yml";
         var grifty = "Maps/_NF/POI/grifty.yml";
+        var nfsdStation = "/Maps/_NF/POI/nfsd.yml";
         var depotColor = new Color(55, 200, 55);
         var civilianColor = new Color(55, 55, 200);
         var lpbravoColor = new Color(200, 55, 55);
@@ -150,6 +151,23 @@ private void OnStartup(RoundStartingEvent ev)
             _shuttle.SetIFFColor(depotUid3s[0], depotColor);
         }
 
+        if (_map.TryLoad(mapId, nfsdStation, out var nfsdUids, new MapLoadOptions
+            {
+                Offset = _random.NextVector2(500f, 700f)
+            }))
+        {
+            // We should figure out if it is possible to add this grid to the latejoin listing.
+            // Hey turns out we can! (This is kinda copypasted from the lodge with some values filled in.)
+            if (_prototypeManager.TryIndex<GameMapPrototype>("nfsd", out var stationProto))
+            {
+                _station.InitializeNewStation(stationProto.Stations["nfsd"], nfsdUids);
+            }
+
+            var meta = EnsureComp<MetaDataComponent>(nfsdUids[0]);
+            _meta.SetEntityName(nfsdUids[0], "NFSD Outpost", meta);
+            _shuttle.SetIFFColor(nfsdUids[0], new Color(1f, 0.2f, 0.2f));
+        }
+
         if (_map.TryLoad(mapId, tinnia, out var depotUid2s, new MapLoadOptions
             {
                 Offset = tinniaOffset

diff --git a/Resources/Maps/_NF/Outpost/frontier.yml b/Resources/Maps/_NF/Outpost/frontier.yml
diff --git a/Resources/Maps/_NF/POI/anomalouslab.yml b/Resources/Maps/_NF/POI/anomalouslab.yml
@@ -91,6 +91,8 @@ entities:
     - type: OccluderTree
     - type: SpreaderGrid
     - type: Shuttle
+      angularDamping: 999999
+      linearDamping: 999999
     - type: GridPathfinding
     - gravityShakeSound: !type:SoundPathSpecifier
         path: /Audio/Effects/alert.ogg

diff --git a/Resources/Maps/_NF/POI/arena.yml b/Resources/Maps/_NF/POI/arena.yml
@@ -135,6 +135,8 @@ entities:
     - type: OccluderTree
     - type: SpreaderGrid
     - type: Shuttle
+      angularDamping: 999999
+      linearDamping: 999999
     - type: GridPathfinding
     - gravityShakeSound: !type:SoundPathSpecifier
         path: /Audio/Effects/alert.ogg

diff --git a/Resources/Maps/_NF/POI/beacon.yml b/Resources/Maps/_NF/POI/beacon.yml
@@ -84,6 +84,8 @@ entities:
     - type: OccluderTree
     - type: SpreaderGrid
     - type: Shuttle
+      angularDamping: 999999
+      linearDamping: 999999
     - type: GridPathfinding
     - gravityShakeSound: !type:SoundPathSpecifier
         path: /Audio/Effects/alert.ogg

diff --git a/Resources/Maps/_NF/POI/cargodepot.yml b/Resources/Maps/_NF/POI/cargodepot.yml
@@ -51,9 +51,9 @@ entities:
     - fixtures: {}
       type: Fixtures
     - type: OccluderTree
-    - angularDamping: 999999
+    - type: Shuttle
+      angularDamping: 999999
       linearDamping: 999999
-      type: Shuttle
     - type: GridPathfinding
     - gravityShakeSound: !type:SoundPathSpecifier
         path: /Audio/Effects/alert.ogg

diff --git a/Resources/Maps/_NF/POI/caseyscasino.yml b/Resources/Maps/_NF/POI/caseyscasino.yml
@@ -56,6 +56,8 @@ entities:
     - type: OccluderTree
     - type: SpreaderGrid
     - type: Shuttle
+      linearDamping: 999999
+      angularDamping: 999999
     - type: GridPathfinding
     - gravityShakeSound: !type:SoundPathSpecifier
         path: /Audio/Effects/alert.ogg

diff --git a/Resources/Maps/_NF/POI/courthouse.yml b/Resources/Maps/_NF/POI/courthouse.yml
@@ -86,6 +86,8 @@ entities:
     - type: OccluderTree
     - type: SpreaderGrid
     - type: Shuttle
+      linearDamping: 999999
+      angularDamping: 999999
     - type: GridPathfinding
     - gravityShakeSound: !type:SoundPathSpecifier
         path: /Audio/Effects/alert.ogg

diff --git a/Resources/Maps/_NF/POI/cove.yml b/Resources/Maps/_NF/POI/cove.yml
@@ -107,6 +107,8 @@ entities:
     - type: OccluderTree
     - type: SpreaderGrid
     - type: Shuttle
+      linearDamping: 999999
+      angularDamping: 999999
     - type: GridPathfinding
     - gravityShakeSound: !type:SoundPathSpecifier
         path: /Audio/Effects/alert.ogg

diff --git a/Resources/Maps/_NF/POI/grifty.yml b/Resources/Maps/_NF/POI/grifty.yml
@@ -50,6 +50,8 @@ entities:
     - type: OccluderTree
     - type: SpreaderGrid
     - type: Shuttle
+      linearDamping: 999999
+      angularDamping: 999999
     - type: GridPathfinding
     - gravityShakeSound: !type:SoundPathSpecifier
         path: /Audio/Effects/alert.ogg

diff --git a/Resources/Maps/_NF/POI/lodge.yml b/Resources/Maps/_NF/POI/lodge.yml
@@ -103,6 +103,8 @@ entities:
     - type: OccluderTree
     - type: SpreaderGrid
     - type: Shuttle
+      linearDamping: 999999
+      angularDamping: 999999
     - type: GridPathfinding
     - gravityShakeSound: !type:SoundPathSpecifier
         path: /Audio/Effects/alert.ogg

diff --git a/Resources/Maps/_NF/POI/lpbravo.yml b/Resources/Maps/_NF/POI/lpbravo.yml
@@ -49,6 +49,8 @@ entities:
     - type: OccluderTree
     - type: SpreaderGrid
     - type: Shuttle
+      linearDamping: 999999
+      angularDamping: 999999
     - type: GridPathfinding
     - gravityShakeSound: !type:SoundPathSpecifier
         path: /Audio/Effects/alert.ogg

diff --git a/Resources/Maps/_NF/POI/nfsd.yml b/Resources/Maps/_NF/POI/nfsd.yml
diff --git a/Resources/Maps/_NF/POI/northpole.yml b/Resources/Maps/_NF/POI/northpole.yml
@@ -112,6 +112,8 @@ entities:
     - type: OccluderTree
     - type: SpreaderGrid
     - type: Shuttle
+      linearDamping: 999999
+      angularDamping: 999999
     - type: GridPathfinding
     - gravityShakeSound: !type:SoundPathSpecifier
         path: /Audio/Effects/alert.ogg

diff --git a/Resources/Maps/_NF/POI/tinnia.yml b/Resources/Maps/_NF/POI/tinnia.yml
@@ -79,6 +79,8 @@ entities:
     - type: OccluderTree
     - type: SpreaderGrid
     - type: Shuttle
+      linearDamping: 999999
+      angularDamping: 999999
     - type: GridPathfinding
     - gravityShakeSound: !type:SoundPathSpecifier
         path: /Audio/Effects/alert.ogg

diff --git a/Resources/Prototypes/_NF/Maps/Outpost/frontier.yml b/Resources/Prototypes/_NF/Maps/Outpost/frontier.yml
@@ -19,12 +19,7 @@
           availableJobs:
             Passenger: [ -1, -1 ]
             HeadOfPersonnel: [ 1, 1 ]
-            HeadOfSecurity: [ 1, 1 ]
             SecurityGuard: [ 1, 1 ]
-            SeniorOfficer: [ 0, 0 ]
-            Brigmedic: [ 0, 0 ]
-            SecurityOfficer: [ 0, 0 ]
-            SecurityCadet: [ 0, 0 ]
             StationTrafficController: [ 1, 1 ]
             Valet: [ 1, 1 ]
             Janitor: [ 1, 1 ]

diff --git a/Resources/Prototypes/_NF/Maps/POI/nfsd.yml b/Resources/Prototypes/_NF/Maps/POI/nfsd.yml
@@ -0,0 +1,22 @@
+- type: gameMap
+  id: nfsd
+  mapName: 'NFSD Outpost'
+  mapPath: /Maps/_NF/POI/nfsd.yml
+  minPlayers: 0
+  stations:
+    nfsd:
+      stationProto: SecurityFrontierOutpost
+      components:
+        - type: StationNameSetup
+          mapNameTemplate: 'NFSD Outpost'
+        - type: StationJobs
+          overflowJobs: []
+          availableJobs:
+            HeadOfSecurity: [ 1, 1 ]
+            SeniorOfficer: [ 0, 0 ]
+            Brigmedic: [ 0, 0 ]
+            Detective: [ 0, 0 ]
+            SecurityOfficer: [ 0, 0 ]
+            SecurityCadet: [ 0, 0 ]
+            # Others:
+            Lawyer: [ 0, 0 ]
diff --git a/Resources/Prototypes/_NF/Shipyard/base.yml b/Resources/Prototypes/_NF/Shipyard/base.yml
@@ -23,6 +23,20 @@
   components:
     - type: Transform
 
+- type: entity
+  id: SecurityFrontierOutpost
+  parent:
+    - BaseStation # Copied from StandardFrontierStation
+    - BaseStationCargo # Cargo
+    - BaseStationJobsSpawning # Records and jobsspawning
+    - BaseStationRecords
+    - BaseStationShuttles # Can spawn shuttles via shipyard consoles
+    - BaseStationAlertLevels # Has a comms console
+    - BaseStationSiliconLawFrontierStation # No funny borg laws
+  noSpawn: true
+  components:
+    - type: Transform
+
 - type: entity
   id: StandardFrontierVessel
   parent: