Maps Moving

new-frontiers-14 · Jan 23, 2024 · a2c4d72 · a2c4d72
1 parent a0c89c8
commit a2c4d72
Show file tree

Hide file tree

Showing 115 changed files with 166 additions and 166 deletions.
diff --git a/Resources/Maps/Shuttles/anchor.yml → Resources/Maps/_NF/Shuttles/anchor.yml b/Resources/Maps/Shuttles/anchor.yml → Resources/Maps/_NF/Shuttles/anchor.yml
diff --git a/Resources/Maps/Shuttles/barge.yml → Resources/Maps/_NF/Shuttles/barge.yml b/Resources/Maps/Shuttles/barge.yml → Resources/Maps/_NF/Shuttles/barge.yml
diff --git a/Resources/Maps/Shuttles/bison.yml → Resources/Maps/_NF/Shuttles/bison.yml b/Resources/Maps/Shuttles/bison.yml → Resources/Maps/_NF/Shuttles/bison.yml
diff --git a/Resources/Maps/Shuttles/bocadillo.yml → Resources/Maps/_NF/Shuttles/bocadillo.yml b/Resources/Maps/Shuttles/bocadillo.yml → Resources/Maps/_NF/Shuttles/bocadillo.yml
diff --git a/Resources/Maps/Shuttles/bulker.yml → Resources/Maps/_NF/Shuttles/bulker.yml b/Resources/Maps/Shuttles/bulker.yml → Resources/Maps/_NF/Shuttles/bulker.yml
diff --git a/Resources/Maps/Shuttles/caduceus.yml → Resources/Maps/_NF/Shuttles/caduceus.yml b/Resources/Maps/Shuttles/caduceus.yml → Resources/Maps/_NF/Shuttles/caduceus.yml
diff --git a/Resources/Maps/Shuttles/chisel.yml → Resources/Maps/_NF/Shuttles/chisel.yml b/Resources/Maps/Shuttles/chisel.yml → Resources/Maps/_NF/Shuttles/chisel.yml
diff --git a/Resources/Maps/Shuttles/cleric.yml → Resources/Maps/_NF/Shuttles/cleric.yml b/Resources/Maps/Shuttles/cleric.yml → Resources/Maps/_NF/Shuttles/cleric.yml
diff --git a/Resources/Maps/Shuttles/comet.yml → Resources/Maps/_NF/Shuttles/comet.yml b/Resources/Maps/Shuttles/comet.yml → Resources/Maps/_NF/Shuttles/comet.yml
diff --git a/Resources/Maps/Shuttles/condor.yml → Resources/Maps/_NF/Shuttles/condor.yml b/Resources/Maps/Shuttles/condor.yml → Resources/Maps/_NF/Shuttles/condor.yml
diff --git a/Resources/Maps/Shuttles/construct.yml → Resources/Maps/_NF/Shuttles/construct.yml b/Resources/Maps/Shuttles/construct.yml → Resources/Maps/_NF/Shuttles/construct.yml
diff --git a/Resources/Maps/Shuttles/courserx.yml → Resources/Maps/_NF/Shuttles/courserx.yml b/Resources/Maps/Shuttles/courserx.yml → Resources/Maps/_NF/Shuttles/courserx.yml
diff --git a/Resources/Maps/Shuttles/crescent.yml → Resources/Maps/_NF/Shuttles/crescent.yml b/Resources/Maps/Shuttles/crescent.yml → Resources/Maps/_NF/Shuttles/crescent.yml
diff --git a/Resources/Maps/Shuttles/dartx.yml → Resources/Maps/_NF/Shuttles/dartx.yml b/Resources/Maps/Shuttles/dartx.yml → Resources/Maps/_NF/Shuttles/dartx.yml
diff --git a/Resources/Maps/Shuttles/decadedove.yml → Resources/Maps/_NF/Shuttles/decadedove.yml b/Resources/Maps/Shuttles/decadedove.yml → Resources/Maps/_NF/Shuttles/decadedove.yml
diff --git a/Resources/Maps/Shuttles/dragonfly.yml → Resources/Maps/_NF/Shuttles/dragonfly.yml b/Resources/Maps/Shuttles/dragonfly.yml → Resources/Maps/_NF/Shuttles/dragonfly.yml
diff --git a/Resources/Maps/Shuttles/empress.yml → Resources/Maps/_NF/Shuttles/empress.yml b/Resources/Maps/Shuttles/empress.yml → Resources/Maps/_NF/Shuttles/empress.yml
diff --git a/Resources/Maps/Shuttles/enforcer.yml → Resources/Maps/_NF/Shuttles/enforcer.yml b/Resources/Maps/Shuttles/enforcer.yml → Resources/Maps/_NF/Shuttles/enforcer.yml
diff --git a/Resources/Maps/Shuttles/esquire.yml → Resources/Maps/_NF/Shuttles/esquire.yml b/Resources/Maps/Shuttles/esquire.yml → Resources/Maps/_NF/Shuttles/esquire.yml
diff --git a/Resources/Maps/Shuttles/fighter.yml → Resources/Maps/_NF/Shuttles/fighter.yml b/Resources/Maps/Shuttles/fighter.yml → Resources/Maps/_NF/Shuttles/fighter.yml
diff --git a/Resources/Maps/Shuttles/garden.yml → Resources/Maps/_NF/Shuttles/garden.yml b/Resources/Maps/Shuttles/garden.yml → Resources/Maps/_NF/Shuttles/garden.yml
diff --git a/Resources/Maps/Shuttles/helix.yml → Resources/Maps/_NF/Shuttles/helix.yml b/Resources/Maps/Shuttles/helix.yml → Resources/Maps/_NF/Shuttles/helix.yml
diff --git a/Resources/Maps/Shuttles/honker.yml → Resources/Maps/_NF/Shuttles/honker.yml b/Resources/Maps/Shuttles/honker.yml → Resources/Maps/_NF/Shuttles/honker.yml
diff --git a/Resources/Maps/Shuttles/hospitaller.yml → Resources/Maps/_NF/Shuttles/hospitaller.yml b/Resources/Maps/Shuttles/hospitaller.yml → Resources/Maps/_NF/Shuttles/hospitaller.yml
diff --git a/Resources/Maps/Shuttles/hunter.yml → Resources/Maps/_NF/Shuttles/hunter.yml b/Resources/Maps/Shuttles/hunter.yml → Resources/Maps/_NF/Shuttles/hunter.yml
diff --git a/Resources/Maps/Shuttles/infiltrator.yml → Resources/Maps/_NF/Shuttles/infiltrator.yml b/Resources/Maps/Shuttles/infiltrator.yml → Resources/Maps/_NF/Shuttles/infiltrator.yml
diff --git a/Resources/Maps/Shuttles/inquisitor.yml → Resources/Maps/_NF/Shuttles/inquisitor.yml b/Resources/Maps/Shuttles/inquisitor.yml → Resources/Maps/_NF/Shuttles/inquisitor.yml
diff --git a/Resources/Maps/Shuttles/interceptor.yml → Resources/Maps/_NF/Shuttles/interceptor.yml b/Resources/Maps/Shuttles/interceptor.yml → Resources/Maps/_NF/Shuttles/interceptor.yml
diff --git a/Resources/Maps/Shuttles/investigator.yml → Resources/Maps/_NF/Shuttles/investigator.yml b/Resources/Maps/Shuttles/investigator.yml → Resources/Maps/_NF/Shuttles/investigator.yml
diff --git a/Resources/Maps/Shuttles/kestrel.yml → Resources/Maps/_NF/Shuttles/kestrel.yml b/Resources/Maps/Shuttles/kestrel.yml → Resources/Maps/_NF/Shuttles/kestrel.yml
diff --git a/Resources/Maps/Shuttles/mail.yml → Resources/Maps/_NF/Shuttles/mail.yml b/Resources/Maps/Shuttles/mail.yml → Resources/Maps/_NF/Shuttles/mail.yml
diff --git a/Resources/Maps/Shuttles/marauder.yml → Resources/Maps/_NF/Shuttles/marauder.yml b/Resources/Maps/Shuttles/marauder.yml → Resources/Maps/_NF/Shuttles/marauder.yml
diff --git a/Resources/Maps/Shuttles/metastable.yml → Resources/Maps/_NF/Shuttles/metastable.yml b/Resources/Maps/Shuttles/metastable.yml → Resources/Maps/_NF/Shuttles/metastable.yml
diff --git a/Resources/Maps/Shuttles/mission.yml → Resources/Maps/_NF/Shuttles/mission.yml b/Resources/Maps/Shuttles/mission.yml → Resources/Maps/_NF/Shuttles/mission.yml
diff --git a/Resources/Maps/Shuttles/svnugget.yml → Resources/Maps/_NF/Shuttles/nugget.yml b/Resources/Maps/Shuttles/svnugget.yml → Resources/Maps/_NF/Shuttles/nugget.yml
diff --git a/Resources/Maps/Shuttles/opportunity.yml → Resources/Maps/_NF/Shuttles/opportunity.yml b/Resources/Maps/Shuttles/opportunity.yml → Resources/Maps/_NF/Shuttles/opportunity.yml
diff --git a/Resources/Maps/Shuttles/svorange.yml → Resources/Maps/_NF/Shuttles/orange.yml b/Resources/Maps/Shuttles/svorange.yml → Resources/Maps/_NF/Shuttles/orange.yml
diff --git a/Resources/Maps/Shuttles/pathfinder.yml → Resources/Maps/_NF/Shuttles/pathfinder.yml b/Resources/Maps/Shuttles/pathfinder.yml → Resources/Maps/_NF/Shuttles/pathfinder.yml
diff --git a/Resources/Maps/Shuttles/pheonix.yml → Resources/Maps/_NF/Shuttles/pheonix.yml b/Resources/Maps/Shuttles/pheonix.yml → Resources/Maps/_NF/Shuttles/pheonix.yml
diff --git a/Resources/Maps/Shuttles/pioneer.yml → Resources/Maps/_NF/Shuttles/pioneer.yml b/Resources/Maps/Shuttles/pioneer.yml → Resources/Maps/_NF/Shuttles/pioneer.yml
diff --git a/Resources/Maps/Shuttles/prospector.yml → Resources/Maps/_NF/Shuttles/prospector.yml b/Resources/Maps/Shuttles/prospector.yml → Resources/Maps/_NF/Shuttles/prospector.yml
diff --git a/Resources/Maps/Shuttles/prowler.yml → Resources/Maps/_NF/Shuttles/prowler.yml b/Resources/Maps/Shuttles/prowler.yml → Resources/Maps/_NF/Shuttles/prowler.yml
diff --git a/Resources/Maps/Shuttles/pts.yml → Resources/Maps/_NF/Shuttles/pts.yml b/Resources/Maps/Shuttles/pts.yml → Resources/Maps/_NF/Shuttles/pts.yml
diff --git a/Resources/Maps/Shuttles/pulse.yml → Resources/Maps/_NF/Shuttles/pulse.yml b/Resources/Maps/Shuttles/pulse.yml → Resources/Maps/_NF/Shuttles/pulse.yml
diff --git a/Resources/Maps/Shuttles/rogue.yml → Resources/Maps/_NF/Shuttles/rogue.yml b/Resources/Maps/Shuttles/rogue.yml → Resources/Maps/_NF/Shuttles/rogue.yml
diff --git a/Resources/Maps/Shuttles/rosebudmki.yml → Resources/Maps/_NF/Shuttles/rosebudmki.yml b/Resources/Maps/Shuttles/rosebudmki.yml → Resources/Maps/_NF/Shuttles/rosebudmki.yml
diff --git a/Resources/Maps/Shuttles/rosebudmkii.yml → Resources/Maps/_NF/Shuttles/rosebudmkii.yml b/Resources/Maps/Shuttles/rosebudmkii.yml → Resources/Maps/_NF/Shuttles/rosebudmkii.yml
diff --git a/Resources/Maps/Shuttles/schooner.yml → Resources/Maps/_NF/Shuttles/schooner.yml b/Resources/Maps/Shuttles/schooner.yml → Resources/Maps/_NF/Shuttles/schooner.yml
diff --git a/Resources/Maps/Shuttles/skipper.yml → Resources/Maps/_NF/Shuttles/skipper.yml b/Resources/Maps/Shuttles/skipper.yml → Resources/Maps/_NF/Shuttles/skipper.yml
diff --git a/Resources/Maps/Shuttles/sparrow.yml → Resources/Maps/_NF/Shuttles/sparrow.yml b/Resources/Maps/Shuttles/sparrow.yml → Resources/Maps/_NF/Shuttles/sparrow.yml
diff --git a/Resources/Maps/Shuttles/spectre.yml → Resources/Maps/_NF/Shuttles/spectre.yml b/Resources/Maps/Shuttles/spectre.yml → Resources/Maps/_NF/Shuttles/spectre.yml
diff --git a/Resources/Maps/Shuttles/templar.yml → Resources/Maps/_NF/Shuttles/templar.yml b/Resources/Maps/Shuttles/templar.yml → Resources/Maps/_NF/Shuttles/templar.yml
diff --git a/Resources/Maps/Shuttles/svtide.yml → Resources/Maps/_NF/Shuttles/tide.yml b/Resources/Maps/Shuttles/svtide.yml → Resources/Maps/_NF/Shuttles/tide.yml
diff --git a/Resources/Maps/Shuttles/trident.yml → Resources/Maps/_NF/Shuttles/trident.yml b/Resources/Maps/Shuttles/trident.yml → Resources/Maps/_NF/Shuttles/trident.yml
diff --git a/Resources/Maps/Shuttles/waveshot.yml → Resources/Maps/_NF/Shuttles/waveshot.yml b/Resources/Maps/Shuttles/waveshot.yml → Resources/Maps/_NF/Shuttles/waveshot.yml
diff --git a/Resources/Prototypes/_NF/Shipyard/anchor.yml b/Resources/Prototypes/_NF/Shipyard/anchor.yml
@@ -5,12 +5,12 @@
   price: 135020
   category: Large
   group: Expedition
-  shuttlePath: /Maps/Shuttles/anchor.yml
+  shuttlePath: /Maps/_NF/Shuttles/anchor.yml
 
 - type: gameMap
   id: Anchor
   mapName: 'KC Anchor'
-  mapPath: /Maps/Shuttles/anchor.yml
+  mapPath: /Maps/_NF/Shuttles/anchor.yml
   minPlayers: 0
   stations: 
     Anchor:

diff --git a/Resources/Prototypes/_NF/Shipyard/barge.yml b/Resources/Prototypes/_NF/Shipyard/barge.yml
@@ -5,12 +5,12 @@
   price: 42300
   category: Medium
   group: Civilian
-  shuttlePath: /Maps/Shuttles/barge.yml
+  shuttlePath: /Maps/_NF/Shuttles/barge.yml
 
 - type: gameMap
   id: Barge
   mapName: 'NC Barge'
-  mapPath: /Maps/Shuttles/barge.yml
+  mapPath: /Maps/_NF/Shuttles/barge.yml
   minPlayers: 0
   stations:
     Barge:

diff --git a/Resources/Prototypes/_NF/Shipyard/base.yml b/Resources/Prototypes/_NF/Shipyard/base.yml
@@ -53,6 +53,22 @@
   components:
     - type: Transform
 
+- type: entity
+  id: StandardFrontierSecurityExpeditionVessel
+  parent:
+    - BaseStation
+    - BaseStationJobsSpawning
+    - BaseStationRecords
+    - BaseStationAlertLevels
+    - BaseStationAllEventsEligible
+    - BaseStationRenameFaxes
+    - BaseStationRenameWarpPoints
+    - BaseStationSiliconLawFrontierShips
+    - BaseStationExpeditions
+  noSpawn: true
+  components:
+    - type: Transform
+
 - type: entity
   id: StandardFrontierExpeditionVessel
   parent:

diff --git a/Resources/Prototypes/_NF/Shipyard/bazaar.yml b/Resources/Prototypes/_NF/Shipyard/bazaar.yml
@@ -17,7 +17,7 @@
       stationProto: StandardFrontierVessel
       components:
         - type: StationNameSetup
-          mapNameTemplate: 'SLI Bazaar {1}'
+          mapNameTemplate: 'Bazaar {1}'
           nameGenerator:
             !type:NanotrasenNameGenerator
             prefixCreator: '14'

diff --git a/Resources/Prototypes/_NF/Shipyard/bison.yml b/Resources/Prototypes/_NF/Shipyard/bison.yml
@@ -5,12 +5,12 @@
   price: 166138
   category: Large
   group: Scrap
-  shuttlePath: /Maps/Shuttles/bison.yml
+  shuttlePath: /Maps/_NF/Shuttles/bison.yml
 
 - type: gameMap
   id: Bison
   mapName: 'NT Bison'
-  mapPath: /Maps/Shuttles/bison.yml
+  mapPath: /Maps/_NF/Shuttles/bison.yml
   minPlayers: 0
   stations: 
     Bison:

diff --git a/Resources/Prototypes/_NF/Shipyard/bocadillo.yml b/Resources/Prototypes/_NF/Shipyard/bocadillo.yml
@@ -5,12 +5,12 @@
   price: 20000 # 6%~ Added price - cheap small ship
   category: Small
   group: Civilian
-  shuttlePath: /Maps/Shuttles/bocadillo.yml
+  shuttlePath: /Maps/_NF/Shuttles/bocadillo.yml
 
 - type: gameMap
   id: Bocadillo
   mapName: 'NC Bocadillo'
-  mapPath: /Maps/Shuttles/bocadillo.yml
+  mapPath: /Maps/_NF/Shuttles/bocadillo.yml
   minPlayers: 0
   stations:
     Bocadillo:
@@ -23,5 +23,4 @@
             prefixCreator: '14'
         - type: StationJobs
           overflowJobs: []
-          availableJobs:
-            Passenger: [ 0, 0 ]
+          availableJobs: {}
diff --git a/Resources/Prototypes/_NF/Shipyard/bulker.yml b/Resources/Prototypes/_NF/Shipyard/bulker.yml
@@ -5,12 +5,12 @@
   price: 34250 #29751 before the +15% (4462) 
   category: Medium
   group: Civilian
-  shuttlePath: /Maps/Shuttles/bulker.yml
+  shuttlePath: /Maps/_NF/Shuttles/bulker.yml
 
 - type: gameMap
   id: Bulker
   mapName: 'KL Bulker'
-  mapPath: /Maps/Shuttles/bulker.yml
+  mapPath: /Maps/_NF/Shuttles/bulker.yml
   minPlayers: 0
   stations:
     Bulker:

diff --git a/Resources/Prototypes/_NF/Shipyard/caduceus.yml b/Resources/Prototypes/_NF/Shipyard/caduceus.yml
@@ -1,5 +1,5 @@
 - type: vessel
-  id: caduceus
+  id: Caduceus
   name: NM Caduceus
   description: A former humanitarian vessel, the Caduceus now works as the best mobile hospital money can buy.
   price: 105000
@@ -8,12 +8,12 @@
   shuttlePath: /Maps/Shuttles/caduceus.yml
 
 - type: gameMap
-  id: caduceus
+  id: Caduceus
   mapName: 'NM Caduceus'
   mapPath: /Maps/Shuttles/caduceus.yml
   minPlayers: 0
   stations:
-    caduceus:
+    Caduceus:
       stationProto: StandardFrontierVessel
       components:
         - type: StationNameSetup

diff --git a/Resources/Prototypes/_NF/Shipyard/chisel.yml b/Resources/Prototypes/_NF/Shipyard/chisel.yml
@@ -5,12 +5,12 @@
   price: 31340
   category: Small
   group: Civilian
-  shuttlePath: /Maps/Shuttles/chisel.yml
+  shuttlePath: /Maps/_NF/Shuttles/chisel.yml
 
 - type: gameMap
   id: Chisel
   mapName: 'ICR Chisel'
-  mapPath: /Maps/Shuttles/chisel.yml
+  mapPath: /Maps/_NF/Shuttles/chisel.yml
   minPlayers: 0
   stations:
     Chisel:

diff --git a/Resources/Prototypes/_NF/Shipyard/cleric.yml b/Resources/Prototypes/_NF/Shipyard/cleric.yml
@@ -6,12 +6,12 @@
   category: Small
   group: None
   mapchecker_group_override: Security  # Treat this as a security vessel for mapchecker purposes
-  shuttlePath: /Maps/Shuttles/cleric.yml
+  shuttlePath: /Maps/_NF/Shuttles/cleric.yml
 
 - type: gameMap
   id: Cleric
   mapName: 'NSF Cleric'
-  mapPath: /Maps/Shuttles/cleric.yml
+  mapPath: /Maps/_NF/Shuttles/cleric.yml
   minPlayers: 0
   stations:
     Cleric:
@@ -24,5 +24,4 @@
             prefixCreator: '14'
         - type: StationJobs
           overflowJobs: []
-          availableJobs:
-            Passenger: [ 0, 0 ]
+          availableJobs: {}
diff --git a/Resources/Prototypes/_NF/Shipyard/comet.yml b/Resources/Prototypes/_NF/Shipyard/comet.yml
@@ -5,12 +5,12 @@
   price: 53000
   category: Medium
   group: Civilian
-  shuttlePath: /Maps/Shuttles/comet.yml
+  shuttlePath: /Maps/_NF/Shuttles/comet.yml
 
 - type: gameMap
   id: Comet
   mapName: 'NT Comet'
-  mapPath: /Maps/Shuttles/comet.yml
+  mapPath: /Maps/_NF/Shuttles/comet.yml
   minPlayers: 0
   stations: 
     Comet:
@@ -25,4 +25,3 @@
           overflowJobs: []
           availableJobs:
             StationEngineer: [ 0, 0 ]
-            Passenger: [ 0, 0 ]
diff --git a/Resources/Prototypes/_NF/Shipyard/condor.yml b/Resources/Prototypes/_NF/Shipyard/condor.yml
@@ -5,12 +5,12 @@
   price: 72890
   category: Medium
   group: Civilian
-  shuttlePath: /Maps/Shuttles/condor.yml
+  shuttlePath: /Maps/_NF/Shuttles/condor.yml
 
 - type: gameMap
   id: Condor
   mapName: 'NR Condor'
-  mapPath: /Maps/Shuttles/condor.yml
+  mapPath: /Maps/_NF/Shuttles/condor.yml
   minPlayers: 0
   stations:
     Condor:

diff --git a/Resources/Prototypes/_NF/Shipyard/construct.yml b/Resources/Prototypes/_NF/Shipyard/construct.yml
@@ -5,12 +5,12 @@
   price: 12075
   category: Small
   group: Civilian
-  shuttlePath: /Maps/Shuttles/construct.yml
+  shuttlePath: /Maps/_NF/Shuttles/construct.yml
 
 - type: gameMap
   id: Construct
   mapName: 'NT Construct'
-  mapPath: /Maps/Shuttles/construct.yml
+  mapPath: /Maps/_NF/Shuttles/construct.yml
   minPlayers: 0
   stations:
     Construct:
@@ -23,5 +23,4 @@
             prefixCreator: '14'
         - type: StationJobs
           overflowJobs: []
-          availableJobs:
-            Passenger: [ 0, 0 ]
+          availableJobs: {}
diff --git a/Resources/Prototypes/_NF/Shipyard/courser.yml b/Resources/Prototypes/_NF/Shipyard/courser.yml
@@ -5,12 +5,12 @@
   price: 68650
   category: Medium
   group: Expedition
-  shuttlePath: /Maps/Shuttles/courserx.yml
+  shuttlePath: /Maps/_NF/Shuttles/courserx.yml
 
 - type: gameMap
   id: Courser
   mapName: 'NT Courser-X'
-  mapPath: /Maps/Shuttles/courserx.yml
+  mapPath: /Maps/_NF/Shuttles/courserx.yml
   minPlayers: 0
   stations:
     Courser:

diff --git a/Resources/Prototypes/_NF/Shipyard/crescent.yml b/Resources/Prototypes/_NF/Shipyard/crescent.yml
@@ -5,12 +5,12 @@
   price: 208020
   category: Large
   group: Civilian
-  shuttlePath: /Maps/Shuttles/crescent.yml
+  shuttlePath: /Maps/_NF/Shuttles/crescent.yml
 
 - type: gameMap
   id: Crescent
   mapName: 'KC Crescent'
-  mapPath: /Maps/Shuttles/crescent.yml
+  mapPath: /Maps/_NF/Shuttles/crescent.yml
   minPlayers: 0
   stations:
     Crescent:

diff --git a/Resources/Prototypes/_NF/Shipyard/dartx.yml b/Resources/Prototypes/_NF/Shipyard/dartx.yml
@@ -5,12 +5,12 @@
   price: 80500
   category: Medium
   group: Expedition
-  shuttlePath: /Maps/Shuttles/dartx.yml
+  shuttlePath: /Maps/_NF/Shuttles/dartx.yml
 
 - type: gameMap
   id: DartX
   mapName: 'NT Dart-X'
-  mapPath: /Maps/Shuttles/dartx.yml
+  mapPath: /Maps/_NF/Shuttles/dartx.yml
   minPlayers: 0
   stations:
     DartX:

diff --git a/Resources/Prototypes/_NF/Shipyard/decadedove.yml b/Resources/Prototypes/_NF/Shipyard/decadedove.yml
@@ -5,12 +5,12 @@
   price: 75000
   category: Medium
   group: Expedition
-  shuttlePath: /Maps/Shuttles/decadedove.yml
+  shuttlePath: /Maps/_NF/Shuttles/decadedove.yml
 
 - type: gameMap
   id: DecadeDove
-  mapName: 'Dove'
-  mapPath: /Maps/Shuttles/decadedove.yml
+  mapName: 'DYS Dove'
+  mapPath: /Maps/_NF/Shuttles/decadedove.yml
   minPlayers: 0
   stations:
     DecadeDove:
@@ -27,4 +27,3 @@
             StationEngineer: [ 0, 0 ]
             SalvageSpecialist: [ 0, 0 ]
             Borg: [ 0, 0 ]
-
diff --git a/Resources/Prototypes/_NF/Shipyard/dragonfly.yml b/Resources/Prototypes/_NF/Shipyard/dragonfly.yml
@@ -5,12 +5,12 @@
   price: 85000
   category: Medium
   group: Expedition
-  shuttlePath: /Maps/Shuttles/dragonfly.yml
+  shuttlePath: /Maps/_NF/Shuttles/dragonfly.yml
 
 - type: gameMap
   id: Dragonfly
-  mapName: 'Dragonfly'
-  mapPath: /Maps/Shuttles/dragonfly.yml
+  mapName: 'DYS Dragonfly'
+  mapPath: /Maps/_NF/Shuttles/dragonfly.yml
   minPlayers: 0
   stations:
     Dragonfly:

diff --git a/Resources/Prototypes/_NF/Shipyard/empress.yml b/Resources/Prototypes/_NF/Shipyard/empress.yml
@@ -5,12 +5,12 @@
   price: 170200
   category: Large
   group: Security
-  shuttlePath: /Maps/Shuttles/empress.yml
+  shuttlePath: /Maps/_NF/Shuttles/empress.yml
 
 - type: gameMap
   id: Empress
   mapName: 'NSF Empress'
-  mapPath: /Maps/Shuttles/empress.yml
+  mapPath: /Maps/_NF/Shuttles/empress.yml
   minPlayers: 0
   stations:
     Empress:

diff --git a/Resources/Prototypes/_NF/Shipyard/enforcer.yml b/Resources/Prototypes/_NF/Shipyard/enforcer.yml
@@ -5,19 +5,19 @@
   # price: 21350
   # category: Small
   # group: Security
-  # shuttlePath: /Maps/Shuttles/enforcer.yml
+  # shuttlePath: /Maps/_NF/Shuttles/enforcer.yml
 
 # - type: gameMap
   # id: Enforcer
   # mapName: 'NSF Enforcer'
-  # mapPath: /Maps/Shuttles/enforcer.yml
+  # mapPath: /Maps/_NF/Shuttles/enforcer.yml
   # minPlayers: 0
   # stations:
     # Enforcer:
       # stationProto: StandardFrontierSecurityVessel
       # components:
         # - type: StationNameSetup
-          # mapNameTemplate: '{0} Enforcer {1}'
+          # mapNameTemplate: 'Enforcer {1}'
           # nameGenerator:
             # !type:NanotrasenNameGenerator
             # prefixCreator: '14'

diff --git a/Resources/Prototypes/_NF/Shipyard/esquire.yml b/Resources/Prototypes/_NF/Shipyard/esquire.yml
@@ -5,12 +5,12 @@
   price: 42500
   category: Medium
   group: Civilian
-  shuttlePath: /Maps/Shuttles/esquire.yml
+  shuttlePath: /Maps/_NF/Shuttles/esquire.yml
 
 - type: gameMap
   id: Esquire
   mapName: 'NT Esquire'
-  mapPath: /Maps/Shuttles/esquire.yml
+  mapPath: /Maps/_NF/Shuttles/esquire.yml
   minPlayers: 0
   stations:
     Esquire:
@@ -26,4 +26,4 @@
           availableJobs:
             Lawyer: [ 0, 0 ]
             StationEngineer: [ 0, 0 ]
-            PrisonGuard: [ 0, 0 ]
+            Mercenary: [ 0, 0 ] # Replaced the PrisonGuard job on it
diff --git a/Resources/Prototypes/_NF/Shipyard/fighter.yml b/Resources/Prototypes/_NF/Shipyard/fighter.yml
@@ -6,12 +6,12 @@
   category: Small
   group: None
   mapchecker_group_override: Security  # Treat this as a security vessel for mapchecker purposes
-  shuttlePath: /Maps/Shuttles/fighter.yml
+  shuttlePath: /Maps/_NF/Shuttles/fighter.yml
 
 - type: gameMap
   id: Fighter
   mapName: 'NSF Fighter'
-  mapPath: /Maps/Shuttles/fighter.yml
+  mapPath: /Maps/_NF/Shuttles/fighter.yml
   minPlayers: 0
   stations:
     Fighter:
@@ -24,5 +24,4 @@
             prefixCreator: '14'
         - type: StationJobs
           overflowJobs: []
-          availableJobs:
-            Passenger: [ 0, 0 ]
+          availableJobs: {}