Skip to content
This repository has been archived by the owner on Nov 1, 2024. It is now read-only.

Commit

Permalink
Merge pull request #223 from Corvax-Frontier/Up290524
Browse files Browse the repository at this point in the history 
Мини-апстрим
  • Loading branch information
@Vonsant
Vonsant authored May 29, 2024
2 parents e24aa20 + c6ef40d commit e4f4183
Show file tree
Hide file tree
Showing 65 changed files with 2,012 additions and 215 deletions.
14 changes: 14 additions & 0 deletions Resources/Changelog/Changelog.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4680,3 +4680,17 @@ Entries:
message: Fixed Clippy not hearing Service Radio
id: 4993
time: '2024-05-26T14:18:25.0000000+00:00'
- author: MagnusCrowe
changes:
- type: Tweak
message: Ships can only hire contractors, pilots, and mercs now.
id: 4994
time: '2024-05-28T15:26:52.0000000+00:00'
- author: UncaughtEx
changes:
- type: Add
message: >-
Introducing from SBI, with Blueprints graciously supplied by the NT
archives, the Crown, for all your Civilian Templar oriented needs!
id: 4995
time: '2024-05-29T06:42:09.0000000+00:00'
1,783 changes: 1,783 additions & 0 deletions Resources/Maps/_NF/Shuttles/crown.yml
View file

Large diffs are not rendered by default.

6 changes: 2 additions & 4 deletions Resources/Prototypes/_NF/Shipyard/Expedition/ambition.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,6 @@
- type: StationJobs
overflowJobs: []
availableJobs:
Contractor: [ 0, 0 ]
Pilot: [ 0, 0 ]
ChiefEngineer: [ 0, 0 ]
AtmosphericTechnician: [ 0, 0 ]
StationEngineer: [ 0, 0 ]
SalvageSpecialist: [ 0, 0 ]
Mercenary: [ 0, 0 ]
10 changes: 2 additions & 8 deletions Resources/Prototypes/_NF/Shipyard/Expedition/anchor.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,12 +24,6 @@
- type: StationJobs
overflowJobs: []
availableJobs:
ServiceWorker: [ 0, 0 ]
ChiefEngineer: [ 0, 0 ]
Chaplain: [ 0, 0 ]
MedicalDoctor: [ 0, 0 ]
Contractor: [ 0, 0 ]
Pilot: [ 0, 0 ]
Mercenary: [ 0, 0 ]
StationEngineer: [ 0, 0 ]
AtmosphericTechnician: [ 0, 0 ]
Bartender: [ 0, 0 ]
Chef: [ 0, 0 ]
5 changes: 2 additions & 3 deletions Resources/Prototypes/_NF/Shipyard/Expedition/courserx.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@
- type: StationJobs
overflowJobs: []
availableJobs:
Bartender: [ 0, 0 ]
StationEngineer: [ 0, 0 ]
Contractor: [ 0, 0 ]
Pilot: [ 0, 0 ]
Mercenary: [ 0, 0 ]
Paramedic: [ 0, 0 ]
6 changes: 2 additions & 4 deletions Resources/Prototypes/_NF/Shipyard/Expedition/dartx.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,6 @@
- type: StationJobs
overflowJobs: []
availableJobs:
Bartender: [ 0, 0 ]
StationEngineer: [ 0, 0 ]
Clown: [ 0, 0 ]
Paramedic: [ 0, 0 ]
Contractor: [ 0, 0 ]
Pilot: [ 0, 0 ]
Mercenary: [ 0, 0 ]
6 changes: 3 additions & 3 deletions Resources/Prototypes/_NF/Shipyard/Expedition/decadedove.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,6 @@
- type: StationJobs
overflowJobs: []
availableJobs:
StationEngineer: [ 0, 0 ]
SalvageSpecialist: [ 0, 0 ]
Borg: [ 0, 0 ]
Contractor: [ 0, 0 ]
Pilot: [ 0, 0 ]
Mercenary: [ 0, 0 ]
8 changes: 3 additions & 5 deletions Resources/Prototypes/_NF/Shipyard/Expedition/dragonfly.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,6 @@
- type: StationJobs
overflowJobs: []
availableJobs:
CargoTechnician: [ 0, 0 ]
Chemist: [ 0, 0 ]
SalvageSpecialist: [ 0, 0 ]
ServiceWorker: [ 0, 0 ]
StationEngineer: [ 0, 0 ]
Contractor: [ 0, 0 ]
Pilot: [ 0, 0 ]
Mercenary: [ 0, 0 ]
12 changes: 3 additions & 9 deletions Resources/Prototypes/_NF/Shipyard/Expedition/gourd.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,12 +24,6 @@
- type: StationJobs
overflowJobs: []
availableJobs:
AtmosphericTechnician: [ 0, 0 ]
StationEngineer: [ 0, 0 ]
Scientist: [ 0, 0 ]
ResearchDirector: [ 0, 0 ]
Chef: [ 0, 0 ]
Bartender: [ 0, 0 ]
SalvageSpecialist: [ 0, 0 ]
Janitor: [ 0, 0 ]
Musician: [ 0, 0 ]
Contractor: [ 0, 0 ]
Pilot: [ 0, 0 ]
Mercenary: [ 0, 0 ]
4 changes: 3 additions & 1 deletion Resources/Prototypes/_NF/Shipyard/Expedition/kestrel.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,4 +34,6 @@
- type: StationJobs
overflowJobs: []
availableJobs:
SalvageSpecialist: [ 0, 0 ]
Contractor: [ 0, 0 ]
Pilot: [ 0, 0 ]
Mercenary: [ 0, 0 ]
3 changes: 2 additions & 1 deletion Resources/Prototypes/_NF/Shipyard/Expedition/mayflower.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,5 +24,6 @@
- type: StationJobs
overflowJobs: []
availableJobs:
MedicalDoctor: [ 0, 0 ]
Contractor: [ 0, 0 ]
Pilot: [ 0, 0 ]
Mercenary: [ 0, 0 ]
3 changes: 2 additions & 1 deletion Resources/Prototypes/_NF/Shipyard/Expedition/pathfinder.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,5 +34,6 @@
- type: StationJobs
overflowJobs: []
availableJobs:
Contractor: [ 0, 0 ]
Pilot: [ 0, 0 ]
SalvageSpecialist: [ 0, 0 ]
Mercenary: [ 0, 0 ]
10 changes: 2 additions & 8 deletions Resources/Prototypes/_NF/Shipyard/Expedition/praeda.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,12 +34,6 @@
- type: StationJobs
overflowJobs: []
availableJobs:
Quartermaster: [ 0, 0 ]
SalvageSpecialist: [ 0, 0 ]
CargoTechnician: [ 0, 0 ]
ChiefEngineer: [ 0, 0 ]
StationEngineer: [ 0, 0 ]
Bartender: [ 0, 0 ]
Paramedic: [ 0, 0 ]
Contractor: [ 0, 0 ]
Pilot: [ 0, 0 ]
Mercenary: [ 0, 0 ]
Janitor: [ 0, 0 ]
8 changes: 3 additions & 5 deletions Resources/Prototypes/_NF/Shipyard/Expedition/rosebudmkii.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,6 @@
- type: StationJobs
overflowJobs: []
availableJobs:
SalvageSpecialist: [ 0, 0 ]
Paramedic: [ 0, 0 ]
ChiefEngineer: [ 0, 0 ]
MedicalDoctor: [ 0, 0 ]
Chemist: [ 0, 0 ]
Contractor: [ 0, 0 ]
Pilot: [ 0, 0 ]
Mercenary: [ 0, 0 ]
5 changes: 2 additions & 3 deletions Resources/Prototypes/_NF/Shipyard/Expedition/sprinter.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@
- type: StationJobs
overflowJobs: []
availableJobs:
Bartender: [ 0, 0 ]
Paramedic: [ 0, 0 ]
Contractor: [ 0, 0 ]
Pilot: [ 0, 0 ]
Mercenary: [ 0, 0 ]
SalvageSpecialist: [ 0, 0 ]
5 changes: 4 additions & 1 deletion Resources/Prototypes/_NF/Shipyard/Scrap/bison.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,4 +23,7 @@
prefixCreator: '14'
- type: StationJobs
overflowJobs: []
availableJobs: {}
availableJobs:
Contractor: [ 0, 0 ]
Pilot: [ 0, 0 ]
Mercenary: [ 0, 0 ]
5 changes: 4 additions & 1 deletion Resources/Prototypes/_NF/Shipyard/Scrap/canister.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,4 +27,7 @@
prefixCreator: '14'
- type: StationJobs
overflowJobs: []
availableJobs: {}
availableJobs:
Contractor: [ 0, 0 ]
Pilot: [ 0, 0 ]
Mercenary: [ 0, 0 ]
5 changes: 4 additions & 1 deletion Resources/Prototypes/_NF/Shipyard/Scrap/disciple.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,4 +33,7 @@
prefixCreator: '14'
- type: StationJobs
overflowJobs: []
availableJobs: {}
availableJobs:
Contractor: [ 0, 0 ]
Pilot: [ 0, 0 ]
Mercenary: [ 0, 0 ]
5 changes: 4 additions & 1 deletion Resources/Prototypes/_NF/Shipyard/Scrap/nugget.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,4 +33,7 @@
prefixCreator: '14'
- type: StationJobs
overflowJobs: []
availableJobs: {}
availableJobs:
Contractor: [ 0, 0 ]
Pilot: [ 0, 0 ]
Mercenary: [ 0, 0 ]
5 changes: 4 additions & 1 deletion Resources/Prototypes/_NF/Shipyard/Scrap/orange.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,4 +23,7 @@
prefixCreator: '14'
- type: StationJobs
overflowJobs: []
availableJobs: {}
availableJobs:
Contractor: [ 0, 0 ]
Pilot: [ 0, 0 ]
Mercenary: [ 0, 0 ]
5 changes: 4 additions & 1 deletion Resources/Prototypes/_NF/Shipyard/Scrap/point.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,4 +23,7 @@
prefixCreator: '14'
- type: StationJobs
overflowJobs: []
availableJobs: {}
availableJobs:
Contractor: [ 0, 0 ]
Pilot: [ 0, 0 ]
Mercenary: [ 0, 0 ]
5 changes: 4 additions & 1 deletion Resources/Prototypes/_NF/Shipyard/Scrap/tide.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,4 +23,7 @@
prefixCreator: '14'
- type: StationJobs
overflowJobs: []
availableJobs: {}
availableJobs:
Contractor: [ 0, 0 ]
Pilot: [ 0, 0 ]
Mercenary: [ 0, 0 ]
6 changes: 2 additions & 4 deletions Resources/Prototypes/_NF/Shipyard/barge.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,6 @@
- type: StationJobs
overflowJobs: []
availableJobs:
CargoTechnician: [ 0, 0 ]
Bartender: [ 0, 0 ]
SalvageSpecialist: [ 0, 0 ]
Quartermaster: [ 0, 0 ]
Contractor: [ 0, 0 ]
Pilot: [ 0, 0 ]
Mercenary: [ 0, 0 ]
5 changes: 2 additions & 3 deletions Resources/Prototypes/_NF/Shipyard/bazaar.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@
- type: StationJobs
overflowJobs: []
availableJobs:
Quartermaster: [ 0, 0 ]
CargoTechnician: [ 0, 0 ]
Contractor: [ 0, 0 ]
Pilot: [ 0, 0 ]
Mercenary: [ 0, 0 ]
ServiceWorker: [ 0, 0 ]
3 changes: 2 additions & 1 deletion Resources/Prototypes/_NF/Shipyard/bocadillo.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,5 +34,6 @@
- type: StationJobs
overflowJobs: []
availableJobs:
Contractor: [ 0, 0 ]
Pilot: [ 0, 0 ]
Chef: [ 0, 0 ]
Mercenary: [ 0, 0 ]
3 changes: 2 additions & 1 deletion Resources/Prototypes/_NF/Shipyard/bookworm.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,5 +24,6 @@
- type: StationJobs
overflowJobs: []
availableJobs:
Librarian: [ 0, 0 ]
Contractor: [ 0, 0 ]
Pilot: [ 0, 0 ]
Mercenary: [ 0, 0 ]
4 changes: 2 additions & 2 deletions Resources/Prototypes/_NF/Shipyard/bulker.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,6 @@
- type: StationJobs
overflowJobs: []
availableJobs:
Chef: [ 0, 0 ]
SalvageSpecialist: [ 0, 0 ]
Contractor: [ 0, 0 ]
Pilot: [ 0, 0 ]
Mercenary: [ 0, 0 ]
10 changes: 3 additions & 7 deletions Resources/Prototypes/_NF/Shipyard/caduceus.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,6 @@
- type: StationJobs
overflowJobs: []
availableJobs:
Paramedic: [ 0, 0 ]
ChiefMedicalOfficer: [ 0, 0 ]
MedicalDoctor: [ 0, 0 ]
Chemist: [ 0, 0 ]
Borg: [ 0, 0 ]
StationEngineer: [ 0, 0 ]
MedicalIntern: [ 0, 0 ]
Contractor: [ 0, 0 ]
Pilot: [ 0, 0 ]
Mercenary: [ 0, 0 ]
5 changes: 2 additions & 3 deletions Resources/Prototypes/_NF/Shipyard/ceres.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@
- type: StationJobs
overflowJobs: []
availableJobs:
Botanist: [ 0, 0 ]
Chef: [ 0, 0 ]
ServiceWorker: [ 0, 0 ]
Contractor: [ 0, 0 ]
Pilot: [ 0, 0 ]
Mercenary: [ 0, 0 ]
3 changes: 2 additions & 1 deletion Resources/Prototypes/_NF/Shipyard/chisel.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,5 +34,6 @@
- type: StationJobs
overflowJobs: []
availableJobs:
SalvageSpecialist: [ 0, 0 ]
Contractor: [ 0, 0 ]
Pilot: [ 0, 0 ]
Mercenary: [ 0, 0 ]
5 changes: 3 additions & 2 deletions Resources/Prototypes/_NF/Shipyard/cleithro.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,5 +31,6 @@
- type: StationJobs
overflowJobs: []
availableJobs:
Psychologist: [ 0, 0 ]
ServiceWorker: [ 0, 0 ]
Contractor: [ 0, 0 ]
Pilot: [ 0, 0 ]
Mercenary: [ 0, 0 ]
5 changes: 2 additions & 3 deletions Resources/Prototypes/_NF/Shipyard/comet.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@
- type: StationJobs
overflowJobs: []
availableJobs:
StationEngineer: [ 0, 0 ]
ChiefEngineer: [ 0, 0 ]
SalvageSpecialist: [ 0, 0 ]
Contractor: [ 0, 0 ]
Pilot: [ 0, 0 ]
Mercenary: [ 0, 0 ]
9 changes: 3 additions & 6 deletions Resources/Prototypes/_NF/Shipyard/condor.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,6 @@
- type: StationJobs
overflowJobs: []
availableJobs:
StationEngineer: [ 0, 0 ]
Scientist: [ 0, 0 ]
ResearchDirector: [ 0, 0 ]
ChiefEngineer: [ 0, 0 ]
AtmosphericTechnician: [ 0, 0 ]
Borg: [ 0, 0 ]
Contractor: [ 0, 0 ]
Pilot: [ 0, 0 ]
Mercenary: [ 0, 0 ]
4 changes: 3 additions & 1 deletion Resources/Prototypes/_NF/Shipyard/construct.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,4 +24,6 @@
- type: StationJobs
overflowJobs: []
availableJobs:
Passenger: [ 0, 0 ]
Contractor: [ 0, 0 ]
Pilot: [ 0, 0 ]
Mercenary: [ 0, 0 ]
17 changes: 2 additions & 15 deletions Resources/Prototypes/_NF/Shipyard/crescent.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,19 +34,6 @@
- type: StationJobs
overflowJobs: []
availableJobs:
Quartermaster: [ 0, 0 ]
Lawyer: [ 0, 0 ]
Janitor: [ 0, 0 ]
Scientist: [ 0, 0 ]
ResearchDirector: [ 0, 0 ]
ChiefMedicalOfficer: [ 0, 0 ]
ChiefEngineer: [ 0, 0 ]
Chef: [ 0, 0 ]
Bartender: [ 0, 0 ]
MedicalDoctor: [ 0, 0 ]
Chemist: [ 0, 0 ]
Mercenary: [ 0, 0 ]
AtmosphericTechnician: [ 0, 0 ]
StationEngineer: [ 0, 0 ]
Musician: [ 0, 0 ]
Contractor: [ 0, 0 ]
Pilot: [ 0, 0 ]
Mercenary: [ 0, 0 ]
29 changes: 29 additions & 0 deletions Resources/Prototypes/_NF/Shipyard/crown.yml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
- type: vessel
id: Crown
name: SBI Ворон
description: "Малогабаритный шаттл для наёмников, рекомендуемый состав экипажа 2 человека"
price: 20000
category: Small
group: Civilian
shuttlePath: /Maps/_NF/Shuttles/crown.yml

- type: gameMap
id: Crown
mapName: 'SBI Crown'
mapPath: /Maps/_NF/Shuttles/crown.yml
minPlayers: 0
stations:
Crown:
stationProto: StandardFrontierVessel
components:
- type: StationNameSetup
mapNameTemplate: 'Ворон {1}'
nameGenerator:
!type:NanotrasenNameGenerator
prefixCreator: '14'
- type: StationJobs
overflowJobs: []
availableJobs:
Mercenary: [ 0, 0 ]
Pilot: [ 0, 0 ]
Contractor: [ 0, 0 ]
Loading

0 comments on commit e4f4183

Please sign in to comment.