diff --git a/Resources/Maps/Shuttles/anchor.yml b/Resources/Maps/_NF/Shuttles/anchor.yml similarity index 100% rename from Resources/Maps/Shuttles/anchor.yml rename to Resources/Maps/_NF/Shuttles/anchor.yml diff --git a/Resources/Maps/Shuttles/barge.yml b/Resources/Maps/_NF/Shuttles/barge.yml similarity index 100% rename from Resources/Maps/Shuttles/barge.yml rename to Resources/Maps/_NF/Shuttles/barge.yml diff --git a/Resources/Maps/Shuttles/bison.yml b/Resources/Maps/_NF/Shuttles/bison.yml similarity index 100% rename from Resources/Maps/Shuttles/bison.yml rename to Resources/Maps/_NF/Shuttles/bison.yml diff --git a/Resources/Maps/Shuttles/bocadillo.yml b/Resources/Maps/_NF/Shuttles/bocadillo.yml similarity index 100% rename from Resources/Maps/Shuttles/bocadillo.yml rename to Resources/Maps/_NF/Shuttles/bocadillo.yml diff --git a/Resources/Maps/Shuttles/bulker.yml b/Resources/Maps/_NF/Shuttles/bulker.yml similarity index 100% rename from Resources/Maps/Shuttles/bulker.yml rename to Resources/Maps/_NF/Shuttles/bulker.yml diff --git a/Resources/Maps/Shuttles/caduceus.yml b/Resources/Maps/_NF/Shuttles/caduceus.yml similarity index 100% rename from Resources/Maps/Shuttles/caduceus.yml rename to Resources/Maps/_NF/Shuttles/caduceus.yml diff --git a/Resources/Maps/Shuttles/chisel.yml b/Resources/Maps/_NF/Shuttles/chisel.yml similarity index 100% rename from Resources/Maps/Shuttles/chisel.yml rename to Resources/Maps/_NF/Shuttles/chisel.yml diff --git a/Resources/Maps/Shuttles/cleric.yml b/Resources/Maps/_NF/Shuttles/cleric.yml similarity index 100% rename from Resources/Maps/Shuttles/cleric.yml rename to Resources/Maps/_NF/Shuttles/cleric.yml diff --git a/Resources/Maps/Shuttles/comet.yml b/Resources/Maps/_NF/Shuttles/comet.yml similarity index 100% rename from Resources/Maps/Shuttles/comet.yml rename to Resources/Maps/_NF/Shuttles/comet.yml diff --git a/Resources/Maps/Shuttles/condor.yml b/Resources/Maps/_NF/Shuttles/condor.yml similarity index 100% rename from Resources/Maps/Shuttles/condor.yml rename to Resources/Maps/_NF/Shuttles/condor.yml diff --git a/Resources/Maps/Shuttles/construct.yml b/Resources/Maps/_NF/Shuttles/construct.yml similarity index 100% rename from Resources/Maps/Shuttles/construct.yml rename to Resources/Maps/_NF/Shuttles/construct.yml diff --git a/Resources/Maps/Shuttles/courserx.yml b/Resources/Maps/_NF/Shuttles/courserx.yml similarity index 100% rename from Resources/Maps/Shuttles/courserx.yml rename to Resources/Maps/_NF/Shuttles/courserx.yml diff --git a/Resources/Maps/Shuttles/crescent.yml b/Resources/Maps/_NF/Shuttles/crescent.yml similarity index 100% rename from Resources/Maps/Shuttles/crescent.yml rename to Resources/Maps/_NF/Shuttles/crescent.yml diff --git a/Resources/Maps/Shuttles/dartx.yml b/Resources/Maps/_NF/Shuttles/dartx.yml similarity index 100% rename from Resources/Maps/Shuttles/dartx.yml rename to Resources/Maps/_NF/Shuttles/dartx.yml diff --git a/Resources/Maps/Shuttles/decadedove.yml b/Resources/Maps/_NF/Shuttles/decadedove.yml similarity index 100% rename from Resources/Maps/Shuttles/decadedove.yml rename to Resources/Maps/_NF/Shuttles/decadedove.yml diff --git a/Resources/Maps/Shuttles/dragonfly.yml b/Resources/Maps/_NF/Shuttles/dragonfly.yml similarity index 100% rename from Resources/Maps/Shuttles/dragonfly.yml rename to Resources/Maps/_NF/Shuttles/dragonfly.yml diff --git a/Resources/Maps/Shuttles/empress.yml b/Resources/Maps/_NF/Shuttles/empress.yml similarity index 100% rename from Resources/Maps/Shuttles/empress.yml rename to Resources/Maps/_NF/Shuttles/empress.yml diff --git a/Resources/Maps/Shuttles/enforcer.yml b/Resources/Maps/_NF/Shuttles/enforcer.yml similarity index 100% rename from Resources/Maps/Shuttles/enforcer.yml rename to Resources/Maps/_NF/Shuttles/enforcer.yml diff --git a/Resources/Maps/Shuttles/esquire.yml b/Resources/Maps/_NF/Shuttles/esquire.yml similarity index 100% rename from Resources/Maps/Shuttles/esquire.yml rename to Resources/Maps/_NF/Shuttles/esquire.yml diff --git a/Resources/Maps/Shuttles/fighter.yml b/Resources/Maps/_NF/Shuttles/fighter.yml similarity index 100% rename from Resources/Maps/Shuttles/fighter.yml rename to Resources/Maps/_NF/Shuttles/fighter.yml diff --git a/Resources/Maps/Shuttles/garden.yml b/Resources/Maps/_NF/Shuttles/garden.yml similarity index 100% rename from Resources/Maps/Shuttles/garden.yml rename to Resources/Maps/_NF/Shuttles/garden.yml diff --git a/Resources/Maps/Shuttles/helix.yml b/Resources/Maps/_NF/Shuttles/helix.yml similarity index 100% rename from Resources/Maps/Shuttles/helix.yml rename to Resources/Maps/_NF/Shuttles/helix.yml diff --git a/Resources/Maps/Shuttles/honker.yml b/Resources/Maps/_NF/Shuttles/honker.yml similarity index 100% rename from Resources/Maps/Shuttles/honker.yml rename to Resources/Maps/_NF/Shuttles/honker.yml diff --git a/Resources/Maps/Shuttles/hospitaller.yml b/Resources/Maps/_NF/Shuttles/hospitaller.yml similarity index 100% rename from Resources/Maps/Shuttles/hospitaller.yml rename to Resources/Maps/_NF/Shuttles/hospitaller.yml diff --git a/Resources/Maps/Shuttles/hunter.yml b/Resources/Maps/_NF/Shuttles/hunter.yml similarity index 100% rename from Resources/Maps/Shuttles/hunter.yml rename to Resources/Maps/_NF/Shuttles/hunter.yml diff --git a/Resources/Maps/Shuttles/infiltrator.yml b/Resources/Maps/_NF/Shuttles/infiltrator.yml similarity index 100% rename from Resources/Maps/Shuttles/infiltrator.yml rename to Resources/Maps/_NF/Shuttles/infiltrator.yml diff --git a/Resources/Maps/Shuttles/inquisitor.yml b/Resources/Maps/_NF/Shuttles/inquisitor.yml similarity index 100% rename from Resources/Maps/Shuttles/inquisitor.yml rename to Resources/Maps/_NF/Shuttles/inquisitor.yml diff --git a/Resources/Maps/Shuttles/interceptor.yml b/Resources/Maps/_NF/Shuttles/interceptor.yml similarity index 100% rename from Resources/Maps/Shuttles/interceptor.yml rename to Resources/Maps/_NF/Shuttles/interceptor.yml diff --git a/Resources/Maps/Shuttles/investigator.yml b/Resources/Maps/_NF/Shuttles/investigator.yml similarity index 100% rename from Resources/Maps/Shuttles/investigator.yml rename to Resources/Maps/_NF/Shuttles/investigator.yml diff --git a/Resources/Maps/Shuttles/kestrel.yml b/Resources/Maps/_NF/Shuttles/kestrel.yml similarity index 100% rename from Resources/Maps/Shuttles/kestrel.yml rename to Resources/Maps/_NF/Shuttles/kestrel.yml diff --git a/Resources/Maps/Shuttles/mail.yml b/Resources/Maps/_NF/Shuttles/mail.yml similarity index 100% rename from Resources/Maps/Shuttles/mail.yml rename to Resources/Maps/_NF/Shuttles/mail.yml diff --git a/Resources/Maps/Shuttles/marauder.yml b/Resources/Maps/_NF/Shuttles/marauder.yml similarity index 100% rename from Resources/Maps/Shuttles/marauder.yml rename to Resources/Maps/_NF/Shuttles/marauder.yml diff --git a/Resources/Maps/Shuttles/metastable.yml b/Resources/Maps/_NF/Shuttles/metastable.yml similarity index 100% rename from Resources/Maps/Shuttles/metastable.yml rename to Resources/Maps/_NF/Shuttles/metastable.yml diff --git a/Resources/Maps/Shuttles/mission.yml b/Resources/Maps/_NF/Shuttles/mission.yml similarity index 100% rename from Resources/Maps/Shuttles/mission.yml rename to Resources/Maps/_NF/Shuttles/mission.yml diff --git a/Resources/Maps/Shuttles/svnugget.yml b/Resources/Maps/_NF/Shuttles/nugget.yml similarity index 100% rename from Resources/Maps/Shuttles/svnugget.yml rename to Resources/Maps/_NF/Shuttles/nugget.yml diff --git a/Resources/Maps/Shuttles/opportunity.yml b/Resources/Maps/_NF/Shuttles/opportunity.yml similarity index 100% rename from Resources/Maps/Shuttles/opportunity.yml rename to Resources/Maps/_NF/Shuttles/opportunity.yml diff --git a/Resources/Maps/Shuttles/svorange.yml b/Resources/Maps/_NF/Shuttles/orange.yml similarity index 100% rename from Resources/Maps/Shuttles/svorange.yml rename to Resources/Maps/_NF/Shuttles/orange.yml diff --git a/Resources/Maps/Shuttles/pathfinder.yml b/Resources/Maps/_NF/Shuttles/pathfinder.yml similarity index 100% rename from Resources/Maps/Shuttles/pathfinder.yml rename to Resources/Maps/_NF/Shuttles/pathfinder.yml diff --git a/Resources/Maps/Shuttles/pheonix.yml b/Resources/Maps/_NF/Shuttles/pheonix.yml similarity index 100% rename from Resources/Maps/Shuttles/pheonix.yml rename to Resources/Maps/_NF/Shuttles/pheonix.yml diff --git a/Resources/Maps/Shuttles/pioneer.yml b/Resources/Maps/_NF/Shuttles/pioneer.yml similarity index 100% rename from Resources/Maps/Shuttles/pioneer.yml rename to Resources/Maps/_NF/Shuttles/pioneer.yml diff --git a/Resources/Maps/Shuttles/prospector.yml b/Resources/Maps/_NF/Shuttles/prospector.yml similarity index 100% rename from Resources/Maps/Shuttles/prospector.yml rename to Resources/Maps/_NF/Shuttles/prospector.yml diff --git a/Resources/Maps/Shuttles/prowler.yml b/Resources/Maps/_NF/Shuttles/prowler.yml similarity index 100% rename from Resources/Maps/Shuttles/prowler.yml rename to Resources/Maps/_NF/Shuttles/prowler.yml diff --git a/Resources/Maps/Shuttles/pts.yml b/Resources/Maps/_NF/Shuttles/pts.yml similarity index 100% rename from Resources/Maps/Shuttles/pts.yml rename to Resources/Maps/_NF/Shuttles/pts.yml diff --git a/Resources/Maps/Shuttles/pulse.yml b/Resources/Maps/_NF/Shuttles/pulse.yml similarity index 100% rename from Resources/Maps/Shuttles/pulse.yml rename to Resources/Maps/_NF/Shuttles/pulse.yml diff --git a/Resources/Maps/Shuttles/rogue.yml b/Resources/Maps/_NF/Shuttles/rogue.yml similarity index 100% rename from Resources/Maps/Shuttles/rogue.yml rename to Resources/Maps/_NF/Shuttles/rogue.yml diff --git a/Resources/Maps/Shuttles/rosebudmki.yml b/Resources/Maps/_NF/Shuttles/rosebudmki.yml similarity index 100% rename from Resources/Maps/Shuttles/rosebudmki.yml rename to Resources/Maps/_NF/Shuttles/rosebudmki.yml diff --git a/Resources/Maps/Shuttles/rosebudmkii.yml b/Resources/Maps/_NF/Shuttles/rosebudmkii.yml similarity index 100% rename from Resources/Maps/Shuttles/rosebudmkii.yml rename to Resources/Maps/_NF/Shuttles/rosebudmkii.yml diff --git a/Resources/Maps/Shuttles/schooner.yml b/Resources/Maps/_NF/Shuttles/schooner.yml similarity index 100% rename from Resources/Maps/Shuttles/schooner.yml rename to Resources/Maps/_NF/Shuttles/schooner.yml diff --git a/Resources/Maps/Shuttles/skipper.yml b/Resources/Maps/_NF/Shuttles/skipper.yml similarity index 100% rename from Resources/Maps/Shuttles/skipper.yml rename to Resources/Maps/_NF/Shuttles/skipper.yml diff --git a/Resources/Maps/Shuttles/sparrow.yml b/Resources/Maps/_NF/Shuttles/sparrow.yml similarity index 100% rename from Resources/Maps/Shuttles/sparrow.yml rename to Resources/Maps/_NF/Shuttles/sparrow.yml diff --git a/Resources/Maps/Shuttles/spectre.yml b/Resources/Maps/_NF/Shuttles/spectre.yml similarity index 100% rename from Resources/Maps/Shuttles/spectre.yml rename to Resources/Maps/_NF/Shuttles/spectre.yml diff --git a/Resources/Maps/Shuttles/templar.yml b/Resources/Maps/_NF/Shuttles/templar.yml similarity index 100% rename from Resources/Maps/Shuttles/templar.yml rename to Resources/Maps/_NF/Shuttles/templar.yml diff --git a/Resources/Maps/Shuttles/svtide.yml b/Resources/Maps/_NF/Shuttles/tide.yml similarity index 100% rename from Resources/Maps/Shuttles/svtide.yml rename to Resources/Maps/_NF/Shuttles/tide.yml diff --git a/Resources/Maps/Shuttles/trident.yml b/Resources/Maps/_NF/Shuttles/trident.yml similarity index 100% rename from Resources/Maps/Shuttles/trident.yml rename to Resources/Maps/_NF/Shuttles/trident.yml diff --git a/Resources/Maps/Shuttles/waveshot.yml b/Resources/Maps/_NF/Shuttles/waveshot.yml similarity index 100% rename from Resources/Maps/Shuttles/waveshot.yml rename to Resources/Maps/_NF/Shuttles/waveshot.yml diff --git a/Resources/Prototypes/_NF/Shipyard/anchor.yml b/Resources/Prototypes/_NF/Shipyard/anchor.yml index bbb09f6947d..9a26b002028 100644 --- 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 index 8175699ce8b..ae484c98440 100644 --- 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 index e784bb9b7cc..1ed3e31bf04 100644 --- 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 index 8343d71f607..187eb3f6e10 100644 --- 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 index b80f5393828..9f9d653f1cb 100644 --- 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 index c4e59268241..2f51ffba2a8 100644 --- 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 index f7c3a3268f9..26de884a248 100644 --- 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 index db8d5bee94b..678f1e37b46 100644 --- 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 index 5e3a234716a..4ef4fe56e9d 100644 --- 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 index 77422bbf2ae..1ee5ecc8405 100644 --- 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 index 885aad910b8..55641db828c 100644 --- 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 index 435bb9d7a0b..25492692f01 100644 --- 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 index bdc9b8482c9..9f554cf61be 100644 --- 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 index 5aa592b17e7..af2ae5c06e5 100644 --- 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 index 770551eb277..cd6eb4c29cf 100644 --- 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 index 57c84014749..c2a9a255ed0 100644 --- 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 index 4b3340839a8..7c84df09afb 100644 --- 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 index bda46d40b63..0437ab3e81a 100644 --- 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 index 91ae9fb0998..5fa3b127814 100644 --- 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 index c0b77c1b3b5..c4cf1adc044 100644 --- 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 index 592c3fb7800..7729f52e7c5 100644 --- 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 index 560e4556021..04108183b62 100644 --- 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: {} diff --git a/Resources/Prototypes/_NF/Shipyard/garden.yml b/Resources/Prototypes/_NF/Shipyard/garden.yml index ddf029ded05..c474b4ac1e4 100644 --- a/Resources/Prototypes/_NF/Shipyard/garden.yml +++ b/Resources/Prototypes/_NF/Shipyard/garden.yml @@ -5,12 +5,12 @@ price: 24750 category: Small group: Civilian - shuttlePath: /Maps/Shuttles/garden.yml + shuttlePath: /Maps/_NF/Shuttles/garden.yml - type: gameMap id: Garden mapName: 'HS Garden' - mapPath: /Maps/Shuttles/garden.yml + mapPath: /Maps/_NF/Shuttles/garden.yml minPlayers: 0 stations: Garden: diff --git a/Resources/Prototypes/_NF/Shipyard/gourd.yml b/Resources/Prototypes/_NF/Shipyard/gourd.yml index 77ee0fa5417..597ab525640 100644 --- a/Resources/Prototypes/_NF/Shipyard/gourd.yml +++ b/Resources/Prototypes/_NF/Shipyard/gourd.yml @@ -1,5 +1,5 @@ - type: vessel - id: gourd + id: Gourd name: SLI Gourd description: The Gourd is a Science/Salvo-Expo vessel with a dedicated blast chamber, and a proper bar/grill. price: 225000 @@ -8,12 +8,12 @@ shuttlePath: /Maps/_NF/Shuttles/gourd.yml - type: gameMap - id: gourd + id: Gourd mapName: 'SLI Gourd' mapPath: /Maps/_NF/Shuttles/gourd.yml minPlayers: 0 stations: - gourd: + Gourd: stationProto: StandardFrontierExpeditionVessel components: - type: StationNameSetup diff --git a/Resources/Prototypes/_NF/Shipyard/helix.yml b/Resources/Prototypes/_NF/Shipyard/helix.yml index 7bfdbd816ba..5249da25332 100644 --- a/Resources/Prototypes/_NF/Shipyard/helix.yml +++ b/Resources/Prototypes/_NF/Shipyard/helix.yml @@ -5,12 +5,12 @@ price: 52400 category: Medium group: Civilian - shuttlePath: /Maps/Shuttles/helix.yml + shuttlePath: /Maps/_NF/Shuttles/helix.yml - type: gameMap id: Helix mapName: 'NM Helix' - mapPath: /Maps/Shuttles/helix.yml + mapPath: /Maps/_NF/Shuttles/helix.yml minPlayers: 0 stations: Helix: diff --git a/Resources/Prototypes/_NF/Shipyard/honker.yml b/Resources/Prototypes/_NF/Shipyard/honker.yml index 083a47f6a9a..4b2720855f4 100644 --- a/Resources/Prototypes/_NF/Shipyard/honker.yml +++ b/Resources/Prototypes/_NF/Shipyard/honker.yml @@ -5,12 +5,12 @@ price: 22500 category: Small group: Civilian - shuttlePath: /Maps/Shuttles/honker.yml + shuttlePath: /Maps/_NF/Shuttles/honker.yml - type: gameMap id: Honker mapName: 'NT Honker' - mapPath: /Maps/Shuttles/honker.yml + mapPath: /Maps/_NF/Shuttles/honker.yml minPlayers: 0 stations: Honker: diff --git a/Resources/Prototypes/_NF/Shipyard/hospitaller.yml b/Resources/Prototypes/_NF/Shipyard/hospitaller.yml index 1291a21cb55..432ad241f64 100644 --- a/Resources/Prototypes/_NF/Shipyard/hospitaller.yml +++ b/Resources/Prototypes/_NF/Shipyard/hospitaller.yml @@ -5,12 +5,12 @@ price: 23220 category: Small group: Security - shuttlePath: /Maps/Shuttles/hospitaller.yml + shuttlePath: /Maps/_NF/Shuttles/hospitaller.yml - type: gameMap id: Hospitaller mapName: 'NSF14 Hospitaller' - mapPath: /Maps/Shuttles/hospitaller.yml + mapPath: /Maps/_NF/Shuttles/hospitaller.yml minPlayers: 0 stations: Hospitaller: diff --git a/Resources/Prototypes/_NF/Shipyard/hunter.yml b/Resources/Prototypes/_NF/Shipyard/hunter.yml index c6c0ae8bbab..da5fffa0243 100644 --- a/Resources/Prototypes/_NF/Shipyard/hunter.yml +++ b/Resources/Prototypes/_NF/Shipyard/hunter.yml @@ -5,12 +5,12 @@ price: 46000 category: Small group: BlackMarket - shuttlePath: /Maps/Shuttles/hunter.yml + shuttlePath: /Maps/_NF/Shuttles/hunter.yml - type: gameMap id: Hunter mapName: 'Hunter' - mapPath: /Maps/Shuttles/hunter.yml + mapPath: /Maps/_NF/Shuttles/hunter.yml minPlayers: 0 stations: Hunter: @@ -23,5 +23,4 @@ prefixCreator: '14' - type: StationJobs overflowJobs: [] - availableJobs: - Passenger: [ 0, 0 ] + availableJobs: {} diff --git a/Resources/Prototypes/_NF/Shipyard/infiltrator.yml b/Resources/Prototypes/_NF/Shipyard/infiltrator.yml index c90eacd0a77..03daa61b9cf 100644 --- a/Resources/Prototypes/_NF/Shipyard/infiltrator.yml +++ b/Resources/Prototypes/_NF/Shipyard/infiltrator.yml @@ -5,12 +5,12 @@ price: 64000 category: Medium group: BlackMarket - shuttlePath: /Maps/Shuttles/infiltrator.yml + shuttlePath: /Maps/_NF/Shuttles/infiltrator.yml - type: gameMap id: Infiltrator mapName: 'Infiltrator' - mapPath: /Maps/Shuttles/infiltrator.yml + mapPath: /Maps/_NF/Shuttles/infiltrator.yml minPlayers: 0 stations: Infiltrator: @@ -23,5 +23,4 @@ prefixCreator: '14' - type: StationJobs overflowJobs: [] - availableJobs: - Passenger: [ 0, 0 ] + availableJobs: {} diff --git a/Resources/Prototypes/_NF/Shipyard/inquisitor.yml b/Resources/Prototypes/_NF/Shipyard/inquisitor.yml index 5e8379d6988..a1e1a8eef54 100644 --- a/Resources/Prototypes/_NF/Shipyard/inquisitor.yml +++ b/Resources/Prototypes/_NF/Shipyard/inquisitor.yml @@ -5,12 +5,12 @@ price: 33000 category: Small group: Security - shuttlePath: /Maps/Shuttles/inquisitor.yml + shuttlePath: /Maps/_NF/Shuttles/inquisitor.yml - type: gameMap id: Inquisitor mapName: 'NSF Inquisitor' - mapPath: /Maps/Shuttles/inquisitor.yml + mapPath: /Maps/_NF/Shuttles/inquisitor.yml minPlayers: 0 stations: Inquisitor: diff --git a/Resources/Prototypes/_NF/Shipyard/interceptor.yml b/Resources/Prototypes/_NF/Shipyard/interceptor.yml index 0679a8d9af5..ca8a1b6ae2f 100644 --- a/Resources/Prototypes/_NF/Shipyard/interceptor.yml +++ b/Resources/Prototypes/_NF/Shipyard/interceptor.yml @@ -5,12 +5,12 @@ price: 21350 category: Small group: Security - shuttlePath: /Maps/Shuttles/interceptor.yml + shuttlePath: /Maps/_NF/Shuttles/interceptor.yml - type: gameMap id: Interceptor mapName: 'NSF Interceptor' - mapPath: /Maps/Shuttles/interceptor.yml + mapPath: /Maps/_NF/Shuttles/interceptor.yml minPlayers: 0 stations: Interceptor: diff --git a/Resources/Prototypes/_NF/Shipyard/investigator.yml b/Resources/Prototypes/_NF/Shipyard/investigator.yml index eeed6d35bd1..3a3b2e8154d 100644 --- a/Resources/Prototypes/_NF/Shipyard/investigator.yml +++ b/Resources/Prototypes/_NF/Shipyard/investigator.yml @@ -5,12 +5,12 @@ price: 38500 category: Small group: Civilian - shuttlePath: /Maps/Shuttles/investigator.yml + shuttlePath: /Maps/_NF/Shuttles/investigator.yml - type: gameMap id: Investigator mapName: 'NR Investigator' - mapPath: /Maps/Shuttles/investigator.yml + mapPath: /Maps/_NF/Shuttles/investigator.yml minPlayers: 0 stations: Investigator: diff --git a/Resources/Prototypes/_NF/Shipyard/kestrel.yml b/Resources/Prototypes/_NF/Shipyard/kestrel.yml index 46ca1984955..c5b7e9aae97 100644 --- a/Resources/Prototypes/_NF/Shipyard/kestrel.yml +++ b/Resources/Prototypes/_NF/Shipyard/kestrel.yml @@ -5,12 +5,12 @@ price: 44000 category: Medium group: Civilian - shuttlePath: /Maps/Shuttles/kestrel.yml + shuttlePath: /Maps/_NF/Shuttles/kestrel.yml - type: gameMap id: Kestrel mapName: 'NT Kestrel' - mapPath: /Maps/Shuttles/kestrel.yml + mapPath: /Maps/_NF/Shuttles/kestrel.yml minPlayers: 0 stations: Kestrel: diff --git a/Resources/Prototypes/_NF/Shipyard/mailtruck.yml b/Resources/Prototypes/_NF/Shipyard/mailtruck.yml index 72869630052..cd5f7bc73a9 100644 --- a/Resources/Prototypes/_NF/Shipyard/mailtruck.yml +++ b/Resources/Prototypes/_NF/Shipyard/mailtruck.yml @@ -5,12 +5,12 @@ price: 12150 category: Small group: Civilian - shuttlePath: /Maps/Shuttles/mail.yml + shuttlePath: /Maps/_NF/Shuttles/mail.yml - type: gameMap id: MailTruck mapName: 'NC Mail Truck' - mapPath: /Maps/Shuttles/mail.yml + mapPath: /Maps/_NF/Shuttles/mail.yml minPlayers: 0 stations: MailTruck: @@ -23,5 +23,4 @@ prefixCreator: '14' - type: StationJobs overflowJobs: [] - availableJobs: - MailCarrier: [ 0, 0 ] + availableJobs: {} diff --git a/Resources/Prototypes/_NF/Shipyard/marauder.yml b/Resources/Prototypes/_NF/Shipyard/marauder.yml index c97a5756715..37abbe80a2c 100644 --- a/Resources/Prototypes/_NF/Shipyard/marauder.yml +++ b/Resources/Prototypes/_NF/Shipyard/marauder.yml @@ -5,12 +5,12 @@ price: 111550 category: Large group: Security - shuttlePath: /Maps/Shuttles/marauder.yml + shuttlePath: /Maps/_NF/Shuttles/marauder.yml - type: gameMap id: Marauder mapName: 'NSF Marauder' - mapPath: /Maps/Shuttles/marauder.yml + mapPath: /Maps/_NF/Shuttles/marauder.yml minPlayers: 0 stations: Marauder: diff --git a/Resources/Prototypes/_NF/Shipyard/metastable.yml b/Resources/Prototypes/_NF/Shipyard/metastable.yml index ecabd5fd377..d2df947ab7e 100644 --- a/Resources/Prototypes/_NF/Shipyard/metastable.yml +++ b/Resources/Prototypes/_NF/Shipyard/metastable.yml @@ -5,12 +5,12 @@ price: 89000 category: Medium group: Civilian - shuttlePath: /Maps/Shuttles/metastable.yml + shuttlePath: /Maps/_NF/Shuttles/metastable.yml - type: gameMap id: Metastable mapName: 'TC Metastable' - mapPath: /Maps/Shuttles/metastable.yml + mapPath: /Maps/_NF/Shuttles/metastable.yml minPlayers: 0 stations: Metastable: diff --git a/Resources/Prototypes/_NF/Shipyard/mission.yml b/Resources/Prototypes/_NF/Shipyard/mission.yml index 33cd683a28c..f4aef6998ae 100644 --- a/Resources/Prototypes/_NF/Shipyard/mission.yml +++ b/Resources/Prototypes/_NF/Shipyard/mission.yml @@ -5,12 +5,12 @@ price: 17500 category: Small group: Civilian - shuttlePath: /Maps/Shuttles/mission.yml + shuttlePath: /Maps/_NF/Shuttles/mission.yml - type: gameMap id: Mission mapName: 'NC Mission' - mapPath: /Maps/Shuttles/mission.yml + mapPath: /Maps/_NF/Shuttles/mission.yml minPlayers: 0 stations: Mission: diff --git a/Resources/Prototypes/_NF/Shipyard/svnugget.yml b/Resources/Prototypes/_NF/Shipyard/nugget.yml similarity index 74% rename from Resources/Prototypes/_NF/Shipyard/svnugget.yml rename to Resources/Prototypes/_NF/Shipyard/nugget.yml index b8b06329a9e..198964af36f 100644 --- a/Resources/Prototypes/_NF/Shipyard/svnugget.yml +++ b/Resources/Prototypes/_NF/Shipyard/nugget.yml @@ -1,19 +1,19 @@ - type: vessel - id: svnugget + id: Nugget name: SV Nugget description: A flying hunk of wood and metal disguised as a kitchen shuttle. Not FDA approved. price: 12985 category: Small group: Scrap - shuttlePath: /Maps/Shuttles/svnugget.yml + shuttlePath: /Maps/_NF/Shuttles/nugget.yml - type: gameMap - id: svnugget + id: Nugget mapName: 'SV Nugget' - mapPath: /Maps/Shuttles/svnugget.yml + mapPath: /Maps/_NF/Shuttles/nugget.yml minPlayers: 0 stations: - svnugget: + Nugget: stationProto: StandardFrontierVessel components: - type: StationNameSetup @@ -23,5 +23,4 @@ prefixCreator: '14' - type: StationJobs overflowJobs: [] - availableJobs: - Passenger: [ 0, 0 ] + availableJobs: {} diff --git a/Resources/Prototypes/_NF/Shipyard/opportunity.yml b/Resources/Prototypes/_NF/Shipyard/opportunity.yml index a3c1558fdef..f7c4a2908d1 100644 --- a/Resources/Prototypes/_NF/Shipyard/opportunity.yml +++ b/Resources/Prototypes/_NF/Shipyard/opportunity.yml @@ -5,16 +5,16 @@ price: 70000 category: Medium group: Security - shuttlePath: /Maps/Shuttles/opportunity.yml + shuttlePath: /Maps/_NF/Shuttles/opportunity.yml - type: gameMap id: Opportunity mapName: 'NSF Opportunity' - mapPath: /Maps/Shuttles/opportunity.yml + mapPath: /Maps/_NF/Shuttles/opportunity.yml minPlayers: 0 stations: Opportunity: - stationProto: StandardFrontierExpeditionVessel + stationProto: StandardFrontierSecurityExpeditionVessel components: - type: StationNameSetup mapNameTemplate: 'Opportunity {1}' diff --git a/Resources/Prototypes/_NF/Shipyard/svorange.yml b/Resources/Prototypes/_NF/Shipyard/orange.yml similarity index 75% rename from Resources/Prototypes/_NF/Shipyard/svorange.yml rename to Resources/Prototypes/_NF/Shipyard/orange.yml index 91246e651f5..2c576e883dc 100644 --- a/Resources/Prototypes/_NF/Shipyard/svorange.yml +++ b/Resources/Prototypes/_NF/Shipyard/orange.yml @@ -1,19 +1,19 @@ - type: vessel - id: svorange + id: Orange name: SV Orange description: A cargo slash salvage shuttle made from scavenged wrecks, comes with some damage. price: 16000 #Appraisal is 14500 category: Small group: Scrap - shuttlePath: /Maps/Shuttles/svorange.yml + shuttlePath: /Maps/_NF/Shuttles/orange.yml - type: gameMap - id: svorange + id: Orange mapName: 'SV Orange' - mapPath: /Maps/Shuttles/svorange.yml + mapPath: /Maps/_NF/Shuttles/orange.yml minPlayers: 0 stations: - svorange: + Orange: stationProto: StandardFrontierVessel components: - type: StationNameSetup @@ -23,5 +23,4 @@ prefixCreator: '14' - type: StationJobs overflowJobs: [] - availableJobs: - Passenger: [ 0, 0 ] + availableJobs: {} diff --git a/Resources/Prototypes/_NF/Shipyard/pathfinder.yml b/Resources/Prototypes/_NF/Shipyard/pathfinder.yml index f1e0615ebe7..35d5342f2ea 100644 --- a/Resources/Prototypes/_NF/Shipyard/pathfinder.yml +++ b/Resources/Prototypes/_NF/Shipyard/pathfinder.yml @@ -5,12 +5,12 @@ price: 52920 category: Small group: Expedition - shuttlePath: /Maps/Shuttles/pathfinder.yml + shuttlePath: /Maps/_NF/Shuttles/pathfinder.yml - type: gameMap id: Pathfinder mapName: 'KC Pathfinder' - mapPath: /Maps/Shuttles/pathfinder.yml + mapPath: /Maps/_NF/Shuttles/pathfinder.yml minPlayers: 0 stations: Pathfinder: diff --git a/Resources/Prototypes/_NF/Shipyard/personal.yml b/Resources/Prototypes/_NF/Shipyard/personal.yml index 5f1e0916443..97ed0da146c 100644 --- a/Resources/Prototypes/_NF/Shipyard/personal.yml +++ b/Resources/Prototypes/_NF/Shipyard/personal.yml @@ -5,12 +5,12 @@ price: 15000 category: Small group: Civilian - shuttlePath: /Maps/Shuttles/pts.yml + shuttlePath: /Maps/_NF/Shuttles/pts.yml - type: gameMap id: PTS mapName: 'NC Personal Transport' - mapPath: /Maps/Shuttles/pts.yml + mapPath: /Maps/_NF/Shuttles/pts.yml minPlayers: 0 stations: PTS: @@ -23,5 +23,4 @@ prefixCreator: '14' - type: StationJobs overflowJobs: [] - availableJobs: - Passenger: [ 0, 0 ] + availableJobs: {} diff --git a/Resources/Prototypes/_NF/Shipyard/pheonix.yml b/Resources/Prototypes/_NF/Shipyard/pheonix.yml index 31f03dfe7ee..5f07343ff0e 100644 --- a/Resources/Prototypes/_NF/Shipyard/pheonix.yml +++ b/Resources/Prototypes/_NF/Shipyard/pheonix.yml @@ -5,12 +5,12 @@ price: 62515 category: Medium group: Civilian - shuttlePath: /Maps/Shuttles/pheonix.yml + shuttlePath: /Maps/_NF/Shuttles/pheonix.yml - type: gameMap id: Pheonix mapName: 'NR Phoenix' - mapPath: /Maps/Shuttles/pheonix.yml + mapPath: /Maps/_NF/Shuttles/pheonix.yml minPlayers: 0 stations: Pheonix: diff --git a/Resources/Prototypes/_NF/Shipyard/pioneer.yml b/Resources/Prototypes/_NF/Shipyard/pioneer.yml index b5e85e509f2..3b4a32c8e5c 100644 --- a/Resources/Prototypes/_NF/Shipyard/pioneer.yml +++ b/Resources/Prototypes/_NF/Shipyard/pioneer.yml @@ -1,19 +1,19 @@ - type: vessel - id: pioneer + id: Pioneer name: NC Pioneer description: A cargo container outfitted to be space-capable and equipped for salvaging and mining either on its own or as part of a fleet. price: 15950 category: Small group: Civilian - shuttlePath: /Maps/Shuttles/pioneer.yml + shuttlePath: /Maps/_NF/Shuttles/pioneer.yml - type: gameMap - id: pioneer + id: Pioneer mapName: 'NC Pioneer' - mapPath: /Maps/Shuttles/pioneer.yml + mapPath: /Maps/_NF/Shuttles/pioneer.yml minPlayers: 0 stations: - pioneer: + Pioneer: stationProto: StandardFrontierVessel components: - type: StationNameSetup @@ -23,5 +23,4 @@ prefixCreator: '14' - type: StationJobs overflowJobs: [] - availableJobs: - SalvageSpecialist: [ 0, 0 ] + availableJobs: {} diff --git a/Resources/Prototypes/_NF/Shipyard/prospector.yml b/Resources/Prototypes/_NF/Shipyard/prospector.yml index 0e34ea01aff..34dd8d2fc3f 100644 --- a/Resources/Prototypes/_NF/Shipyard/prospector.yml +++ b/Resources/Prototypes/_NF/Shipyard/prospector.yml @@ -5,12 +5,12 @@ price: 23000 category: Small group: Civilian - shuttlePath: /Maps/Shuttles/prospector.yml + shuttlePath: /Maps/_NF/Shuttles/prospector.yml - type: gameMap id: Prospector mapName: 'NC Prospector' - mapPath: /Maps/Shuttles/prospector.yml + mapPath: /Maps/_NF/Shuttles/prospector.yml minPlayers: 0 stations: Prospector: diff --git a/Resources/Prototypes/_NF/Shipyard/prowler.yml b/Resources/Prototypes/_NF/Shipyard/prowler.yml index 7e392a06a89..3ef0e2a92dc 100644 --- a/Resources/Prototypes/_NF/Shipyard/prowler.yml +++ b/Resources/Prototypes/_NF/Shipyard/prowler.yml @@ -5,12 +5,12 @@ price: 49220 category: Medium group: Security - shuttlePath: /Maps/Shuttles/prowler.yml + shuttlePath: /Maps/_NF/Shuttles/prowler.yml - type: gameMap id: Prowler mapName: 'NSF Prowler' - mapPath: /Maps/Shuttles/prowler.yml + mapPath: /Maps/_NF/Shuttles/prowler.yml minPlayers: 0 stations: Prowler: diff --git a/Resources/Prototypes/_NF/Shipyard/pulse.yml b/Resources/Prototypes/_NF/Shipyard/pulse.yml index df482fcb2af..5f6a9070442 100644 --- a/Resources/Prototypes/_NF/Shipyard/pulse.yml +++ b/Resources/Prototypes/_NF/Shipyard/pulse.yml @@ -5,12 +5,12 @@ price: 18765 category: Small group: Civilian - shuttlePath: /Maps/Shuttles/pulse.yml + shuttlePath: /Maps/_NF/Shuttles/pulse.yml - type: gameMap id: Pulse mapName: 'NM Pulse' - mapPath: /Maps/Shuttles/pulse.yml + mapPath: /Maps/_NF/Shuttles/pulse.yml minPlayers: 0 stations: Pulse: diff --git a/Resources/Prototypes/_NF/Shipyard/rogue.yml b/Resources/Prototypes/_NF/Shipyard/rogue.yml index 33d40b8bb20..1ef4fba4c2b 100644 --- a/Resources/Prototypes/_NF/Shipyard/rogue.yml +++ b/Resources/Prototypes/_NF/Shipyard/rogue.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/rogue.yml + shuttlePath: /Maps/_NF/Shuttles/rogue.yml - type: gameMap id: Rogue mapName: 'NSF Rogue' - mapPath: /Maps/Shuttles/rogue.yml + mapPath: /Maps/_NF/Shuttles/rogue.yml minPlayers: 0 stations: Rogue: @@ -24,5 +24,4 @@ prefixCreator: '14' - type: StationJobs overflowJobs: [] - availableJobs: - Passenger: [ 0, 0 ] + availableJobs: {} diff --git a/Resources/Prototypes/_NF/Shipyard/rosebudmki.yml b/Resources/Prototypes/_NF/Shipyard/rosebudmki.yml index 9d988c57a2b..b0fabc0079a 100644 --- a/Resources/Prototypes/_NF/Shipyard/rosebudmki.yml +++ b/Resources/Prototypes/_NF/Shipyard/rosebudmki.yml @@ -5,12 +5,12 @@ price: 85000 category: Medium group: Civilian - shuttlePath: /Maps/Shuttles/rosebudmki.yml + shuttlePath: /Maps/_NF/Shuttles/rosebudmki.yml - type: gameMap id: RosebudMKI mapName: 'NT Rosebud MKI' - mapPath: /Maps/Shuttles/rosebudmki.yml + mapPath: /Maps/_NF/Shuttles/rosebudmki.yml minPlayers: 0 stations: RosebudMKI: diff --git a/Resources/Prototypes/_NF/Shipyard/rosebudmkii.yml b/Resources/Prototypes/_NF/Shipyard/rosebudmkii.yml index cb0a00ff7e9..cbfdbf0d95d 100644 --- a/Resources/Prototypes/_NF/Shipyard/rosebudmkii.yml +++ b/Resources/Prototypes/_NF/Shipyard/rosebudmkii.yml @@ -5,12 +5,12 @@ price: 125000 category: Medium group: Expedition - shuttlePath: /Maps/Shuttles/rosebudmkii.yml + shuttlePath: /Maps/_NF/Shuttles/rosebudmkii.yml - type: gameMap id: RosebudMKII mapName: 'NT Rosebud MKII' - mapPath: /Maps/Shuttles/rosebudmkii.yml + mapPath: /Maps/_NF/Shuttles/rosebudmkii.yml minPlayers: 0 stations: RosebudMKII: diff --git a/Resources/Prototypes/_NF/Shipyard/schooner.yml b/Resources/Prototypes/_NF/Shipyard/schooner.yml index 3f5cca8b104..2f7c67e9ebd 100644 --- a/Resources/Prototypes/_NF/Shipyard/schooner.yml +++ b/Resources/Prototypes/_NF/Shipyard/schooner.yml @@ -5,12 +5,12 @@ price: 39120 category: Medium group: BlackMarket - shuttlePath: /Maps/Shuttles/schooner.yml + shuttlePath: /Maps/_NF/Shuttles/schooner.yml - type: gameMap id: Schooner mapName: 'Schooner' - mapPath: /Maps/Shuttles/schooner.yml + mapPath: /Maps/_NF/Shuttles/schooner.yml minPlayers: 0 stations: Schooner: @@ -23,5 +23,4 @@ prefixCreator: '14' - type: StationJobs overflowJobs: [] - availableJobs: - Passenger: [ 0, 0 ] \ No newline at end of file + availableJobs: {} diff --git a/Resources/Prototypes/_NF/Shipyard/skipper.yml b/Resources/Prototypes/_NF/Shipyard/skipper.yml index bf0a3f4233f..ea3644c6113 100644 --- a/Resources/Prototypes/_NF/Shipyard/skipper.yml +++ b/Resources/Prototypes/_NF/Shipyard/skipper.yml @@ -5,12 +5,12 @@ price: 32650 category: Small group: Civilian - shuttlePath: /Maps/Shuttles/skipper.yml + shuttlePath: /Maps/_NF/Shuttles/skipper.yml - type: gameMap id: Skipper mapName: 'NC Skipper' - mapPath: /Maps/Shuttles/skipper.yml + mapPath: /Maps/_NF/Shuttles/skipper.yml minPlayers: 0 stations: Skipper: diff --git a/Resources/Prototypes/_NF/Shipyard/sparrow.yml b/Resources/Prototypes/_NF/Shipyard/sparrow.yml index 8c4cc86580c..2214a497993 100644 --- a/Resources/Prototypes/_NF/Shipyard/sparrow.yml +++ b/Resources/Prototypes/_NF/Shipyard/sparrow.yml @@ -5,12 +5,12 @@ price: 45875 category: Small group: Civilian - shuttlePath: /Maps/Shuttles/sparrow.yml + shuttlePath: /Maps/_NF/Shuttles/sparrow.yml - type: gameMap id: Sparrow mapName: 'NR Sparrow' - mapPath: /Maps/Shuttles/sparrow.yml + mapPath: /Maps/_NF/Shuttles/sparrow.yml minPlayers: 0 stations: Sparrow: diff --git a/Resources/Prototypes/_NF/Shipyard/spectre.yml b/Resources/Prototypes/_NF/Shipyard/spectre.yml index fa6d628638e..29ac51714d9 100644 --- a/Resources/Prototypes/_NF/Shipyard/spectre.yml +++ b/Resources/Prototypes/_NF/Shipyard/spectre.yml @@ -5,12 +5,12 @@ price: 195000 category: Large group: Civilian - shuttlePath: /Maps/Shuttles/spectre.yml + shuttlePath: /Maps/_NF/Shuttles/spectre.yml - type: gameMap id: Spectre mapName: 'Spectre' - mapPath: /Maps/Shuttles/spectre.yml + mapPath: /Maps/_NF/Shuttles/spectre.yml minPlayers: 0 stations: Spectre: diff --git a/Resources/Prototypes/_NF/Shipyard/stellaris.yml b/Resources/Prototypes/_NF/Shipyard/stellaris.yml index 8db5fe43c3d..b323848f178 100644 --- a/Resources/Prototypes/_NF/Shipyard/stellaris.yml +++ b/Resources/Prototypes/_NF/Shipyard/stellaris.yml @@ -17,7 +17,7 @@ stationProto: StandardFrontierVessel components: - type: StationNameSetup - mapNameTemplate: '{0} Stellaris {1}' + mapNameTemplate: 'Stellaris {1}' nameGenerator: !type:NanotrasenNameGenerator prefixCreator: '14' diff --git a/Resources/Prototypes/_NF/Shipyard/templar.yml b/Resources/Prototypes/_NF/Shipyard/templar.yml index aada2515779..73bf2dd8ce2 100644 --- a/Resources/Prototypes/_NF/Shipyard/templar.yml +++ b/Resources/Prototypes/_NF/Shipyard/templar.yml @@ -5,16 +5,16 @@ price: 21220 category: Small group: Security - shuttlePath: /Maps/Shuttles/templar.yml + shuttlePath: /Maps/_NF/Shuttles/templar.yml - type: gameMap id: Templar mapName: 'NSF Templar' - mapPath: /Maps/Shuttles/templar.yml + mapPath: /Maps/_NF/Shuttles/templar.yml minPlayers: 0 stations: Templar: - stationProto: StandardFrontierVessel + stationProto: StandardFrontierSecurityVessel components: - type: StationNameSetup mapNameTemplate: 'Templar {1}' diff --git a/Resources/Prototypes/_NF/Shipyard/svtide.yml b/Resources/Prototypes/_NF/Shipyard/tide.yml similarity index 75% rename from Resources/Prototypes/_NF/Shipyard/svtide.yml rename to Resources/Prototypes/_NF/Shipyard/tide.yml index b2d4a6390ae..11ff225e90e 100644 --- a/Resources/Prototypes/_NF/Shipyard/svtide.yml +++ b/Resources/Prototypes/_NF/Shipyard/tide.yml @@ -1,19 +1,19 @@ - type: vessel - id: svtide + id: Tide name: SV Tide description: A cheaply made mass-produced shuttle made from salvaged wrecks. For the seasoned assistant. price: 9700 category: Small group: Scrap - shuttlePath: /Maps/Shuttles/svtide.yml + shuttlePath: /Maps/_NF/Shuttles/tide.yml - type: gameMap - id: svtide + id: Tide mapName: 'SV Tide' - mapPath: /Maps/Shuttles/svtide.yml + mapPath: /Maps/_NF/Shuttles/tide.yml minPlayers: 0 stations: - svtide: + Tide: stationProto: StandardFrontierVessel components: - type: StationNameSetup @@ -23,5 +23,4 @@ prefixCreator: '14' - type: StationJobs overflowJobs: [] - availableJobs: - Passenger: [ 0, 0 ] + availableJobs: {} diff --git a/Resources/Prototypes/_NF/Shipyard/trident.yml b/Resources/Prototypes/_NF/Shipyard/trident.yml index 4dfdac338d8..8cd8ebb25f2 100644 --- a/Resources/Prototypes/_NF/Shipyard/trident.yml +++ b/Resources/Prototypes/_NF/Shipyard/trident.yml @@ -5,19 +5,19 @@ # price: 49300 # category: Medium # group: Security - # shuttlePath: /Maps/Shuttles/trident.yml + # shuttlePath: /Maps/_NF/Shuttles/trident.yml # - type: gameMap # id: Trident # mapName: 'NSF Trident' - # mapPath: /Maps/Shuttles/trident.yml + # mapPath: /Maps/_NF/Shuttles/trident.yml # minPlayers: 0 # stations: # Trident: # stationProto: StandardFrontierSecurityVessel # components: # - type: StationNameSetup - # mapNameTemplate: '{0} Trident {1}' + # mapNameTemplate: 'Trident {1}' # nameGenerator: # !type:NanotrasenNameGenerator # prefixCreator: '14' diff --git a/Resources/Prototypes/_NF/Shipyard/wasp.yml b/Resources/Prototypes/_NF/Shipyard/wasp.yml index 37109fc254b..d38dc6f707a 100644 --- a/Resources/Prototypes/_NF/Shipyard/wasp.yml +++ b/Resources/Prototypes/_NF/Shipyard/wasp.yml @@ -14,7 +14,7 @@ minPlayers: 0 stations: Wasp: - stationProto: StandardFrontierExpeditionVessel + stationProto: StandardFrontierSecurityExpeditionVessel components: - type: StationNameSetup mapNameTemplate: 'Wasp {1}' diff --git a/Resources/Prototypes/_NF/Shipyard/waveshot.yml b/Resources/Prototypes/_NF/Shipyard/waveshot.yml index 54c17e8e519..ff3fddada3e 100644 --- a/Resources/Prototypes/_NF/Shipyard/waveshot.yml +++ b/Resources/Prototypes/_NF/Shipyard/waveshot.yml @@ -5,12 +5,12 @@ price: 40000 category: Small group: Civilian - shuttlePath: /Maps/Shuttles/waveshot.yml + shuttlePath: /Maps/_NF/Shuttles/waveshot.yml - type: gameMap id: WaveShot mapName: 'NT WaveShot' - mapPath: /Maps/Shuttles/waveshot.yml + mapPath: /Maps/_NF/Shuttles/waveshot.yml minPlayers: 0 stations: WaveShot: