From f41f9c81a9143318dd21a8d999e3a22aae37925a Mon Sep 17 00:00:00 2001 From: Maxtone <124747282+MagnusCrowe@users.noreply.github.com> Date: Tue, 28 May 2024 10:26:52 -0500 Subject: [PATCH 1/6] ship jobs fix (#1427) --- .../_NF/Shipyard/Expedition/ambition.yml | 6 ++---- .../_NF/Shipyard/Expedition/anchor.yml | 10 ++-------- .../_NF/Shipyard/Expedition/courserx.yml | 5 ++--- .../_NF/Shipyard/Expedition/dartx.yml | 6 ++---- .../_NF/Shipyard/Expedition/decadedove.yml | 6 +++--- .../_NF/Shipyard/Expedition/dragonfly.yml | 8 +++----- .../_NF/Shipyard/Expedition/gourd.yml | 12 +++--------- .../_NF/Shipyard/Expedition/kestrel.yml | 4 +++- .../_NF/Shipyard/Expedition/mayflower.yml | 3 ++- .../_NF/Shipyard/Expedition/pathfinder.yml | 3 ++- .../_NF/Shipyard/Expedition/praeda.yml | 10 ++-------- .../_NF/Shipyard/Expedition/rosebudmkii.yml | 8 +++----- .../_NF/Shipyard/Expedition/sprinter.yml | 5 ++--- .../Prototypes/_NF/Shipyard/Scrap/bison.yml | 5 ++++- .../Prototypes/_NF/Shipyard/Scrap/canister.yml | 5 ++++- .../Prototypes/_NF/Shipyard/Scrap/disciple.yml | 5 ++++- .../Prototypes/_NF/Shipyard/Scrap/nugget.yml | 5 ++++- .../Prototypes/_NF/Shipyard/Scrap/orange.yml | 5 ++++- .../Prototypes/_NF/Shipyard/Scrap/point.yml | 5 ++++- .../Prototypes/_NF/Shipyard/Scrap/tide.yml | 5 ++++- Resources/Prototypes/_NF/Shipyard/barge.yml | 6 ++---- Resources/Prototypes/_NF/Shipyard/bazaar.yml | 5 ++--- Resources/Prototypes/_NF/Shipyard/bocadillo.yml | 3 ++- Resources/Prototypes/_NF/Shipyard/bookworm.yml | 3 ++- Resources/Prototypes/_NF/Shipyard/bulker.yml | 4 ++-- Resources/Prototypes/_NF/Shipyard/caduceus.yml | 10 +++------- Resources/Prototypes/_NF/Shipyard/ceres.yml | 5 ++--- Resources/Prototypes/_NF/Shipyard/chisel.yml | 3 ++- Resources/Prototypes/_NF/Shipyard/cleithro.yml | 5 +++-- Resources/Prototypes/_NF/Shipyard/comet.yml | 5 ++--- Resources/Prototypes/_NF/Shipyard/condor.yml | 9 +++------ Resources/Prototypes/_NF/Shipyard/construct.yml | 4 +++- Resources/Prototypes/_NF/Shipyard/crescent.yml | 17 ++--------------- Resources/Prototypes/_NF/Shipyard/eagle.yml | 6 ++---- Resources/Prototypes/_NF/Shipyard/esquire.yml | 4 ++-- Resources/Prototypes/_NF/Shipyard/garden.yml | 3 ++- Resources/Prototypes/_NF/Shipyard/hauler.yml | 7 +++---- Resources/Prototypes/_NF/Shipyard/helix.yml | 7 +++---- Resources/Prototypes/_NF/Shipyard/honker.yml | 4 +++- .../Prototypes/_NF/Shipyard/investigator.yml | 6 +++--- .../Prototypes/_NF/Shipyard/knuckleverse.yml | 6 ++---- Resources/Prototypes/_NF/Shipyard/loader.yml | 4 +++- Resources/Prototypes/_NF/Shipyard/lyrae.yml | 4 ++-- Resources/Prototypes/_NF/Shipyard/mccargo.yml | 8 ++------ .../Prototypes/_NF/Shipyard/metastable.yml | 7 +------ Resources/Prototypes/_NF/Shipyard/mission.yml | 4 ++-- Resources/Prototypes/_NF/Shipyard/phoenix.yml | 6 ++---- Resources/Prototypes/_NF/Shipyard/piecrust.yml | 3 ++- Resources/Prototypes/_NF/Shipyard/placebo.yml | 4 +++- .../Prototypes/_NF/Shipyard/prospector.yml | 4 +++- Resources/Prototypes/_NF/Shipyard/pts.yml | 5 ++++- Resources/Prototypes/_NF/Shipyard/pulse.yml | 3 ++- .../Prototypes/_NF/Shipyard/rosebudmki.yml | 6 ++---- .../Prototypes/_NF/Shipyard/searchlight.yml | 2 +- Resources/Prototypes/_NF/Shipyard/skipper.yml | 5 +++-- Resources/Prototypes/_NF/Shipyard/sparrow.yml | 5 +++-- Resources/Prototypes/_NF/Shipyard/spectre.yml | 7 +++---- Resources/Prototypes/_NF/Shipyard/stellaris.yml | 7 +++---- Resources/Prototypes/_NF/Shipyard/stratos.yml | 8 +++----- Resources/Prototypes/_NF/Shipyard/vagabond.yml | 7 +++---- Resources/Prototypes/_NF/Shipyard/waveshot.yml | 3 ++- 61 files changed, 158 insertions(+), 187 deletions(-) diff --git a/Resources/Prototypes/_NF/Shipyard/Expedition/ambition.yml b/Resources/Prototypes/_NF/Shipyard/Expedition/ambition.yml index 9cefe654c39..4a61647574d 100644 --- a/Resources/Prototypes/_NF/Shipyard/Expedition/ambition.yml +++ b/Resources/Prototypes/_NF/Shipyard/Expedition/ambition.yml @@ -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 ] \ No newline at end of file + Mercenary: [ 0, 0 ] \ No newline at end of file diff --git a/Resources/Prototypes/_NF/Shipyard/Expedition/anchor.yml b/Resources/Prototypes/_NF/Shipyard/Expedition/anchor.yml index ec153cdeb2f..8d61c751409 100644 --- a/Resources/Prototypes/_NF/Shipyard/Expedition/anchor.yml +++ b/Resources/Prototypes/_NF/Shipyard/Expedition/anchor.yml @@ -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 ] diff --git a/Resources/Prototypes/_NF/Shipyard/Expedition/courserx.yml b/Resources/Prototypes/_NF/Shipyard/Expedition/courserx.yml index 7b716c9e5c9..3eda606446f 100644 --- a/Resources/Prototypes/_NF/Shipyard/Expedition/courserx.yml +++ b/Resources/Prototypes/_NF/Shipyard/Expedition/courserx.yml @@ -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 ] diff --git a/Resources/Prototypes/_NF/Shipyard/Expedition/dartx.yml b/Resources/Prototypes/_NF/Shipyard/Expedition/dartx.yml index 8609ac7bf0d..7c45eb4a002 100644 --- a/Resources/Prototypes/_NF/Shipyard/Expedition/dartx.yml +++ b/Resources/Prototypes/_NF/Shipyard/Expedition/dartx.yml @@ -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 ] diff --git a/Resources/Prototypes/_NF/Shipyard/Expedition/decadedove.yml b/Resources/Prototypes/_NF/Shipyard/Expedition/decadedove.yml index b1fc3b13c78..e3647b6bb0a 100644 --- a/Resources/Prototypes/_NF/Shipyard/Expedition/decadedove.yml +++ b/Resources/Prototypes/_NF/Shipyard/Expedition/decadedove.yml @@ -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 ] diff --git a/Resources/Prototypes/_NF/Shipyard/Expedition/dragonfly.yml b/Resources/Prototypes/_NF/Shipyard/Expedition/dragonfly.yml index 400e7cb2f50..881dc93524d 100644 --- a/Resources/Prototypes/_NF/Shipyard/Expedition/dragonfly.yml +++ b/Resources/Prototypes/_NF/Shipyard/Expedition/dragonfly.yml @@ -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 ] \ No newline at end of file diff --git a/Resources/Prototypes/_NF/Shipyard/Expedition/gourd.yml b/Resources/Prototypes/_NF/Shipyard/Expedition/gourd.yml index 316470a9568..dd1984637cf 100644 --- a/Resources/Prototypes/_NF/Shipyard/Expedition/gourd.yml +++ b/Resources/Prototypes/_NF/Shipyard/Expedition/gourd.yml @@ -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 ] \ No newline at end of file diff --git a/Resources/Prototypes/_NF/Shipyard/Expedition/kestrel.yml b/Resources/Prototypes/_NF/Shipyard/Expedition/kestrel.yml index 52dd35295f9..16436be934f 100644 --- a/Resources/Prototypes/_NF/Shipyard/Expedition/kestrel.yml +++ b/Resources/Prototypes/_NF/Shipyard/Expedition/kestrel.yml @@ -34,4 +34,6 @@ - type: StationJobs overflowJobs: [] availableJobs: - SalvageSpecialist: [ 0, 0 ] + Contractor: [ 0, 0 ] + Pilot: [ 0, 0 ] + Mercenary: [ 0, 0 ] diff --git a/Resources/Prototypes/_NF/Shipyard/Expedition/mayflower.yml b/Resources/Prototypes/_NF/Shipyard/Expedition/mayflower.yml index d3d88ab5a45..45fe4910ca9 100644 --- a/Resources/Prototypes/_NF/Shipyard/Expedition/mayflower.yml +++ b/Resources/Prototypes/_NF/Shipyard/Expedition/mayflower.yml @@ -24,5 +24,6 @@ - type: StationJobs overflowJobs: [] availableJobs: - MedicalDoctor: [ 0, 0 ] + Contractor: [ 0, 0 ] + Pilot: [ 0, 0 ] Mercenary: [ 0, 0 ] diff --git a/Resources/Prototypes/_NF/Shipyard/Expedition/pathfinder.yml b/Resources/Prototypes/_NF/Shipyard/Expedition/pathfinder.yml index 28c8fff75ee..b40903a2bdd 100644 --- a/Resources/Prototypes/_NF/Shipyard/Expedition/pathfinder.yml +++ b/Resources/Prototypes/_NF/Shipyard/Expedition/pathfinder.yml @@ -34,5 +34,6 @@ - type: StationJobs overflowJobs: [] availableJobs: + Contractor: [ 0, 0 ] Pilot: [ 0, 0 ] - SalvageSpecialist: [ 0, 0 ] + Mercenary: [ 0, 0 ] diff --git a/Resources/Prototypes/_NF/Shipyard/Expedition/praeda.yml b/Resources/Prototypes/_NF/Shipyard/Expedition/praeda.yml index 76defabe64f..0954667c783 100644 --- a/Resources/Prototypes/_NF/Shipyard/Expedition/praeda.yml +++ b/Resources/Prototypes/_NF/Shipyard/Expedition/praeda.yml @@ -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 ] diff --git a/Resources/Prototypes/_NF/Shipyard/Expedition/rosebudmkii.yml b/Resources/Prototypes/_NF/Shipyard/Expedition/rosebudmkii.yml index 1df693aae33..8fc437a7a34 100644 --- a/Resources/Prototypes/_NF/Shipyard/Expedition/rosebudmkii.yml +++ b/Resources/Prototypes/_NF/Shipyard/Expedition/rosebudmkii.yml @@ -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 ] diff --git a/Resources/Prototypes/_NF/Shipyard/Expedition/sprinter.yml b/Resources/Prototypes/_NF/Shipyard/Expedition/sprinter.yml index 2c2acdb4c1b..ae352aa0796 100644 --- a/Resources/Prototypes/_NF/Shipyard/Expedition/sprinter.yml +++ b/Resources/Prototypes/_NF/Shipyard/Expedition/sprinter.yml @@ -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 ] diff --git a/Resources/Prototypes/_NF/Shipyard/Scrap/bison.yml b/Resources/Prototypes/_NF/Shipyard/Scrap/bison.yml index 682840a7ae9..b71a1185cea 100644 --- a/Resources/Prototypes/_NF/Shipyard/Scrap/bison.yml +++ b/Resources/Prototypes/_NF/Shipyard/Scrap/bison.yml @@ -23,4 +23,7 @@ prefixCreator: '14' - type: StationJobs overflowJobs: [] - availableJobs: {} + availableJobs: + Contractor: [ 0, 0 ] + Pilot: [ 0, 0 ] + Mercenary: [ 0, 0 ] diff --git a/Resources/Prototypes/_NF/Shipyard/Scrap/canister.yml b/Resources/Prototypes/_NF/Shipyard/Scrap/canister.yml index 8632dcb291f..7b98d53d2c9 100644 --- a/Resources/Prototypes/_NF/Shipyard/Scrap/canister.yml +++ b/Resources/Prototypes/_NF/Shipyard/Scrap/canister.yml @@ -27,4 +27,7 @@ prefixCreator: '14' - type: StationJobs overflowJobs: [] - availableJobs: {} \ No newline at end of file + availableJobs: + Contractor: [ 0, 0 ] + Pilot: [ 0, 0 ] + Mercenary: [ 0, 0 ] \ No newline at end of file diff --git a/Resources/Prototypes/_NF/Shipyard/Scrap/disciple.yml b/Resources/Prototypes/_NF/Shipyard/Scrap/disciple.yml index 29b6b8fac67..55e4fd902ca 100644 --- a/Resources/Prototypes/_NF/Shipyard/Scrap/disciple.yml +++ b/Resources/Prototypes/_NF/Shipyard/Scrap/disciple.yml @@ -33,4 +33,7 @@ prefixCreator: '14' - type: StationJobs overflowJobs: [] - availableJobs: {} + availableJobs: + Contractor: [ 0, 0 ] + Pilot: [ 0, 0 ] + Mercenary: [ 0, 0 ] diff --git a/Resources/Prototypes/_NF/Shipyard/Scrap/nugget.yml b/Resources/Prototypes/_NF/Shipyard/Scrap/nugget.yml index 06272bfb7a5..03825012e30 100644 --- a/Resources/Prototypes/_NF/Shipyard/Scrap/nugget.yml +++ b/Resources/Prototypes/_NF/Shipyard/Scrap/nugget.yml @@ -33,4 +33,7 @@ prefixCreator: '14' - type: StationJobs overflowJobs: [] - availableJobs: {} + availableJobs: + Contractor: [ 0, 0 ] + Pilot: [ 0, 0 ] + Mercenary: [ 0, 0 ] diff --git a/Resources/Prototypes/_NF/Shipyard/Scrap/orange.yml b/Resources/Prototypes/_NF/Shipyard/Scrap/orange.yml index b1582bee67d..45bcccd6b34 100644 --- a/Resources/Prototypes/_NF/Shipyard/Scrap/orange.yml +++ b/Resources/Prototypes/_NF/Shipyard/Scrap/orange.yml @@ -23,4 +23,7 @@ prefixCreator: '14' - type: StationJobs overflowJobs: [] - availableJobs: {} + availableJobs: + Contractor: [ 0, 0 ] + Pilot: [ 0, 0 ] + Mercenary: [ 0, 0 ] diff --git a/Resources/Prototypes/_NF/Shipyard/Scrap/point.yml b/Resources/Prototypes/_NF/Shipyard/Scrap/point.yml index 0f1de51786e..97612df1b3f 100644 --- a/Resources/Prototypes/_NF/Shipyard/Scrap/point.yml +++ b/Resources/Prototypes/_NF/Shipyard/Scrap/point.yml @@ -23,4 +23,7 @@ prefixCreator: '14' - type: StationJobs overflowJobs: [] - availableJobs: {} + availableJobs: + Contractor: [ 0, 0 ] + Pilot: [ 0, 0 ] + Mercenary: [ 0, 0 ] diff --git a/Resources/Prototypes/_NF/Shipyard/Scrap/tide.yml b/Resources/Prototypes/_NF/Shipyard/Scrap/tide.yml index cee528cc490..65d95cc9685 100644 --- a/Resources/Prototypes/_NF/Shipyard/Scrap/tide.yml +++ b/Resources/Prototypes/_NF/Shipyard/Scrap/tide.yml @@ -23,4 +23,7 @@ prefixCreator: '14' - type: StationJobs overflowJobs: [] - availableJobs: {} + availableJobs: + Contractor: [ 0, 0 ] + Pilot: [ 0, 0 ] + Mercenary: [ 0, 0 ] diff --git a/Resources/Prototypes/_NF/Shipyard/barge.yml b/Resources/Prototypes/_NF/Shipyard/barge.yml index ee5c7564abe..2f08cf9e015 100644 --- a/Resources/Prototypes/_NF/Shipyard/barge.yml +++ b/Resources/Prototypes/_NF/Shipyard/barge.yml @@ -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 ] diff --git a/Resources/Prototypes/_NF/Shipyard/bazaar.yml b/Resources/Prototypes/_NF/Shipyard/bazaar.yml index 8343d71f607..f5072caeb08 100644 --- a/Resources/Prototypes/_NF/Shipyard/bazaar.yml +++ b/Resources/Prototypes/_NF/Shipyard/bazaar.yml @@ -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 ] diff --git a/Resources/Prototypes/_NF/Shipyard/bocadillo.yml b/Resources/Prototypes/_NF/Shipyard/bocadillo.yml index f9d1a722ed1..aed77085486 100644 --- a/Resources/Prototypes/_NF/Shipyard/bocadillo.yml +++ b/Resources/Prototypes/_NF/Shipyard/bocadillo.yml @@ -34,5 +34,6 @@ - type: StationJobs overflowJobs: [] availableJobs: + Contractor: [ 0, 0 ] Pilot: [ 0, 0 ] - Chef: [ 0, 0 ] + Mercenary: [ 0, 0 ] diff --git a/Resources/Prototypes/_NF/Shipyard/bookworm.yml b/Resources/Prototypes/_NF/Shipyard/bookworm.yml index fe8133b6f38..d31aa063d79 100644 --- a/Resources/Prototypes/_NF/Shipyard/bookworm.yml +++ b/Resources/Prototypes/_NF/Shipyard/bookworm.yml @@ -24,5 +24,6 @@ - type: StationJobs overflowJobs: [] availableJobs: - Librarian: [ 0, 0 ] + Contractor: [ 0, 0 ] Pilot: [ 0, 0 ] + Mercenary: [ 0, 0 ] diff --git a/Resources/Prototypes/_NF/Shipyard/bulker.yml b/Resources/Prototypes/_NF/Shipyard/bulker.yml index 81f4dc8965d..52650fa104b 100644 --- a/Resources/Prototypes/_NF/Shipyard/bulker.yml +++ b/Resources/Prototypes/_NF/Shipyard/bulker.yml @@ -34,6 +34,6 @@ - type: StationJobs overflowJobs: [] availableJobs: - Chef: [ 0, 0 ] - SalvageSpecialist: [ 0, 0 ] + Contractor: [ 0, 0 ] Pilot: [ 0, 0 ] + Mercenary: [ 0, 0 ] diff --git a/Resources/Prototypes/_NF/Shipyard/caduceus.yml b/Resources/Prototypes/_NF/Shipyard/caduceus.yml index aabbff387c7..acca673513f 100644 --- a/Resources/Prototypes/_NF/Shipyard/caduceus.yml +++ b/Resources/Prototypes/_NF/Shipyard/caduceus.yml @@ -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 ] diff --git a/Resources/Prototypes/_NF/Shipyard/ceres.yml b/Resources/Prototypes/_NF/Shipyard/ceres.yml index 703df670793..b3e4056e99f 100644 --- a/Resources/Prototypes/_NF/Shipyard/ceres.yml +++ b/Resources/Prototypes/_NF/Shipyard/ceres.yml @@ -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 ] diff --git a/Resources/Prototypes/_NF/Shipyard/chisel.yml b/Resources/Prototypes/_NF/Shipyard/chisel.yml index 00d93eee310..677f8434af3 100644 --- a/Resources/Prototypes/_NF/Shipyard/chisel.yml +++ b/Resources/Prototypes/_NF/Shipyard/chisel.yml @@ -34,5 +34,6 @@ - type: StationJobs overflowJobs: [] availableJobs: - SalvageSpecialist: [ 0, 0 ] + Contractor: [ 0, 0 ] Pilot: [ 0, 0 ] + Mercenary: [ 0, 0 ] diff --git a/Resources/Prototypes/_NF/Shipyard/cleithro.yml b/Resources/Prototypes/_NF/Shipyard/cleithro.yml index e8a0e77284e..bbb2b9db214 100644 --- a/Resources/Prototypes/_NF/Shipyard/cleithro.yml +++ b/Resources/Prototypes/_NF/Shipyard/cleithro.yml @@ -31,5 +31,6 @@ - type: StationJobs overflowJobs: [] availableJobs: - Psychologist: [ 0, 0 ] - ServiceWorker: [ 0, 0 ] + Contractor: [ 0, 0 ] + Pilot: [ 0, 0 ] + Mercenary: [ 0, 0 ] \ No newline at end of file diff --git a/Resources/Prototypes/_NF/Shipyard/comet.yml b/Resources/Prototypes/_NF/Shipyard/comet.yml index 1fc590d1a80..e83968c629a 100644 --- a/Resources/Prototypes/_NF/Shipyard/comet.yml +++ b/Resources/Prototypes/_NF/Shipyard/comet.yml @@ -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 ] diff --git a/Resources/Prototypes/_NF/Shipyard/condor.yml b/Resources/Prototypes/_NF/Shipyard/condor.yml index 25492692f01..326b333ff7b 100644 --- a/Resources/Prototypes/_NF/Shipyard/condor.yml +++ b/Resources/Prototypes/_NF/Shipyard/condor.yml @@ -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 ] diff --git a/Resources/Prototypes/_NF/Shipyard/construct.yml b/Resources/Prototypes/_NF/Shipyard/construct.yml index 12c2cd6fabe..dc4d7545d50 100644 --- a/Resources/Prototypes/_NF/Shipyard/construct.yml +++ b/Resources/Prototypes/_NF/Shipyard/construct.yml @@ -24,4 +24,6 @@ - type: StationJobs overflowJobs: [] availableJobs: - Passenger: [ 0, 0 ] + Contractor: [ 0, 0 ] + Pilot: [ 0, 0 ] + Mercenary: [ 0, 0 ] diff --git a/Resources/Prototypes/_NF/Shipyard/crescent.yml b/Resources/Prototypes/_NF/Shipyard/crescent.yml index fec8f968699..443c32ae260 100644 --- a/Resources/Prototypes/_NF/Shipyard/crescent.yml +++ b/Resources/Prototypes/_NF/Shipyard/crescent.yml @@ -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 ] diff --git a/Resources/Prototypes/_NF/Shipyard/eagle.yml b/Resources/Prototypes/_NF/Shipyard/eagle.yml index b59cffad600..7c2b4a9c310 100644 --- a/Resources/Prototypes/_NF/Shipyard/eagle.yml +++ b/Resources/Prototypes/_NF/Shipyard/eagle.yml @@ -31,8 +31,6 @@ - type: StationJobs overflowJobs: [] availableJobs: - Chemist: [ 0, 0 ] - MedicalDoctor: [ 0, 0 ] - Paramedic: [ 0, 0 ] + Contractor: [ 0, 0 ] Pilot: [ 0, 0 ] - StationEngineer: [ 0, 0 ] + Mercenary: [ 0, 0 ] diff --git a/Resources/Prototypes/_NF/Shipyard/esquire.yml b/Resources/Prototypes/_NF/Shipyard/esquire.yml index 38d71f2fbae..b48399a2d5e 100644 --- a/Resources/Prototypes/_NF/Shipyard/esquire.yml +++ b/Resources/Prototypes/_NF/Shipyard/esquire.yml @@ -34,6 +34,6 @@ - type: StationJobs overflowJobs: [] availableJobs: - Lawyer: [ 0, 0 ] - Mercenary: [ 0, 0 ] + Contractor: [ 0, 0 ] Pilot: [ 0, 0 ] + Mercenary: [ 0, 0 ] diff --git a/Resources/Prototypes/_NF/Shipyard/garden.yml b/Resources/Prototypes/_NF/Shipyard/garden.yml index a8fb2fe52f5..8485fa613fa 100644 --- a/Resources/Prototypes/_NF/Shipyard/garden.yml +++ b/Resources/Prototypes/_NF/Shipyard/garden.yml @@ -34,5 +34,6 @@ - type: StationJobs overflowJobs: [] availableJobs: - Botanist: [ 0, 0 ] + Contractor: [ 0, 0 ] Pilot: [ 0, 0 ] + Mercenary: [ 0, 0 ] diff --git a/Resources/Prototypes/_NF/Shipyard/hauler.yml b/Resources/Prototypes/_NF/Shipyard/hauler.yml index 129ffe4d489..bdf4c275e37 100644 --- a/Resources/Prototypes/_NF/Shipyard/hauler.yml +++ b/Resources/Prototypes/_NF/Shipyard/hauler.yml @@ -24,7 +24,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 ] diff --git a/Resources/Prototypes/_NF/Shipyard/helix.yml b/Resources/Prototypes/_NF/Shipyard/helix.yml index 55841edf1a4..24338cd4de9 100644 --- a/Resources/Prototypes/_NF/Shipyard/helix.yml +++ b/Resources/Prototypes/_NF/Shipyard/helix.yml @@ -34,7 +34,6 @@ - type: StationJobs overflowJobs: [] availableJobs: - Paramedic: [ 0, 0 ] - ChiefMedicalOfficer: [ 0, 0 ] - MedicalDoctor: [ 0, 0 ] - Chemist: [ 0, 0 ] + Contractor: [ 0, 0 ] + Pilot: [ 0, 0 ] + Mercenary: [ 0, 0 ] diff --git a/Resources/Prototypes/_NF/Shipyard/honker.yml b/Resources/Prototypes/_NF/Shipyard/honker.yml index 4b2720855f4..db1f1d33644 100644 --- a/Resources/Prototypes/_NF/Shipyard/honker.yml +++ b/Resources/Prototypes/_NF/Shipyard/honker.yml @@ -24,4 +24,6 @@ - type: StationJobs overflowJobs: [] availableJobs: - Clown: [ 0, 0 ] + Contractor: [ 0, 0 ] + Pilot: [ 0, 0 ] + Mercenary: [ 0, 0 ] diff --git a/Resources/Prototypes/_NF/Shipyard/investigator.yml b/Resources/Prototypes/_NF/Shipyard/investigator.yml index 5516698df2f..c2420838480 100644 --- a/Resources/Prototypes/_NF/Shipyard/investigator.yml +++ b/Resources/Prototypes/_NF/Shipyard/investigator.yml @@ -24,6 +24,6 @@ - type: StationJobs overflowJobs: [] availableJobs: - Bartender: [ 0, 0 ] - SalvageSpecialist: [ 0, 0 ] - Scientist: [ 0, 0 ] + Contractor: [ 0, 0 ] + Pilot: [ 0, 0 ] + Mercenary: [ 0, 0 ] diff --git a/Resources/Prototypes/_NF/Shipyard/knuckleverse.yml b/Resources/Prototypes/_NF/Shipyard/knuckleverse.yml index f0a533767bc..b209b573b12 100644 --- a/Resources/Prototypes/_NF/Shipyard/knuckleverse.yml +++ b/Resources/Prototypes/_NF/Shipyard/knuckleverse.yml @@ -24,8 +24,6 @@ - type: StationJobs overflowJobs: [] availableJobs: - Janitor: [ 0, 0 ] - Bartender: [ 0, 0 ] - MedicalDoctor: [ 0, 0 ] + Contractor: [ 0, 0 ] Pilot: [ 0, 0 ] - Boxer: [ 0, 0 ] + Mercenary: [ 0, 0 ] diff --git a/Resources/Prototypes/_NF/Shipyard/loader.yml b/Resources/Prototypes/_NF/Shipyard/loader.yml index 4e8335f39aa..24c3e5859d6 100644 --- a/Resources/Prototypes/_NF/Shipyard/loader.yml +++ b/Resources/Prototypes/_NF/Shipyard/loader.yml @@ -34,4 +34,6 @@ - type: StationJobs overflowJobs: [] availableJobs: - CargoTechnician: [ 0, 0 ] + Contractor: [ 0, 0 ] + Pilot: [ 0, 0 ] + Mercenary: [ 0, 0 ] diff --git a/Resources/Prototypes/_NF/Shipyard/lyrae.yml b/Resources/Prototypes/_NF/Shipyard/lyrae.yml index 1d2a51e0fb4..9a9feb8f9e6 100644 --- a/Resources/Prototypes/_NF/Shipyard/lyrae.yml +++ b/Resources/Prototypes/_NF/Shipyard/lyrae.yml @@ -24,6 +24,6 @@ - type: StationJobs overflowJobs: [] availableJobs: - Scientist: [ 0, 0 ] - ResearchDirector: [ 0, 0 ] + Contractor: [ 0, 0 ] Pilot: [ 0, 0 ] + Mercenary: [ 0, 0 ] diff --git a/Resources/Prototypes/_NF/Shipyard/mccargo.yml b/Resources/Prototypes/_NF/Shipyard/mccargo.yml index 6b01b0db481..1150b366178 100644 --- a/Resources/Prototypes/_NF/Shipyard/mccargo.yml +++ b/Resources/Prototypes/_NF/Shipyard/mccargo.yml @@ -31,10 +31,6 @@ - type: StationJobs overflowJobs: [] availableJobs: - Quartermaster: [ 0, 0 ] - CargoTechnician: [ 0, 0 ] + Contractor: [ 0, 0 ] Pilot: [ 0, 0 ] - Chef: [ 0, 0 ] - Botanist: [ 0, 0 ] - Janitor: [ 0, 0 ] - Borg: [ 0, 0 ] + Mercenary: [ 0, 0 ] diff --git a/Resources/Prototypes/_NF/Shipyard/metastable.yml b/Resources/Prototypes/_NF/Shipyard/metastable.yml index 86bf8499b27..0fbc909cf09 100644 --- a/Resources/Prototypes/_NF/Shipyard/metastable.yml +++ b/Resources/Prototypes/_NF/Shipyard/metastable.yml @@ -24,11 +24,6 @@ - type: StationJobs overflowJobs: [] availableJobs: + Contractor: [ 0, 0 ] Pilot: [ 0, 0 ] - Scientist: [ 0, 0 ] - Chef: [ 0, 0 ] - MedicalDoctor: [ 0, 0 ] - Chemist: [ 0, 0 ] - StationEngineer: [ 0, 0 ] Mercenary: [ 0, 0 ] - Borg: [ 0, 0 ] diff --git a/Resources/Prototypes/_NF/Shipyard/mission.yml b/Resources/Prototypes/_NF/Shipyard/mission.yml index 4f538e6d3f2..6cd770e81d0 100644 --- a/Resources/Prototypes/_NF/Shipyard/mission.yml +++ b/Resources/Prototypes/_NF/Shipyard/mission.yml @@ -34,6 +34,6 @@ - type: StationJobs overflowJobs: [] availableJobs: - Chaplain: [ 0, 0 ] - Janitor: [ 0, 0 ] + Contractor: [ 0, 0 ] Pilot: [ 0, 0 ] + Mercenary: [ 0, 0 ] diff --git a/Resources/Prototypes/_NF/Shipyard/phoenix.yml b/Resources/Prototypes/_NF/Shipyard/phoenix.yml index 6a5996a0352..44e44462f0f 100644 --- a/Resources/Prototypes/_NF/Shipyard/phoenix.yml +++ b/Resources/Prototypes/_NF/Shipyard/phoenix.yml @@ -24,8 +24,6 @@ - type: StationJobs overflowJobs: [] availableJobs: - SalvageSpecialist: [ 0, 0 ] - Scientist: [ 0, 0 ] - ResearchDirector: [ 0, 0 ] - Borg: [ 0, 0 ] + Contractor: [ 0, 0 ] Pilot: [ 0, 0 ] + Mercenary: [ 0, 0 ] diff --git a/Resources/Prototypes/_NF/Shipyard/piecrust.yml b/Resources/Prototypes/_NF/Shipyard/piecrust.yml index 682eff4ff30..7d601a4ffa2 100644 --- a/Resources/Prototypes/_NF/Shipyard/piecrust.yml +++ b/Resources/Prototypes/_NF/Shipyard/piecrust.yml @@ -34,5 +34,6 @@ - type: StationJobs overflowJobs: [] availableJobs: + Contractor: [ 0, 0 ] Pilot: [ 0, 0 ] - Chef: [ 0, 0 ] + Mercenary: [ 0, 0 ] diff --git a/Resources/Prototypes/_NF/Shipyard/placebo.yml b/Resources/Prototypes/_NF/Shipyard/placebo.yml index f00cb6301b7..47e628a468f 100644 --- a/Resources/Prototypes/_NF/Shipyard/placebo.yml +++ b/Resources/Prototypes/_NF/Shipyard/placebo.yml @@ -24,4 +24,6 @@ - type: StationJobs overflowJobs: [] availableJobs: - Psychologist: [ 0, 0 ] \ No newline at end of file + Contractor: [ 0, 0 ] + Pilot: [ 0, 0 ] + Mercenary: [ 0, 0 ] \ No newline at end of file diff --git a/Resources/Prototypes/_NF/Shipyard/prospector.yml b/Resources/Prototypes/_NF/Shipyard/prospector.yml index 1afde203a9b..58dd5843d10 100644 --- a/Resources/Prototypes/_NF/Shipyard/prospector.yml +++ b/Resources/Prototypes/_NF/Shipyard/prospector.yml @@ -34,4 +34,6 @@ - type: StationJobs overflowJobs: [] availableJobs: - SalvageSpecialist: [ 0, 0 ] + Contractor: [ 0, 0 ] + Pilot: [ 0, 0 ] + Mercenary: [ 0, 0 ] diff --git a/Resources/Prototypes/_NF/Shipyard/pts.yml b/Resources/Prototypes/_NF/Shipyard/pts.yml index 2c2c051b0a2..7598daaa8da 100644 --- a/Resources/Prototypes/_NF/Shipyard/pts.yml +++ b/Resources/Prototypes/_NF/Shipyard/pts.yml @@ -33,4 +33,7 @@ prefixCreator: '14' - type: StationJobs overflowJobs: [] - availableJobs: {} + availableJobs: + Contractor: [ 0, 0 ] + Pilot: [ 0, 0 ] + Mercenary: [ 0, 0 ] diff --git a/Resources/Prototypes/_NF/Shipyard/pulse.yml b/Resources/Prototypes/_NF/Shipyard/pulse.yml index 175c7f127a0..c72d5a1ec80 100644 --- a/Resources/Prototypes/_NF/Shipyard/pulse.yml +++ b/Resources/Prototypes/_NF/Shipyard/pulse.yml @@ -34,5 +34,6 @@ - type: StationJobs overflowJobs: [] availableJobs: - Paramedic: [ 0, 0 ] + Contractor: [ 0, 0 ] Pilot: [ 0, 0 ] + Mercenary: [ 0, 0 ] diff --git a/Resources/Prototypes/_NF/Shipyard/rosebudmki.yml b/Resources/Prototypes/_NF/Shipyard/rosebudmki.yml index d5c42fd121c..3a5bbcf768e 100644 --- a/Resources/Prototypes/_NF/Shipyard/rosebudmki.yml +++ b/Resources/Prototypes/_NF/Shipyard/rosebudmki.yml @@ -34,8 +34,6 @@ - type: StationJobs overflowJobs: [] availableJobs: + Contractor: [ 0, 0 ] Pilot: [ 0, 0 ] - SalvageSpecialist: [ 0, 0 ] - StationEngineer: [ 0, 0 ] - MedicalDoctor: [ 0, 0 ] - Chemist: [ 0, 0 ] + Mercenary: [ 0, 0 ] diff --git a/Resources/Prototypes/_NF/Shipyard/searchlight.yml b/Resources/Prototypes/_NF/Shipyard/searchlight.yml index ebc4acf0be0..31dbc82245d 100644 --- a/Resources/Prototypes/_NF/Shipyard/searchlight.yml +++ b/Resources/Prototypes/_NF/Shipyard/searchlight.yml @@ -36,4 +36,4 @@ availableJobs: Contractor: [ 0, 0 ] Pilot: [ 0, 0 ] - Mercenary: [ 0, 0 ] + Mercenary: [ 0, 0 ] \ No newline at end of file diff --git a/Resources/Prototypes/_NF/Shipyard/skipper.yml b/Resources/Prototypes/_NF/Shipyard/skipper.yml index a318f9b68e4..c3be629df4c 100644 --- a/Resources/Prototypes/_NF/Shipyard/skipper.yml +++ b/Resources/Prototypes/_NF/Shipyard/skipper.yml @@ -34,5 +34,6 @@ - type: StationJobs overflowJobs: [] availableJobs: - Botanist: [ 0, 0 ] - Chef: [ 0, 0 ] + Contractor: [ 0, 0 ] + Pilot: [ 0, 0 ] + Mercenary: [ 0, 0 ] \ No newline at end of file diff --git a/Resources/Prototypes/_NF/Shipyard/sparrow.yml b/Resources/Prototypes/_NF/Shipyard/sparrow.yml index dbffdc97751..8b4724dd707 100644 --- a/Resources/Prototypes/_NF/Shipyard/sparrow.yml +++ b/Resources/Prototypes/_NF/Shipyard/sparrow.yml @@ -34,5 +34,6 @@ - type: StationJobs overflowJobs: [] availableJobs: - StationEngineer: [ 0, 0 ] - Scientist: [ 0, 0 ] + Contractor: [ 0, 0 ] + Pilot: [ 0, 0 ] + Mercenary: [ 0, 0 ] diff --git a/Resources/Prototypes/_NF/Shipyard/spectre.yml b/Resources/Prototypes/_NF/Shipyard/spectre.yml index 12d9a2a3611..b30b521c27b 100644 --- a/Resources/Prototypes/_NF/Shipyard/spectre.yml +++ b/Resources/Prototypes/_NF/Shipyard/spectre.yml @@ -34,7 +34,6 @@ - type: StationJobs overflowJobs: [] availableJobs: - Bartender: [ 0, 0 ] - ResearchDirector: [ 0, 0 ] - Scientist: [ 0, 0 ] - StationEngineer: [ 0, 0 ] + Contractor: [ 0, 0 ] + Pilot: [ 0, 0 ] + Mercenary: [ 0, 0 ] diff --git a/Resources/Prototypes/_NF/Shipyard/stellaris.yml b/Resources/Prototypes/_NF/Shipyard/stellaris.yml index b323848f178..8b68b4a8b37 100644 --- a/Resources/Prototypes/_NF/Shipyard/stellaris.yml +++ b/Resources/Prototypes/_NF/Shipyard/stellaris.yml @@ -24,7 +24,6 @@ - type: StationJobs overflowJobs: [] availableJobs: - Clown: [ 0, 0 ] - Mime: [ 0, 0 ] - Musician: [ 0, 0 ] - Chef: [ 0, 0 ] + Contractor: [ 0, 0 ] + Pilot: [ 0, 0 ] + Mercenary: [ 0, 0 ] \ No newline at end of file diff --git a/Resources/Prototypes/_NF/Shipyard/stratos.yml b/Resources/Prototypes/_NF/Shipyard/stratos.yml index afd364eca2f..eb1325c0936 100644 --- a/Resources/Prototypes/_NF/Shipyard/stratos.yml +++ b/Resources/Prototypes/_NF/Shipyard/stratos.yml @@ -34,8 +34,6 @@ - type: StationJobs overflowJobs: [] availableJobs: - Bartender: [ 0, 0 ] - SalvageSpecialist: [ 0, 0 ] - StationEngineer: [ 0, 0 ] - Scientist: [ 0, 0 ] - ResearchDirector: [ 0, 0 ] + Contractor: [ 0, 0 ] + Pilot: [ 0, 0 ] + Mercenary: [ 0, 0 ] diff --git a/Resources/Prototypes/_NF/Shipyard/vagabond.yml b/Resources/Prototypes/_NF/Shipyard/vagabond.yml index 4bb745c8a76..b73cc3c72d2 100644 --- a/Resources/Prototypes/_NF/Shipyard/vagabond.yml +++ b/Resources/Prototypes/_NF/Shipyard/vagabond.yml @@ -35,7 +35,6 @@ - type: StationJobs overflowJobs: [] availableJobs: - CargoTechnician: [ 0, 0 ] - StationEngineer: [ 0, 0 ] - SalvageSpecialist: [ 0, 0 ] - Quartermaster: [ 0, 0 ] + Contractor: [ 0, 0 ] + Pilot: [ 0, 0 ] + Mercenary: [ 0, 0 ] diff --git a/Resources/Prototypes/_NF/Shipyard/waveshot.yml b/Resources/Prototypes/_NF/Shipyard/waveshot.yml index abe5fa1390b..f2868f365a9 100644 --- a/Resources/Prototypes/_NF/Shipyard/waveshot.yml +++ b/Resources/Prototypes/_NF/Shipyard/waveshot.yml @@ -34,5 +34,6 @@ - type: StationJobs overflowJobs: [] availableJobs: + Contractor: [ 0, 0 ] Pilot: [ 0, 0 ] - Reporter: [ 0, 0 ] + Mercenary: [ 0, 0 ] From 79f1b9d42fd3d5ca49e6cdfab22244178d7f0782 Mon Sep 17 00:00:00 2001 From: FrontierATC Date: Tue, 28 May 2024 15:27:19 +0000 Subject: [PATCH 2/6] Automatic Changelog (#1427) --- Resources/Changelog/Changelog.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index c410cbe43e2..736e586090f 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -4680,3 +4680,9 @@ 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' From 9745f4c1938e09ea0b5929684b404ae7f1933f0b Mon Sep 17 00:00:00 2001 From: Uncaught_Ex Date: Wed, 29 May 2024 02:42:09 -0400 Subject: [PATCH 3/6] The SBI-Crown (#1261) * Adds the SBI Crown * Adds the SBI Crown * Readded Defib and Extinguisher cabinet * Adjusted the Brig/Engine room to adhere to mapping standards, redid wiring and distro slightly. Added secret goodie in the prisoners locker. Adjusted her shape, deviating from the Templar radar signature and reflecting the name a bit more. * Updated the Crown to Remove Merc Spawn Adjusted the shipyard file to include Pilot * Changes the front facing windows to be full Windows Changed glass floor in front of the headlights into Exterior shuttle Added Atmos Distro Redid Lighting Added Contractor Job to shipyard yml Removed unneeded wiring Moved APC * Added bed, fixed thrusters, changed to active vents, added prisoner eva locker * dirt --------- Co-authored-by: Maxtone <124747282+MagnusCrowe@users.noreply.github.com> --- Resources/Maps/_NF/Shuttles/crown.yml | 1783 +++++++++++++++++++ Resources/Prototypes/_NF/Shipyard/crown.yml | 29 + SpaceStation14.sln | 56 +- 3 files changed, 1840 insertions(+), 28 deletions(-) create mode 100644 Resources/Maps/_NF/Shuttles/crown.yml create mode 100644 Resources/Prototypes/_NF/Shipyard/crown.yml diff --git a/Resources/Maps/_NF/Shuttles/crown.yml b/Resources/Maps/_NF/Shuttles/crown.yml new file mode 100644 index 00000000000..c56f519efac --- /dev/null +++ b/Resources/Maps/_NF/Shuttles/crown.yml @@ -0,0 +1,1783 @@ +meta: + format: 6 + postmapinit: false +tilemap: + 0: Space + 30: FloorDark + 1: FloorGlass + 57: FloorHull + 65: FloorMetalDiamond + 107: FloorTechMaint + 124: Lattice + 125: Plating +entities: +- proto: "" + entities: + - uid: 1 + components: + - type: MetaData + name: grid + - type: Transform + parent: invalid + - type: MapGrid + chunks: + 0,0: + ind: 0,0 + tiles: QQAAAAAAQQAAAAAAQQAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQQAAAAAAQQAAAAAAOQAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgAAAAAAHgAAAAACOQAAAAAAAAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgAAAAACHgAAAAABOQAAAAAAAAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgAAAAADHgAAAAACOQAAAAAAAAAAAAAAOQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgAAAAABHgAAAAABfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOQAAAAAAOQAAAAAAOQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + version: 6 + 0,-1: + ind: 0,-1 + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAAQAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgAAAAAAHgAAAAABHgAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgAAAAADHgAAAAACHgAAAAACfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQQAAAAAAHgAAAAACHgAAAAADHgAAAAAAOQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAHgAAAAABfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQQAAAAAAawAAAAAAHgAAAAACfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQQAAAAAAQQAAAAAAQQAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + version: 6 + -1,0: + ind: -1,0 + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAQQAAAAAAQQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAOQAAAAAAQQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAAAAAAAAAOQAAAAAAHgAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAAAAAAAAAOQAAAAAAHgAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOQAAAAAAAAAAAAAAOQAAAAAAHgAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAHgAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOQAAAAAAOQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + version: 6 + -1,-1: + ind: -1,-1 + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAADfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAHgAAAAADHgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAHgAAAAADHgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOQAAAAAAHgAAAAACHgAAAAADHgAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAHgAAAAACfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAHgAAAAABHgAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAQQAAAAAAQQAAAAAA + version: 6 + - type: Broadphase + - type: Physics + bodyStatus: InAir + angularDamping: 0.05 + linearDamping: 0.05 + fixedRotation: False + bodyType: Dynamic + - type: Fixtures + fixtures: {} + - type: OccluderTree + - type: SpreaderGrid + - type: Shuttle + - type: GridPathfinding + - type: Gravity + gravityShakeSound: !type:SoundPathSpecifier + path: /Audio/Effects/alert.ogg + - type: DecalGrid + chunkCollection: + version: 2 + nodes: + - node: + color: '#5E7C1696' + id: CheckerNESW + decals: + 31: 0,-6 + 32: 1,-5 + 33: 0,-5 + 34: 1,-6 + 35: 2,-5 + 36: 2,-4 + 37: 2,-6 + - node: + cleanable: True + color: '#FFFFFFFF' + id: DirtHeavy + decals: + 38: 0,-5 + 39: 0,-6 + 40: 1,-6 + 41: 1,-5 + 42: 2,-5 + 43: 2,-6 + 55: -1,3 + 56: -1,4 + 57: -1,3 + 70: 1,3 + - node: + cleanable: True + angle: 1.5707963267948966 rad + color: '#FFFFFFFF' + id: DirtHeavy + decals: + 44: 0,-5 + - node: + cleanable: True + angle: 3.141592653589793 rad + color: '#FFFFFFFF' + id: DirtHeavy + decals: + 45: 1,-5 + - node: + cleanable: True + angle: 4.71238898038469 rad + color: '#FFFFFFFF' + id: DirtHeavy + decals: + 46: -2,-6 + 47: -2,-5 + - node: + cleanable: True + angle: 6.283185307179586 rad + color: '#FFFFFFFF' + id: DirtHeavy + decals: + 48: -2,-6 + - node: + cleanable: True + angle: 7.853981633974483 rad + color: '#FFFFFFFF' + id: DirtHeavy + decals: + 49: -1,-6 + 50: -1,-5 + - node: + cleanable: True + angle: 9.42477796076938 rad + color: '#FFFFFFFF' + id: DirtHeavy + decals: + 51: -2,-6 + 52: -1,-6 + 53: -2,-5 + 54: 0,-5 + - node: + cleanable: True + color: '#FFFFFFFF' + id: DirtHeavyMonotile + decals: + 58: 0,4 + 59: 1,4 + 60: 1,5 + 61: 0,5 + 62: -1,5 + 71: -1,1 + 72: -1,1 + 73: -1,1 + 74: 0,1 + 75: 0,1 + 76: 1,1 + 77: 1,1 + 78: -2,-1 + 79: -1,-1 + 81: 1,-1 + 82: 2,-1 + 83: 2,-1 + 84: 1,-1 + 87: -1,-1 + 88: -2,-1 + 89: 1,-1 + 90: 1,-1 + 91: 2,-1 + 92: 2,-1 + 93: 1,-1 + 96: 0,-1 + 97: 0,-1 + - node: + cleanable: True + angle: 1.5707963267948966 rad + color: '#FFFFFFFF' + id: DirtHeavyMonotile + decals: + 98: 0,-1 + 99: 0,-1 + - node: + cleanable: True + angle: 3.141592653589793 rad + color: '#FFFFFFFF' + id: DirtHeavyMonotile + decals: + 100: 1,-1 + 101: 1,-1 + 102: 0,-1 + 103: 0,-1 + 107: -2,-3 + 108: -1,-3 + 109: -2,-3 + 110: -1,-3 + 111: 1,-3 + 112: 1,-3 + 113: 2,-3 + 114: 1,-3 + 115: 0,-3 + 116: -1,-3 + 117: -1,-3 + - node: + cleanable: True + angle: 3.141592653589793 rad + color: '#FFFFFFFF' + id: DirtLight + decals: + 104: 0,-5 + 105: 1,-5 + 106: 1,-5 + - node: + cleanable: True + color: '#FFFFFFFF' + id: DirtMedium + decals: + 63: 0,3 + 64: -1,3 + 65: 0,4 + 66: 0,4 + 67: 1,4 + 68: 1,3 + 69: 1,3 + - node: + color: '#FFFFFFFF' + id: LoadingArea + decals: + 30: 0,1 + - node: + color: '#5E7C1696' + id: QuarterTileOverlayGreyscale270 + decals: + 4: -1,-4 + 5: 1,-4 + 6: -1,2 + 7: -1,4 + 8: -1,5 + 9: 0,5 + 10: 1,5 + 11: 1,4 + 12: 1,3 + 13: 1,2 + 14: 0,2 + 24: -1,3 + 27: 0,3 + 28: 0,4 + - node: + color: '#5E7C1696' + id: QuarterTileOverlayGreyscale90 + decals: + 2: -1,-4 + 3: 1,-4 + 15: -1,4 + 16: -1,5 + 17: 0,5 + 18: 1,5 + 19: 1,4 + 20: 1,3 + 21: 1,2 + 22: 0,2 + 23: -1,2 + 25: -1,3 + 26: 0,3 + 29: 0,4 + - node: + color: '#FFFFFFFF' + id: WarnLineE + decals: + 1: 2,-1 + - node: + color: '#FFFFFFFF' + id: WarnLineS + decals: + 0: -2,-1 + - type: GridAtmosphere + version: 2 + data: + tiles: + 0,0: + 0: 12593 + 1: 136 + 0,-1: + 0: 29041 + 1: 34816 + -1,0: + 0: 32896 + 1: 4403 + 0,1: + 0: 51 + 1: 64 + -1,1: + 0: 137 + 1: 64 + 1,0: + 1: 4369 + 1,-1: + 1: 4368 + 0: 1 + 1,1: + 0: 1 + 0,-2: + 1: 34928 + 0: 30592 + -1,-2: + 1: 13248 + 0: 52256 + -1,-1: + 0: 49345 + 1: 13072 + 1,-2: + 1: 4352 + uniqueMixes: + - volume: 2500 + temperature: 293.15 + moles: + - 21.824879 + - 82.10312 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - volume: 2500 + immutable: True + moles: + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + chunkSize: 4 + - type: GasTileOverlay + - type: RadiationGridResistance + - type: BecomesStation + id: Crown +- proto: AirlockGlassShuttle + entities: + - uid: 201 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 4.5,-3.5 + parent: 1 + - uid: 202 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -3.5,-3.5 + parent: 1 +- proto: AirlockMercenary + entities: + - uid: 59 + components: + - type: Transform + pos: 0.5,0.5 + parent: 1 + - uid: 60 + components: + - type: Transform + pos: 0.5,2.5 + parent: 1 + - uid: 161 + components: + - type: Transform + pos: 0.5,-1.5 + parent: 1 + - uid: 188 + components: + - type: Transform + pos: 0.5,-3.5 + parent: 1 +- proto: APCBasic + entities: + - uid: 112 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -0.5,2.5 + parent: 1 +- proto: AtmosDeviceFanTiny + entities: + - uid: 8 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 0.5,-1.5 + parent: 1 + - uid: 164 + components: + - type: Transform + pos: 0.5,0.5 + parent: 1 +- proto: Bed + entities: + - uid: 224 + components: + - type: Transform + pos: -1.5,-4.5 + parent: 1 +- proto: BedsheetUSA + entities: + - uid: 225 + components: + - type: Transform + pos: -1.5,-4.5 + parent: 1 +- proto: BlastDoorOpen + entities: + - uid: 160 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 2.5,-0.5 + parent: 1 + - type: DeviceLinkSink + links: + - 35 + - uid: 165 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -1.5,-0.5 + parent: 1 + - type: DeviceLinkSink + links: + - 35 +- proto: Bucket + entities: + - uid: 196 + components: + - type: Transform + pos: -0.7327081,-4.212652 + parent: 1 +- proto: ButtonFrameCaution + entities: + - uid: 7 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -0.5,-1.5 + parent: 1 +- proto: CableApcExtension + entities: + - uid: 13 + components: + - type: Transform + pos: 0.5,2.5 + parent: 1 + - uid: 14 + components: + - type: Transform + pos: 0.5,1.5 + parent: 1 + - uid: 15 + components: + - type: Transform + pos: 0.5,0.5 + parent: 1 + - uid: 16 + components: + - type: Transform + pos: 0.5,-0.5 + parent: 1 + - uid: 17 + components: + - type: Transform + pos: 0.5,-1.5 + parent: 1 + - uid: 18 + components: + - type: Transform + pos: 0.5,-2.5 + parent: 1 + - uid: 19 + components: + - type: Transform + pos: 0.5,-3.5 + parent: 1 + - uid: 20 + components: + - type: Transform + pos: 0.5,3.5 + parent: 1 + - uid: 21 + components: + - type: Transform + pos: 0.5,4.5 + parent: 1 + - uid: 22 + components: + - type: Transform + pos: -0.5,-0.5 + parent: 1 + - uid: 23 + components: + - type: Transform + pos: -1.5,-0.5 + parent: 1 + - uid: 24 + components: + - type: Transform + pos: 1.5,-0.5 + parent: 1 + - uid: 25 + components: + - type: Transform + pos: 2.5,-0.5 + parent: 1 + - uid: 28 + components: + - type: Transform + pos: -0.5,-5.5 + parent: 1 + - uid: 29 + components: + - type: Transform + pos: 0.5,-5.5 + parent: 1 + - uid: 42 + components: + - type: Transform + pos: -1.5,-5.5 + parent: 1 + - uid: 48 + components: + - type: Transform + pos: 0.5,-4.5 + parent: 1 + - uid: 85 + components: + - type: Transform + pos: -2.5,-0.5 + parent: 1 + - uid: 104 + components: + - type: Transform + pos: -0.5,2.5 + parent: 1 + - uid: 116 + components: + - type: Transform + pos: -0.5,1.5 + parent: 1 + - uid: 173 + components: + - type: Transform + pos: -1.5,-4.5 + parent: 1 + - uid: 174 + components: + - type: Transform + pos: 0.5,-5.5 + parent: 1 + - uid: 175 + components: + - type: Transform + pos: 1.5,-5.5 + parent: 1 + - uid: 176 + components: + - type: Transform + pos: 2.5,-5.5 + parent: 1 + - uid: 177 + components: + - type: Transform + pos: 2.5,-4.5 + parent: 1 + - uid: 207 + components: + - type: Transform + pos: -3.5,0.5 + parent: 1 + - uid: 208 + components: + - type: Transform + pos: -3.5,-0.5 + parent: 1 + - uid: 209 + components: + - type: Transform + pos: -3.5,1.5 + parent: 1 + - uid: 210 + components: + - type: Transform + pos: 3.5,-0.5 + parent: 1 + - uid: 211 + components: + - type: Transform + pos: 4.5,-0.5 + parent: 1 + - uid: 212 + components: + - type: Transform + pos: 4.5,0.5 + parent: 1 + - uid: 213 + components: + - type: Transform + pos: 4.5,1.5 + parent: 1 + - uid: 216 + components: + - type: Transform + pos: -3.5,2.5 + parent: 1 + - uid: 217 + components: + - type: Transform + pos: 4.5,2.5 + parent: 1 +- proto: CableHV + entities: + - uid: 33 + components: + - type: Transform + pos: 2.5,2.5 + parent: 1 + - uid: 37 + components: + - type: Transform + pos: 0.5,0.5 + parent: 1 + - uid: 39 + components: + - type: Transform + pos: 0.5,-0.5 + parent: 1 + - uid: 71 + components: + - type: Transform + pos: 0.5,-2.5 + parent: 1 + - uid: 79 + components: + - type: Transform + pos: 0.5,-1.5 + parent: 1 + - uid: 100 + components: + - type: Transform + pos: 0.5,1.5 + parent: 1 + - uid: 108 + components: + - type: Transform + pos: 2.5,1.5 + parent: 1 + - uid: 109 + components: + - type: Transform + pos: 1.5,1.5 + parent: 1 + - uid: 121 + components: + - type: Transform + pos: 1.5,-0.5 + parent: 1 + - uid: 124 + components: + - type: Transform + pos: 2.5,-5.5 + parent: 1 + - uid: 128 + components: + - type: Transform + pos: 1.5,-5.5 + parent: 1 + - uid: 135 + components: + - type: Transform + pos: 0.5,-5.5 + parent: 1 + - uid: 150 + components: + - type: Transform + pos: 0.5,-4.5 + parent: 1 + - uid: 172 + components: + - type: Transform + pos: 0.5,-3.5 + parent: 1 +- proto: CableMV + entities: + - uid: 12 + components: + - type: Transform + pos: 0.5,1.5 + parent: 1 + - uid: 36 + components: + - type: Transform + pos: -0.5,1.5 + parent: 1 + - uid: 89 + components: + - type: Transform + pos: 1.5,1.5 + parent: 1 + - uid: 105 + components: + - type: Transform + pos: -0.5,2.5 + parent: 1 + - uid: 119 + components: + - type: Transform + pos: 2.5,1.5 + parent: 1 +- proto: Catwalk + entities: + - uid: 2 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 4.5,-2.5 + parent: 1 + - uid: 3 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 4.5,-3.5 + parent: 1 + - uid: 9 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -3.5,0.5 + parent: 1 + - uid: 10 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -3.5,-0.5 + parent: 1 + - uid: 11 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 0.5,-2.5 + parent: 1 + - uid: 41 + components: + - type: Transform + pos: 3.5,0.5 + parent: 1 + - uid: 43 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -2.5,0.5 + parent: 1 + - uid: 44 + components: + - type: Transform + pos: -2.5,-0.5 + parent: 1 + - uid: 46 + components: + - type: Transform + pos: 3.5,-0.5 + parent: 1 + - uid: 50 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 4.5,-0.5 + parent: 1 + - uid: 53 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -2.5,-1.5 + parent: 1 + - uid: 57 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 4.5,-1.5 + parent: 1 + - uid: 58 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -3.5,-1.5 + parent: 1 + - uid: 75 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 4.5,1.5 + parent: 1 + - uid: 94 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 3.5,-1.5 + parent: 1 + - uid: 101 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 4.5,0.5 + parent: 1 + - uid: 102 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 4.5,2.5 + parent: 1 + - uid: 114 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 2.5,-2.5 + parent: 1 + - uid: 123 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 1.5,-2.5 + parent: 1 + - uid: 199 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -3.5,-2.5 + parent: 1 + - uid: 200 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -3.5,-3.5 + parent: 1 + - uid: 203 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -3.5,2.5 + parent: 1 + - uid: 204 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -3.5,1.5 + parent: 1 +- proto: ChairPilotSeat + entities: + - uid: 146 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 0.5,4.5 + parent: 1 + - uid: 147 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 1.5,4.5 + parent: 1 +- proto: ClosetWall + entities: + - uid: 189 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 1.5,-6.5 + parent: 1 + - type: ContainerContainer + containers: + entity_storage: !type:Container + showEnts: False + occludes: True + ents: + - 191 + - 190 +- proto: ComputerFrame + entities: + - uid: 145 + components: + - type: Transform + pos: -0.5,5.5 + parent: 1 +- proto: ComputerShuttle + entities: + - uid: 143 + components: + - type: Transform + pos: 1.5,5.5 + parent: 1 +- proto: ComputerStationRecords + entities: + - uid: 144 + components: + - type: Transform + pos: 0.5,5.5 + parent: 1 +- proto: DefibrillatorCabinetFilled + entities: + - uid: 170 + components: + - type: Transform + pos: 2.5,0.5 + parent: 1 +- proto: ExtinguisherCabinetFilled + entities: + - uid: 171 + components: + - type: Transform + pos: -1.5,0.5 + parent: 1 +- proto: FaxMachineShip + entities: + - uid: 168 + components: + - type: Transform + pos: 1.5,3.5 + parent: 1 +- proto: GasPassiveVent + entities: + - uid: 62 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -1.5,-0.5 + parent: 1 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 63 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 2.5,-0.5 + parent: 1 + - type: AtmosPipeColor + color: '#990000FF' +- proto: GasPipeFourway + entities: + - uid: 64 + components: + - type: Transform + pos: 1.5,-0.5 + parent: 1 + - type: AtmosPipeColor + color: '#990000FF' +- proto: GasPipeStraight + entities: + - uid: 38 + components: + - type: Transform + pos: 1.5,2.5 + parent: 1 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 65 + components: + - type: Transform + pos: 1.5,-1.5 + parent: 1 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 66 + components: + - type: Transform + pos: 1.5,0.5 + parent: 1 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 67 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 0.5,-0.5 + parent: 1 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 68 + components: + - type: Transform + pos: 1.5,1.5 + parent: 1 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 69 + components: + - type: Transform + pos: -0.5,-1.5 + parent: 1 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 178 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -0.5,-2.5 + parent: 1 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 179 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -0.5,-3.5 + parent: 1 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 180 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -0.5,-4.5 + parent: 1 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 181 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 1.5,-1.5 + parent: 1 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 182 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 1.5,-2.5 + parent: 1 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 183 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 1.5,-3.5 + parent: 1 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 184 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 1.5,-4.5 + parent: 1 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 198 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 0.5,-0.5 + parent: 1 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 218 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 0.5,0.5 + parent: 1 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 219 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 0.5,1.5 + parent: 1 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 220 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 0.5,2.5 + parent: 1 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 222 + components: + - type: Transform + pos: 0.5,-3.5 + parent: 1 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 227 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 0.5,-1.5 + parent: 1 + - type: AtmosPipeColor + color: '#0055CCFF' +- proto: GasPipeTJunction + entities: + - uid: 70 + components: + - type: Transform + pos: -0.5,-0.5 + parent: 1 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 197 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 0.5,-2.5 + parent: 1 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 223 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 0.5,-4.5 + parent: 1 + - type: AtmosPipeColor + color: '#0055CCFF' +- proto: GasPort + entities: + - uid: 151 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -1.5,-2.5 + parent: 1 +- proto: GasPressurePump + entities: + - uid: 139 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -0.5,-2.5 + parent: 1 + - type: AtmosPipeColor + color: '#0055CCFF' +- proto: GasVentPump + entities: + - uid: 127 + components: + - type: Transform + pos: 0.5,3.5 + parent: 1 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 192 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 0.5,-5.5 + parent: 1 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 193 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -0.5,-4.5 + parent: 1 + - type: AtmosPipeColor + color: '#0055CCFF' +- proto: GasVentScrubber + entities: + - uid: 156 + components: + - type: Transform + pos: 1.5,3.5 + parent: 1 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 185 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 1.5,-5.5 + parent: 1 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 186 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -0.5,-5.5 + parent: 1 + - type: AtmosPipeColor + color: '#990000FF' +- proto: GravityGeneratorMini + entities: + - uid: 125 + components: + - type: Transform + pos: 2.5,-2.5 + parent: 1 +- proto: Grille + entities: + - uid: 56 + components: + - type: Transform + pos: -2.5,-3.5 + parent: 1 + - uid: 76 + components: + - type: Transform + pos: 3.5,-3.5 + parent: 1 + - uid: 77 + components: + - type: Transform + pos: 2.5,3.5 + parent: 1 + - uid: 83 + components: + - type: Transform + pos: -1.5,3.5 + parent: 1 + - uid: 86 + components: + - type: Transform + pos: -0.5,6.5 + parent: 1 + - uid: 113 + components: + - type: Transform + pos: 3.5,-4.5 + parent: 1 + - uid: 115 + components: + - type: Transform + pos: -2.5,-4.5 + parent: 1 + - uid: 129 + components: + - type: Transform + pos: -1.5,6.5 + parent: 1 + - uid: 136 + components: + - type: Transform + pos: 0.5,6.5 + parent: 1 + - uid: 137 + components: + - type: Transform + pos: 1.5,6.5 + parent: 1 + - uid: 138 + components: + - type: Transform + pos: 2.5,6.5 + parent: 1 +- proto: Gyroscope + entities: + - uid: 51 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 2.5,-4.5 + parent: 1 + - type: Thruster + originalPowerLoad: 1500 +- proto: IntercomCommon + entities: + - uid: 52 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 2.5,4.5 + parent: 1 +- proto: LockerMercenaryFilled + entities: + - uid: 162 + components: + - type: Transform + pos: -0.5,1.5 + parent: 1 +- proto: PortableGeneratorPacmanShuttle + entities: + - uid: 120 + components: + - type: Transform + pos: 2.5,-5.5 + parent: 1 + - type: FuelGenerator + on: False + - type: Physics + bodyType: Static +- proto: PosterLegitEnlist + entities: + - uid: 152 + components: + - type: Transform + pos: -1.5,-1.5 + parent: 1 +- proto: PoweredLEDSmallLight + entities: + - uid: 226 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 1.5,-2.5 + parent: 1 +- proto: Poweredlight + entities: + - uid: 6 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 1.5,1.5 + parent: 1 +- proto: PoweredlightColoredRed + entities: + - uid: 110 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -0.5,4.5 + parent: 1 +- proto: PoweredlightExterior + entities: + - uid: 214 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 4.5,4.5 + parent: 1 + - uid: 215 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -3.5,4.5 + parent: 1 +- proto: PoweredlightRed + entities: + - uid: 166 + components: + - type: Transform + pos: -0.5,-0.5 + parent: 1 + - uid: 167 + components: + - type: Transform + pos: 1.5,-0.5 + parent: 1 +- proto: PoweredlightSodium + entities: + - uid: 49 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 0.5,-5.5 + parent: 1 +- proto: RandomPosterLegit + entities: + - uid: 153 + components: + - type: Transform + pos: -1.5,4.5 + parent: 1 + - uid: 154 + components: + - type: Transform + pos: 2.5,-1.5 + parent: 1 +- proto: ReinforcedWindow + entities: + - uid: 5 + components: + - type: Transform + pos: -2.5,-3.5 + parent: 1 + - uid: 54 + components: + - type: Transform + pos: -2.5,-4.5 + parent: 1 + - uid: 55 + components: + - type: Transform + pos: 3.5,-4.5 + parent: 1 + - uid: 74 + components: + - type: Transform + pos: -1.5,3.5 + parent: 1 + - uid: 78 + components: + - type: Transform + pos: 2.5,3.5 + parent: 1 + - uid: 80 + components: + - type: Transform + pos: 3.5,-3.5 + parent: 1 + - uid: 140 + components: + - type: Transform + pos: 1.5,6.5 + parent: 1 + - uid: 141 + components: + - type: Transform + pos: 0.5,6.5 + parent: 1 + - uid: 142 + components: + - type: Transform + pos: -0.5,6.5 + parent: 1 + - uid: 155 + components: + - type: Transform + pos: 2.5,6.5 + parent: 1 + - uid: 158 + components: + - type: Transform + pos: -1.5,6.5 + parent: 1 +- proto: SheetPlasma + entities: + - uid: 191 + components: + - type: Transform + parent: 189 + - type: Physics + canCollide: False + - type: InsideEntityStorage +- proto: SignalButton + entities: + - uid: 35 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -0.5,-1.5 + parent: 1 + - type: DeviceLinkSource + linkedPorts: + 165: + - Pressed: Toggle + 160: + - Pressed: Toggle +- proto: SinkStemlessWater + entities: + - uid: 195 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -1.5,-5.5 + parent: 1 +- proto: SpawnPointLatejoin + entities: + - uid: 149 + components: + - type: Transform + pos: -0.5,4.5 + parent: 1 +- proto: SubstationWallBasic + entities: + - uid: 157 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 2.5,1.5 + parent: 1 +- proto: SuitStorageWallmountEVAPrisoner + entities: + - uid: 87 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 0.5,-6.5 + parent: 1 + - type: Physics + canCollide: False +- proto: SuitStorageWallmountMercenary + entities: + - uid: 163 + components: + - type: Transform + pos: 1.5,2.5 + parent: 1 + - type: Physics + canCollide: False +- proto: TableReinforced + entities: + - uid: 169 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 1.5,3.5 + parent: 1 +- proto: Thruster + entities: + - uid: 84 + components: + - type: Transform + pos: -2.5,1.5 + parent: 1 + - type: Thruster + originalPowerLoad: 1500 + - uid: 93 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -3.5,-5.5 + parent: 1 + - type: Thruster + originalPowerLoad: 1500 + - uid: 117 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 4.5,-4.5 + parent: 1 + - type: Thruster + originalPowerLoad: 1500 + - uid: 118 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -3.5,-4.5 + parent: 1 + - type: Thruster + originalPowerLoad: 1500 + - uid: 194 + components: + - type: Transform + pos: 3.5,1.5 + parent: 1 + - type: Thruster + originalPowerLoad: 1500 + - uid: 221 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 4.5,-5.5 + parent: 1 + - type: Thruster + originalPowerLoad: 1500 +- proto: WallReinforced + entities: + - uid: 4 + components: + - type: Transform + pos: -1.5,-6.5 + parent: 1 + - uid: 26 + components: + - type: Transform + pos: -0.5,-6.5 + parent: 1 + - uid: 27 + components: + - type: Transform + pos: 1.5,-6.5 + parent: 1 + - uid: 30 + components: + - type: Transform + pos: 1.5,2.5 + parent: 1 + - uid: 31 + components: + - type: Transform + pos: 1.5,0.5 + parent: 1 + - uid: 32 + components: + - type: Transform + pos: -1.5,-3.5 + parent: 1 + - uid: 34 + components: + - type: Transform + pos: -0.5,0.5 + parent: 1 + - uid: 40 + components: + - type: Transform + pos: 2.5,-3.5 + parent: 1 + - uid: 45 + components: + - type: Transform + pos: -2.5,-1.5 + parent: 1 + - uid: 47 + components: + - type: Transform + pos: 3.5,-1.5 + parent: 1 + - uid: 61 + components: + - type: Transform + pos: 0.5,-6.5 + parent: 1 + - uid: 73 + components: + - type: Transform + pos: -2.5,-2.5 + parent: 1 + - uid: 81 + components: + - type: Transform + pos: 3.5,-5.5 + parent: 1 + - uid: 82 + components: + - type: Transform + pos: -2.5,-5.5 + parent: 1 + - uid: 88 + components: + - type: Transform + pos: -0.5,-1.5 + parent: 1 + - uid: 90 + components: + - type: Transform + pos: -1.5,4.5 + parent: 1 + - uid: 91 + components: + - type: Transform + pos: 2.5,2.5 + parent: 1 + - uid: 92 + components: + - type: Transform + pos: 2.5,1.5 + parent: 1 + - uid: 95 + components: + - type: Transform + pos: -1.5,2.5 + parent: 1 + - uid: 96 + components: + - type: Transform + pos: -1.5,1.5 + parent: 1 + - uid: 97 + components: + - type: Transform + pos: 2.5,4.5 + parent: 1 + - uid: 98 + components: + - type: Transform + pos: -1.5,-1.5 + parent: 1 + - uid: 103 + components: + - type: Transform + pos: 3.5,-2.5 + parent: 1 + - uid: 106 + components: + - type: Transform + pos: 2.5,-1.5 + parent: 1 + - uid: 107 + components: + - type: Transform + pos: -1.5,5.5 + parent: 1 + - uid: 111 + components: + - type: Transform + pos: 2.5,5.5 + parent: 1 + - uid: 122 + components: + - type: Transform + pos: 2.5,0.5 + parent: 1 + - uid: 126 + components: + - type: Transform + pos: 1.5,-1.5 + parent: 1 + - uid: 130 + components: + - type: Transform + pos: -0.5,-3.5 + parent: 1 + - uid: 131 + components: + - type: Transform + pos: -1.5,0.5 + parent: 1 + - uid: 132 + components: + - type: Transform + pos: -0.5,2.5 + parent: 1 + - uid: 133 + components: + - type: Transform + pos: 2.5,-6.5 + parent: 1 + - uid: 134 + components: + - type: Transform + pos: 1.5,-3.5 + parent: 1 + - uid: 205 + components: + - type: Transform + anchored: False + pos: 4.5,3.5 + parent: 1 + - type: Physics + bodyType: Dynamic + - uid: 206 + components: + - type: Transform + anchored: False + pos: -3.5,3.5 + parent: 1 + - type: Physics + bodyType: Dynamic +- proto: WallReinforcedDiagonal + entities: + - uid: 72 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -2.5,-6.5 + parent: 1 + - uid: 99 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 3.5,-6.5 + parent: 1 +- proto: WarpPointShip + entities: + - uid: 159 + components: + - type: Transform + pos: 0.5,3.5 + parent: 1 +- proto: WindoorSecureMercenaryLocked + entities: + - uid: 148 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -0.5,-5.5 + parent: 1 + - type: DeviceLinkSource + lastSignals: + DoorStatus: True + - type: Door + secondsUntilStateChange: -1327.9542 + state: Opening +- proto: WindowReinforcedDirectional + entities: + - uid: 187 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -0.5,-4.5 + parent: 1 +- proto: Wrench + entities: + - uid: 190 + components: + - type: Transform + parent: 189 + - type: Physics + canCollide: False + - type: InsideEntityStorage +... diff --git a/Resources/Prototypes/_NF/Shipyard/crown.yml b/Resources/Prototypes/_NF/Shipyard/crown.yml new file mode 100644 index 00000000000..e075357c873 --- /dev/null +++ b/Resources/Prototypes/_NF/Shipyard/crown.yml @@ -0,0 +1,29 @@ +- type: vessel + id: Crown + name: SBI Crown + description: "A refurbished and repainted older model of the NSF Templar for Civilian and Mercenary use, mind the gap." + 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: 'Crown {1}' + nameGenerator: + !type:NanotrasenNameGenerator + prefixCreator: '14' + - type: StationJobs + overflowJobs: [] + availableJobs: + Mercenary: [ 0, 0 ] + Pilot: [ 0, 0 ] + Contractor: [ 0, 0 ] diff --git a/SpaceStation14.sln b/SpaceStation14.sln index e0cb455a6db..80dcccd7168 100644 --- a/SpaceStation14.sln +++ b/SpaceStation14.sln @@ -69,39 +69,39 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Robust.Shared.Scripting", " EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NetSerializer", "RobustToolbox\NetSerializer\NetSerializer\NetSerializer.csproj", "{7B9472D3-79D4-48D1-9B22-BCDE518FE842}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Robust.LoaderApi", "RobustToolbox\Robust.LoaderApi\Robust.LoaderApi\Robust.LoaderApi.csproj", "{1FAE651D-29D8-437A-9864-47CE0D180016}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Robust.LoaderApi", "RobustToolbox\Robust.LoaderApi\Robust.LoaderApi\Robust.LoaderApi.csproj", "{1FAE651D-29D8-437A-9864-47CE0D180016}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Robust.Client.NameGenerator", "RobustToolbox\Robust.Client.NameGenerator\Robust.Client.NameGenerator.csproj", "{3CFEB7DB-12C6-46F3-89FC-1450F3016FFA}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Robust.Client.NameGenerator", "RobustToolbox\Robust.Client.NameGenerator\Robust.Client.NameGenerator.csproj", "{3CFEB7DB-12C6-46F3-89FC-1450F3016FFA}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Robust.Client.Injectors", "RobustToolbox\Robust.Client.Injectors\Robust.Client.Injectors.csproj", "{8922428F-17C3-47A7-BFE9-570DEB2464DA}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Robust.Client.Injectors", "RobustToolbox\Robust.Client.Injectors\Robust.Client.Injectors.csproj", "{8922428F-17C3-47A7-BFE9-570DEB2464DA}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XamlX.IL.Cecil", "RobustToolbox\XamlX\src\XamlX.IL.Cecil\XamlX.IL.Cecil.csproj", "{16F7DE32-0186-44B9-9345-0C20D1BF2422}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "XamlX.IL.Cecil", "RobustToolbox\XamlX\src\XamlX.IL.Cecil\XamlX.IL.Cecil.csproj", "{16F7DE32-0186-44B9-9345-0C20D1BF2422}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "XamlX", "XamlX", "{AFF53804-115F-4E67-B81F-26265EA27880}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XamlX", "RobustToolbox\XamlX\src\XamlX\XamlX.csproj", "{23F09C45-950E-4DB7-A465-E937450FF008}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "XamlX", "RobustToolbox\XamlX\src\XamlX\XamlX.csproj", "{23F09C45-950E-4DB7-A465-E937450FF008}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XamlX.Runtime", "RobustToolbox\XamlX\src\XamlX.Runtime\XamlX.Runtime.csproj", "{440426C1-8DCA-43F6-967F-94439B8DAF47}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "XamlX.Runtime", "RobustToolbox\XamlX\src\XamlX.Runtime\XamlX.Runtime.csproj", "{440426C1-8DCA-43F6-967F-94439B8DAF47}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Content.Tools", "Content.Tools\Content.Tools.csproj", "{75AB8F8D-9E56-4B12-85E3-E03A852B31CC}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Content.Tools", "Content.Tools\Content.Tools.csproj", "{75AB8F8D-9E56-4B12-85E3-E03A852B31CC}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Robust.Analyzers", "RobustToolbox\Robust.Analyzers\Robust.Analyzers.csproj", "{88B0FC0F-7209-40E2-AF16-EB90AF727C5B}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Robust.Analyzers", "RobustToolbox\Robust.Analyzers\Robust.Analyzers.csproj", "{88B0FC0F-7209-40E2-AF16-EB90AF727C5B}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Content.YAMLLinter", "Content.YAMLLinter\Content.YAMLLinter.csproj", "{A59E2FCC-93CF-4886-8EA7-94F021A7475D}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Content.YAMLLinter", "Content.YAMLLinter\Content.YAMLLinter.csproj", "{A59E2FCC-93CF-4886-8EA7-94F021A7475D}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Avalonia.Base", "RobustToolbox\Avalonia.Base\Avalonia.Base.csproj", "{A3C5B00A-D232-4A01-B82E-B0E58BFD5C12}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Avalonia.Base", "RobustToolbox\Avalonia.Base\Avalonia.Base.csproj", "{A3C5B00A-D232-4A01-B82E-B0E58BFD5C12}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Robust.Benchmarks", "RobustToolbox\Robust.Benchmarks\Robust.Benchmarks.csproj", "{8A21C7CA-2EB8-40E5-8043-33582C06D139}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Robust.Benchmarks", "RobustToolbox\Robust.Benchmarks\Robust.Benchmarks.csproj", "{8A21C7CA-2EB8-40E5-8043-33582C06D139}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Pow3r", "Pow3r\Pow3r.csproj", "{1C048C9F-00A9-4796-BE4D-BB36B7769720}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Pow3r", "Pow3r\Pow3r.csproj", "{1C048C9F-00A9-4796-BE4D-BB36B7769720}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Content.Shared.Database", "Content.Shared.Database\Content.Shared.Database.csproj", "{8842381D-3426-4BA8-93DA-599AB14D88E9}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Content.Shared.Database", "Content.Shared.Database\Content.Shared.Database.csproj", "{8842381D-3426-4BA8-93DA-599AB14D88E9}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Content.MapRenderer", "Content.MapRenderer\Content.MapRenderer.csproj", "{199BBEA1-7627-434B-B6F6-0F52A7C0E1E0}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Content.MapRenderer", "Content.MapRenderer\Content.MapRenderer.csproj", "{199BBEA1-7627-434B-B6F6-0F52A7C0E1E0}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Robust.Packaging", "RobustToolbox\Robust.Packaging\Robust.Packaging.csproj", "{952AAF2A-DF63-4A7D-8094-3453893EBA80}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Robust.Packaging", "RobustToolbox\Robust.Packaging\Robust.Packaging.csproj", "{952AAF2A-DF63-4A7D-8094-3453893EBA80}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Content.Packaging", "Content.Packaging\Content.Packaging.csproj", "{424445D4-F5D9-4CA9-A435-0A36E8AA28F3}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Content.Packaging", "Content.Packaging\Content.Packaging.csproj", "{424445D4-F5D9-4CA9-A435-0A36E8AA28F3}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Project Files", "Project Files", "{EC27A16C-9412-4AA6-AE68-CAAB28882802}" ProjectSection(SolutionItems) = preProject @@ -121,13 +121,13 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Project Files", "Project Fi EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Content.Replay", "Content.Replay\Content.Replay.csproj", "{A493616C-338D-47B7-8072-A7F14D034D0B}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Robust.Shared.CompNetworkGenerator", "RobustToolbox\Robust.Shared.CompNetworkGenerator\Robust.Shared.CompNetworkGenerator.csproj", "{07CA34A1-1D37-4771-A2E3-495A1044AE0B}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Robust.Shared.CompNetworkGenerator", "RobustToolbox\Robust.Shared.CompNetworkGenerator\Robust.Shared.CompNetworkGenerator.csproj", "{07CA34A1-1D37-4771-A2E3-495A1044AE0B}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Robust.Serialization.Generator", "RobustToolbox\Robust.Serialization.Generator\Robust.Serialization.Generator.csproj", "{6FBF108E-5CB5-47DE-8D7E-B496ABA9E3E2}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Robust.Serialization.Generator", "RobustToolbox\Robust.Serialization.Generator\Robust.Serialization.Generator.csproj", "{6FBF108E-5CB5-47DE-8D7E-B496ABA9E3E2}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Content.PatreonParser", "Content.PatreonParser\Content.PatreonParser.csproj", "{D97D8258-D915-4D1D-B1E3-1A8D00CF9EB5}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Content.PatreonParser", "Content.PatreonParser\Content.PatreonParser.csproj", "{D97D8258-D915-4D1D-B1E3-1A8D00CF9EB5}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Robust.Analyzers.Tests", "RobustToolbox\Robust.Analyzers.Tests\Robust.Analyzers.Tests.csproj", "{83F510FE-9B50-4D96-AFAB-CC13998D6AFE}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Robust.Analyzers.Tests", "RobustToolbox\Robust.Analyzers.Tests\Robust.Analyzers.Tests.csproj", "{83F510FE-9B50-4D96-AFAB-CC13998D6AFE}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Roslyn", "Roslyn", "{7844DA69-B0F0-49FB-A05E-ECA37372277A}" ProjectSection(SolutionItems) = preProject @@ -150,16 +150,16 @@ Global {26AEEBB3-DDE7-443A-9F43-7BC7F4ACF6B5}.Release|Any CPU.Build.0 = Release|Any CPU {26AEEBB3-DDE7-443A-9F43-7BC7F4ACF6B5}.Tools|Any CPU.ActiveCfg = Tools|Any CPU {26AEEBB3-DDE7-443A-9F43-7BC7F4ACF6B5}.Tools|Any CPU.Build.0 = Tools|Any CPU - {B38DBBD0-04C2-4D1A-84E2-B3446F6ADF2A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B38DBBD0-04C2-4D1A-84E2-B3446F6ADF2A}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B38DBBD0-04C2-4D1A-84E2-B3446F6ADF2A}.Debug|Any CPU.ActiveCfg = Release|Any CPU + {B38DBBD0-04C2-4D1A-84E2-B3446F6ADF2A}.Debug|Any CPU.Build.0 = Release|Any CPU {B38DBBD0-04C2-4D1A-84E2-B3446F6ADF2A}.DebugOpt|Any CPU.ActiveCfg = DebugOpt|Any CPU {B38DBBD0-04C2-4D1A-84E2-B3446F6ADF2A}.DebugOpt|Any CPU.Build.0 = DebugOpt|Any CPU {B38DBBD0-04C2-4D1A-84E2-B3446F6ADF2A}.Release|Any CPU.ActiveCfg = Release|Any CPU {B38DBBD0-04C2-4D1A-84E2-B3446F6ADF2A}.Release|Any CPU.Build.0 = Release|Any CPU {B38DBBD0-04C2-4D1A-84E2-B3446F6ADF2A}.Tools|Any CPU.ActiveCfg = Tools|Any CPU {B38DBBD0-04C2-4D1A-84E2-B3446F6ADF2A}.Tools|Any CPU.Build.0 = Tools|Any CPU - {A2E5F175-78AF-4DDD-8F97-E2D2552372ED}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A2E5F175-78AF-4DDD-8F97-E2D2552372ED}.Debug|Any CPU.Build.0 = Debug|Any CPU + {A2E5F175-78AF-4DDD-8F97-E2D2552372ED}.Debug|Any CPU.ActiveCfg = Release|Any CPU + {A2E5F175-78AF-4DDD-8F97-E2D2552372ED}.Debug|Any CPU.Build.0 = Release|Any CPU {A2E5F175-78AF-4DDD-8F97-E2D2552372ED}.DebugOpt|Any CPU.ActiveCfg = DebugOpt|Any CPU {A2E5F175-78AF-4DDD-8F97-E2D2552372ED}.DebugOpt|Any CPU.Build.0 = DebugOpt|Any CPU {A2E5F175-78AF-4DDD-8F97-E2D2552372ED}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -462,21 +462,21 @@ Global {41B450C0-A361-4CD7-8121-7072B8995CFC} = {83B4CBBA-547A-42F0-A7CD-8A67D93196CE} {7B9472D3-79D4-48D1-9B22-BCDE518FE842} = {83B4CBBA-547A-42F0-A7CD-8A67D93196CE} {1FAE651D-29D8-437A-9864-47CE0D180016} = {83B4CBBA-547A-42F0-A7CD-8A67D93196CE} + {3CFEB7DB-12C6-46F3-89FC-1450F3016FFA} = {7844DA69-B0F0-49FB-A05E-ECA37372277A} {8922428F-17C3-47A7-BFE9-570DEB2464DA} = {83B4CBBA-547A-42F0-A7CD-8A67D93196CE} {16F7DE32-0186-44B9-9345-0C20D1BF2422} = {AFF53804-115F-4E67-B81F-26265EA27880} {AFF53804-115F-4E67-B81F-26265EA27880} = {83B4CBBA-547A-42F0-A7CD-8A67D93196CE} {23F09C45-950E-4DB7-A465-E937450FF008} = {AFF53804-115F-4E67-B81F-26265EA27880} {440426C1-8DCA-43F6-967F-94439B8DAF47} = {AFF53804-115F-4E67-B81F-26265EA27880} + {88B0FC0F-7209-40E2-AF16-EB90AF727C5B} = {7844DA69-B0F0-49FB-A05E-ECA37372277A} {A3C5B00A-D232-4A01-B82E-B0E58BFD5C12} = {83B4CBBA-547A-42F0-A7CD-8A67D93196CE} {8A21C7CA-2EB8-40E5-8043-33582C06D139} = {83B4CBBA-547A-42F0-A7CD-8A67D93196CE} {952AAF2A-DF63-4A7D-8094-3453893EBA80} = {83B4CBBA-547A-42F0-A7CD-8A67D93196CE} {A965CB3B-FD31-44AF-8872-85ABA436098D} = {83B4CBBA-547A-42F0-A7CD-8A67D93196CE} - {7844DA69-B0F0-49FB-A05E-ECA37372277A} = {83B4CBBA-547A-42F0-A7CD-8A67D93196CE} - {3CFEB7DB-12C6-46F3-89FC-1450F3016FFA} = {7844DA69-B0F0-49FB-A05E-ECA37372277A} - {6FBF108E-5CB5-47DE-8D7E-B496ABA9E3E2} = {7844DA69-B0F0-49FB-A05E-ECA37372277A} {07CA34A1-1D37-4771-A2E3-495A1044AE0B} = {7844DA69-B0F0-49FB-A05E-ECA37372277A} - {88B0FC0F-7209-40E2-AF16-EB90AF727C5B} = {7844DA69-B0F0-49FB-A05E-ECA37372277A} + {6FBF108E-5CB5-47DE-8D7E-B496ABA9E3E2} = {7844DA69-B0F0-49FB-A05E-ECA37372277A} {83F510FE-9B50-4D96-AFAB-CC13998D6AFE} = {7844DA69-B0F0-49FB-A05E-ECA37372277A} + {7844DA69-B0F0-49FB-A05E-ECA37372277A} = {83B4CBBA-547A-42F0-A7CD-8A67D93196CE} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {AA37ED9F-F8D6-468E-A101-658AD605B09A} From 780a8095a6c36cfbc44fca6f80666355a0fb2572 Mon Sep 17 00:00:00 2001 From: FrontierATC Date: Wed, 29 May 2024 06:42:39 +0000 Subject: [PATCH 4/6] Automatic Changelog (#1261) --- Resources/Changelog/Changelog.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index 736e586090f..7a799796446 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -4686,3 +4686,11 @@ Entries: 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' From bee39859cccb38300ef68fc10ba7dd70a213906e Mon Sep 17 00:00:00 2001 From: Kill_Me_I_Noobs <118206719+Vonsant@users.noreply.github.com> Date: Wed, 29 May 2024 13:05:10 +0300 Subject: [PATCH 5/6] =?UTF-8?q?=D0=9F=D0=B5=D1=80=D0=B5=D0=B2=D0=BE=D0=B4?= =?UTF-8?q?=20crown.yml?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Resources/Prototypes/_NF/Shipyard/crown.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Resources/Prototypes/_NF/Shipyard/crown.yml b/Resources/Prototypes/_NF/Shipyard/crown.yml index e075357c873..9f52376d376 100644 --- a/Resources/Prototypes/_NF/Shipyard/crown.yml +++ b/Resources/Prototypes/_NF/Shipyard/crown.yml @@ -1,7 +1,7 @@ - type: vessel id: Crown - name: SBI Crown - description: "A refurbished and repainted older model of the NSF Templar for Civilian and Mercenary use, mind the gap." + name: SBI Ворон + description: "Малогабаритный шаттл для наёмников, рекомендуемый состав экипажа 2 человека" price: 20000 category: Small group: Civilian @@ -17,7 +17,7 @@ stationProto: StandardFrontierVessel components: - type: StationNameSetup - mapNameTemplate: 'Crown {1}' + mapNameTemplate: 'Ворон {1}' nameGenerator: !type:NanotrasenNameGenerator prefixCreator: '14' From 74294ac1bace61987e02843c78efe14640b128cd Mon Sep 17 00:00:00 2001 From: Vonsant Date: Wed, 29 May 2024 13:07:21 +0300 Subject: [PATCH 6/6] =?UTF-8?q?=D0=92=D1=8B=20=D1=87=D0=BE=20=D1=82=D1=83?= =?UTF-8?q?=D1=82=20=D0=B7=D0=B0=D0=B1=D1=8B=D0=BB=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../piratebw.rsi/equipped-INNERCLOTHING.png | Bin 883 -> 0 bytes .../Uniforms/PirateTeam/piratebw.rsi/icon.png | Bin 410 -> 0 bytes .../PirateTeam/piratebw.rsi/inhand-left.png | Bin 368 -> 0 bytes .../PirateTeam/piratebw.rsi/inhand-right.png | Bin 372 -> 0 bytes .../PirateTeam/piratebw.rsi/meta.json | 26 -------- .../Uniforms/PirateTeam/piratewb.rsi/icon.png | Bin 523 -> 0 bytes .../PirateTeam/piratewb.rsi/inhand-left.png | Bin 570 -> 0 bytes .../PirateTeam/piratewb.rsi/inhand-right.png | Bin 577 -> 0 bytes .../PirateTeam/piratewb.rsi/meta.json | 26 -------- .../PirateTeam/piratewb.rsi/pirate3.png | Bin 1561 -> 0 bytes .../piratewr.rsi/equipped-INNERCLOTHING.png | Bin 1426 -> 0 bytes .../Uniforms/PirateTeam/piratewr.rsi/icon.png | Bin 523 -> 0 bytes .../PirateTeam/piratewr.rsi/inhand-left.png | Bin 570 -> 0 bytes .../PirateTeam/piratewr.rsi/inhand-right.png | Bin 577 -> 0 bytes .../PirateTeam/piratewr.rsi/meta.json | 26 -------- .../pirateyb.rsi/equipped-INNERCLOTHING.png | Bin 966 -> 0 bytes .../Uniforms/PirateTeam/pirateyb.rsi/icon.png | Bin 426 -> 0 bytes .../PirateTeam/pirateyb.rsi/inhand-left.png | Bin 389 -> 0 bytes .../PirateTeam/pirateyb.rsi/inhand-right.png | Bin 398 -> 0 bytes .../PirateTeam/pirateyb.rsi/meta.json | 26 -------- .../pirateyg.rsi/equipped-INNERCLOTHING.png | Bin 1142 -> 0 bytes .../Uniforms/PirateTeam/pirateyg.rsi/icon.png | Bin 552 -> 0 bytes .../PirateTeam/pirateyg.rsi/inhand-left.png | Bin 457 -> 0 bytes .../PirateTeam/pirateyg.rsi/inhand-right.png | Bin 457 -> 0 bytes .../PirateTeam/pirateyg.rsi/meta.json | 26 -------- Resources/Textures/_CP/Clothing/pirate.png | Bin 646 -> 0 bytes .../Textures/_CP/Clothing/pirate_basic.png | Bin 202 -> 0 bytes .../Textures/_CP/Clothing/piratebandana1.png | Bin 690 -> 0 bytes Resources/Textures/_CP/Clothing/piratehat.png | Bin 643 -> 0 bytes .../Textures/_CP/Clothing/piratejacket1.png | Bin 1152 -> 0 bytes .../Textures/_CP/Clothing/piratejacket2.png | Bin 1189 -> 0 bytes .../Textures/_CP/Clothing/piratejacket3.png | Bin 599 -> 0 bytes .../Textures/_CP/Clothing/piratejacket4.png | Bin 545 -> 0 bytes .../Textures/_CP/Clothing/piratejacket5.png | Bin 1181 -> 0 bytes .../Textures/_CP/Clothing/png-to-meta.py | 57 ------------------ 35 files changed, 187 deletions(-) delete mode 100644 Resources/Textures/_CP/Clothing/Uniforms/PirateTeam/piratebw.rsi/equipped-INNERCLOTHING.png delete mode 100644 Resources/Textures/_CP/Clothing/Uniforms/PirateTeam/piratebw.rsi/icon.png delete mode 100644 Resources/Textures/_CP/Clothing/Uniforms/PirateTeam/piratebw.rsi/inhand-left.png delete mode 100644 Resources/Textures/_CP/Clothing/Uniforms/PirateTeam/piratebw.rsi/inhand-right.png delete mode 100644 Resources/Textures/_CP/Clothing/Uniforms/PirateTeam/piratebw.rsi/meta.json delete mode 100644 Resources/Textures/_CP/Clothing/Uniforms/PirateTeam/piratewb.rsi/icon.png delete mode 100644 Resources/Textures/_CP/Clothing/Uniforms/PirateTeam/piratewb.rsi/inhand-left.png delete mode 100644 Resources/Textures/_CP/Clothing/Uniforms/PirateTeam/piratewb.rsi/inhand-right.png delete mode 100644 Resources/Textures/_CP/Clothing/Uniforms/PirateTeam/piratewb.rsi/meta.json delete mode 100644 Resources/Textures/_CP/Clothing/Uniforms/PirateTeam/piratewb.rsi/pirate3.png delete mode 100644 Resources/Textures/_CP/Clothing/Uniforms/PirateTeam/piratewr.rsi/equipped-INNERCLOTHING.png delete mode 100644 Resources/Textures/_CP/Clothing/Uniforms/PirateTeam/piratewr.rsi/icon.png delete mode 100644 Resources/Textures/_CP/Clothing/Uniforms/PirateTeam/piratewr.rsi/inhand-left.png delete mode 100644 Resources/Textures/_CP/Clothing/Uniforms/PirateTeam/piratewr.rsi/inhand-right.png delete mode 100644 Resources/Textures/_CP/Clothing/Uniforms/PirateTeam/piratewr.rsi/meta.json delete mode 100644 Resources/Textures/_CP/Clothing/Uniforms/PirateTeam/pirateyb.rsi/equipped-INNERCLOTHING.png delete mode 100644 Resources/Textures/_CP/Clothing/Uniforms/PirateTeam/pirateyb.rsi/icon.png delete mode 100644 Resources/Textures/_CP/Clothing/Uniforms/PirateTeam/pirateyb.rsi/inhand-left.png delete mode 100644 Resources/Textures/_CP/Clothing/Uniforms/PirateTeam/pirateyb.rsi/inhand-right.png delete mode 100644 Resources/Textures/_CP/Clothing/Uniforms/PirateTeam/pirateyb.rsi/meta.json delete mode 100644 Resources/Textures/_CP/Clothing/Uniforms/PirateTeam/pirateyg.rsi/equipped-INNERCLOTHING.png delete mode 100644 Resources/Textures/_CP/Clothing/Uniforms/PirateTeam/pirateyg.rsi/icon.png delete mode 100644 Resources/Textures/_CP/Clothing/Uniforms/PirateTeam/pirateyg.rsi/inhand-left.png delete mode 100644 Resources/Textures/_CP/Clothing/Uniforms/PirateTeam/pirateyg.rsi/inhand-right.png delete mode 100644 Resources/Textures/_CP/Clothing/Uniforms/PirateTeam/pirateyg.rsi/meta.json delete mode 100644 Resources/Textures/_CP/Clothing/pirate.png delete mode 100644 Resources/Textures/_CP/Clothing/pirate_basic.png delete mode 100644 Resources/Textures/_CP/Clothing/piratebandana1.png delete mode 100644 Resources/Textures/_CP/Clothing/piratehat.png delete mode 100644 Resources/Textures/_CP/Clothing/piratejacket1.png delete mode 100644 Resources/Textures/_CP/Clothing/piratejacket2.png delete mode 100644 Resources/Textures/_CP/Clothing/piratejacket3.png delete mode 100644 Resources/Textures/_CP/Clothing/piratejacket4.png delete mode 100644 Resources/Textures/_CP/Clothing/piratejacket5.png delete mode 100644 Resources/Textures/_CP/Clothing/png-to-meta.py diff --git a/Resources/Textures/_CP/Clothing/Uniforms/PirateTeam/piratebw.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/_CP/Clothing/Uniforms/PirateTeam/piratebw.rsi/equipped-INNERCLOTHING.png deleted file mode 100644 index 606d92b17069d6d20ad52c3ca496126d3307b4c5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 883 zcmV-(1C0EMP)Dk$8k%53DhT@iet3b(%;ws z6dw!*fLoHRY6u|~A301QebiR87AXB%`Z@;44MlJ(1pi%e84wv$W{Oi2RQ=xZCmFuys|uX;XMhw}_D3BskmE?NfcKe!LCpY6ltopj~c zkE0y&;}hV7Lto2)bbAZ#+`b9FexJa_3tNkRY~Q$c1s*>?C|VQXfnWI{ohRcX<2h8+Lj20-9M10Zms0T4K*2B`0*n=KSr#-eQi)#;ITyA64s3uw*+ zk)|n3r&HO;vP`g+#%P5I)#*{Vtkn3-i2o`hbn&KZ6O1cEC`d*SJ}N_ae#$^q(@S~0 ztk9}$!F|CMF;tmsye7lyS75nL*F**&HU(QN1DdE5*JOY(F#~LZDQ`Rh9;wIxt2DHJ z5}eIuaz7f4SQkku$fYv0g7@lc<gFXU|NJMF7tAWUP4FGV46{sOe4{R(Iuq0s;U002ov JPDHLkV1krXk=6hJ diff --git a/Resources/Textures/_CP/Clothing/Uniforms/PirateTeam/piratebw.rsi/icon.png b/Resources/Textures/_CP/Clothing/Uniforms/PirateTeam/piratebw.rsi/icon.png deleted file mode 100644 index 896d9a68dd8843c436d6e15c7d7be85afca9e9d8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 410 zcmV;L0cHM)P)v!Hh^tnAZ(es z9yi~CD2i13_3BFj@gGO5Luf;k&2z;$0|I;dS9hJ>0;96kLryzj#5iAW0IE7*JygvD z#Age-zKrQ$;uYrJ*IU}|QsRmQ;0^k8dU8yg&y>c)eqKjDKb+F})hf#pcK}A~kDdAg z0_MnVAg2H@oQwv_^kTUp|7fOi)LQ|-O7EWD==Sl29$ph%3F*^JZ9yvlFz3`82Qcmb zt&W@E9H42j0C3N5?w<>Fth|+X;QP=el{IGoF0^-mFAnadL$+K#mjD0&07*qoM6N<$ Ef`=rohyVZp diff --git a/Resources/Textures/_CP/Clothing/Uniforms/PirateTeam/piratebw.rsi/inhand-left.png b/Resources/Textures/_CP/Clothing/Uniforms/PirateTeam/piratebw.rsi/inhand-left.png deleted file mode 100644 index 4f511bcd2e14554c400d1bbf774f392882f407c2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 368 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%zwLD!MLn`LH zy}2>#uz|#pkHIgwr#Q9oy}h<|y@q|#^_;U46a#*7yh;jG?Mr5#pBnPdUVz1Vj(yHU z2R|mDSwK**ULtwYlyFT?ufIRfehL#!_L;ekXUFrMTjMMP1{g3Xa52Rqys_@_RGyS~po`=@bzsi8VGk|Ki^6(d^D|D6#wURO@{H z)a|>vw|`5}{UaJNr@T9r-Q)WFu%B19os<6jg3D-6f7n^+;8gY_66WWnlXsq#f4@HS z`=2G-r{8^W=laJbm%sPheQ&>cz34e3#Gx6{!EZN4cfZ{@d#i2UyY;E%)j8U3S%uq= zpS{bl^5C}{XK%`x?_^equg=MC&o172{C^Sqoy&6O-;Fgc$}xZV$y)OFzJ&TU6)liy Mp00i_>zopr0HN5VaR2}S diff --git a/Resources/Textures/_CP/Clothing/Uniforms/PirateTeam/piratebw.rsi/inhand-right.png b/Resources/Textures/_CP/Clothing/Uniforms/PirateTeam/piratebw.rsi/inhand-right.png deleted file mode 100644 index e076a8b15560a0dbce3234a1b5fe855ea06b1ed3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 372 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%z^*mi1Ln`LH zy}8kkMNy>nVe?1Uo|9r?w{HIGI-`8+R%YVH&X0l{3Ib&$4jc5GHvK<+LQaCBdif2_ zZ(cy7Kw!^z#~_)N3Yv4SwO=${|J}}IDf8mMt_|+@CgfcyPu;xJv1^0o`qO^D?fq^l2cV?yKBzQXWpR>!J0Tr*r3_BDLt*1nHY-Mtg1fap-x z32#b!c5ensh1N2wRLee=>c0C>DEa+%t-E;#I)L1({ZsgK8vegvK7Q=J#MP#qlR(CL My85}Sb4q9e0D_sX4*&oF diff --git a/Resources/Textures/_CP/Clothing/Uniforms/PirateTeam/piratebw.rsi/meta.json b/Resources/Textures/_CP/Clothing/Uniforms/PirateTeam/piratebw.rsi/meta.json deleted file mode 100644 index ad70b829fc8..00000000000 --- a/Resources/Textures/_CP/Clothing/Uniforms/PirateTeam/piratebw.rsi/meta.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from Civ13", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "equipped-INNERCLOTHING", - "directions": 4 - }, - { - "name": "icon" - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - } - ] -} \ No newline at end of file diff --git a/Resources/Textures/_CP/Clothing/Uniforms/PirateTeam/piratewb.rsi/icon.png b/Resources/Textures/_CP/Clothing/Uniforms/PirateTeam/piratewb.rsi/icon.png deleted file mode 100644 index 08b1eadb12a50f0053bd28e25e734c0170a2e4d1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 523 zcmV+m0`&cfP)Px$#Ysd#R9J=Wls!u$Q51%sY_e>pf$WB{kwnoDQwiy8th0@cRf@0#1|hw*2>t{? z7MA@1g4j$tA-K$vgoRWh#=?+hE*H#%Edl{$EaD7_U%8VQmW6qmnS0NfIq!Mz6{ zKtO;GjFRq{m9k@$bVp@hg%7HUW~J;TH4T8++}udaT_-gSvr_gYBBGLHlyoPR&LDqP z2L%gxs^B!@5!U4$u|ggxEC5pJ3`R+Jz8-!Lsr-Aa1H+xW1*EWu74n`KDJ)XyjF;ob ziLnB@$EU>gBDMX4kv)Lrl{Ihu^T!b<)!)?i4~XkUFJ~$NZueK07eu$WxDf&vbSQv6&0GuBq_m zCF~xbQsZ?i7Za!^OptR-wmTY2VUYW2UJm-1H(vR5$^T)Xm@D0 znuH^t_}lAo|2PL`D!_0e{Mp?bEY8kHgJ%A_P)Px$^hrcPRCt{2*|BQdP!z`TzZ;isA>h`iORy6f<9f=RC3CuD$>hNlg9!L70(pc& zDTF*gpk%RULvgXEP9elgjTZ?Gap>TwMI90e2OLM1blnQR-=-_+a5?8#7CImzA|fIp zA|fIp%WAi5zt`>f?UwCFSzmR$MP4Kg(Cc>mvSk5KSYLm1E;ue*7QJpK(x%gn_ndr^ zo7*khuT*Pz-}(R)8g=^M|0w3!^?p-m)bU&gfJ(JSyJh(_`u@Vqe>*o53jiW<;x-M{E5zlqlEbZXA4rR;YWAm8Z(iR&>humCW&8=G6@r)+` z2(!Ppe~<&1Om2bu)*X+AVXFq~d;15upvtR=7gel>;N8U~1D)x zO2BhZ-tlP2>o;#B-6Dj~TgIayYx!6Fnojxi z@W1`9STRw5P|ZeHC5>6Vv0&bbzVpab^-=YI>ZB1ely2 zXCeV$ZhD-FhoH&naV8RAa(bMZpTHtXrpKA+fO#}M7Lhdk1z_*A{<+}A=Kufz07*qo IM6N<$f@|IoO8@`> diff --git a/Resources/Textures/_CP/Clothing/Uniforms/PirateTeam/piratewb.rsi/inhand-right.png b/Resources/Textures/_CP/Clothing/Uniforms/PirateTeam/piratewb.rsi/inhand-right.png deleted file mode 100644 index 35aa6a874fc0cb0540fd2a3ea6ae952065727074..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 577 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%ze|x$(hE&XX zdvjyf?EsNuANLDS%~O1EZH4!SXsO3lr{<^@?@BrOSDcf#@a2P*uCg&JvxF@-DJ9+i^mkkJdX>IDzDus`E-T|dg+o| zeiPE_uI359Kek`^Z=Csx8)ghg*RI`v?NH&-Z7;v?%AVMA`&jl-_PN`HL$XW%_&5J# zoyE&0P@@_7=BK@ene>l&+zwmAmIDoYzW$y_(Z1zZK6RL{YN${5Uv0@$a_N zv)0PVZa(F8Li?TuY`z}?)nPz z2mWUI=g!}-vwO7qIpgP^pYu-pRf^v)UU|bzKT7|mwtd>~A06GFH%|?5ocGa9R3I(= z|AP$-26N+>K3|&E;~uEl`uR6|d+P_yHBNCKqYU(?DxO@rC-|OkO!xE$u_uk=xF0Mt z|CwU*=-^@Z@Mqy)Sx*?>)BfG?TIbXYt0=WN?aYJUW6aWx-}&m#>~YVD`u@{y_Q%iP z%S-Rh5L@2?1t)eHuT7p4wrc;OWu-mSC;kYxNQpXL5y`E6U`t=27`Jdj)NzaMBP=tn z8J^2ZWCc-5A5}Aef~z5dT378JSOK+8zO#eBBbYtR<)8U}2FCI&|E8B;vjV0G22WQ% Jmvv4FO#pdU50wA_ diff --git a/Resources/Textures/_CP/Clothing/Uniforms/PirateTeam/piratewb.rsi/meta.json b/Resources/Textures/_CP/Clothing/Uniforms/PirateTeam/piratewb.rsi/meta.json deleted file mode 100644 index ad70b829fc8..00000000000 --- a/Resources/Textures/_CP/Clothing/Uniforms/PirateTeam/piratewb.rsi/meta.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from Civ13", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "equipped-INNERCLOTHING", - "directions": 4 - }, - { - "name": "icon" - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - } - ] -} \ No newline at end of file diff --git a/Resources/Textures/_CP/Clothing/Uniforms/PirateTeam/piratewb.rsi/pirate3.png b/Resources/Textures/_CP/Clothing/Uniforms/PirateTeam/piratewb.rsi/pirate3.png deleted file mode 100644 index 090f9ea3d097e047f0431242c351764c606c9231..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1561 zcmV+!2Il#RP)reH$S zHqlgKVxK@_eDJ|o<-z9$(sImOgaseJ`$|D3d%mIM*|+r?ewi!9%atqe-Q5GV{80-Zdd8JbP zHjAPX$Nzql+5xyKDp|kAm)i0!g3MoCYlUkihKkZvl-#wTVrMxP6n0+ztOOwCt7~g; z`BIFv+n*Q5|JoAbv*;Dqt7mbMhmbm!S3LvXbGk&m+oS74?HB5+LU=}-eRk7K3 zRaD_fV-1!?CuuRF{$$HF3h4Y_{SF2H62f5`u4qHwaCim({Jj+CFDh|m#h)<(jx<`C znv_$NTSP<-P{{kd9_*`cW}z?H0V1S+G;1?c$QhJky#opUO#Nm4&ep`bln!YHpzy=Q zbjsf;0#boO7RW6PB>tePb9)DZS@EY8Ak#|fzd4IChnxGnY@v1>p7U~g5=<8XTES*3 z75~Ok*!iP{TL4=0?nMQ*7*PaRwmi(*!2l&(epdce`1#Yf;5%)@&TUR~e=FI#&q~KP zjt3D8g}KM%62N!*1MCVl;NPV%hURR{Hs>8>?Fq5%8yJC>aN2EnwY33@BA?q~i`%LF z?4Bp^1LOB|jj1XH7Vd=Dk(?lMYAYSm5?8PNfoQT)?P%qHM(#6aChxRw99*bLmRH3Fe z1bHFPekNPC;1)m`g6r*SLU6PB%{M|ko#{S1I=1lvpOmMMn)~o(^K%IxEjs>;Hm#rq zznKCsI7|UxaF_zX;4lS%!C?vjgToX628SvE`uqEZ!otFMyQ!&3vpoUnaASH*=)3X| znk)Xoxk)Py?2Uo96vr(9)!QVpC_J|x$KmH5V0d^~h(@DmYirX*h-0V51>&Vw^pUU? z-p8uossKFm5pID^(zY8~g9@_OZzS_8fG-BX{Ne$31bF5{Xx<(GwkLN^YfwQJ zC}ZC#6&Hh11jG;BmdP(?y<58opq!^%SKe!ned814eLIqK+JZ#BG8S3eDzot!gq{s} z#^YWDlRaqA_L%!o0Xv@2Cjuhja<&E~3wPedn6EC7WN^A0$jy8W?IQ(>U{F%c&^ zQN|Dv8I`%UOz_VTD^kRY3_)0Fx(=Z~L_|f|{HV^4Q8zl5EUpt==T=?2vAGh=(xfJ1 zntFZT+uUn1@^Mdk@0D=x1LNkLd+vSS^PKm6&*|RlgvDVC0E@#G02YTW04xq$09YKh z03w6G=-DdWyyxWcHGLkH_(NJw4%Ceud{(*FoHsr(cA>qyUQY*#xIgorISr zjW0h?C!cMgo}O?mzZQt_mlS~Gs`b@g1YhfyU##?bcWg&<%WAbfa@%2CJ$el7v$N== z@zXS34`lOmsCkQwO{7vXuLyrp0TlIl#W~4L^Te^JFt7UUcdV4J-0tk^Lhxc#9>?SL z@B)6`ap0iJA0__!*yX%qW7Ho_BvgJDOACKV5Abg7lGWsx;@FC13}BZ(e(ZbPbMFJP z>nr_CD90?VLW~SqDmcW>3=FCKrN%4#E6GEZyi^QD1z`6JVqd}g>;Z)k)FA|zf3D1D zSu`yuDnO}BdVb~%8g6M6eoiaOeUHdm@HP`15}VxB#~ z;k-f4z6%=SO%ELZF$hg)F>?kZb5#HIi*!b>H?oDcUbacQ-aE5n} zhj1$T2NGweu$=m)={isCwuwo^=spJb3ca(e5a5Z1!{LH$qwwB`pZ~{mVsi2N*;i`2 z<6;D&sK~zt^<01@2@nc}mihgD2^EZr^Z*5VEI>sIpa+Bm2m}JE;;g=Mr5Kcy`=~Go zdjLI+11%SmNECAQr zu6(>7H$J%$HQ$V(=9#C^va0=m`G0_^UnZpFyYD0U;5sNaiPj>81Q^}%yyT=w-|A~5 zB|`W;5l3?Nl4{7^{ku#N;zaLGiG}AHg%pdyL$dXzJO9p@u4H`-^WHD#Fm)FG)2IZ^pU7J*ainA?m2Ys^_-I_qcMM=7Q|N zu;%xPSBBmh!F(!(C{4PBCjB?Lo+q;!W?_mZf3neot4G4v{MIgnXd&uJjN0mIV69*1 zT|xrHX|k=ayeyZc(peMcy4+<70W?&>4De*PbZtXK8j;)VnH~xOwu8M=1i~S};K|0x z1H9w`3RwN-mOEiI_^XuK)Y+UqPJl@g#r;ChqK!s{0DHi1t}&!3>(=GDZ$`D4IsW-6 zR{+lbNxELxJ%}r`Fd`5VfMcFxJ$tJOQbtz3+u>@l(O{0{nctj?I@ewOo4KHGRp7I~kL0QoXK?*^O@IVZ$T@_=*}rxqKFLD&P>r(~AP0m^wOyH2mPVKVfxp==MxSEn}{ gde~rx04$Dw0k_`3LAXy$lK=n!07*qoM6N<$g2oZL)&Kwi diff --git a/Resources/Textures/_CP/Clothing/Uniforms/PirateTeam/piratewr.rsi/icon.png b/Resources/Textures/_CP/Clothing/Uniforms/PirateTeam/piratewr.rsi/icon.png deleted file mode 100644 index 08b1eadb12a50f0053bd28e25e734c0170a2e4d1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 523 zcmV+m0`&cfP)Px$#Ysd#R9J=Wls!u$Q51%sY_e>pf$WB{kwnoDQwiy8th0@cRf@0#1|hw*2>t{? z7MA@1g4j$tA-K$vgoRWh#=?+hE*H#%Edl{$EaD7_U%8VQmW6qmnS0NfIq!Mz6{ zKtO;GjFRq{m9k@$bVp@hg%7HUW~J;TH4T8++}udaT_-gSvr_gYBBGLHlyoPR&LDqP z2L%gxs^B!@5!U4$u|ggxEC5pJ3`R+Jz8-!Lsr-Aa1H+xW1*EWu74n`KDJ)XyjF;ob ziLnB@$EU>gBDMX4kv)Lrl{Ihu^T!b<)!)?i4~XkUFJ~$NZueK07eu$WxDf&vbSQv6&0GuBq_m zCF~xbQsZ?i7Za!^OptR-wmTY2VUYW2UJm-1H(vR5$^T)Xm@D0 znuH^t_}lAo|2PL`D!_0e{Mp?bEY8kHgJ%A_P)Px$^hrcPRCt{2*|BQdP!z`TzZ;isA>h`iORy6f<9f=RC3CuD$>hNlg9!L70(pc& zDTF*gpk%RULvgXEP9elgjTZ?Gap>TwMI90e2OLM1blnQR-=-_+a5?8#7CImzA|fIp zA|fIp%WAi5zt`>f?UwCFSzmR$MP4Kg(Cc>mvSk5KSYLm1E;ue*7QJpK(x%gn_ndr^ zo7*khuT*Pz-}(R)8g=^M|0w3!^?p-m)bU&gfJ(JSyJh(_`u@Vqe>*o53jiW<;x-M{E5zlqlEbZXA4rR;YWAm8Z(iR&>humCW&8=G6@r)+` z2(!Ppe~<&1Om2bu)*X+AVXFq~d;15upvtR=7gel>;N8U~1D)x zO2BhZ-tlP2>o;#B-6Dj~TgIayYx!6Fnojxi z@W1`9STRw5P|ZeHC5>6Vv0&bbzVpab^-=YI>ZB1ely2 zXCeV$ZhD-FhoH&naV8RAa(bMZpTHtXrpKA+fO#}M7Lhdk1z_*A{<+}A=Kufz07*qo IM6N<$f@|IoO8@`> diff --git a/Resources/Textures/_CP/Clothing/Uniforms/PirateTeam/piratewr.rsi/inhand-right.png b/Resources/Textures/_CP/Clothing/Uniforms/PirateTeam/piratewr.rsi/inhand-right.png deleted file mode 100644 index 35aa6a874fc0cb0540fd2a3ea6ae952065727074..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 577 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%ze|x$(hE&XX zdvjyf?EsNuANLDS%~O1EZH4!SXsO3lr{<^@?@BrOSDcf#@a2P*uCg&JvxF@-DJ9+i^mkkJdX>IDzDus`E-T|dg+o| zeiPE_uI359Kek`^Z=Csx8)ghg*RI`v?NH&-Z7;v?%AVMA`&jl-_PN`HL$XW%_&5J# zoyE&0P@@_7=BK@ene>l&+zwmAmIDoYzW$y_(Z1zZK6RL{YN${5Uv0@$a_N zv)0PVZa(F8Li?TuY`z}?)nPz z2mWUI=g!}-vwO7qIpgP^pYu-pRf^v)UU|bzKT7|mwtd>~A06GFH%|?5ocGa9R3I(= z|AP$-26N+>K3|&E;~uEl`uR6|d+P_yHBNCKqYU(?DxO@rC-|OkO!xE$u_uk=xF0Mt z|CwU*=-^@Z@Mqy)Sx*?>)BfG?TIbXYt0=WN?aYJUW6aWx-}&m#>~YVD`u@{y_Q%iP z%S-Rh5L@2?1t)eHuT7p4wrc;OWu-mSC;kYxNQpXL5y`E6U`t=27`Jdj)NzaMBP=tn z8J^2ZWCc-5A5}Aef~z5dT378JSOK+8zO#eBBbYtR<)8U}2FCI&|E8B;vjV0G22WQ% Jmvv4FO#pdU50wA_ diff --git a/Resources/Textures/_CP/Clothing/Uniforms/PirateTeam/piratewr.rsi/meta.json b/Resources/Textures/_CP/Clothing/Uniforms/PirateTeam/piratewr.rsi/meta.json deleted file mode 100644 index ad70b829fc8..00000000000 --- a/Resources/Textures/_CP/Clothing/Uniforms/PirateTeam/piratewr.rsi/meta.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from Civ13", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "equipped-INNERCLOTHING", - "directions": 4 - }, - { - "name": "icon" - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - } - ] -} \ No newline at end of file diff --git a/Resources/Textures/_CP/Clothing/Uniforms/PirateTeam/pirateyb.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/_CP/Clothing/Uniforms/PirateTeam/pirateyb.rsi/equipped-INNERCLOTHING.png deleted file mode 100644 index bfba137af41c13fbef8c17db7ee2db81fa3f2098..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 966 zcmV;%13CPOP)UY0A=pYnNQ|Zu6XR#_$Vrc$ zxpVU1iBI9pg9-8E&AT_VMkB_6{7I=KD#%5^cDw7mYiF5m8_VqMY(r*#33NMC=6UCt zcW1l2TY%wM17JAT02q!n0ES}?fZmRzr&1rb0u<0sLV&H!@xxcP4t zzI|8@+qnC>4T$S=RP+;_0wm^P4%ct5geGJ)`M5quMPKQA0MCH)jFJI71I{xx17tpY z|H*Td$1B};Yq8!n9GoJC4FfFd}jZN*P+aV``*pf?pA|hA|bmhphr9V7hJ3X94+P zpKj9Dmo|WWF6JHNyM|LNzyGwupt3L^ZGCA2*0;CevHUA^cOlw{w|5)i=2Ud_p9X2` zOBt~GZmUn>)qpl#=+L+S6NKSd17JAT02q!n0ES}?fZ0-=Q@m_{7Nj4L;AN>nR zP1b}&rvRTYFIDqEqB^~1#EGkx<)sY}SD02qEK-gFn!Feje_G|N*sA~x#~J{`kuqRu z>1EG*+I;HudbH{2t_~A-9=$<%{IoLcx^B-UFCODClr!MrY&kl9y#egtJ9I+jaZ%HC z)y7jc;Pd8Y_&Q&!;ihv4#dwB78q9`BR~2ak78j}kFHq3&ENHfyx=6l74AutCDzxM)UL@Jj)GG)LaCV opGiq%z$hj>h&1A`H$yO-zjun}?~$fx`2YX_07*qoM6N<$f`_@jg8%>k diff --git a/Resources/Textures/_CP/Clothing/Uniforms/PirateTeam/pirateyb.rsi/icon.png b/Resources/Textures/_CP/Clothing/Uniforms/PirateTeam/pirateyb.rsi/icon.png deleted file mode 100644 index cbe9e4b178e90635f8497e732b8afbbd2a9ac6a4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 426 zcmV;b0agBqP)Px$WJyFpR9J=Wl}$^-KomvKOcJqmp;T~TDQ<)!h&%sV*IoI`+!hrn(rO!OEl4SD zY-*FtbCEVm#loZ?F3edad5^g__f0a8larH^W5M9MCWGsm*w&VzZJNDuF%?@B|6aGj zwQ3$c;1+&9FBE#o#mHLUE&+fbs1TK^4E?$Q4E?%9r7A&Cu~)Y>uqd*#UzBC_wHtsW z?yx@w;N`XkK-eFDjbYOUf}oO$9ba6frnWMIMdk^t!b%3_3H+IXbtIr{norJ-q_kW9 zwLY5k@tdz!Yg+w?E{l7dpB@s$29(0l8bmN6Xsx+#zv0^~NQMyzU}j(cU8~JBj+w?W zBG$)1HUp6{jHe+ttw%a?K=Y}CR?2Rcs~9jwm_#um&}cN2qZFR&fXZgUY7amXe{4*8 zFABoQAY#(dY}9}PJV)cqUf39T{|JfAmJGDIT_O=&ojA}My3aiX@O0Llkn^AU1p9cI UJ@u;=p8x;=07*qoM6N<$g69yrfdBvi diff --git a/Resources/Textures/_CP/Clothing/Uniforms/PirateTeam/pirateyb.rsi/inhand-left.png b/Resources/Textures/_CP/Clothing/Uniforms/PirateTeam/pirateyb.rsi/inhand-left.png deleted file mode 100644 index c69f5214e92818c322956186ae6d56bed0fa31ac..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 389 zcmV;00eb$4P)Px$KS@MERCt{2**#0cP#DGWqg3&B5i&Sfiequ<=gZv5Pu36MB95WNf|QJn(8BEy zfnpFxwMEFyY$~bPT=jbS zy<8tEugSzDBzxDy{l4zprudKzo7cqT1V~bz&vlFz+9fM5NxNj_kI_PTJ|9J19g_k4 z+|=#;)Hkj7o!7+d1UR?RA>B)oK3-!<(jnb{AKQWR>X^O)<>nrjFOrIzX!8nK=G8G9 zKvns~#+p~v$pFeHHrBkVe}4k5EJB{1AAEE-t6k5&QYCMnfBr4&JOBUy00000VY6(H zJNZ|*YnJV?Njuy(%l0_P6Cl~O$3YIjvONxR0FqsM9P9wB+T&mcP}Qb8yodp`X^$^r j0Bue{kPR#CF#szk!-3Kw__(O{00000NkvXXu0mjfk(0CA diff --git a/Resources/Textures/_CP/Clothing/Uniforms/PirateTeam/pirateyb.rsi/inhand-right.png b/Resources/Textures/_CP/Clothing/Uniforms/PirateTeam/pirateyb.rsi/inhand-right.png deleted file mode 100644 index cf6fc330e1ad8751d67dcd800866d724c56d74d5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 398 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%zJv?0;Ln`LH zy}2=q$x(pq!TkiMYi>J~TwQ{^X4%}o8dhl}ui)!ZdBRm-=Ou29oUVeZ7wgWvQz{q! zzkX7zd;PJU#~3?cAYQPMfml94AA=u6arG&u-9sCdOcP^v=7@lCP>}P5b7R^w~O+)eNA zvEC?86j|{X^ac!T~MIxRU;A|Qq;ztkE~ zJME&K?Pk5W*Kj(&3V%Za@c$hEl?!XtQONz6vf`}$BmwbwFK`~e7+2+Y6rgso0}04V zl%)PU(@X@B-0KCf9zTa0epmMadg3_Ne zl#9<(E<4Zash4+YX(3O&#WKx)S|wfR>Tap<4^}xVc>t_FImGyj75>amxpPVn8HmJ^ z*FnC$c|f}1HGjhbjEwi1@vc^ib%Y7!cD_m$X${fl+CNrDJC6H4_s8>R0bTr3Gob5g z8&kQkUt-^n4od7li6mm}VHW?prEeDK;BQ!fP`JgKVj$bwJ!188>6kj=QC3GB$LWAB zez|9Xit->w31X0;6x($|2fvg6AaRQGku^11-#~O_!l61 z@HA&MSZ}eklR$uCEvwY7%tt2d~A+ z=LiHKpCb@}e2zc>@;L$l$mdWJ01l1l&tDn+(6rlO5j%^It=GVChE!ZBX#u!f%dF^{ zM4Bap*l`Y3M_PJ^2>0de{COm%TLiK5Vh#Xu)3QP0%#Thw%)NS^h_z8cGsKQ_XIK@= zi=drLdlBHyu&M~bRe*dB`In-ax521FH7_XvQZL@q@?!4P3VVID-*n^7%3|cvS2B!m ztPV%WE+3imNeM79IS9g2ZP$jP6p4iB##j$?YBQu4RfjlX8KTRJ&NaENYjZ9d3R22uim2qgI6J35ci z2k=gQA-$np0qzEMcDGsFJRcsHIiK`Zz%BuFUY9Fu2XKKC{9+C&`x4ae1Yu8|V^cK? zxz#<_uC$T>;%FlQ*ish((F|3cfv)ZZo8<^Q<=_VHHcAe4u(G-UHqRsE>kwN5sQOn> zg|YzHnUP)DWpy2!qMQKE%CvWV>!~C_Ge^4~yvQSX8YG|NKUq4xp}_jPk^lez07*qo IM6N<$g7;Mp7XSbN diff --git a/Resources/Textures/_CP/Clothing/Uniforms/PirateTeam/pirateyg.rsi/icon.png b/Resources/Textures/_CP/Clothing/Uniforms/PirateTeam/pirateyg.rsi/icon.png deleted file mode 100644 index 909cce78212556d5243b699a1477d2634df39bc0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 552 zcmV+@0@wYCP)Px$;z>k7R9J=Wm9cKxU=YWD;E!N?2r>gr6Gd4fF;q(1HIecL89R5)BQR%T?+f$| zI`jc5F)$)E6G)XBgc4MQOj&FPf5siCU7&5^D^ywhU%vDGPj~;j`)osw965625MbDD z#KU$YmU0iFC@Ee#uv2@T11KHXzj0d;kQ7&L56c>0S%Vcm@hP__7V)TnqgQL0ED-mNJQopB*mApQ?cWR_^k;@x`)NMljpnZM#?X*WjX#a z6f#Hh>#|wa09~!Kf70acx`A?gY4^`ho1&be6|5tfz$Vy8!2U_|X$5R!0-}BGRP6Y; ztg%W3-n_l!_{D36gRi`Q*TfHFzT7KjQ%{sr6#VLJFFwCGqV=)Q`Na`HYIi$h!Z6~~ zhZ|8&B?$)TcE&4bVuxYGWE4o#WuL&y(`Rv|YU0#PCZhn~(wcG+nS3xD$e7Xh8tu;A3pzjkTa3a4hSh{^)d%x=2h qQ#-kAhAJ`(G_yc6b>-iIC&v#*iRE4yP&AnU0000}3|Ln`LH zy}2>#kb?yKhyAKidfgM&cFleeAh7G3tyTG3<&?5h_rzaZ{=tyf=rnObq{;==g}x80 zrg#T?Uw#qWl>UFe=jW65$IGYl)G-LcfUH*BFQd3$pDsj&SC;CPFh5$V|2uj6pFQ!+ z4gYTZ4ScQjUO$RApu2REfRl@W(yy@a>vL3cwq#tc^p&~Gu=PgGWG049IZcOVCvK1P zV7ReXeA9=t6Pq|06z(tC+HE%X`jl_V3=3kW7)k8fwC-MMoa|b*6?d8J`j`LO7yC1H zZ&lCg{qL35cg`zg+85{NT{qi{ISktO8Ry6ePt=r;S(hFV&+{)37&i=_u6{1-oD!M}3|Ln`LH zy}2>#kb?yKhy98hW5f=wWivmxP@&{)b;-M1?kC<%*{gqH`A5b(Osz_eu__miUXa?s zr>b~t#dH^o_5bQ8KPx(Z{CF+jKSm`Oh&o@hbKcKQ?`G-czS_FV%wpc`dcF0G4Uc!S zXYbmw_PSPnfsJ^Xj8g}PlS{RJ`uR5&d%DzO7R9ZuxskV%l|kjCKxTc<*(5E-gv~Qf zZLxQo#KXw2`)OFVuwLlf+rZhh9GT`BZdqyZf5O{(JVbdXx#t-#4qZA{Pg{?h rW0Uc diff --git a/Resources/Textures/_CP/Clothing/Uniforms/PirateTeam/pirateyg.rsi/meta.json b/Resources/Textures/_CP/Clothing/Uniforms/PirateTeam/pirateyg.rsi/meta.json deleted file mode 100644 index ad70b829fc8..00000000000 --- a/Resources/Textures/_CP/Clothing/Uniforms/PirateTeam/pirateyg.rsi/meta.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from Civ13", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "equipped-INNERCLOTHING", - "directions": 4 - }, - { - "name": "icon" - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - } - ] -} \ No newline at end of file diff --git a/Resources/Textures/_CP/Clothing/pirate.png b/Resources/Textures/_CP/Clothing/pirate.png deleted file mode 100644 index 774083234f05041417a5fe87c29403debee4b79c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 646 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9F5M?jcysy3fA0|S$V zr;B4q#hkaZ>{n?SiX7YD$jvqFQN&KB|0e4WgdMTn!Kxe6w{$PZv~>sE?lw-1ir`oj zx=!7v%_3jUT-fOQLF?!2lM3BF`PQ9WQSgbC-)e5(qB5hI31+irUKXtDobc0?Rin7T zLZ-xeuHVJCWra3!XSW);YWzN1wO38@*A4Ui9So_5GCl-~IBHJart+|8=LPSDGMt%p zGRJqV4bggO82kBTx!?kgmN=0FrvGlAET?W!bb0dZ@&n)BReSe*o*UM{IrseY8*j@b z_}b++`@gT=EBEWKomhA4OwJai+4Z~c+O3<+a=%8LF>uqGlILb76-k?Kz9`#&fAPhP z7f*lGsX5!SUFly`xA~{p^2;Z+?`N{kSeg>O^yc|be6Er#Q+~3?**E_eR$@3K$e7T_ z!BFhNFhiN?fQ%r+vknFWca{cA6sgC$3Vn~agvhSo_~rlZpmzhOnd|AY-D|hq&RsGo zDRD};Id{X|{|N>G*I$Ru_g{7Fl)IB6VC?cbB^;$2#@ zEB_=vSR3ZOz5lo~f1Qcc%Tu|VZyxzs<2EyZ?Jj$2(6(B8v2#ju!W$%OuKoI3cf4q) z%hssBg`ZtGG@3VQOkQy{t4it2-it0X&Wh-XX!bvUC%9qZt(uzwZI$0TpMRbyH~Xw$ z%j@I^dze0b<9HHy>HGYb))mh`*%Rs2!*K`9d4I46x6b=%0!&y8p00i_>zopr0Ek>1 A6951J diff --git a/Resources/Textures/_CP/Clothing/pirate_basic.png b/Resources/Textures/_CP/Clothing/pirate_basic.png deleted file mode 100644 index 13ec755c80abdadbf6e179a3edcd01d5dd0e33d5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 202 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?4jBOuH;Rhv&5C|Kj^ z;uumf=j|0kt^*1@tQW+pCeLwrap^aIEZ01R^oz>`G@V{g(fF}hBkhEDOHOxT%U_T9 zofUIeYdUn@cb#W#JiS~=tMW7FmP5P>v8P40RF^j>y((bN`2JPo+0Q0LwGVc&44X1` o=_%=cnm#{WkP&Dj6d33zFfYy4{80VNZ4yYx)78&qol`;+0FNp|yZ`_I diff --git a/Resources/Textures/_CP/Clothing/piratebandana1.png b/Resources/Textures/_CP/Clothing/piratebandana1.png deleted file mode 100644 index 4deeb130b77c7d2cda9c52c116f345fccd5175de..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 690 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9F5M?jcysy3fA0|Qfv zr;B4q#hkaZcKb;?inRUrDBR%@(=x|Jq(RAXB9m0ssglf~r6--A1Xc)3WzD)`vcyBO z)y0XCo3XDzsH?Z0zdhD$nyvA@Sc$oxMYpA2zh?P-c6aVso7N&9hcoT>)+x=-e){$u z?}qvw^^A`4>=WB=RsLSV{HC_MTVAK(Xudsr+}Wqs_m#2xM+yr?{P|t_y{b~oVkcXi z{;nT}LQO0l=ga@^TBO-{KIgO5`|FyGNB2iEp8L<>9lWmMklA`=C#MMwjtBOAeYZ4Q zeje}6cx7|R51Y%cKQ0eAHl4fNeu@HP``l;GeriPIgsObiEwJ9ZDeV8oJsg|9CohW+ zV&dq267~7<^x1s+>5sbAPjV_KH69HX9YI2($57^WmMEszmrcsheY<2Z|hr5eL2L&gBVFFzUbCW=3F%M4Cu zS=A$7YWLtU+l6^-R{KA{-sB#?ouxCrW#^G&{6Yu*{=7Nu_FUckz{&ly3q5}vdL+46 zW8Q|dbHwKDlyN@C!P4LGwRKMgo9=wU6|?W2|9*Q8*BSSsM}CDI7rPa@(>I*HeeXv} z)c-&FeQV~5OUSfOXln2EkYB{&@p10FZ1cbx$zw}co(bG~?Yf8c#2@<~|LT=06uN{| z)?fX(q4a=vgGhbN*A1-vi|3s8s~6;(_`sG)F8SkOiJq=~E#G?X|31z&;hsCc=fOF( zZU;RW`zv4cJGnKU50TJpkbj~yIp|}Phs5;XH#8?CeQff7_bp!l;@)622WQ%mvv4FO#o2cF!lfd diff --git a/Resources/Textures/_CP/Clothing/piratehat.png b/Resources/Textures/_CP/Clothing/piratehat.png deleted file mode 100644 index e375a1811aaeedb49b13212436c330ef94c39a3c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 643 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9F5M?jcysy3fA0|S$( zr;B4q#hkaZ?7I#*h#cF0ps8u8gtq^K`NxEBbXBmgU(kAd;}-FQmxOPuFy9cw&F#2l z)>-LKhi0VSv``cKeUCro49Cy3I^)2^d*U`3Tcg@;UCd}XnR4hZqa8jVWsKEQ~#dp3&>C7h28jnwC&; zDN#ag?iKOW>Zj>I`3Z3%U!*@iSIhe>@^Q-f$@){hDs1HPpQhhql(CxYck%uA`C;?d zt*kej{n1My|IVMYY0amfCaw2$T7KDa`|Yo%&TA=jY@g1XnDOaI*49H03mn#lZN6<- zrS`dw=S5xHyZ6tGr|i9(xA&9rdxm>KIn%@LAN}d3*TS?UYEK>8e_<_#LxGF}eOwI% zAq*{xnG|G186K`+;BaSkut1S|tgFCt_{j{b=gk-T`wn_Duzzk$-F(yJ^;au{kBNyB z?95Mde*d>O?);qd>9^(QOGwLe>T`Pd?}=KQWFeEZGe#{`dH#X50g*al@7%Zj7Zsez zvPAt}hDlEK?z?ZEus1i_Ze6O>`S@dp(n207_SB$l)^hD*o!oHaN&l|~lM=gllPL$!+ZFD=Klyu%g5#4o z#YyY^nW8TRWW$F`njxgN@xNA29Fw% diff --git a/Resources/Textures/_CP/Clothing/piratejacket1.png b/Resources/Textures/_CP/Clothing/piratejacket1.png deleted file mode 100644 index 7d0cb8f306ce30bbfad7fa908caa1e687beb5ae9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1152 zcmV-`1b_R9P)1RCt{2TiZ_KFc6(UDJ&95Tv{kAka*z*iU0qOO1vOdNT4N9 zZrWCqQfRU{rW3iQmyGL#Mb3GN<6O?n@p$6eZiPHYDFAtnQULNCr2ynPN&(1oSPAfZ ze?R_ndmBtU&l|_b$MN9xH9fEX`bC$Qmsb2D0pKVTo}Hb=&1N&evD@vY*YXsCIe?vd zowl~N==u4X7U9n<00=<(*lrWlZ;lj)2uzOa337=BlfSpTOmQ63Yf|QDu;I@nK%>!! zcWO0NM(b~EY@|eN7+Qgih=L#v!_b)sCjaW{DlI1hL{X&5l}d%)-rlVE=L!JwlarG) z)JD#K0qXfW?oZ%E1d|^Q0}x<19HvLq+whBWfbOJ;S>m_=-oL)SuF7!O1cbnK+=twd z6*C3M+WMxUfQu;5`5BX(=X!_$;Qp-qb0YvRyT89z<&TdKr7kfi^lY-{ZjO#g|E#B9f}aGD0NnaZD=TC5 zeEt*jfJgui{pkIDte(${$OAkaM%bJ6HV_Gb@P@OKA^_dOtalCcZ}jt*mzOWsZ2G@? zF6)i>wqhcppO8cbks=NPswPI*PE2Is$59^-ppMUBgU$Fu6amwmbNSPE9!w_}9dwm* zg5)_$0myTd0+8n@1t8B+3P7Ht6o5QODS*vGSQ6Lg-HZG+r~@lUT&~q>YNcBG4zU1C z3PP+BU0q$Jbwvqb+Q9RWsF&Jc6#=`uyXtszbA#O)m?v<$9F_%ZYir65*l=)gpz3T^ zkwgMOVW^II_=krF+S}Vx&SN&1_YCA61#ANV?xUk4y1TnmVvOoVHY}6`FD@<=Y2HiY zlfay?VS9Vq`aNO+(C5(ly^u`gglQ|rc>k?m zVOAYwbP4pwq9XvDNryyn%pU1`ta1RU{Q$%xFXj9qyELQ#SG)bWH;_kvY+LR*0AR-% z=#ODooB+(pQOEY!G=h^H&}#jqB7u<~KD#c4-y#7DI(W#7hwxC?p@hKt2hxjCyCEX%F)|1-NcsWk!HulcWwmjd&pf`n<2pOeo1K}E znGfjv_`df(?|t6)``+%pZ#jh=kpL8OL;_IA5eYycM!15{RM z@4ZP{TZ_2wxU$h+D*WPiBmf$J{z9Q6hgEt%t?19HX6^*+cu!<)FBMk&;}iRH_G3rC zkz0Oe0_cskHP>s4KWdEUR0{vUuRW`Dn^UTS-N)V3nky??I2~lC{NntjCUdw@?)@dwN*Jgo&h)fn+i}! z4j>M#0K3;BSn&fq=u-I|c>p)cGtG-lAz(*Y{Ndhfi1y16Fkb#Ctmr zz*fcNT;B~urxnf2KQfasLZBEB0w)Ui?FJ9n3V_PPiTpEM3fGa*2K|59vd;Sb*WKVZ z<6l+R)-8f~cFP}q6qYG`=k^Wb+W+9u2HS=1ZsXc@{T}&+&a>y}(1AvJJor@ifc$&J z{?*GD>C@L)n(QBxYEw!844ij`LOdH9@@4B|U`I&4dPzzBzFb)!)_8^}Tux@^aV&s& zODqO2wmv(k>Ix}JrEzbLd$U~@TWSs9!NcXvUcjFXggqnG=9Ut`>;YCEh-0mJL700@yX|SIh^&v!z174@3e`$Po!ZAx9(tg&dIp6mmoYP{j2zAp0UMfK{?Wa%>+hWwL?&FoIu(s^c*_dHg%sC2lx@lmH+eO;k`_ zb&TG>6DP*Wu|=wiRT%e}4Zl5t2MH=bi<`k`^?Y2uoLvoXI3%C;C zeAma^U^zhw2+9M@z(Odv)71BHuXKHB0eWuDna=*nh<~1upge#9Zte$;!qKW>?^62QxS*b8uf5Q?&hz7ES2&Y#g+BfDB!TAUMrqu5Nl z`9>=30d^t;@pag1epew7)c5`%_@gy|LXJoP3OW7(wSPZ}6unEn00000NkvXXu0mjf D39Kv^ diff --git a/Resources/Textures/_CP/Clothing/piratejacket3.png b/Resources/Textures/_CP/Clothing/piratejacket3.png deleted file mode 100644 index ad828e1eb852d9ab29bf88649d1a482c19ee2b8c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 599 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9F5M?jcysy3fA0|OJM zr;B4q#hkaZ_In+6kU73TXkow$g_L(KmKv<&h5WnM*W}pDN$H>gB3TumA5Ig(vLOV%$9cb8XP{itSHkzjWy^ zRR}%)#$%tm&u)JHC#i4i9!|e7`@p^+zmVhN>=v9qXKTIf{`*pF$4vGkSy2S+f0iCE8iCDGqhISKTyVPbGQ1Ad;(LeLx8SN+;P@RDHeivLtmO` zU*>r4yq@voroB3Ld?y{}1{{AU=8!FZvhdAs23e2wXI`Yf)+=$F&vR} z5K5b|C2y7Pv&#m5(;GY(djBb&t*@LXBv)Aft5E3d-)e+RaoDz=l-wQ)$nxH zvdjj>1q!>x_Dp!tsln97b+7fZt;*ZjuG0-SL}oJ1dH0S@Lu6yax~cPw683vLXT7*; zUB4sSGQKQCVI1cJ#N2dsgY;>5y=Nq z&-i{Ef9iZ7_cwFFE3uQBP1hUrep|kU^p$m7{F}s@a=zj4 zoapDf<&Q`z)V}>0!S-dX!u73|ry7>MjQ79r@ke~BbHS>+Ys_7}kDxp0Gwa3Ghc3u} STxt%Ca|TaWKbLh*2~7ZdPVuDx diff --git a/Resources/Textures/_CP/Clothing/piratejacket5.png b/Resources/Textures/_CP/Clothing/piratejacket5.png deleted file mode 100644 index 78d82c9bf75c22bf681f7b89039c5b6e5ecb4cfd..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1181 zcmV;O1Y-M%P)x*i8te=p>X8m>Ub?YHj3Uvr;G>rtdei-|o1(Gdthx%v@%E zm)V&&^S$?e-}~M-v+o^2#1RvKh$AKd5l2h_B952#UOcsT`~$CXuJbP_ei^3fsa zT?zB|jloiRwFpYTD*`z9^B1+a+^ON?TCF(ObgL1R^EyyoUM5@z!e+`VCG$ZC>#>Mtq$2m0CM;JYw0kE;`7z)2z-9)G4TDMML4%* zIPV0?4HCqWQPb~2zbyebuh;4;tD3RiQxi!roEVOj*+l?h+=ryj=SURCnP1eDNs#)x z9szGBwy<*0h;C#nKF9mI+OlXFcBkK#0P~?*om)%47;Mgx^qeAq=+7zVmgL3xa{5=s z3$tqn%5k8k-*E{@BSt3=5Aykyv+)c&uQPA2KPzU|jKIwH;XJ@|iR5OsM(B4Pc@>jj zbu(B!g4VC}Ezo;^%s8f=jg-g|BV%A{n7dah^9zYv186_rjMqgvzFazoy90NS+7Rjg z>9o?AN(3wj$C=&HP%2v;8_92jL4XN(LpZllMt1SjW}Xz)_Ycw^zh&W;b5OKr=czH-RD-c06LxgFIG6Ch971EPtRVJ)IM)=PVD@3hBfK%g!8z>P# z#dJ2&q#?ZsG{QWxN|RZyz8LBT)UhyV>ZC2w25D1Ze~VioOH;C3E=$vuYKDG*I;bnN zUTT9Ecus<{R*$Aa1UOZV{Q`Ax=4EY=Hl%WW0bbzSE=W%g;zy5g@^JpUv69J_6b{JE1n7G6CFn%+j-F zoZm)aAFk9l;0LIq-EuC=;PZ=SPe5JHF1Ju7z^}T05TI>tsz+A%k_6>87#8w7kPlEM zfFVBv^F?EPctAgO@&t|_t2bl|&w^`?utGL!{QA9%3qN=C2NTmZ(zad2u{=e9T=#o3 z)7Y~L0xpnBuo!ajL>w^zh&cWOv$7qkf4DiB00000NkvXXu0mjfw2dO~ diff --git a/Resources/Textures/_CP/Clothing/png-to-meta.py b/Resources/Textures/_CP/Clothing/png-to-meta.py deleted file mode 100644 index 507ee7235a9..00000000000 --- a/Resources/Textures/_CP/Clothing/png-to-meta.py +++ /dev/null @@ -1,57 +0,0 @@ -import json -import os -import tkinter as tk -from tkinter import simpledialog -from PIL import Image - -# Генерация meta.json -def generate_meta_json(width, height, directions): - # Собирает все png файлы в папке - png_files = [f for f in os.listdir('.') if f.endswith('.png')] - - # Создает список states - states = [] - for file in png_files: - # Проверяет разрешение изображения - with Image.open(file) as img: - img_width, img_height = img.size - - state = {"name": file.replace('.png', '')} - # Добавляет "directions" только если при запуске их указано >1 и разрешение файла не совпадает с указанным разрешением - if (img_width != width or img_height != height) and directions > 1: - state["directions"] = directions - - states.append(state) - - # Генерация заполнения меты - meta = { - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Python generated", - "size": { - "x": width, - "y": height - }, - "states": states - } - - # Сохранение JSON - with open('meta.json', 'w') as json_file: - json.dump(meta, json_file, indent=4) - -# Интерфейс вся хуйня -def ask_user_input(): - root = tk.Tk() - root.withdraw() # Скрыть мусор - - # Спросить за базар - width = simpledialog.askinteger("Input", "Ширина в пикселях (X):", parent=root, minvalue=1) - height = simpledialog.askinteger("Input", "Высота в пикселях (Y):", parent=root, minvalue=1) - directions = simpledialog.askinteger("Input", "Количество направлений:", parent=root, minvalue=0) - - # Закончить с генерацией - if width is not None and height is not None and directions is not None: - generate_meta_json(width, height, directions) - -ask_user_input() -