From 9f9cea3ddefcd23605341119f05a3f1e9bafd287 Mon Sep 17 00:00:00 2001 From: Dvir Date: Sat, 28 Dec 2024 04:59:11 +0200 Subject: [PATCH 1/9] Fixup --- Resources/Prototypes/_NF/Shipyard/BlackMarket/barnacle.yml | 3 +++ Resources/Prototypes/_NF/Shipyard/BlackMarket/bocakillo.yml | 3 +++ Resources/Prototypes/_NF/Shipyard/BlackMarket/falcon.yml | 3 +++ Resources/Prototypes/_NF/Shipyard/BlackMarket/menace.yml | 3 +++ Resources/Prototypes/_NF/Shipyard/BlackMarket/schooner.yml | 3 +++ Resources/Prototypes/_NF/Shipyard/Syndicate/hunter.yml | 3 +++ Resources/Prototypes/_NF/Shipyard/Syndicate/infiltrator.yml | 3 +++ 7 files changed, 21 insertions(+) diff --git a/Resources/Prototypes/_NF/Shipyard/BlackMarket/barnacle.yml b/Resources/Prototypes/_NF/Shipyard/BlackMarket/barnacle.yml index 203a86228e3..90d454a0e0d 100644 --- a/Resources/Prototypes/_NF/Shipyard/BlackMarket/barnacle.yml +++ b/Resources/Prototypes/_NF/Shipyard/BlackMarket/barnacle.yml @@ -16,6 +16,9 @@ - Pirate engine: - Plasma + addComponents: + - type: IFF + flags: [HideLabel] - type: gameMap id: Barnacle diff --git a/Resources/Prototypes/_NF/Shipyard/BlackMarket/bocakillo.yml b/Resources/Prototypes/_NF/Shipyard/BlackMarket/bocakillo.yml index 96715fd810d..8211c9954e7 100644 --- a/Resources/Prototypes/_NF/Shipyard/BlackMarket/bocakillo.yml +++ b/Resources/Prototypes/_NF/Shipyard/BlackMarket/bocakillo.yml @@ -21,6 +21,9 @@ - Pirate engine: - Plasma + addComponents: + - type: IFF + flags: [HideLabel] - type: gameMap id: Bocakillo diff --git a/Resources/Prototypes/_NF/Shipyard/BlackMarket/falcon.yml b/Resources/Prototypes/_NF/Shipyard/BlackMarket/falcon.yml index 3f94499b370..b84d5959985 100644 --- a/Resources/Prototypes/_NF/Shipyard/BlackMarket/falcon.yml +++ b/Resources/Prototypes/_NF/Shipyard/BlackMarket/falcon.yml @@ -16,6 +16,9 @@ - Pirate engine: - Plasma + addComponents: + - type: IFF + flags: [HideLabel] - type: gameMap id: Falcon diff --git a/Resources/Prototypes/_NF/Shipyard/BlackMarket/menace.yml b/Resources/Prototypes/_NF/Shipyard/BlackMarket/menace.yml index f4e2d9ef6d6..0549f4aa144 100644 --- a/Resources/Prototypes/_NF/Shipyard/BlackMarket/menace.yml +++ b/Resources/Prototypes/_NF/Shipyard/BlackMarket/menace.yml @@ -21,6 +21,9 @@ - Pirate engine: - Plasma + addComponents: + - type: IFF + flags: [HideLabel] - type: gameMap id: Menace diff --git a/Resources/Prototypes/_NF/Shipyard/BlackMarket/schooner.yml b/Resources/Prototypes/_NF/Shipyard/BlackMarket/schooner.yml index a3c4a49c4f9..95ebb973319 100644 --- a/Resources/Prototypes/_NF/Shipyard/BlackMarket/schooner.yml +++ b/Resources/Prototypes/_NF/Shipyard/BlackMarket/schooner.yml @@ -11,6 +11,9 @@ - Pirate engine: - Uranium + addComponents: + - type: IFF + flags: [HideLabel] - type: gameMap id: Schooner diff --git a/Resources/Prototypes/_NF/Shipyard/Syndicate/hunter.yml b/Resources/Prototypes/_NF/Shipyard/Syndicate/hunter.yml index e52c03a387c..94d44d946eb 100644 --- a/Resources/Prototypes/_NF/Shipyard/Syndicate/hunter.yml +++ b/Resources/Prototypes/_NF/Shipyard/Syndicate/hunter.yml @@ -11,6 +11,9 @@ - Syndicate engine: - Plasma + addComponents: + - type: IFF + flags: [HideLabel] - type: gameMap id: Hunter diff --git a/Resources/Prototypes/_NF/Shipyard/Syndicate/infiltrator.yml b/Resources/Prototypes/_NF/Shipyard/Syndicate/infiltrator.yml index 7b9d70685b2..40bb603de2c 100644 --- a/Resources/Prototypes/_NF/Shipyard/Syndicate/infiltrator.yml +++ b/Resources/Prototypes/_NF/Shipyard/Syndicate/infiltrator.yml @@ -11,6 +11,9 @@ - Syndicate engine: - AME + addComponents: + - type: IFF + flags: [HideLabel] - type: gameMap id: Infiltrator From 297233146ba8c30d980dc12b0001628181c77429 Mon Sep 17 00:00:00 2001 From: Dvir Date: Sat, 28 Dec 2024 05:03:25 +0200 Subject: [PATCH 2/9] The rest --- Resources/Maps/_NF/Shuttles/BlackMarket/barnacle.yml | 3 --- Resources/Maps/_NF/Shuttles/BlackMarket/bocakillo.yml | 2 -- Resources/Maps/_NF/Shuttles/BlackMarket/falcon.yml | 2 -- Resources/Maps/_NF/Shuttles/BlackMarket/schooner.yml | 3 --- Resources/Maps/_NF/Shuttles/Syndicate/hunter.yml | 3 --- Resources/Maps/_NF/Shuttles/Syndicate/infiltrator.yml | 3 --- Resources/Prototypes/_NF/Shipyard/BlackMarket/barnacle.yml | 1 + Resources/Prototypes/_NF/Shipyard/BlackMarket/bocakillo.yml | 1 + Resources/Prototypes/_NF/Shipyard/BlackMarket/falcon.yml | 1 + Resources/Prototypes/_NF/Shipyard/BlackMarket/menace.yml | 1 + Resources/Prototypes/_NF/Shipyard/BlackMarket/schooner.yml | 1 + Resources/Prototypes/_NF/Shipyard/Syndicate/hunter.yml | 1 + Resources/Prototypes/_NF/Shipyard/Syndicate/infiltrator.yml | 1 + 13 files changed, 7 insertions(+), 16 deletions(-) diff --git a/Resources/Maps/_NF/Shuttles/BlackMarket/barnacle.yml b/Resources/Maps/_NF/Shuttles/BlackMarket/barnacle.yml index 1308cd190c1..16515bcddfb 100644 --- a/Resources/Maps/_NF/Shuttles/BlackMarket/barnacle.yml +++ b/Resources/Maps/_NF/Shuttles/BlackMarket/barnacle.yml @@ -48,9 +48,6 @@ entities: bodyType: Dynamic - type: Fixtures fixtures: {} - - type: IFF - color: '#FFC000FF' - flags: HideLabel - type: OccluderTree - type: Shuttle - type: GridPathfinding diff --git a/Resources/Maps/_NF/Shuttles/BlackMarket/bocakillo.yml b/Resources/Maps/_NF/Shuttles/BlackMarket/bocakillo.yml index c8ee4aaeb40..fd01f53615d 100644 --- a/Resources/Maps/_NF/Shuttles/BlackMarket/bocakillo.yml +++ b/Resources/Maps/_NF/Shuttles/BlackMarket/bocakillo.yml @@ -51,8 +51,6 @@ entities: bodyType: Dynamic - type: Fixtures fixtures: {} - - type: IFF - flags: HideLabel - type: OccluderTree - type: SpreaderGrid - type: Shuttle diff --git a/Resources/Maps/_NF/Shuttles/BlackMarket/falcon.yml b/Resources/Maps/_NF/Shuttles/BlackMarket/falcon.yml index dc6c266bef2..88a2a146ead 100644 --- a/Resources/Maps/_NF/Shuttles/BlackMarket/falcon.yml +++ b/Resources/Maps/_NF/Shuttles/BlackMarket/falcon.yml @@ -68,8 +68,6 @@ entities: bodyType: Dynamic - type: Fixtures fixtures: {} - - type: IFF - flags: HideLabel - type: OccluderTree - type: SpreaderGrid - type: Shuttle diff --git a/Resources/Maps/_NF/Shuttles/BlackMarket/schooner.yml b/Resources/Maps/_NF/Shuttles/BlackMarket/schooner.yml index 83f7e001450..2310826fc33 100644 --- a/Resources/Maps/_NF/Shuttles/BlackMarket/schooner.yml +++ b/Resources/Maps/_NF/Shuttles/BlackMarket/schooner.yml @@ -50,9 +50,6 @@ entities: bodyType: Dynamic - type: Fixtures fixtures: {} - - type: IFF - color: '#FFC000FF' - flags: HideLabel - type: OccluderTree - type: SpreaderGrid - type: Shuttle diff --git a/Resources/Maps/_NF/Shuttles/Syndicate/hunter.yml b/Resources/Maps/_NF/Shuttles/Syndicate/hunter.yml index 30c5b895420..cceeffcc4e0 100644 --- a/Resources/Maps/_NF/Shuttles/Syndicate/hunter.yml +++ b/Resources/Maps/_NF/Shuttles/Syndicate/hunter.yml @@ -44,9 +44,6 @@ entities: bodyType: Dynamic - type: Fixtures fixtures: {} - - type: IFF - color: '#FFC000FF' - flags: HideLabel - type: OccluderTree - type: SpreaderGrid - type: Shuttle diff --git a/Resources/Maps/_NF/Shuttles/Syndicate/infiltrator.yml b/Resources/Maps/_NF/Shuttles/Syndicate/infiltrator.yml index 320482a0152..7ee3dda53e5 100644 --- a/Resources/Maps/_NF/Shuttles/Syndicate/infiltrator.yml +++ b/Resources/Maps/_NF/Shuttles/Syndicate/infiltrator.yml @@ -537,9 +537,6 @@ entities: id: syndlogo8 decals: 19: 0,-6 - - type: IFF - color: '#FFC000FF' - flags: HideLabel - type: OccluderTree - type: Shuttle - type: RadiationGridResistance diff --git a/Resources/Prototypes/_NF/Shipyard/BlackMarket/barnacle.yml b/Resources/Prototypes/_NF/Shipyard/BlackMarket/barnacle.yml index 90d454a0e0d..c72cee5b43c 100644 --- a/Resources/Prototypes/_NF/Shipyard/BlackMarket/barnacle.yml +++ b/Resources/Prototypes/_NF/Shipyard/BlackMarket/barnacle.yml @@ -18,6 +18,7 @@ - Plasma addComponents: - type: IFF + color: '#FFC000FF' flags: [HideLabel] - type: gameMap diff --git a/Resources/Prototypes/_NF/Shipyard/BlackMarket/bocakillo.yml b/Resources/Prototypes/_NF/Shipyard/BlackMarket/bocakillo.yml index 8211c9954e7..09aaa4feb0f 100644 --- a/Resources/Prototypes/_NF/Shipyard/BlackMarket/bocakillo.yml +++ b/Resources/Prototypes/_NF/Shipyard/BlackMarket/bocakillo.yml @@ -23,6 +23,7 @@ - Plasma addComponents: - type: IFF + color: '#FFC000FF' flags: [HideLabel] - type: gameMap diff --git a/Resources/Prototypes/_NF/Shipyard/BlackMarket/falcon.yml b/Resources/Prototypes/_NF/Shipyard/BlackMarket/falcon.yml index b84d5959985..0d37c46b5ac 100644 --- a/Resources/Prototypes/_NF/Shipyard/BlackMarket/falcon.yml +++ b/Resources/Prototypes/_NF/Shipyard/BlackMarket/falcon.yml @@ -18,6 +18,7 @@ - Plasma addComponents: - type: IFF + color: '#FFC000FF' flags: [HideLabel] - type: gameMap diff --git a/Resources/Prototypes/_NF/Shipyard/BlackMarket/menace.yml b/Resources/Prototypes/_NF/Shipyard/BlackMarket/menace.yml index 0549f4aa144..239a07e4c7b 100644 --- a/Resources/Prototypes/_NF/Shipyard/BlackMarket/menace.yml +++ b/Resources/Prototypes/_NF/Shipyard/BlackMarket/menace.yml @@ -23,6 +23,7 @@ - Plasma addComponents: - type: IFF + color: '#FFC000FF' flags: [HideLabel] - type: gameMap diff --git a/Resources/Prototypes/_NF/Shipyard/BlackMarket/schooner.yml b/Resources/Prototypes/_NF/Shipyard/BlackMarket/schooner.yml index 95ebb973319..9de90703346 100644 --- a/Resources/Prototypes/_NF/Shipyard/BlackMarket/schooner.yml +++ b/Resources/Prototypes/_NF/Shipyard/BlackMarket/schooner.yml @@ -13,6 +13,7 @@ - Uranium addComponents: - type: IFF + color: '#FFC000FF' flags: [HideLabel] - type: gameMap diff --git a/Resources/Prototypes/_NF/Shipyard/Syndicate/hunter.yml b/Resources/Prototypes/_NF/Shipyard/Syndicate/hunter.yml index 94d44d946eb..1668267bb33 100644 --- a/Resources/Prototypes/_NF/Shipyard/Syndicate/hunter.yml +++ b/Resources/Prototypes/_NF/Shipyard/Syndicate/hunter.yml @@ -13,6 +13,7 @@ - Plasma addComponents: - type: IFF + color: '#FFC000FF' flags: [HideLabel] - type: gameMap diff --git a/Resources/Prototypes/_NF/Shipyard/Syndicate/infiltrator.yml b/Resources/Prototypes/_NF/Shipyard/Syndicate/infiltrator.yml index 40bb603de2c..43cad051a6d 100644 --- a/Resources/Prototypes/_NF/Shipyard/Syndicate/infiltrator.yml +++ b/Resources/Prototypes/_NF/Shipyard/Syndicate/infiltrator.yml @@ -13,6 +13,7 @@ - AME addComponents: - type: IFF + color: '#FFC000FF' flags: [HideLabel] - type: gameMap From 6825d155f0b2b45473d355bd0f6de1b1a99e27b5 Mon Sep 17 00:00:00 2001 From: Dvir Date: Sat, 28 Dec 2024 05:18:48 +0200 Subject: [PATCH 3/9] Fix yml --- Resources/Prototypes/_NF/Shipyard/BlackMarket/barnacle.yml | 4 ++-- Resources/Prototypes/_NF/Shipyard/BlackMarket/bocakillo.yml | 4 ++-- Resources/Prototypes/_NF/Shipyard/BlackMarket/falcon.yml | 4 ++-- Resources/Prototypes/_NF/Shipyard/BlackMarket/menace.yml | 4 ++-- Resources/Prototypes/_NF/Shipyard/BlackMarket/schooner.yml | 4 ++-- Resources/Prototypes/_NF/Shipyard/Syndicate/hunter.yml | 4 ++-- Resources/Prototypes/_NF/Shipyard/Syndicate/infiltrator.yml | 4 ++-- 7 files changed, 14 insertions(+), 14 deletions(-) diff --git a/Resources/Prototypes/_NF/Shipyard/BlackMarket/barnacle.yml b/Resources/Prototypes/_NF/Shipyard/BlackMarket/barnacle.yml index c72cee5b43c..cfb07076c6e 100644 --- a/Resources/Prototypes/_NF/Shipyard/BlackMarket/barnacle.yml +++ b/Resources/Prototypes/_NF/Shipyard/BlackMarket/barnacle.yml @@ -18,8 +18,8 @@ - Plasma addComponents: - type: IFF - color: '#FFC000FF' - flags: [HideLabel] + color: '#FFFFFFFF' + flags: [IsPlayerShuttle, HideLabel] - type: gameMap id: Barnacle diff --git a/Resources/Prototypes/_NF/Shipyard/BlackMarket/bocakillo.yml b/Resources/Prototypes/_NF/Shipyard/BlackMarket/bocakillo.yml index 09aaa4feb0f..af58a3d1f6f 100644 --- a/Resources/Prototypes/_NF/Shipyard/BlackMarket/bocakillo.yml +++ b/Resources/Prototypes/_NF/Shipyard/BlackMarket/bocakillo.yml @@ -23,8 +23,8 @@ - Plasma addComponents: - type: IFF - color: '#FFC000FF' - flags: [HideLabel] + color: '#FFFFFFFF' + flags: [IsPlayerShuttle, HideLabel] - type: gameMap id: Bocakillo diff --git a/Resources/Prototypes/_NF/Shipyard/BlackMarket/falcon.yml b/Resources/Prototypes/_NF/Shipyard/BlackMarket/falcon.yml index 0d37c46b5ac..cbffc192a61 100644 --- a/Resources/Prototypes/_NF/Shipyard/BlackMarket/falcon.yml +++ b/Resources/Prototypes/_NF/Shipyard/BlackMarket/falcon.yml @@ -18,8 +18,8 @@ - Plasma addComponents: - type: IFF - color: '#FFC000FF' - flags: [HideLabel] + color: '#FFFFFFFF' + flags: [IsPlayerShuttle, HideLabel] - type: gameMap id: Falcon diff --git a/Resources/Prototypes/_NF/Shipyard/BlackMarket/menace.yml b/Resources/Prototypes/_NF/Shipyard/BlackMarket/menace.yml index 239a07e4c7b..9cc3c19ff61 100644 --- a/Resources/Prototypes/_NF/Shipyard/BlackMarket/menace.yml +++ b/Resources/Prototypes/_NF/Shipyard/BlackMarket/menace.yml @@ -23,8 +23,8 @@ - Plasma addComponents: - type: IFF - color: '#FFC000FF' - flags: [HideLabel] + color: '#FFFFFFFF' + flags: [IsPlayerShuttle, HideLabel] - type: gameMap id: Menace diff --git a/Resources/Prototypes/_NF/Shipyard/BlackMarket/schooner.yml b/Resources/Prototypes/_NF/Shipyard/BlackMarket/schooner.yml index 9de90703346..bb8f4062674 100644 --- a/Resources/Prototypes/_NF/Shipyard/BlackMarket/schooner.yml +++ b/Resources/Prototypes/_NF/Shipyard/BlackMarket/schooner.yml @@ -13,8 +13,8 @@ - Uranium addComponents: - type: IFF - color: '#FFC000FF' - flags: [HideLabel] + color: '#FFFFFFFF' + flags: [IsPlayerShuttle, HideLabel] - type: gameMap id: Schooner diff --git a/Resources/Prototypes/_NF/Shipyard/Syndicate/hunter.yml b/Resources/Prototypes/_NF/Shipyard/Syndicate/hunter.yml index 1668267bb33..e044fe8e777 100644 --- a/Resources/Prototypes/_NF/Shipyard/Syndicate/hunter.yml +++ b/Resources/Prototypes/_NF/Shipyard/Syndicate/hunter.yml @@ -13,8 +13,8 @@ - Plasma addComponents: - type: IFF - color: '#FFC000FF' - flags: [HideLabel] + color: '#FFFFFFFF' + flags: [IsPlayerShuttle, HideLabel] - type: gameMap id: Hunter diff --git a/Resources/Prototypes/_NF/Shipyard/Syndicate/infiltrator.yml b/Resources/Prototypes/_NF/Shipyard/Syndicate/infiltrator.yml index 43cad051a6d..1f5b2130547 100644 --- a/Resources/Prototypes/_NF/Shipyard/Syndicate/infiltrator.yml +++ b/Resources/Prototypes/_NF/Shipyard/Syndicate/infiltrator.yml @@ -13,8 +13,8 @@ - AME addComponents: - type: IFF - color: '#FFC000FF' - flags: [HideLabel] + color: '#FFFFFFFF' + flags: [IsPlayerShuttle, HideLabel] - type: gameMap id: Infiltrator From 3fe4006ff84e52be741decff43a687b4d5f689c1 Mon Sep 17 00:00:00 2001 From: Dvir Date: Sat, 28 Dec 2024 05:30:45 +0200 Subject: [PATCH 4/9] Small fix --- .../Shipyard/Systems/ShipyardSystem.Consoles.cs | 10 ---------- .../_NF/Shipyard/Expedition/ambition.yml | 4 ++++ .../Prototypes/_NF/Shipyard/Expedition/anchor.yml | 4 ++++ .../_NF/Shipyard/Expedition/brigand.yml | 4 ++++ .../Prototypes/_NF/Shipyard/Expedition/charon.yml | 6 +++++- .../_NF/Shipyard/Expedition/decadedove.yml | 4 ++++ .../_NF/Shipyard/Expedition/dragonfly.yml | 4 ++++ .../_NF/Shipyard/Expedition/gasbender.yml | 4 ++++ .../Prototypes/_NF/Shipyard/Expedition/gourd.yml | 4 ++++ .../_NF/Shipyard/Expedition/pathfinder.yml | 4 ++++ .../_NF/Shipyard/Expedition/sprinter.yml | 4 ++++ .../Prototypes/_NF/Shipyard/Nfsd/broadhead.yml | 4 ++++ Resources/Prototypes/_NF/Shipyard/Nfsd/cleric.yml | 4 ++++ .../Prototypes/_NF/Shipyard/Nfsd/empress.yml | 15 +++++++++------ .../Prototypes/_NF/Shipyard/Nfsd/fighter.yml | 4 ++++ .../Prototypes/_NF/Shipyard/Nfsd/hospitaller.yml | 4 ++++ .../Prototypes/_NF/Shipyard/Nfsd/interceptor.yml | 4 ++++ .../Prototypes/_NF/Shipyard/Nfsd/paladin.yml | 4 ++++ .../Prototypes/_NF/Shipyard/Nfsd/prowler.yml | 4 ++++ Resources/Prototypes/_NF/Shipyard/Nfsd/rogue.yml | 4 ++++ .../Prototypes/_NF/Shipyard/Nfsd/templar.yml | 4 ++++ Resources/Prototypes/_NF/Shipyard/Nfsd/wasp.yml | 4 ++++ .../Prototypes/_NF/Shipyard/Nfsd/wendigo.yml | 4 ++++ Resources/Prototypes/_NF/Shipyard/Scrap/bison.yml | 4 ++++ .../Prototypes/_NF/Shipyard/Scrap/canister.yml | 4 ++++ .../Prototypes/_NF/Shipyard/Scrap/disciple.yml | 4 ++++ .../Prototypes/_NF/Shipyard/Scrap/nugget.yml | 4 ++++ .../Prototypes/_NF/Shipyard/Scrap/orange.yml | 4 ++++ Resources/Prototypes/_NF/Shipyard/Scrap/point.yml | 4 ++++ Resources/Prototypes/_NF/Shipyard/Scrap/tide.yml | 4 ++++ .../Prototypes/_NF/Shipyard/Sr/bottleneck.yml | 4 ++++ Resources/Prototypes/_NF/Shipyard/Sr/broom.yml | 4 ++++ .../Prototypes/_NF/Shipyard/Sr/chauffeur.yml | 4 ++++ Resources/Prototypes/_NF/Shipyard/Sr/mailpod.yml | 4 ++++ Resources/Prototypes/_NF/Shipyard/Sr/parcel.yml | 4 ++++ Resources/Prototypes/_NF/Shipyard/Sr/watchdog.yml | 4 ++++ Resources/Prototypes/_NF/Shipyard/akupara.yml | 4 ++++ Resources/Prototypes/_NF/Shipyard/apothecary.yml | 4 ++++ Resources/Prototypes/_NF/Shipyard/barge.yml | 4 ++++ Resources/Prototypes/_NF/Shipyard/bazaar.yml | 4 ++++ Resources/Prototypes/_NF/Shipyard/beaker.yml | 4 ++++ Resources/Prototypes/_NF/Shipyard/bocadillo.yml | 4 ++++ Resources/Prototypes/_NF/Shipyard/bodkin.yml | 4 ++++ Resources/Prototypes/_NF/Shipyard/bookworm.yml | 4 ++++ Resources/Prototypes/_NF/Shipyard/bulker.yml | 4 ++++ Resources/Prototypes/_NF/Shipyard/caduceus.yml | 4 ++++ Resources/Prototypes/_NF/Shipyard/camper.yml | 4 ++++ Resources/Prototypes/_NF/Shipyard/ceres.yml | 4 ++++ Resources/Prototypes/_NF/Shipyard/chisel.yml | 4 ++++ Resources/Prototypes/_NF/Shipyard/comet.yml | 4 ++++ Resources/Prototypes/_NF/Shipyard/construct.yml | 4 ++++ Resources/Prototypes/_NF/Shipyard/crescent.yml | 4 ++++ Resources/Prototypes/_NF/Shipyard/eagle.yml | 4 ++++ Resources/Prototypes/_NF/Shipyard/garden.yml | 4 ++++ Resources/Prototypes/_NF/Shipyard/hammer.yml | 4 ++++ .../Prototypes/_NF/Shipyard/harbormaster.yml | 4 ++++ Resources/Prototypes/_NF/Shipyard/hauler.yml | 4 ++++ Resources/Prototypes/_NF/Shipyard/honker.yml | 4 ++++ .../Prototypes/_NF/Shipyard/investigator.yml | 4 ++++ Resources/Prototypes/_NF/Shipyard/kestrel.yml | 4 ++++ Resources/Prototypes/_NF/Shipyard/kilderkin.yml | 4 ++++ Resources/Prototypes/_NF/Shipyard/lantern.yml | 4 ++++ Resources/Prototypes/_NF/Shipyard/legman.yml | 4 ++++ Resources/Prototypes/_NF/Shipyard/liquidator.yml | 4 ++++ Resources/Prototypes/_NF/Shipyard/loader.yml | 4 ++++ Resources/Prototypes/_NF/Shipyard/lyrae.yml | 4 ++++ Resources/Prototypes/_NF/Shipyard/mccargo.yml | 4 ++++ Resources/Prototypes/_NF/Shipyard/mcdelivery.yml | 4 ++++ Resources/Prototypes/_NF/Shipyard/phoenix.yml | 4 ++++ Resources/Prototypes/_NF/Shipyard/piecrust.yml | 4 ++++ Resources/Prototypes/_NF/Shipyard/pioneer.yml | 4 ++++ Resources/Prototypes/_NF/Shipyard/placebo.yml | 4 ++++ Resources/Prototypes/_NF/Shipyard/prospector.yml | 4 ++++ Resources/Prototypes/_NF/Shipyard/pts.yml | 4 ++++ Resources/Prototypes/_NF/Shipyard/searchlight.yml | 4 ++++ Resources/Prototypes/_NF/Shipyard/skipper.yml | 4 ++++ Resources/Prototypes/_NF/Shipyard/sparrow.yml | 4 ++++ Resources/Prototypes/_NF/Shipyard/spectre.yml | 4 ++++ Resources/Prototypes/_NF/Shipyard/spirit.yml | 4 ++++ Resources/Prototypes/_NF/Shipyard/stasis.yml | 4 ++++ Resources/Prototypes/_NF/Shipyard/stellaris.yml | 4 ++++ Resources/Prototypes/_NF/Shipyard/tyne.yml | 4 ++++ Resources/Prototypes/_NF/Shipyard/vagabond.yml | 4 ++++ 83 files changed, 334 insertions(+), 17 deletions(-) diff --git a/Content.Server/Shipyard/Systems/ShipyardSystem.Consoles.cs b/Content.Server/Shipyard/Systems/ShipyardSystem.Consoles.cs index 923371f3b1e..2d1e7eb2358 100644 --- a/Content.Server/Shipyard/Systems/ShipyardSystem.Consoles.cs +++ b/Content.Server/Shipyard/Systems/ShipyardSystem.Consoles.cs @@ -29,7 +29,6 @@ using Content.Server.StationRecords.Systems; using Content.Shared.Database; using Content.Shared.Preferences; -using Content.Shared.Shuttles.Components; using static Content.Shared.Shipyard.Components.ShuttleDeedComponent; using Content.Server.Shuttles.Components; using Content.Server.Station.Components; @@ -38,7 +37,6 @@ using Content.Shared.UserInterface; using Robust.Shared.Audio.Systems; using Content.Shared.Access; -using Content.Shared.Tiles; using Content.Server._NF.Smuggling.Components; using Content.Shared._NF.ShuttleRecords; using Content.Server.StationEvents.Components; @@ -203,14 +201,6 @@ private void OnPurchaseMessage(EntityUid shipyardConsoleUid, ShipyardConsoleComp shuttleStation = _station.InitializeNewStation(stationProto.Stations[vessel.ID], gridUids); var metaData = MetaData((EntityUid)shuttleStation); name = metaData.EntityName; - _shuttle.SetIFFColor(shuttleUid, new Color - { - R = 10, - G = 50, - B = 100, - A = 100 - }); - _shuttle.AddIFFFlag(shuttleUid, IFFFlags.IsPlayerShuttle); } if (TryComp(targetId, out var newCap)) diff --git a/Resources/Prototypes/_NF/Shipyard/Expedition/ambition.yml b/Resources/Prototypes/_NF/Shipyard/Expedition/ambition.yml index 3bdd13cc86b..448ccfea853 100644 --- a/Resources/Prototypes/_NF/Shipyard/Expedition/ambition.yml +++ b/Resources/Prototypes/_NF/Shipyard/Expedition/ambition.yml @@ -22,6 +22,10 @@ - Atmospherics engine: - AME + addComponents: + - type: IFF + color: '#FFFFFFFF' + flags: [IsPlayerShuttle] - type: gameMap id: Ambition diff --git a/Resources/Prototypes/_NF/Shipyard/Expedition/anchor.yml b/Resources/Prototypes/_NF/Shipyard/Expedition/anchor.yml index 2063e7ce822..b4562e0ea0e 100644 --- a/Resources/Prototypes/_NF/Shipyard/Expedition/anchor.yml +++ b/Resources/Prototypes/_NF/Shipyard/Expedition/anchor.yml @@ -22,6 +22,10 @@ - Civilian engine: - AME + addComponents: + - type: IFF + color: '#FFFFFFFF' + flags: [IsPlayerShuttle] - type: gameMap id: Anchor diff --git a/Resources/Prototypes/_NF/Shipyard/Expedition/brigand.yml b/Resources/Prototypes/_NF/Shipyard/Expedition/brigand.yml index 859a9eac57c..a4688ee65d6 100644 --- a/Resources/Prototypes/_NF/Shipyard/Expedition/brigand.yml +++ b/Resources/Prototypes/_NF/Shipyard/Expedition/brigand.yml @@ -21,6 +21,10 @@ - Expedition engine: - AME + addComponents: + - type: IFF + color: '#FFFFFFFF' + flags: [IsPlayerShuttle] - type: gameMap id: Brigand diff --git a/Resources/Prototypes/_NF/Shipyard/Expedition/charon.yml b/Resources/Prototypes/_NF/Shipyard/Expedition/charon.yml index c02d155fc1f..6f8953cd7a7 100644 --- a/Resources/Prototypes/_NF/Shipyard/Expedition/charon.yml +++ b/Resources/Prototypes/_NF/Shipyard/Expedition/charon.yml @@ -23,7 +23,11 @@ guidebookPage: ShipyardCharon class: - Expedition - + addComponents: + - type: IFF + color: '#FFFFFFFF' + flags: [IsPlayerShuttle] + - type: gameMap id: Charon mapName: 'Charon' diff --git a/Resources/Prototypes/_NF/Shipyard/Expedition/decadedove.yml b/Resources/Prototypes/_NF/Shipyard/Expedition/decadedove.yml index a3d21261f9c..c72c2c67fa3 100644 --- a/Resources/Prototypes/_NF/Shipyard/Expedition/decadedove.yml +++ b/Resources/Prototypes/_NF/Shipyard/Expedition/decadedove.yml @@ -21,6 +21,10 @@ - Expedition engine: - AME + addComponents: + - type: IFF + color: '#FFFFFFFF' + flags: [IsPlayerShuttle] - type: gameMap id: DecadeDove diff --git a/Resources/Prototypes/_NF/Shipyard/Expedition/dragonfly.yml b/Resources/Prototypes/_NF/Shipyard/Expedition/dragonfly.yml index 04f41d86ad9..752a80e4428 100644 --- a/Resources/Prototypes/_NF/Shipyard/Expedition/dragonfly.yml +++ b/Resources/Prototypes/_NF/Shipyard/Expedition/dragonfly.yml @@ -21,6 +21,10 @@ - Expedition engine: - AME + addComponents: + - type: IFF + color: '#FFFFFFFF' + flags: [IsPlayerShuttle] - type: gameMap id: Dragonfly diff --git a/Resources/Prototypes/_NF/Shipyard/Expedition/gasbender.yml b/Resources/Prototypes/_NF/Shipyard/Expedition/gasbender.yml index e3bff648d33..72afcd66cee 100644 --- a/Resources/Prototypes/_NF/Shipyard/Expedition/gasbender.yml +++ b/Resources/Prototypes/_NF/Shipyard/Expedition/gasbender.yml @@ -22,6 +22,10 @@ - Atmospherics engine: - AME + addComponents: + - type: IFF + color: '#FFFFFFFF' + flags: [IsPlayerShuttle] - type: gameMap id: Gasbender diff --git a/Resources/Prototypes/_NF/Shipyard/Expedition/gourd.yml b/Resources/Prototypes/_NF/Shipyard/Expedition/gourd.yml index d49502c123e..4e60f032675 100644 --- a/Resources/Prototypes/_NF/Shipyard/Expedition/gourd.yml +++ b/Resources/Prototypes/_NF/Shipyard/Expedition/gourd.yml @@ -23,6 +23,10 @@ - Civilian engine: - AME + addComponents: + - type: IFF + color: '#FFFFFFFF' + flags: [IsPlayerShuttle] - type: gameMap id: Gourd diff --git a/Resources/Prototypes/_NF/Shipyard/Expedition/pathfinder.yml b/Resources/Prototypes/_NF/Shipyard/Expedition/pathfinder.yml index 9e6c0438428..15f7f7d7beb 100644 --- a/Resources/Prototypes/_NF/Shipyard/Expedition/pathfinder.yml +++ b/Resources/Prototypes/_NF/Shipyard/Expedition/pathfinder.yml @@ -21,6 +21,10 @@ - Expedition engine: - AME + addComponents: + - type: IFF + color: '#FFFFFFFF' + flags: [IsPlayerShuttle] - type: gameMap id: Pathfinder diff --git a/Resources/Prototypes/_NF/Shipyard/Expedition/sprinter.yml b/Resources/Prototypes/_NF/Shipyard/Expedition/sprinter.yml index d7f762575c5..b0df18e822b 100644 --- a/Resources/Prototypes/_NF/Shipyard/Expedition/sprinter.yml +++ b/Resources/Prototypes/_NF/Shipyard/Expedition/sprinter.yml @@ -21,6 +21,10 @@ - Expedition engine: - AME + addComponents: + - type: IFF + color: '#FFFFFFFF' + flags: [IsPlayerShuttle] - type: gameMap id: Sprinter diff --git a/Resources/Prototypes/_NF/Shipyard/Nfsd/broadhead.yml b/Resources/Prototypes/_NF/Shipyard/Nfsd/broadhead.yml index 5360a29ab7e..045013a8460 100644 --- a/Resources/Prototypes/_NF/Shipyard/Nfsd/broadhead.yml +++ b/Resources/Prototypes/_NF/Shipyard/Nfsd/broadhead.yml @@ -22,6 +22,10 @@ - Detective engine: - Uranium + addComponents: + - type: IFF + color: '#FFFFFFFF' + flags: [IsPlayerShuttle] - type: gameMap id: Broadhead diff --git a/Resources/Prototypes/_NF/Shipyard/Nfsd/cleric.yml b/Resources/Prototypes/_NF/Shipyard/Nfsd/cleric.yml index c174c1ddedb..aac1afc14e4 100644 --- a/Resources/Prototypes/_NF/Shipyard/Nfsd/cleric.yml +++ b/Resources/Prototypes/_NF/Shipyard/Nfsd/cleric.yml @@ -13,6 +13,10 @@ - Medical engine: - APU + addComponents: + - type: IFF + color: '#FFFFFFFF' + flags: [IsPlayerShuttle] - type: gameMap id: Cleric diff --git a/Resources/Prototypes/_NF/Shipyard/Nfsd/empress.yml b/Resources/Prototypes/_NF/Shipyard/Nfsd/empress.yml index e7cc245ed47..1dc151850c5 100644 --- a/Resources/Prototypes/_NF/Shipyard/Nfsd/empress.yml +++ b/Resources/Prototypes/_NF/Shipyard/Nfsd/empress.yml @@ -12,6 +12,14 @@ - Capital engine: - AME + addComponents: + - type: IFF + color: '#FFFFFFFF' + flags: [IsPlayerShuttle] + addComponents: + - type: IFF + color: '#FFFFFFFF' + flags: [IsPlayerShuttle] - type: gameMap id: Empress @@ -28,9 +36,4 @@ !type:NanotrasenNameGenerator prefixCreator: '14' - type: StationJobs - availableJobs: -# PrisonGuard: [ 0, 0 ] -# SecurityOfficer: [ 0, 0 ] -# Warden: [ 0, 0 ] -# Brigmedic: [ 0, 0 ] - Chef: [ 0, 0 ] + availableJobs: {} # Removed the chef since we dont have a real loadout for it diff --git a/Resources/Prototypes/_NF/Shipyard/Nfsd/fighter.yml b/Resources/Prototypes/_NF/Shipyard/Nfsd/fighter.yml index e1aca8b0493..700424b6e96 100644 --- a/Resources/Prototypes/_NF/Shipyard/Nfsd/fighter.yml +++ b/Resources/Prototypes/_NF/Shipyard/Nfsd/fighter.yml @@ -13,6 +13,10 @@ - Fighter engine: - APU + addComponents: + - type: IFF + color: '#FFFFFFFF' + flags: [IsPlayerShuttle] - type: gameMap id: Fighter diff --git a/Resources/Prototypes/_NF/Shipyard/Nfsd/hospitaller.yml b/Resources/Prototypes/_NF/Shipyard/Nfsd/hospitaller.yml index d232622e42c..066a5eb3db7 100644 --- a/Resources/Prototypes/_NF/Shipyard/Nfsd/hospitaller.yml +++ b/Resources/Prototypes/_NF/Shipyard/Nfsd/hospitaller.yml @@ -12,6 +12,10 @@ - Medical engine: - APU + addComponents: + - type: IFF + color: '#FFFFFFFF' + flags: [IsPlayerShuttle] - type: gameMap id: Hospitaller diff --git a/Resources/Prototypes/_NF/Shipyard/Nfsd/interceptor.yml b/Resources/Prototypes/_NF/Shipyard/Nfsd/interceptor.yml index 68b03e1dea2..e30a349513c 100644 --- a/Resources/Prototypes/_NF/Shipyard/Nfsd/interceptor.yml +++ b/Resources/Prototypes/_NF/Shipyard/Nfsd/interceptor.yml @@ -12,6 +12,10 @@ - Detective engine: - Plasma + addComponents: + - type: IFF + color: '#FFFFFFFF' + flags: [IsPlayerShuttle] - type: gameMap id: Interceptor diff --git a/Resources/Prototypes/_NF/Shipyard/Nfsd/paladin.yml b/Resources/Prototypes/_NF/Shipyard/Nfsd/paladin.yml index 4591cf9e2ca..559f1194ffb 100644 --- a/Resources/Prototypes/_NF/Shipyard/Nfsd/paladin.yml +++ b/Resources/Prototypes/_NF/Shipyard/Nfsd/paladin.yml @@ -10,6 +10,10 @@ guidebookPage: Null class: - Fighter + addComponents: + - type: IFF + color: '#FFFFFFFF' + flags: [IsPlayerShuttle] - type: gameMap id: Paladin diff --git a/Resources/Prototypes/_NF/Shipyard/Nfsd/prowler.yml b/Resources/Prototypes/_NF/Shipyard/Nfsd/prowler.yml index 1fdf9381684..2bfaa050278 100644 --- a/Resources/Prototypes/_NF/Shipyard/Nfsd/prowler.yml +++ b/Resources/Prototypes/_NF/Shipyard/Nfsd/prowler.yml @@ -12,6 +12,10 @@ - Patrol engine: - AME + addComponents: + - type: IFF + color: '#FFFFFFFF' + flags: [IsPlayerShuttle] - type: gameMap id: Prowler diff --git a/Resources/Prototypes/_NF/Shipyard/Nfsd/rogue.yml b/Resources/Prototypes/_NF/Shipyard/Nfsd/rogue.yml index b50c6de86e9..9052bc99c21 100644 --- a/Resources/Prototypes/_NF/Shipyard/Nfsd/rogue.yml +++ b/Resources/Prototypes/_NF/Shipyard/Nfsd/rogue.yml @@ -13,6 +13,10 @@ - Fighter engine: - APU + addComponents: + - type: IFF + color: '#FFFFFFFF' + flags: [IsPlayerShuttle] - type: gameMap id: Rogue diff --git a/Resources/Prototypes/_NF/Shipyard/Nfsd/templar.yml b/Resources/Prototypes/_NF/Shipyard/Nfsd/templar.yml index d5d747b852a..4342327959a 100644 --- a/Resources/Prototypes/_NF/Shipyard/Nfsd/templar.yml +++ b/Resources/Prototypes/_NF/Shipyard/Nfsd/templar.yml @@ -12,6 +12,10 @@ - Pursuit engine: - APU + addComponents: + - type: IFF + color: '#FFFFFFFF' + flags: [IsPlayerShuttle] - type: gameMap id: Templar diff --git a/Resources/Prototypes/_NF/Shipyard/Nfsd/wasp.yml b/Resources/Prototypes/_NF/Shipyard/Nfsd/wasp.yml index f97a0f24225..6ba8f4102f7 100644 --- a/Resources/Prototypes/_NF/Shipyard/Nfsd/wasp.yml +++ b/Resources/Prototypes/_NF/Shipyard/Nfsd/wasp.yml @@ -14,6 +14,10 @@ - Expedition engine: - AME + addComponents: + - type: IFF + color: '#FFFFFFFF' + flags: [IsPlayerShuttle] - type: gameMap id: Wasp diff --git a/Resources/Prototypes/_NF/Shipyard/Nfsd/wendigo.yml b/Resources/Prototypes/_NF/Shipyard/Nfsd/wendigo.yml index c5f3891e944..4d30a744825 100644 --- a/Resources/Prototypes/_NF/Shipyard/Nfsd/wendigo.yml +++ b/Resources/Prototypes/_NF/Shipyard/Nfsd/wendigo.yml @@ -21,6 +21,10 @@ - Pursuit engine: - Uranium + addComponents: + - type: IFF + color: '#FFFFFFFF' + flags: [IsPlayerShuttle] - type: gameMap id: Wendigo diff --git a/Resources/Prototypes/_NF/Shipyard/Scrap/bison.yml b/Resources/Prototypes/_NF/Shipyard/Scrap/bison.yml index 90ebb55ed76..5579291f029 100644 --- a/Resources/Prototypes/_NF/Shipyard/Scrap/bison.yml +++ b/Resources/Prototypes/_NF/Shipyard/Scrap/bison.yml @@ -13,6 +13,10 @@ - Civilian engine: - Plasma + addComponents: + - type: IFF + color: '#FFFFFFFF' + flags: [IsPlayerShuttle] - type: gameMap id: Bison diff --git a/Resources/Prototypes/_NF/Shipyard/Scrap/canister.yml b/Resources/Prototypes/_NF/Shipyard/Scrap/canister.yml index fae2fae78d4..5fcb4c220c8 100644 --- a/Resources/Prototypes/_NF/Shipyard/Scrap/canister.yml +++ b/Resources/Prototypes/_NF/Shipyard/Scrap/canister.yml @@ -16,6 +16,10 @@ - Civilian engine: - Plasma + addComponents: + - type: IFF + color: '#FFFFFFFF' + flags: [IsPlayerShuttle] - type: gameMap id: Canister diff --git a/Resources/Prototypes/_NF/Shipyard/Scrap/disciple.yml b/Resources/Prototypes/_NF/Shipyard/Scrap/disciple.yml index 18f6ea58ce8..ce74b6e64cc 100644 --- a/Resources/Prototypes/_NF/Shipyard/Scrap/disciple.yml +++ b/Resources/Prototypes/_NF/Shipyard/Scrap/disciple.yml @@ -22,6 +22,10 @@ - Civilian engine: - Plasma + addComponents: + - type: IFF + color: '#FFFFFFFF' + flags: [IsPlayerShuttle] - type: gameMap id: Disciple diff --git a/Resources/Prototypes/_NF/Shipyard/Scrap/nugget.yml b/Resources/Prototypes/_NF/Shipyard/Scrap/nugget.yml index 393428c0bbb..a8d9e78e455 100644 --- a/Resources/Prototypes/_NF/Shipyard/Scrap/nugget.yml +++ b/Resources/Prototypes/_NF/Shipyard/Scrap/nugget.yml @@ -22,6 +22,10 @@ - Kitchen engine: - Plasma + addComponents: + - type: IFF + color: '#FFFFFFFF' + flags: [IsPlayerShuttle] - type: gameMap id: Nugget diff --git a/Resources/Prototypes/_NF/Shipyard/Scrap/orange.yml b/Resources/Prototypes/_NF/Shipyard/Scrap/orange.yml index 6fbc5643db7..24015f31439 100644 --- a/Resources/Prototypes/_NF/Shipyard/Scrap/orange.yml +++ b/Resources/Prototypes/_NF/Shipyard/Scrap/orange.yml @@ -13,6 +13,10 @@ - Salvage engine: - Uranium + addComponents: + - type: IFF + color: '#FFFFFFFF' + flags: [IsPlayerShuttle] - type: gameMap id: Orange diff --git a/Resources/Prototypes/_NF/Shipyard/Scrap/point.yml b/Resources/Prototypes/_NF/Shipyard/Scrap/point.yml index 77db60eb817..f5cda28fcd2 100644 --- a/Resources/Prototypes/_NF/Shipyard/Scrap/point.yml +++ b/Resources/Prototypes/_NF/Shipyard/Scrap/point.yml @@ -12,6 +12,10 @@ - Science engine: - Plasma + addComponents: + - type: IFF + color: '#FFFFFFFF' + flags: [IsPlayerShuttle] - type: gameMap id: Point diff --git a/Resources/Prototypes/_NF/Shipyard/Scrap/tide.yml b/Resources/Prototypes/_NF/Shipyard/Scrap/tide.yml index 79d11ec2bea..51863680669 100644 --- a/Resources/Prototypes/_NF/Shipyard/Scrap/tide.yml +++ b/Resources/Prototypes/_NF/Shipyard/Scrap/tide.yml @@ -12,6 +12,10 @@ - Civilian engine: - Plasma + addComponents: + - type: IFF + color: '#FFFFFFFF' + flags: [IsPlayerShuttle] - type: gameMap id: Tide diff --git a/Resources/Prototypes/_NF/Shipyard/Sr/bottleneck.yml b/Resources/Prototypes/_NF/Shipyard/Sr/bottleneck.yml index 2b36d30c14b..1a94a4f5f31 100644 --- a/Resources/Prototypes/_NF/Shipyard/Sr/bottleneck.yml +++ b/Resources/Prototypes/_NF/Shipyard/Sr/bottleneck.yml @@ -22,6 +22,10 @@ - Civilian engine: - Plasma + addComponents: + - type: IFF + color: '#FFFFFFFF' + flags: [IsPlayerShuttle] - type: gameMap id: Bottleneck diff --git a/Resources/Prototypes/_NF/Shipyard/Sr/broom.yml b/Resources/Prototypes/_NF/Shipyard/Sr/broom.yml index 3772c3e7858..414d251f5c0 100644 --- a/Resources/Prototypes/_NF/Shipyard/Sr/broom.yml +++ b/Resources/Prototypes/_NF/Shipyard/Sr/broom.yml @@ -22,6 +22,10 @@ - Civilian engine: - Plasma + addComponents: + - type: IFF + color: '#FFFFFFFF' + flags: [IsPlayerShuttle] - type: gameMap id: Broom diff --git a/Resources/Prototypes/_NF/Shipyard/Sr/chauffeur.yml b/Resources/Prototypes/_NF/Shipyard/Sr/chauffeur.yml index 7572478fdbc..4cf8b014ac8 100644 --- a/Resources/Prototypes/_NF/Shipyard/Sr/chauffeur.yml +++ b/Resources/Prototypes/_NF/Shipyard/Sr/chauffeur.yml @@ -23,6 +23,10 @@ - Civilian engine: - Plasma + addComponents: + - type: IFF + color: '#FFFFFFFF' + flags: [IsPlayerShuttle] - type: gameMap id: Chauffeur diff --git a/Resources/Prototypes/_NF/Shipyard/Sr/mailpod.yml b/Resources/Prototypes/_NF/Shipyard/Sr/mailpod.yml index ad8a315c71e..12ba15ea09a 100644 --- a/Resources/Prototypes/_NF/Shipyard/Sr/mailpod.yml +++ b/Resources/Prototypes/_NF/Shipyard/Sr/mailpod.yml @@ -22,6 +22,10 @@ - Cargo engine: - Plasma + addComponents: + - type: IFF + color: '#FFFFFFFF' + flags: [IsPlayerShuttle] - type: gameMap id: MailPod diff --git a/Resources/Prototypes/_NF/Shipyard/Sr/parcel.yml b/Resources/Prototypes/_NF/Shipyard/Sr/parcel.yml index c1fcec87c8d..ba77009eefe 100644 --- a/Resources/Prototypes/_NF/Shipyard/Sr/parcel.yml +++ b/Resources/Prototypes/_NF/Shipyard/Sr/parcel.yml @@ -22,6 +22,10 @@ - Cargo engine: - Plasma + addComponents: + - type: IFF + color: '#FFFFFFFF' + flags: [IsPlayerShuttle] - type: gameMap id: Parcel diff --git a/Resources/Prototypes/_NF/Shipyard/Sr/watchdog.yml b/Resources/Prototypes/_NF/Shipyard/Sr/watchdog.yml index 95ad653cb87..472674d365b 100644 --- a/Resources/Prototypes/_NF/Shipyard/Sr/watchdog.yml +++ b/Resources/Prototypes/_NF/Shipyard/Sr/watchdog.yml @@ -23,6 +23,10 @@ - Civilian engine: - Plasma + addComponents: + - type: IFF + color: '#FFFFFFFF' + flags: [IsPlayerShuttle] - type: gameMap id: Watchdog diff --git a/Resources/Prototypes/_NF/Shipyard/akupara.yml b/Resources/Prototypes/_NF/Shipyard/akupara.yml index 311bfaa806f..47df633a2b0 100644 --- a/Resources/Prototypes/_NF/Shipyard/akupara.yml +++ b/Resources/Prototypes/_NF/Shipyard/akupara.yml @@ -21,6 +21,10 @@ - Botany engine: - Uranium + addComponents: + - type: IFF + color: '#FFFFFFFF' + flags: [IsPlayerShuttle] - type: gameMap id: Akupara diff --git a/Resources/Prototypes/_NF/Shipyard/apothecary.yml b/Resources/Prototypes/_NF/Shipyard/apothecary.yml index c9afed3677f..9ccf2307bc0 100644 --- a/Resources/Prototypes/_NF/Shipyard/apothecary.yml +++ b/Resources/Prototypes/_NF/Shipyard/apothecary.yml @@ -22,6 +22,10 @@ - Chemistry engine: - Uranium + addComponents: + - type: IFF + color: '#FFFFFFFF' + flags: [IsPlayerShuttle] - type: gameMap id: Apothecary diff --git a/Resources/Prototypes/_NF/Shipyard/barge.yml b/Resources/Prototypes/_NF/Shipyard/barge.yml index ed9315f79f3..8a88a6a0f0f 100644 --- a/Resources/Prototypes/_NF/Shipyard/barge.yml +++ b/Resources/Prototypes/_NF/Shipyard/barge.yml @@ -23,6 +23,10 @@ engine: - Solar - Plasma + addComponents: + - type: IFF + color: '#FFFFFFFF' + flags: [IsPlayerShuttle] - type: gameMap id: Barge diff --git a/Resources/Prototypes/_NF/Shipyard/bazaar.yml b/Resources/Prototypes/_NF/Shipyard/bazaar.yml index c357fae352b..ad2179acc05 100644 --- a/Resources/Prototypes/_NF/Shipyard/bazaar.yml +++ b/Resources/Prototypes/_NF/Shipyard/bazaar.yml @@ -22,6 +22,10 @@ - Civilian engine: - Uranium + addComponents: + - type: IFF + color: '#FFFFFFFF' + flags: [IsPlayerShuttle] - type: gameMap id: Bazaar diff --git a/Resources/Prototypes/_NF/Shipyard/beaker.yml b/Resources/Prototypes/_NF/Shipyard/beaker.yml index 59a6429ddb9..cf7205612a0 100644 --- a/Resources/Prototypes/_NF/Shipyard/beaker.yml +++ b/Resources/Prototypes/_NF/Shipyard/beaker.yml @@ -11,6 +11,10 @@ - Chemistry engine: - Uranium + addComponents: + - type: IFF + color: '#FFFFFFFF' + flags: [IsPlayerShuttle] - type: gameMap id: Beaker diff --git a/Resources/Prototypes/_NF/Shipyard/bocadillo.yml b/Resources/Prototypes/_NF/Shipyard/bocadillo.yml index b1c55fcbc6d..093f98c5ae5 100644 --- a/Resources/Prototypes/_NF/Shipyard/bocadillo.yml +++ b/Resources/Prototypes/_NF/Shipyard/bocadillo.yml @@ -21,6 +21,10 @@ - Kitchen engine: - Plasma + addComponents: + - type: IFF + color: '#FFFFFFFF' + flags: [IsPlayerShuttle] - type: gameMap id: Bocadillo diff --git a/Resources/Prototypes/_NF/Shipyard/bodkin.yml b/Resources/Prototypes/_NF/Shipyard/bodkin.yml index 0e676f2aaf9..2271908977d 100644 --- a/Resources/Prototypes/_NF/Shipyard/bodkin.yml +++ b/Resources/Prototypes/_NF/Shipyard/bodkin.yml @@ -18,6 +18,10 @@ shuttlePath: /Maps/_NF/Shuttles/bodkin.yml class: - Salvage + addComponents: + - type: IFF + color: '#FFFFFFFF' + flags: [IsPlayerShuttle] - type: gameMap id: Bodkin diff --git a/Resources/Prototypes/_NF/Shipyard/bookworm.yml b/Resources/Prototypes/_NF/Shipyard/bookworm.yml index 8d6260b5583..060fb3803f2 100644 --- a/Resources/Prototypes/_NF/Shipyard/bookworm.yml +++ b/Resources/Prototypes/_NF/Shipyard/bookworm.yml @@ -21,6 +21,10 @@ - Civilian engine: - Plasma + addComponents: + - type: IFF + color: '#FFFFFFFF' + flags: [IsPlayerShuttle] - type: gameMap id: Bookworm diff --git a/Resources/Prototypes/_NF/Shipyard/bulker.yml b/Resources/Prototypes/_NF/Shipyard/bulker.yml index 62a6b5f7547..ad6c68d0c2d 100644 --- a/Resources/Prototypes/_NF/Shipyard/bulker.yml +++ b/Resources/Prototypes/_NF/Shipyard/bulker.yml @@ -21,6 +21,10 @@ - Salvage engine: - Uranium + addComponents: + - type: IFF + color: '#FFFFFFFF' + flags: [IsPlayerShuttle] - type: gameMap id: Bulker diff --git a/Resources/Prototypes/_NF/Shipyard/caduceus.yml b/Resources/Prototypes/_NF/Shipyard/caduceus.yml index 0abf6772bfa..0efcec3b2d8 100644 --- a/Resources/Prototypes/_NF/Shipyard/caduceus.yml +++ b/Resources/Prototypes/_NF/Shipyard/caduceus.yml @@ -12,6 +12,10 @@ - Chemistry engine: - AME + addComponents: + - type: IFF + color: '#FFFFFFFF' + flags: [IsPlayerShuttle] - type: gameMap id: Caduceus diff --git a/Resources/Prototypes/_NF/Shipyard/camper.yml b/Resources/Prototypes/_NF/Shipyard/camper.yml index 945b5ff6487..e4fe7bd97db 100644 --- a/Resources/Prototypes/_NF/Shipyard/camper.yml +++ b/Resources/Prototypes/_NF/Shipyard/camper.yml @@ -21,6 +21,10 @@ - Civilian engine: - Plasma + addComponents: + - type: IFF + color: '#FFFFFFFF' + flags: [IsPlayerShuttle] - type: gameMap id: Camper diff --git a/Resources/Prototypes/_NF/Shipyard/ceres.yml b/Resources/Prototypes/_NF/Shipyard/ceres.yml index bfa4888967f..f6fe8014dd2 100644 --- a/Resources/Prototypes/_NF/Shipyard/ceres.yml +++ b/Resources/Prototypes/_NF/Shipyard/ceres.yml @@ -21,6 +21,10 @@ - Kitchen engine: - Uranium + addComponents: + - type: IFF + color: '#FFFFFFFF' + flags: [IsPlayerShuttle] - type: gameMap id: Ceres diff --git a/Resources/Prototypes/_NF/Shipyard/chisel.yml b/Resources/Prototypes/_NF/Shipyard/chisel.yml index 6a802679211..6ef72f8f97e 100644 --- a/Resources/Prototypes/_NF/Shipyard/chisel.yml +++ b/Resources/Prototypes/_NF/Shipyard/chisel.yml @@ -22,6 +22,10 @@ - Cargo #??? engine: - Plasma + addComponents: + - type: IFF + color: '#FFFFFFFF' + flags: [IsPlayerShuttle] - type: gameMap id: Chisel diff --git a/Resources/Prototypes/_NF/Shipyard/comet.yml b/Resources/Prototypes/_NF/Shipyard/comet.yml index 0efea12ba1a..441f68aa3b2 100644 --- a/Resources/Prototypes/_NF/Shipyard/comet.yml +++ b/Resources/Prototypes/_NF/Shipyard/comet.yml @@ -22,6 +22,10 @@ - Engineering engine: - AME + addComponents: + - type: IFF + color: '#FFFFFFFF' + flags: [IsPlayerShuttle] - type: gameMap id: Comet diff --git a/Resources/Prototypes/_NF/Shipyard/construct.yml b/Resources/Prototypes/_NF/Shipyard/construct.yml index 22e920941ec..fd18bc18bff 100644 --- a/Resources/Prototypes/_NF/Shipyard/construct.yml +++ b/Resources/Prototypes/_NF/Shipyard/construct.yml @@ -11,6 +11,10 @@ - Engineering engine: - Plasma + addComponents: + - type: IFF + color: '#FFFFFFFF' + flags: [IsPlayerShuttle] - type: gameMap id: Construct diff --git a/Resources/Prototypes/_NF/Shipyard/crescent.yml b/Resources/Prototypes/_NF/Shipyard/crescent.yml index 8a1ceede607..dc0f8a98e5a 100644 --- a/Resources/Prototypes/_NF/Shipyard/crescent.yml +++ b/Resources/Prototypes/_NF/Shipyard/crescent.yml @@ -23,6 +23,10 @@ - Civilian engine: - AME + addComponents: + - type: IFF + color: '#FFFFFFFF' + flags: [IsPlayerShuttle] - type: gameMap id: Crescent diff --git a/Resources/Prototypes/_NF/Shipyard/eagle.yml b/Resources/Prototypes/_NF/Shipyard/eagle.yml index 4f296af2447..23136186110 100644 --- a/Resources/Prototypes/_NF/Shipyard/eagle.yml +++ b/Resources/Prototypes/_NF/Shipyard/eagle.yml @@ -22,6 +22,10 @@ - Engineering engine: - Uranium + addComponents: + - type: IFF + color: '#FFFFFFFF' + flags: [IsPlayerShuttle] - type: gameMap id: Eagle diff --git a/Resources/Prototypes/_NF/Shipyard/garden.yml b/Resources/Prototypes/_NF/Shipyard/garden.yml index 2d7d2a646fe..22f191b64b8 100644 --- a/Resources/Prototypes/_NF/Shipyard/garden.yml +++ b/Resources/Prototypes/_NF/Shipyard/garden.yml @@ -21,6 +21,10 @@ - Botany engine: - Plasma + addComponents: + - type: IFF + color: '#FFFFFFFF' + flags: [IsPlayerShuttle] - type: gameMap id: Garden diff --git a/Resources/Prototypes/_NF/Shipyard/hammer.yml b/Resources/Prototypes/_NF/Shipyard/hammer.yml index a6d3f8c9d6b..550e0f4e06c 100644 --- a/Resources/Prototypes/_NF/Shipyard/hammer.yml +++ b/Resources/Prototypes/_NF/Shipyard/hammer.yml @@ -21,6 +21,10 @@ - Engineering engine: - Plasma + addComponents: + - type: IFF + color: '#FFFFFFFF' + flags: [IsPlayerShuttle] - type: gameMap id: Hammer diff --git a/Resources/Prototypes/_NF/Shipyard/harbormaster.yml b/Resources/Prototypes/_NF/Shipyard/harbormaster.yml index d1d8ca6e49f..dac197d94bc 100644 --- a/Resources/Prototypes/_NF/Shipyard/harbormaster.yml +++ b/Resources/Prototypes/_NF/Shipyard/harbormaster.yml @@ -21,6 +21,10 @@ - Civilian engine: - Plasma + addComponents: + - type: IFF + color: '#FFFFFFFF' + flags: [IsPlayerShuttle] - type: gameMap id: Harbormaster diff --git a/Resources/Prototypes/_NF/Shipyard/hauler.yml b/Resources/Prototypes/_NF/Shipyard/hauler.yml index 2161b812fc5..deb0ffd3976 100644 --- a/Resources/Prototypes/_NF/Shipyard/hauler.yml +++ b/Resources/Prototypes/_NF/Shipyard/hauler.yml @@ -12,6 +12,10 @@ - Salvage engine: - Uranium + addComponents: + - type: IFF + color: '#FFFFFFFF' + flags: [IsPlayerShuttle] - type: gameMap id: Hauler diff --git a/Resources/Prototypes/_NF/Shipyard/honker.yml b/Resources/Prototypes/_NF/Shipyard/honker.yml index 3c0cc24f75d..80afbde6f11 100644 --- a/Resources/Prototypes/_NF/Shipyard/honker.yml +++ b/Resources/Prototypes/_NF/Shipyard/honker.yml @@ -21,6 +21,10 @@ - Civilian engine: - Plasma + addComponents: + - type: IFF + color: '#FFFFFFFF' + flags: [IsPlayerShuttle] - type: gameMap id: Honker diff --git a/Resources/Prototypes/_NF/Shipyard/investigator.yml b/Resources/Prototypes/_NF/Shipyard/investigator.yml index 1a328d1d0ce..432e09bba97 100644 --- a/Resources/Prototypes/_NF/Shipyard/investigator.yml +++ b/Resources/Prototypes/_NF/Shipyard/investigator.yml @@ -22,6 +22,10 @@ engine: - Solar - Plasma + addComponents: + - type: IFF + color: '#FFFFFFFF' + flags: [IsPlayerShuttle] - type: gameMap id: Investigator diff --git a/Resources/Prototypes/_NF/Shipyard/kestrel.yml b/Resources/Prototypes/_NF/Shipyard/kestrel.yml index 9fc69e361c1..e274e6a5197 100644 --- a/Resources/Prototypes/_NF/Shipyard/kestrel.yml +++ b/Resources/Prototypes/_NF/Shipyard/kestrel.yml @@ -21,6 +21,10 @@ - Salvage engine: - Uranium + addComponents: + - type: IFF + color: '#FFFFFFFF' + flags: [IsPlayerShuttle] - type: gameMap id: Kestrel diff --git a/Resources/Prototypes/_NF/Shipyard/kilderkin.yml b/Resources/Prototypes/_NF/Shipyard/kilderkin.yml index 2fe08b24214..cb483d8423f 100644 --- a/Resources/Prototypes/_NF/Shipyard/kilderkin.yml +++ b/Resources/Prototypes/_NF/Shipyard/kilderkin.yml @@ -21,6 +21,10 @@ - Civilian engine: - Plasma + addComponents: + - type: IFF + color: '#FFFFFFFF' + flags: [IsPlayerShuttle] - type: gameMap id: Kilderkin diff --git a/Resources/Prototypes/_NF/Shipyard/lantern.yml b/Resources/Prototypes/_NF/Shipyard/lantern.yml index d95087f241d..2602b74987c 100644 --- a/Resources/Prototypes/_NF/Shipyard/lantern.yml +++ b/Resources/Prototypes/_NF/Shipyard/lantern.yml @@ -22,6 +22,10 @@ engine: - Solar - Plasma + addComponents: + - type: IFF + color: '#FFFFFFFF' + flags: [IsPlayerShuttle] - type: gameMap id: Lantern diff --git a/Resources/Prototypes/_NF/Shipyard/legman.yml b/Resources/Prototypes/_NF/Shipyard/legman.yml index adb345a7347..cc498cf629a 100644 --- a/Resources/Prototypes/_NF/Shipyard/legman.yml +++ b/Resources/Prototypes/_NF/Shipyard/legman.yml @@ -21,6 +21,10 @@ - Civilian engine: - Plasma + addComponents: + - type: IFF + color: '#FFFFFFFF' + flags: [IsPlayerShuttle] - type: gameMap id: Legman diff --git a/Resources/Prototypes/_NF/Shipyard/liquidator.yml b/Resources/Prototypes/_NF/Shipyard/liquidator.yml index 690efce11a0..aae8ff09b48 100644 --- a/Resources/Prototypes/_NF/Shipyard/liquidator.yml +++ b/Resources/Prototypes/_NF/Shipyard/liquidator.yml @@ -21,6 +21,10 @@ - Civilian engine: - Uranium + addComponents: + - type: IFF + color: '#FFFFFFFF' + flags: [IsPlayerShuttle] - type: gameMap id: Liquidator diff --git a/Resources/Prototypes/_NF/Shipyard/loader.yml b/Resources/Prototypes/_NF/Shipyard/loader.yml index 91309f9e571..1237d1fe5f8 100644 --- a/Resources/Prototypes/_NF/Shipyard/loader.yml +++ b/Resources/Prototypes/_NF/Shipyard/loader.yml @@ -21,6 +21,10 @@ - Cargo engine: - Plasma + addComponents: + - type: IFF + color: '#FFFFFFFF' + flags: [IsPlayerShuttle] - type: gameMap id: Loader diff --git a/Resources/Prototypes/_NF/Shipyard/lyrae.yml b/Resources/Prototypes/_NF/Shipyard/lyrae.yml index d98e0cb5461..51d2bd54f5c 100644 --- a/Resources/Prototypes/_NF/Shipyard/lyrae.yml +++ b/Resources/Prototypes/_NF/Shipyard/lyrae.yml @@ -21,6 +21,10 @@ - Science engine: - AME + addComponents: + - type: IFF + color: '#FFFFFFFF' + flags: [IsPlayerShuttle] - type: gameMap id: Lyrae diff --git a/Resources/Prototypes/_NF/Shipyard/mccargo.yml b/Resources/Prototypes/_NF/Shipyard/mccargo.yml index afca9a6ef49..aa4eb17cc8a 100644 --- a/Resources/Prototypes/_NF/Shipyard/mccargo.yml +++ b/Resources/Prototypes/_NF/Shipyard/mccargo.yml @@ -18,6 +18,10 @@ - Kitchen engine: - Plasma + addComponents: + - type: IFF + color: '#FFFFFFFF' + flags: [IsPlayerShuttle] - type: gameMap id: McCargo diff --git a/Resources/Prototypes/_NF/Shipyard/mcdelivery.yml b/Resources/Prototypes/_NF/Shipyard/mcdelivery.yml index 28c1dd8dcad..3a5240921d8 100644 --- a/Resources/Prototypes/_NF/Shipyard/mcdelivery.yml +++ b/Resources/Prototypes/_NF/Shipyard/mcdelivery.yml @@ -18,6 +18,10 @@ - Civilian engine: - Welding + addComponents: + - type: IFF + color: '#FFFFFFFF' + flags: [IsPlayerShuttle] - type: gameMap id: McDelivery diff --git a/Resources/Prototypes/_NF/Shipyard/phoenix.yml b/Resources/Prototypes/_NF/Shipyard/phoenix.yml index 2b1510a5c4f..ea9ab455e1a 100644 --- a/Resources/Prototypes/_NF/Shipyard/phoenix.yml +++ b/Resources/Prototypes/_NF/Shipyard/phoenix.yml @@ -22,6 +22,10 @@ - Engineering engine: - Plasma + addComponents: + - type: IFF + color: '#FFFFFFFF' + flags: [IsPlayerShuttle] - type: gameMap id: Phoenix diff --git a/Resources/Prototypes/_NF/Shipyard/piecrust.yml b/Resources/Prototypes/_NF/Shipyard/piecrust.yml index 6b24f7adf9e..864029d54d8 100644 --- a/Resources/Prototypes/_NF/Shipyard/piecrust.yml +++ b/Resources/Prototypes/_NF/Shipyard/piecrust.yml @@ -21,6 +21,10 @@ - Kitchen engine: - Plasma + addComponents: + - type: IFF + color: '#FFFFFFFF' + flags: [IsPlayerShuttle] - type: gameMap id: Piecrust diff --git a/Resources/Prototypes/_NF/Shipyard/pioneer.yml b/Resources/Prototypes/_NF/Shipyard/pioneer.yml index 0d7f63b29c7..72f5c6ab4b1 100644 --- a/Resources/Prototypes/_NF/Shipyard/pioneer.yml +++ b/Resources/Prototypes/_NF/Shipyard/pioneer.yml @@ -21,6 +21,10 @@ - Salvage engine: - Plasma + addComponents: + - type: IFF + color: '#FFFFFFFF' + flags: [IsPlayerShuttle] - type: gameMap id: Pioneer diff --git a/Resources/Prototypes/_NF/Shipyard/placebo.yml b/Resources/Prototypes/_NF/Shipyard/placebo.yml index bd21d23be7d..786565d71d2 100644 --- a/Resources/Prototypes/_NF/Shipyard/placebo.yml +++ b/Resources/Prototypes/_NF/Shipyard/placebo.yml @@ -21,6 +21,10 @@ - Medical engine: - Plasma + addComponents: + - type: IFF + color: '#FFFFFFFF' + flags: [IsPlayerShuttle] - type: gameMap id: Placebo diff --git a/Resources/Prototypes/_NF/Shipyard/prospector.yml b/Resources/Prototypes/_NF/Shipyard/prospector.yml index 9b3239da023..e26d5625090 100644 --- a/Resources/Prototypes/_NF/Shipyard/prospector.yml +++ b/Resources/Prototypes/_NF/Shipyard/prospector.yml @@ -21,6 +21,10 @@ - Salvage engine: - Plasma + addComponents: + - type: IFF + color: '#FFFFFFFF' + flags: [IsPlayerShuttle] - type: gameMap id: Prospector diff --git a/Resources/Prototypes/_NF/Shipyard/pts.yml b/Resources/Prototypes/_NF/Shipyard/pts.yml index 991163da054..b65987b2b44 100644 --- a/Resources/Prototypes/_NF/Shipyard/pts.yml +++ b/Resources/Prototypes/_NF/Shipyard/pts.yml @@ -21,6 +21,10 @@ - Civilian engine: - Plasma + addComponents: + - type: IFF + color: '#FFFFFFFF' + flags: [IsPlayerShuttle] - type: gameMap id: PTS diff --git a/Resources/Prototypes/_NF/Shipyard/searchlight.yml b/Resources/Prototypes/_NF/Shipyard/searchlight.yml index c173c5c0f3a..e7daedcaf12 100644 --- a/Resources/Prototypes/_NF/Shipyard/searchlight.yml +++ b/Resources/Prototypes/_NF/Shipyard/searchlight.yml @@ -21,6 +21,10 @@ - Medical engine: - Plasma + addComponents: + - type: IFF + color: '#FFFFFFFF' + flags: [IsPlayerShuttle] - type: gameMap id: Searchlight diff --git a/Resources/Prototypes/_NF/Shipyard/skipper.yml b/Resources/Prototypes/_NF/Shipyard/skipper.yml index fff671a9172..4b23864caf5 100644 --- a/Resources/Prototypes/_NF/Shipyard/skipper.yml +++ b/Resources/Prototypes/_NF/Shipyard/skipper.yml @@ -21,6 +21,10 @@ - Kitchen engine: - Plasma + addComponents: + - type: IFF + color: '#FFFFFFFF' + flags: [IsPlayerShuttle] - type: gameMap id: Skipper diff --git a/Resources/Prototypes/_NF/Shipyard/sparrow.yml b/Resources/Prototypes/_NF/Shipyard/sparrow.yml index 9b10ecbc0a0..d2dc5a5c03d 100644 --- a/Resources/Prototypes/_NF/Shipyard/sparrow.yml +++ b/Resources/Prototypes/_NF/Shipyard/sparrow.yml @@ -22,6 +22,10 @@ - Engineering engine: - Plasma + addComponents: + - type: IFF + color: '#FFFFFFFF' + flags: [IsPlayerShuttle] - type: gameMap id: Sparrow diff --git a/Resources/Prototypes/_NF/Shipyard/spectre.yml b/Resources/Prototypes/_NF/Shipyard/spectre.yml index 53c93c7ee22..d874e5410a6 100644 --- a/Resources/Prototypes/_NF/Shipyard/spectre.yml +++ b/Resources/Prototypes/_NF/Shipyard/spectre.yml @@ -21,6 +21,10 @@ - Science engine: - AME + addComponents: + - type: IFF + color: '#FFFFFFFF' + flags: [IsPlayerShuttle] - type: gameMap id: Spectre diff --git a/Resources/Prototypes/_NF/Shipyard/spirit.yml b/Resources/Prototypes/_NF/Shipyard/spirit.yml index 38fc6f180a0..71c38ffb4b2 100644 --- a/Resources/Prototypes/_NF/Shipyard/spirit.yml +++ b/Resources/Prototypes/_NF/Shipyard/spirit.yml @@ -21,6 +21,10 @@ - Medical engine: - Plasma + addComponents: + - type: IFF + color: '#FFFFFFFF' + flags: [IsPlayerShuttle] - type: gameMap id: Spirit diff --git a/Resources/Prototypes/_NF/Shipyard/stasis.yml b/Resources/Prototypes/_NF/Shipyard/stasis.yml index b084fd204dc..0ef23037143 100644 --- a/Resources/Prototypes/_NF/Shipyard/stasis.yml +++ b/Resources/Prototypes/_NF/Shipyard/stasis.yml @@ -21,6 +21,10 @@ - Medical engine: - Uranium + addComponents: + - type: IFF + color: '#FFFFFFFF' + flags: [IsPlayerShuttle] - type: gameMap id: Stasis diff --git a/Resources/Prototypes/_NF/Shipyard/stellaris.yml b/Resources/Prototypes/_NF/Shipyard/stellaris.yml index d1645401d6f..d93b7fe3a7f 100644 --- a/Resources/Prototypes/_NF/Shipyard/stellaris.yml +++ b/Resources/Prototypes/_NF/Shipyard/stellaris.yml @@ -11,6 +11,10 @@ - Civilian engine: - Plasma + addComponents: + - type: IFF + color: '#FFFFFFFF' + flags: [IsPlayerShuttle] - type: gameMap id: Stellaris diff --git a/Resources/Prototypes/_NF/Shipyard/tyne.yml b/Resources/Prototypes/_NF/Shipyard/tyne.yml index d4c32687e23..12575b1a6b1 100644 --- a/Resources/Prototypes/_NF/Shipyard/tyne.yml +++ b/Resources/Prototypes/_NF/Shipyard/tyne.yml @@ -18,6 +18,10 @@ shuttlePath: /Maps/_NF/Shuttles/tyne.yml class: - Medical + addComponents: + - type: IFF + color: '#FFFFFFFF' + flags: [IsPlayerShuttle] - type: gameMap id: Tyne diff --git a/Resources/Prototypes/_NF/Shipyard/vagabond.yml b/Resources/Prototypes/_NF/Shipyard/vagabond.yml index 448d9e07c75..a1f67c4cd61 100644 --- a/Resources/Prototypes/_NF/Shipyard/vagabond.yml +++ b/Resources/Prototypes/_NF/Shipyard/vagabond.yml @@ -22,6 +22,10 @@ - Cargo engine: - Plasma + addComponents: + - type: IFF + color: '#FFFFFFFF' + flags: [IsPlayerShuttle] - type: gameMap id: Vagabond From 2d50f3fac9994b49754a77600c97c45dc8ec2edc Mon Sep 17 00:00:00 2001 From: Dvir Date: Sat, 28 Dec 2024 05:33:01 +0200 Subject: [PATCH 5/9] Update ShuttleSystem.FasterThanLight.cs --- .../Shuttles/Systems/ShuttleSystem.FasterThanLight.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Content.Server/Shuttles/Systems/ShuttleSystem.FasterThanLight.cs b/Content.Server/Shuttles/Systems/ShuttleSystem.FasterThanLight.cs index e928ffd5ee8..8244ab5255a 100644 --- a/Content.Server/Shuttles/Systems/ShuttleSystem.FasterThanLight.cs +++ b/Content.Server/Shuttles/Systems/ShuttleSystem.FasterThanLight.cs @@ -637,7 +637,7 @@ private void DoTheDinosaur(TransformComponent xform) { if (!_statusQuery.TryGetComponent(child, out var status)) continue; - + if (HasComp(child)) // Frontier: NPC knockdown immunity continue; // Frontier: NPC knockdown immunity From d7697fb3ab24d3a52d5403c6eb57ec763e3b88f3 Mon Sep 17 00:00:00 2001 From: Dvir Date: Sat, 28 Dec 2024 05:33:40 +0200 Subject: [PATCH 6/9] Wrong file --- .../Shuttles/Systems/ShuttleSystem.FasterThanLight.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Content.Server/Shuttles/Systems/ShuttleSystem.FasterThanLight.cs b/Content.Server/Shuttles/Systems/ShuttleSystem.FasterThanLight.cs index 8244ab5255a..e928ffd5ee8 100644 --- a/Content.Server/Shuttles/Systems/ShuttleSystem.FasterThanLight.cs +++ b/Content.Server/Shuttles/Systems/ShuttleSystem.FasterThanLight.cs @@ -637,7 +637,7 @@ private void DoTheDinosaur(TransformComponent xform) { if (!_statusQuery.TryGetComponent(child, out var status)) continue; - + if (HasComp(child)) // Frontier: NPC knockdown immunity continue; // Frontier: NPC knockdown immunity From eae589d935224d2a6324f60cec1496de2cf40232 Mon Sep 17 00:00:00 2001 From: Whatstone Date: Sat, 28 Dec 2024 01:04:57 -0500 Subject: [PATCH 7/9] inheritable vessels/POIs --- .../_NF/GameRule/PointOfInterestPrototype.cs | 13 +++++++-- .../Shipyard/Prototypes/VesselPrototype.cs | 27 ++++++++++++------- .../_NF/PointsOfInterest/anomalousgeode.yml | 9 +------ .../_NF/PointsOfInterest/anomalouslab.yml | 9 +------ .../_NF/PointsOfInterest/bahamamamas.yml | 7 +---- .../Prototypes/_NF/PointsOfInterest/base.yml | 14 ++++++++++ .../_NF/PointsOfInterest/caseys.yml | 9 +------ .../_NF/PointsOfInterest/courthouse.yml | 8 ++---- .../Prototypes/_NF/PointsOfInterest/cove.yml | 5 ++-- .../_NF/PointsOfInterest/depots.yml | 12 ++------- .../_NF/PointsOfInterest/edison.yml | 6 +---- .../_NF/PointsOfInterest/grifty.yml | 9 +------ .../Prototypes/_NF/PointsOfInterest/lodge.yml | 6 +---- .../_NF/PointsOfInterest/lpbravo.yml | 6 ++--- .../_NF/PointsOfInterest/mchobo.yml | 9 +------ .../Prototypes/_NF/PointsOfInterest/nfsd.yml | 8 ++---- .../_NF/PointsOfInterest/northpole.yml | 5 +--- .../_NF/PointsOfInterest/omnichurch.yml | 9 +------ .../_NF/PointsOfInterest/thepit.yml | 9 +------ .../_NF/PointsOfInterest/tinniasrest.yml | 8 +----- .../Prototypes/_NF/PointsOfInterest/trade.yml | 6 +---- .../_NF/PointsOfInterest/trademall.yml | 6 +---- .../Prototypes/_NF/Shipyard/Base/base.yml | 21 +++++++++++++++ .../_NF/Shipyard/BlackMarket/barnacle.yml | 5 +--- .../_NF/Shipyard/BlackMarket/bocakillo.yml | 5 +--- .../_NF/Shipyard/BlackMarket/falcon.yml | 5 +--- .../_NF/Shipyard/BlackMarket/menace.yml | 5 +--- .../_NF/Shipyard/BlackMarket/schooner.yml | 5 +--- .../_NF/Shipyard/Expedition/ambition.yml | 5 +--- .../_NF/Shipyard/Expedition/anchor.yml | 5 +--- .../_NF/Shipyard/Expedition/brigand.yml | 5 +--- .../_NF/Shipyard/Expedition/charon.yml | 7 +++-- .../_NF/Shipyard/Expedition/decadedove.yml | 5 +--- .../_NF/Shipyard/Expedition/dragonfly.yml | 5 +--- .../_NF/Shipyard/Expedition/gasbender.yml | 5 +--- .../_NF/Shipyard/Expedition/gourd.yml | 5 +--- .../_NF/Shipyard/Expedition/pathfinder.yml | 5 +--- .../_NF/Shipyard/Expedition/sprinter.yml | 5 +--- .../_NF/Shipyard/Nfsd/broadhead.yml | 5 +--- .../Prototypes/_NF/Shipyard/Nfsd/cleric.yml | 5 +--- .../Prototypes/_NF/Shipyard/Nfsd/empress.yml | 9 +------ .../Prototypes/_NF/Shipyard/Nfsd/fighter.yml | 5 +--- .../_NF/Shipyard/Nfsd/hospitaller.yml | 5 +--- .../_NF/Shipyard/Nfsd/interceptor.yml | 5 +--- .../Prototypes/_NF/Shipyard/Nfsd/paladin.yml | 7 +++-- .../Prototypes/_NF/Shipyard/Nfsd/prowler.yml | 5 +--- .../Prototypes/_NF/Shipyard/Nfsd/rogue.yml | 5 +--- .../Prototypes/_NF/Shipyard/Nfsd/templar.yml | 5 +--- .../Prototypes/_NF/Shipyard/Nfsd/wasp.yml | 5 +--- .../Prototypes/_NF/Shipyard/Nfsd/wendigo.yml | 5 +--- .../Prototypes/_NF/Shipyard/Scrap/bison.yml | 5 +--- .../_NF/Shipyard/Scrap/canister.yml | 5 +--- .../_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 +--- .../Prototypes/_NF/Shipyard/Sr/bottleneck.yml | 5 +--- .../Prototypes/_NF/Shipyard/Sr/broom.yml | 5 +--- .../Prototypes/_NF/Shipyard/Sr/chauffeur.yml | 5 +--- .../Prototypes/_NF/Shipyard/Sr/mailpod.yml | 5 +--- .../Prototypes/_NF/Shipyard/Sr/parcel.yml | 5 +--- .../Prototypes/_NF/Shipyard/Sr/watchdog.yml | 5 +--- .../_NF/Shipyard/Syndicate/hunter.yml | 5 +--- .../_NF/Shipyard/Syndicate/infiltrator.yml | 5 +--- Resources/Prototypes/_NF/Shipyard/akupara.yml | 5 +--- .../Prototypes/_NF/Shipyard/apothecary.yml | 5 +--- Resources/Prototypes/_NF/Shipyard/barge.yml | 5 +--- Resources/Prototypes/_NF/Shipyard/bazaar.yml | 5 +--- Resources/Prototypes/_NF/Shipyard/beaker.yml | 5 +--- .../Prototypes/_NF/Shipyard/bocadillo.yml | 5 +--- Resources/Prototypes/_NF/Shipyard/bodkin.yml | 5 +--- .../Prototypes/_NF/Shipyard/bookworm.yml | 5 +--- Resources/Prototypes/_NF/Shipyard/bulker.yml | 5 +--- .../Prototypes/_NF/Shipyard/caduceus.yml | 5 +--- Resources/Prototypes/_NF/Shipyard/camper.yml | 5 +--- Resources/Prototypes/_NF/Shipyard/ceres.yml | 5 +--- Resources/Prototypes/_NF/Shipyard/chisel.yml | 5 +--- Resources/Prototypes/_NF/Shipyard/comet.yml | 5 +--- .../Prototypes/_NF/Shipyard/construct.yml | 5 +--- .../Prototypes/_NF/Shipyard/crescent.yml | 5 +--- Resources/Prototypes/_NF/Shipyard/eagle.yml | 5 +--- Resources/Prototypes/_NF/Shipyard/garden.yml | 5 +--- Resources/Prototypes/_NF/Shipyard/hammer.yml | 5 +--- .../Prototypes/_NF/Shipyard/harbormaster.yml | 5 +--- Resources/Prototypes/_NF/Shipyard/hauler.yml | 5 +--- Resources/Prototypes/_NF/Shipyard/honker.yml | 5 +--- .../Prototypes/_NF/Shipyard/investigator.yml | 5 +--- Resources/Prototypes/_NF/Shipyard/kestrel.yml | 5 +--- .../Prototypes/_NF/Shipyard/kilderkin.yml | 5 +--- Resources/Prototypes/_NF/Shipyard/lantern.yml | 5 +--- Resources/Prototypes/_NF/Shipyard/legman.yml | 5 +--- .../Prototypes/_NF/Shipyard/liquidator.yml | 5 +--- Resources/Prototypes/_NF/Shipyard/loader.yml | 5 +--- Resources/Prototypes/_NF/Shipyard/lyrae.yml | 5 +--- Resources/Prototypes/_NF/Shipyard/mccargo.yml | 5 +--- .../Prototypes/_NF/Shipyard/mcdelivery.yml | 5 +--- Resources/Prototypes/_NF/Shipyard/phoenix.yml | 5 +--- .../Prototypes/_NF/Shipyard/piecrust.yml | 5 +--- Resources/Prototypes/_NF/Shipyard/pioneer.yml | 5 +--- Resources/Prototypes/_NF/Shipyard/placebo.yml | 5 +--- .../Prototypes/_NF/Shipyard/prospector.yml | 5 +--- Resources/Prototypes/_NF/Shipyard/pts.yml | 5 +--- .../Prototypes/_NF/Shipyard/searchlight.yml | 5 +--- Resources/Prototypes/_NF/Shipyard/skipper.yml | 5 +--- Resources/Prototypes/_NF/Shipyard/sparrow.yml | 5 +--- Resources/Prototypes/_NF/Shipyard/spectre.yml | 5 +--- Resources/Prototypes/_NF/Shipyard/spirit.yml | 5 +--- Resources/Prototypes/_NF/Shipyard/stasis.yml | 5 +--- .../Prototypes/_NF/Shipyard/stellaris.yml | 5 +--- Resources/Prototypes/_NF/Shipyard/tyne.yml | 7 +++-- .../Prototypes/_NF/Shipyard/vagabond.yml | 5 +--- 112 files changed, 183 insertions(+), 493 deletions(-) create mode 100644 Resources/Prototypes/_NF/PointsOfInterest/base.yml create mode 100644 Resources/Prototypes/_NF/Shipyard/Base/base.yml diff --git a/Content.Server/_NF/GameRule/PointOfInterestPrototype.cs b/Content.Server/_NF/GameRule/PointOfInterestPrototype.cs index 84baf23c519..5dd7b8a9d07 100644 --- a/Content.Server/_NF/GameRule/PointOfInterestPrototype.cs +++ b/Content.Server/_NF/GameRule/PointOfInterestPrototype.cs @@ -1,5 +1,6 @@ using Content.Server.GameTicking.Presets; using Robust.Shared.Prototypes; +using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype.Array; using Robust.Shared.Utility; namespace Content.Server._NF.GameRule; @@ -7,13 +8,20 @@ namespace Content.Server._NF.GameRule; /// /// Describes information for a single point of interest to be spawned in the world /// -[Prototype("pointOfInterest")] +[Prototype] [Serializable] -public sealed partial class PointOfInterestPrototype : IPrototype +public sealed partial class PointOfInterestPrototype : IPrototype, IInheritingPrototype { [IdDataField] public string ID { get; private set; } = default!; + [ParentDataField(typeof(AbstractPrototypeIdArraySerializer))] + public string[]? Parents { get; private set; } + + [NeverPushInheritance] + [AbstractDataField] + public bool Abstract { get; private set; } + /// /// The name of this point of interest /// @@ -48,6 +56,7 @@ public sealed partial class PointOfInterestPrototype : IPrototype /// Components to be added to any spawned grids. /// [DataField] + [AlwaysPushInheritance] public ComponentRegistry AddComponents { get; set; } = new(); /// diff --git a/Content.Shared/Shipyard/Prototypes/VesselPrototype.cs b/Content.Shared/Shipyard/Prototypes/VesselPrototype.cs index 1d7636e3fc9..d822331ac20 100644 --- a/Content.Shared/Shipyard/Prototypes/VesselPrototype.cs +++ b/Content.Shared/Shipyard/Prototypes/VesselPrototype.cs @@ -1,41 +1,49 @@ using Content.Shared.Guidebook; using Robust.Shared.Prototypes; +using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype.Array; using Robust.Shared.Utility; namespace Content.Shared.Shipyard.Prototypes; -[Prototype("vessel")] -public sealed class VesselPrototype : IPrototype +[Prototype] +public sealed class VesselPrototype : IPrototype, IInheritingPrototype { [IdDataField] public string ID { get; } = default!; + [ParentDataField(typeof(AbstractPrototypeIdArraySerializer))] + public string[]? Parents { get; private set; } + + [NeverPushInheritance] + [AbstractDataField] + public bool Abstract { get; private set; } + /// /// Vessel name. /// - [DataField("name")] public string Name = string.Empty; + [DataField] public string Name = string.Empty; /// /// Short description of the vessel. /// - [DataField("description")] public string Description = string.Empty; + [DataField] public string Description = string.Empty; /// /// The price of the vessel /// - [DataField("price", required: true)] + [DataField(required: true)] public int Price; /// /// The size of the vessel. (e.g. Small, Medium, Large etc.) /// - [DataField("category", required: true)] + [DataField(required: true)] public VesselSize Category = VesselSize.Small; /// /// The shipyard listing that the vessel should be in. (e.g. Civilian, Syndicate, Contraband etc.) /// - [DataField("group", required: true)] + [DataField(required: true)] public ShipyardConsoleUiKey Group = ShipyardConsoleUiKey.Shipyard; /// @@ -53,7 +61,7 @@ public sealed class VesselPrototype : IPrototype /// /// The access required to buy the product. (e.g. Command, Mail, Bailiff, etc.) /// - [DataField("access")] + [DataField] public string Access = string.Empty; /// Frontier - Add this field for the MapChecker script. @@ -66,7 +74,7 @@ public sealed class VesselPrototype : IPrototype /// /// Relative directory path to the given shuttle, i.e. `/Maps/Shuttles/yourshittle.yml` /// - [DataField("shuttlePath", required: true)] + [DataField(required: true)] public ResPath ShuttlePath = default!; /// @@ -85,6 +93,7 @@ public sealed class VesselPrototype : IPrototype /// Components to be added to any spawned grids. /// [DataField] + [AlwaysPushInheritance] public ComponentRegistry AddComponents { get; set; } = new(); } diff --git a/Resources/Prototypes/_NF/PointsOfInterest/anomalousgeode.yml b/Resources/Prototypes/_NF/PointsOfInterest/anomalousgeode.yml index 00644f0686e..f54c2d9449d 100644 --- a/Resources/Prototypes/_NF/PointsOfInterest/anomalousgeode.yml +++ b/Resources/Prototypes/_NF/PointsOfInterest/anomalousgeode.yml @@ -10,19 +10,12 @@ # The local Science lab - type: pointOfInterest id: AnomalousGeode + parent: BasePOI name: 'Anomalous Geode' minimumDistance: 2100 maximumDistance: 3800 - spawnGamePreset: [ NFAdventure, NFPirate ] spawnGroup: ScienceLab gridPath: /Maps/_NF/POI/anomalousgeode.yml - addComponents: - - type: IFF - color: "#ffa600" - readOnly: true - - type: Shuttle - angularDamping: 999999 - linearDamping: 999999 - type: gameMap id: AnomalousGeode diff --git a/Resources/Prototypes/_NF/PointsOfInterest/anomalouslab.yml b/Resources/Prototypes/_NF/PointsOfInterest/anomalouslab.yml index 6d6a37e5db0..ddb886b5ec2 100644 --- a/Resources/Prototypes/_NF/PointsOfInterest/anomalouslab.yml +++ b/Resources/Prototypes/_NF/PointsOfInterest/anomalouslab.yml @@ -10,19 +10,12 @@ # The local Science lab - type: pointOfInterest id: AnomalousLab + parent: BasePOI name: 'Anomalous Lab' minimumDistance: 2100 maximumDistance: 3800 - spawnGamePreset: [ NFAdventure, NFPirate ] spawnGroup: ScienceLab gridPath: /Maps/_NF/POI/anomalouslab.yml - addComponents: - - type: IFF - color: "#ffa600" - readOnly: true - - type: Shuttle - angularDamping: 999999 - linearDamping: 999999 - type: gameMap id: AnomalousLab diff --git a/Resources/Prototypes/_NF/PointsOfInterest/bahamamamas.yml b/Resources/Prototypes/_NF/PointsOfInterest/bahamamamas.yml index 794d1c19e1f..c715b511849 100644 --- a/Resources/Prototypes/_NF/PointsOfInterest/bahamamamas.yml +++ b/Resources/Prototypes/_NF/PointsOfInterest/bahamamamas.yml @@ -10,6 +10,7 @@ # I want to lie, shipwrecked and comatose, drinking fresh mango juice. - type: pointOfInterest id: Bahama + parent: BasePOI name: "Bahama Mama's" minimumDistance: 1200 maximumDistance: 2900 @@ -17,12 +18,6 @@ spawnGroup: RestStop gridPath: /Maps/_NF/POI/bahama.yml addComponents: - - type: IFF - color: "#ffa600" - readOnly: true - - type: Shuttle - angularDamping: 999999 - linearDamping: 999999 - type: StationTransit - type: gameMap diff --git a/Resources/Prototypes/_NF/PointsOfInterest/base.yml b/Resources/Prototypes/_NF/PointsOfInterest/base.yml new file mode 100644 index 00000000000..207392f6eb5 --- /dev/null +++ b/Resources/Prototypes/_NF/PointsOfInterest/base.yml @@ -0,0 +1,14 @@ +- type: pointOfInterest + id: BasePOI + abstract: true + minimumDistance: 2000 # Some sane defaults + maximumDistance: 4000 + spawnGamePreset: [ NFAdventure, NFPirate ] + spawnGroup: Optional + addComponents: + - type: IFF + color: "#ffa600" + readOnly: true + - type: Shuttle + angularDamping: 999999 + linearDamping: 999999 diff --git a/Resources/Prototypes/_NF/PointsOfInterest/caseys.yml b/Resources/Prototypes/_NF/PointsOfInterest/caseys.yml index bad9005947c..3cefa082bc4 100644 --- a/Resources/Prototypes/_NF/PointsOfInterest/caseys.yml +++ b/Resources/Prototypes/_NF/PointsOfInterest/caseys.yml @@ -10,18 +10,11 @@ # Down at your local saloon - type: pointOfInterest id: CaseysCasino + parent: BasePOI name: "Crazy Casey's Casino" minimumDistance: 3250 maximumDistance: 5600 - spawnGamePreset: [ NFAdventure, NFPirate ] gridPath: /Maps/_NF/POI/caseyscasino.yml - addComponents: - - type: IFF - color: "#ffa600" - readOnly: true - - type: Shuttle - angularDamping: 999999 - linearDamping: 999999 - type: gameMap id: CaseysCasino diff --git a/Resources/Prototypes/_NF/PointsOfInterest/courthouse.yml b/Resources/Prototypes/_NF/PointsOfInterest/courthouse.yml index a35d46d3eda..3b2c1fa02cc 100644 --- a/Resources/Prototypes/_NF/PointsOfInterest/courthouse.yml +++ b/Resources/Prototypes/_NF/PointsOfInterest/courthouse.yml @@ -10,19 +10,15 @@ # - type: pointOfInterest id: Courthouse + parent: BasePOI name: "Courthouse" minimumDistance: 1150 maximumDistance: 2050 - spawnGamePreset: [ NFAdventure, NFPirate ] spawnGroup: Required gridPath: /Maps/_NF/POI/courthouse.yml addComponents: - type: IFF - color: "#8e6444" - readOnly: true - - type: Shuttle - angularDamping: 999999 - linearDamping: 999999 + color: "#ae7d57" - type: gameMap id: Courthouse diff --git a/Resources/Prototypes/_NF/PointsOfInterest/cove.yml b/Resources/Prototypes/_NF/PointsOfInterest/cove.yml index 57bb4d1c336..bbd9f1175cd 100644 --- a/Resources/Prototypes/_NF/PointsOfInterest/cove.yml +++ b/Resources/Prototypes/_NF/PointsOfInterest/cove.yml @@ -10,6 +10,7 @@ # Byarr - type: pointOfInterest id: Cove + parent: BasePOI name: Pirate Cove minimumDistance: 10000 maximumDistance: 15000 @@ -21,9 +22,7 @@ - type: IFF color: "#C83737" flags: [HideLabel] - - type: Shuttle - angularDamping: 999999 - linearDamping: 999999 + readOnly: false - type: gameMap id: Cove diff --git a/Resources/Prototypes/_NF/PointsOfInterest/depots.yml b/Resources/Prototypes/_NF/PointsOfInterest/depots.yml index d6c3105327d..7de0d0c2eff 100644 --- a/Resources/Prototypes/_NF/PointsOfInterest/depots.yml +++ b/Resources/Prototypes/_NF/PointsOfInterest/depots.yml @@ -10,37 +10,29 @@ # Basic Cargo Depot selling point for economy and great wealth - type: pointOfInterest id: CargoDepot + parent: BasePOI name: Cargo Depot minimumDistance: 4500 maximumDistance: 6000 - spawnGamePreset: [ NFAdventure, NFPirate ] spawnGroup: CargoDepot gridPath: /Maps/_NF/POI/cargodepot.yml addComponents: - type: IFF color: "#37C837" - readOnly: true - - type: Shuttle - angularDamping: 999999 - linearDamping: 999999 - type: ProtectedGrid preventArtifactTriggers: true - type: pointOfInterest id: CargoDepotAlt + parent: BasePOI name: Cargo Depot minimumDistance: 4500 maximumDistance: 6000 - spawnGamePreset: [ NFAdventure, NFPirate ] spawnGroup: CargoDepot gridPath: /Maps/_NF/POI/cargodepotalt.yml addComponents: - type: IFF color: "#37C837" - readOnly: true - - type: Shuttle - angularDamping: 999999 - linearDamping: 999999 - type: ProtectedGrid preventArtifactTriggers: true diff --git a/Resources/Prototypes/_NF/PointsOfInterest/edison.yml b/Resources/Prototypes/_NF/PointsOfInterest/edison.yml index 04bbf80b51d..8a77b271419 100644 --- a/Resources/Prototypes/_NF/PointsOfInterest/edison.yml +++ b/Resources/Prototypes/_NF/PointsOfInterest/edison.yml @@ -10,19 +10,15 @@ # # - type: pointOfInterest # id: Edison + # parent: BasePOI # name: 'Edison Power Plant' # minimumDistance: 3650 # maximumDistance: 6400 - # spawnGamePreset: [ NFAdventure, NFPirate ] # spawnGroup: Required # gridPath: /Maps/_NF/POI/edison.yml # addComponents: # - type: IFF # color: "#3737C8" - # readOnly: true - # - type: Shuttle - # angularDamping: 999999 - # linearDamping: 999999 # - type: gameMap # id: Edison diff --git a/Resources/Prototypes/_NF/PointsOfInterest/grifty.yml b/Resources/Prototypes/_NF/PointsOfInterest/grifty.yml index cb5fce22f97..a632645b686 100644 --- a/Resources/Prototypes/_NF/PointsOfInterest/grifty.yml +++ b/Resources/Prototypes/_NF/PointsOfInterest/grifty.yml @@ -10,19 +10,12 @@ # Down at your local saloon - type: pointOfInterest id: Grifty + parent: BasePOI name: "Grifty's Gas n Grub" minimumDistance: 3250 maximumDistance: 5600 - spawnGamePreset: [ NFAdventure, NFPirate ] spawnGroup: Scrapyard gridPath: /Maps/_NF/POI/grifty.yml - addComponents: - - type: IFF - color: "#ffa600" - readOnly: true - - type: Shuttle - angularDamping: 999999 - linearDamping: 999999 - type: gameMap id: Grifty diff --git a/Resources/Prototypes/_NF/PointsOfInterest/lodge.yml b/Resources/Prototypes/_NF/PointsOfInterest/lodge.yml index eb09273a2e4..15886925fce 100644 --- a/Resources/Prototypes/_NF/PointsOfInterest/lodge.yml +++ b/Resources/Prototypes/_NF/PointsOfInterest/lodge.yml @@ -10,19 +10,15 @@ # Provides higher end expeditionary ships and a space for vets to spawn in away from potential frontier shenanigans - type: pointOfInterest id: Lodge + parent: BasePOI name: 'Expeditionary Lodge' minimumDistance: 1650 maximumDistance: 3400 - spawnGamePreset: [ NFAdventure, NFPirate ] spawnGroup: Required gridPath: /Maps/_NF/POI/lodge.yml addComponents: - type: IFF color: "#3737C8" - readOnly: true - - type: Shuttle - angularDamping: 999999 - linearDamping: 999999 - type: StationTransit - type: gameMap diff --git a/Resources/Prototypes/_NF/PointsOfInterest/lpbravo.yml b/Resources/Prototypes/_NF/PointsOfInterest/lpbravo.yml index 7f135395d5b..bb9cf0ac3bd 100644 --- a/Resources/Prototypes/_NF/PointsOfInterest/lpbravo.yml +++ b/Resources/Prototypes/_NF/PointsOfInterest/lpbravo.yml @@ -10,10 +10,10 @@ # just a little loot n shoot POI. Pretty much the second POI to even exist - type: pointOfInterest id: LPBravo + parent: BasePOI name: 'Listening Point Bravo' minimumDistance: 4000 maximumDistance: 6000 - spawnGamePreset: [ NFAdventure, NFPirate ] spawnGroup: SyndicateFOB gridPath: /Maps/_NF/POI/lpbravo.yml hideWarp: true @@ -21,9 +21,7 @@ - type: IFF color: "#C83737" flags: [HideLabel, Hide] - - type: Shuttle - angularDamping: 999999 - linearDamping: 999999 + readOnly: false - type: SyndicateFOB # For pinpointer - type: gameMap diff --git a/Resources/Prototypes/_NF/PointsOfInterest/mchobo.yml b/Resources/Prototypes/_NF/PointsOfInterest/mchobo.yml index aa6a3e70c2b..ec3c68cb191 100644 --- a/Resources/Prototypes/_NF/PointsOfInterest/mchobo.yml +++ b/Resources/Prototypes/_NF/PointsOfInterest/mchobo.yml @@ -11,19 +11,12 @@ # Based on the McCargo built by Dvir01 (https://github.com/dvir001) and ruined with drunken pride by Tych0. - type: pointOfInterest id: McHobo + parent: BasePOI name: Derelict McCargo minimumDistance: 3250 maximumDistance: 5600 - spawnGamePreset: [ NFAdventure, NFPirate ] spawnGroup: Scrapyard gridPath: /Maps/_NF/POI/mchobo.yml - addComponents: - - type: IFF - color: "#ffa600" - readOnly: true - - type: Shuttle - angularDamping: 999999 - linearDamping: 999999 - type: gameMap id: McHobo diff --git a/Resources/Prototypes/_NF/PointsOfInterest/nfsd.yml b/Resources/Prototypes/_NF/PointsOfInterest/nfsd.yml index d993915f438..7a13e065f5d 100644 --- a/Resources/Prototypes/_NF/PointsOfInterest/nfsd.yml +++ b/Resources/Prototypes/_NF/PointsOfInterest/nfsd.yml @@ -10,19 +10,15 @@ # - type: pointOfInterest id: Nfsd + parent: BasePOI name: 'NFSD Outpost' minimumDistance: 750 maximumDistance: 1000 - spawnGamePreset: [ NFAdventure, NFPirate ] spawnGroup: Required gridPath: /Maps/_NF/POI/nfsd.yml addComponents: - type: IFF - color: "#8e6444" - readOnly: true - - type: Shuttle - angularDamping: 999999 - linearDamping: 999999 + color: "#ae7d57" - type: ProtectedGrid preventEmpEvents: true diff --git a/Resources/Prototypes/_NF/PointsOfInterest/northpole.yml b/Resources/Prototypes/_NF/PointsOfInterest/northpole.yml index 47a9c84fc8b..837ed606e4c 100644 --- a/Resources/Prototypes/_NF/PointsOfInterest/northpole.yml +++ b/Resources/Prototypes/_NF/PointsOfInterest/northpole.yml @@ -10,10 +10,10 @@ # just a little loot n shoot POI. Pretty much the second POI to even exist - type: pointOfInterest id: NorthPole + parent: BasePOI name: "The North Pole" minimumDistance: 2150 maximumDistance: 4850 - spawnGamePreset: [ NFAdventure, NFPirate ] spawnGroup: Christmas spawnChance: 0 gridPath: /Maps/_NF/POI/northpole.yml @@ -22,6 +22,3 @@ - type: IFF color: "#C83737" flags: [HideLabel] - - type: Shuttle - angularDamping: 999999 - linearDamping: 999999 diff --git a/Resources/Prototypes/_NF/PointsOfInterest/omnichurch.yml b/Resources/Prototypes/_NF/PointsOfInterest/omnichurch.yml index 8a0861058c2..d290198013a 100644 --- a/Resources/Prototypes/_NF/PointsOfInterest/omnichurch.yml +++ b/Resources/Prototypes/_NF/PointsOfInterest/omnichurch.yml @@ -10,15 +10,8 @@ # - type: pointOfInterest id: Omnichurch + parent: BasePOI name: "Omnichurch Beacon" minimumDistance: 2200 maximumDistance: 4900 - spawnGamePreset: [ NFAdventure, NFPirate ] gridPath: /Maps/_NF/POI/beacon.yml - addComponents: - - type: IFF - color: "#ffa600" - readOnly: true - - type: Shuttle - angularDamping: 999999 - linearDamping: 999999 diff --git a/Resources/Prototypes/_NF/PointsOfInterest/thepit.yml b/Resources/Prototypes/_NF/PointsOfInterest/thepit.yml index 8a13ec26b97..b6b5bae495f 100644 --- a/Resources/Prototypes/_NF/PointsOfInterest/thepit.yml +++ b/Resources/Prototypes/_NF/PointsOfInterest/thepit.yml @@ -10,19 +10,12 @@ # Down at your local saloon - type: pointOfInterest id: ThePit + parent: BasePOI name: "The Pit" minimumDistance: 2200 maximumDistance: 4200 - spawnGamePreset: [ NFAdventure, NFPirate ] spawnGroup: Arena gridPath: /Maps/_NF/POI/arena.yml - addComponents: - - type: IFF - color: "#ffa600" - readOnly: true - - type: Shuttle - angularDamping: 999999 - linearDamping: 999999 - type: gameMap id: ThePit diff --git a/Resources/Prototypes/_NF/PointsOfInterest/tinniasrest.yml b/Resources/Prototypes/_NF/PointsOfInterest/tinniasrest.yml index c7f48701a94..9537b09f1f8 100644 --- a/Resources/Prototypes/_NF/PointsOfInterest/tinniasrest.yml +++ b/Resources/Prototypes/_NF/PointsOfInterest/tinniasrest.yml @@ -10,19 +10,13 @@ # Down at your local saloon - type: pointOfInterest id: Tinnia + parent: BasePOI name: "Tinnia's Rest" minimumDistance: 1200 maximumDistance: 2900 - spawnGamePreset: [ NFAdventure, NFPirate ] spawnGroup: RestStop gridPath: /Maps/_NF/POI/tinnia.yml addComponents: - - type: IFF - color: "#ffa600" - readOnly: true - - type: Shuttle - angularDamping: 999999 - linearDamping: 999999 - type: StationTransit - type: gameMap diff --git a/Resources/Prototypes/_NF/PointsOfInterest/trade.yml b/Resources/Prototypes/_NF/PointsOfInterest/trade.yml index 555f321139b..c621b0119ed 100644 --- a/Resources/Prototypes/_NF/PointsOfInterest/trade.yml +++ b/Resources/Prototypes/_NF/PointsOfInterest/trade.yml @@ -10,19 +10,15 @@ # Basic Trade Outpost buying point for economy and great wealth - type: pointOfInterest id: Trade + parent: BasePOI name: Trade Outpost minimumDistance: 1500 maximumDistance: 2500 - spawnGamePreset: [ NFAdventure, NFPirate ] spawnGroup: MarketStation gridPath: /Maps/_NF/POI/trade.yml addComponents: - type: IFF color: "#37C837" - readOnly: true - - type: Shuttle - angularDamping: 999999 - linearDamping: 999999 - type: StationTransit - type: ProtectedGrid preventArtifactTriggers: true diff --git a/Resources/Prototypes/_NF/PointsOfInterest/trademall.yml b/Resources/Prototypes/_NF/PointsOfInterest/trademall.yml index 9b7e75158fb..237c2588381 100644 --- a/Resources/Prototypes/_NF/PointsOfInterest/trademall.yml +++ b/Resources/Prototypes/_NF/PointsOfInterest/trademall.yml @@ -10,19 +10,15 @@ # Basic Trade Outpost buying point for economy and great wealth - type: pointOfInterest id: TradeMall + parent: BasePOI name: Trade Mall minimumDistance: 1500 maximumDistance: 2500 - spawnGamePreset: [ NFAdventure, NFPirate ] spawnGroup: MarketStation gridPath: /Maps/_NF/POI/trademall.yml addComponents: - type: IFF color: "#37C837" - readOnly: true - - type: Shuttle - angularDamping: 999999 - linearDamping: 999999 - type: StationTransit - type: ProtectedGrid preventArtifactTriggers: true diff --git a/Resources/Prototypes/_NF/Shipyard/Base/base.yml b/Resources/Prototypes/_NF/Shipyard/Base/base.yml new file mode 100644 index 00000000000..020c1e17256 --- /dev/null +++ b/Resources/Prototypes/_NF/Shipyard/Base/base.yml @@ -0,0 +1,21 @@ +# Separating this for ease of visualization +- type: vessel + id: BaseVessel + abstract: true + name: NFG Bikeshed + description: Questionably spaceworthy. + price: 50000 + category: Medium + group: Shipyard + addComponents: + - type: IFF + color: '#FFFFFFFF' + flags: [IsPlayerShuttle] + +- type: vessel + id: BaseVesselAntag + abstract: true + parent: BaseVessel + addComponents: + - type: IFF + flags: [IsPlayerShuttle, HideLabel] diff --git a/Resources/Prototypes/_NF/Shipyard/BlackMarket/barnacle.yml b/Resources/Prototypes/_NF/Shipyard/BlackMarket/barnacle.yml index cfb07076c6e..902fc4b94fb 100644 --- a/Resources/Prototypes/_NF/Shipyard/BlackMarket/barnacle.yml +++ b/Resources/Prototypes/_NF/Shipyard/BlackMarket/barnacle.yml @@ -5,6 +5,7 @@ # a wooden pirate version of the classic Prospector - type: vessel id: Barnacle + parent: BaseVesselAntag name: Barnacle description: 'Nobody expects the lowly barnacle' price: 20000 # TODO: review ship values - Whatstone @@ -16,10 +17,6 @@ - Pirate engine: - Plasma - addComponents: - - type: IFF - color: '#FFFFFFFF' - flags: [IsPlayerShuttle, HideLabel] - type: gameMap id: Barnacle diff --git a/Resources/Prototypes/_NF/Shipyard/BlackMarket/bocakillo.yml b/Resources/Prototypes/_NF/Shipyard/BlackMarket/bocakillo.yml index af58a3d1f6f..3e55b5e7999 100644 --- a/Resources/Prototypes/_NF/Shipyard/BlackMarket/bocakillo.yml +++ b/Resources/Prototypes/_NF/Shipyard/BlackMarket/bocakillo.yml @@ -10,6 +10,7 @@ # - type: vessel id: Bocakillo + parent: BaseVesselAntag name: Bocakillo description: A tiny plastitanium vessel suited to a crew of 2 to 3 pirates. Has two broadside cannons and a rear-facing disposals launcher. Runs on plasma. price: 35000 #Cheap @@ -21,10 +22,6 @@ - Pirate engine: - Plasma - addComponents: - - type: IFF - color: '#FFFFFFFF' - flags: [IsPlayerShuttle, HideLabel] - type: gameMap id: Bocakillo diff --git a/Resources/Prototypes/_NF/Shipyard/BlackMarket/falcon.yml b/Resources/Prototypes/_NF/Shipyard/BlackMarket/falcon.yml index cbffc192a61..f6aab2b0aad 100644 --- a/Resources/Prototypes/_NF/Shipyard/BlackMarket/falcon.yml +++ b/Resources/Prototypes/_NF/Shipyard/BlackMarket/falcon.yml @@ -5,6 +5,7 @@ # Kestrel looking ship with hangar bay meant to be used along with hoverbikes. - type: vessel id: Falcon + parent: BaseVesselAntag name: Falcon description: Rebuilt mining vessel made into a pirate ship with hangar bay to store vehicles, fits between 3-4 crew. price: 70000 #Selling price is 22520 @@ -16,10 +17,6 @@ - Pirate engine: - Plasma - addComponents: - - type: IFF - color: '#FFFFFFFF' - flags: [IsPlayerShuttle, HideLabel] - type: gameMap id: Falcon diff --git a/Resources/Prototypes/_NF/Shipyard/BlackMarket/menace.yml b/Resources/Prototypes/_NF/Shipyard/BlackMarket/menace.yml index 9cc3c19ff61..e6dc3e37617 100644 --- a/Resources/Prototypes/_NF/Shipyard/BlackMarket/menace.yml +++ b/Resources/Prototypes/_NF/Shipyard/BlackMarket/menace.yml @@ -10,6 +10,7 @@ # - type: vessel id: Menace + parent: BaseVesselAntag name: Menace description: 'Mail is no longer an option: you either receive it or you die.' price: 21000 @@ -21,10 +22,6 @@ - Pirate engine: - Plasma - addComponents: - - type: IFF - color: '#FFFFFFFF' - flags: [IsPlayerShuttle, HideLabel] - type: gameMap id: Menace diff --git a/Resources/Prototypes/_NF/Shipyard/BlackMarket/schooner.yml b/Resources/Prototypes/_NF/Shipyard/BlackMarket/schooner.yml index bb8f4062674..c3459955676 100644 --- a/Resources/Prototypes/_NF/Shipyard/BlackMarket/schooner.yml +++ b/Resources/Prototypes/_NF/Shipyard/BlackMarket/schooner.yml @@ -1,5 +1,6 @@ - type: vessel id: Schooner + parent: BaseVesselAntag name: Schooner description: A small wooden ship with 2 central cargo bays. price: 60000 @@ -11,10 +12,6 @@ - Pirate engine: - Uranium - addComponents: - - type: IFF - color: '#FFFFFFFF' - flags: [IsPlayerShuttle, HideLabel] - type: gameMap id: Schooner diff --git a/Resources/Prototypes/_NF/Shipyard/Expedition/ambition.yml b/Resources/Prototypes/_NF/Shipyard/Expedition/ambition.yml index 448ccfea853..b2a97a111c4 100644 --- a/Resources/Prototypes/_NF/Shipyard/Expedition/ambition.yml +++ b/Resources/Prototypes/_NF/Shipyard/Expedition/ambition.yml @@ -10,6 +10,7 @@ # - type: vessel id: Ambition + parent: BaseVessel name: UAC Ambition description: Declassified gas production and distribution platform seized in a hostile takeover of an Atmosian conglomerate. For the ultimate insurgent. price: 156000 # ~120000$ on mapinit + ~36000$ from 30% markup @@ -22,10 +23,6 @@ - Atmospherics engine: - AME - addComponents: - - type: IFF - color: '#FFFFFFFF' - flags: [IsPlayerShuttle] - type: gameMap id: Ambition diff --git a/Resources/Prototypes/_NF/Shipyard/Expedition/anchor.yml b/Resources/Prototypes/_NF/Shipyard/Expedition/anchor.yml index b4562e0ea0e..c9ae2f6bca5 100644 --- a/Resources/Prototypes/_NF/Shipyard/Expedition/anchor.yml +++ b/Resources/Prototypes/_NF/Shipyard/Expedition/anchor.yml @@ -10,6 +10,7 @@ # - type: vessel id: Anchor + parent: BaseVessel name: KC Anchor description: A large luxury cruiser capable of long ranged travel acrossed the sector, expedition capable. price: 140000 # $108432 after appraisal +30ish% (~32000) @@ -22,10 +23,6 @@ - Civilian engine: - AME - addComponents: - - type: IFF - color: '#FFFFFFFF' - flags: [IsPlayerShuttle] - type: gameMap id: Anchor diff --git a/Resources/Prototypes/_NF/Shipyard/Expedition/brigand.yml b/Resources/Prototypes/_NF/Shipyard/Expedition/brigand.yml index a4688ee65d6..b9c5a537eaf 100644 --- a/Resources/Prototypes/_NF/Shipyard/Expedition/brigand.yml +++ b/Resources/Prototypes/_NF/Shipyard/Expedition/brigand.yml @@ -10,6 +10,7 @@ # - type: vessel id: Brigand + parent: BaseVessel name: LVHI Brigand description: Civilian conversion of an old military light frigate from the early days of humanity's expansion to the stars, predating FTL technology. Manufactured by Langstad-Voigt Heavy Industries. price: 55500 # ~42645$ on mapinit + ~12800$ from 30% markup @@ -21,10 +22,6 @@ - Expedition engine: - AME - addComponents: - - type: IFF - color: '#FFFFFFFF' - flags: [IsPlayerShuttle] - type: gameMap id: Brigand diff --git a/Resources/Prototypes/_NF/Shipyard/Expedition/charon.yml b/Resources/Prototypes/_NF/Shipyard/Expedition/charon.yml index 6f8953cd7a7..fc2d6dcb424 100644 --- a/Resources/Prototypes/_NF/Shipyard/Expedition/charon.yml +++ b/Resources/Prototypes/_NF/Shipyard/Expedition/charon.yml @@ -10,6 +10,7 @@ # - type: vessel id: Charon + parent: BaseVessel name: EIS Charon description: Originally built as a roll-on, roll-off transport for heavy terraforming equipment. Since its obsolescence and appearance on the secondary market, the Charon has become a favorite of upfitters for the broad possibilities afforded by its open equipment bay. A product of Endurance Industrial Shipyards. # Sell value @ exped shipyard 70408, 15% markup and a little rounding gives us... @@ -23,10 +24,8 @@ guidebookPage: ShipyardCharon class: - Expedition - addComponents: - - type: IFF - color: '#FFFFFFFF' - flags: [IsPlayerShuttle] + engine: + - AME - type: gameMap id: Charon diff --git a/Resources/Prototypes/_NF/Shipyard/Expedition/decadedove.yml b/Resources/Prototypes/_NF/Shipyard/Expedition/decadedove.yml index c72c2c67fa3..4d3dee8a0b5 100644 --- a/Resources/Prototypes/_NF/Shipyard/Expedition/decadedove.yml +++ b/Resources/Prototypes/_NF/Shipyard/Expedition/decadedove.yml @@ -10,6 +10,7 @@ # - type: vessel id: DecadeDove + parent: BaseVessel name: DYS Dove description: Versatile expedition-capable multi-purpose light freighter. price: 78500 # ~60100$ on mapinit + ~18000$ from 30% markup @@ -21,10 +22,6 @@ - Expedition engine: - AME - addComponents: - - type: IFF - color: '#FFFFFFFF' - flags: [IsPlayerShuttle] - type: gameMap id: DecadeDove diff --git a/Resources/Prototypes/_NF/Shipyard/Expedition/dragonfly.yml b/Resources/Prototypes/_NF/Shipyard/Expedition/dragonfly.yml index 752a80e4428..8ac8c1bb9f7 100644 --- a/Resources/Prototypes/_NF/Shipyard/Expedition/dragonfly.yml +++ b/Resources/Prototypes/_NF/Shipyard/Expedition/dragonfly.yml @@ -10,6 +10,7 @@ # - type: vessel id: Dragonfly + parent: BaseVessel name: DYS Dragonfly description: Highly modular salvaging vessel welded together from smaller re-purposed hulls. price: 81000 # ~62075$ on mapinit + ~18650$ from 30% markup @@ -21,10 +22,6 @@ - Expedition engine: - AME - addComponents: - - type: IFF - color: '#FFFFFFFF' - flags: [IsPlayerShuttle] - type: gameMap id: Dragonfly diff --git a/Resources/Prototypes/_NF/Shipyard/Expedition/gasbender.yml b/Resources/Prototypes/_NF/Shipyard/Expedition/gasbender.yml index 72afcd66cee..5ea1110c440 100644 --- a/Resources/Prototypes/_NF/Shipyard/Expedition/gasbender.yml +++ b/Resources/Prototypes/_NF/Shipyard/Expedition/gasbender.yml @@ -10,6 +10,7 @@ # - type: vessel id: Gasbender + parent: BaseVessel name: LVHI Gasbender description: The Gasbender is a medium-sized engineering vessel outfitted for deep space construction projects. Features atmospherics setup with mixing/ignition chamber. Designed to work in pair with smaller salvage ship. Manufactured by Langstad-Voigt Heavy Industries. price: 82500 # ~63330$ on mapinit + 19000$ from 30% markup @@ -22,10 +23,6 @@ - Atmospherics engine: - AME - addComponents: - - type: IFF - color: '#FFFFFFFF' - flags: [IsPlayerShuttle] - type: gameMap id: Gasbender diff --git a/Resources/Prototypes/_NF/Shipyard/Expedition/gourd.yml b/Resources/Prototypes/_NF/Shipyard/Expedition/gourd.yml index 4e60f032675..5b929094fe9 100644 --- a/Resources/Prototypes/_NF/Shipyard/Expedition/gourd.yml +++ b/Resources/Prototypes/_NF/Shipyard/Expedition/gourd.yml @@ -10,6 +10,7 @@ # - type: vessel id: Gourd + parent: BaseVessel name: SLI Gourd description: The Gourd is a Science/Expedition vessel with a dedicated blast chamber. price: 150000 # ~115000$ on mapinit + ~34000$ from 30% markup @@ -23,10 +24,6 @@ - Civilian engine: - AME - addComponents: - - type: IFF - color: '#FFFFFFFF' - flags: [IsPlayerShuttle] - type: gameMap id: Gourd diff --git a/Resources/Prototypes/_NF/Shipyard/Expedition/pathfinder.yml b/Resources/Prototypes/_NF/Shipyard/Expedition/pathfinder.yml index 15f7f7d7beb..b22450f81c4 100644 --- a/Resources/Prototypes/_NF/Shipyard/Expedition/pathfinder.yml +++ b/Resources/Prototypes/_NF/Shipyard/Expedition/pathfinder.yml @@ -10,6 +10,7 @@ # - type: vessel id: Pathfinder + parent: BaseVessel name: KC Pathfinder description: Once a scout ship serving with the Nanotrasen Marine Expeditionary Forces, this now decommissioned expedition capable ship can be yours! price: 52920 @@ -21,10 +22,6 @@ - Expedition engine: - AME - addComponents: - - type: IFF - color: '#FFFFFFFF' - flags: [IsPlayerShuttle] - type: gameMap id: Pathfinder diff --git a/Resources/Prototypes/_NF/Shipyard/Expedition/sprinter.yml b/Resources/Prototypes/_NF/Shipyard/Expedition/sprinter.yml index b0df18e822b..f5f286b803d 100644 --- a/Resources/Prototypes/_NF/Shipyard/Expedition/sprinter.yml +++ b/Resources/Prototypes/_NF/Shipyard/Expedition/sprinter.yml @@ -10,6 +10,7 @@ # - type: vessel id: Sprinter + parent: BaseVessel name: KC Sprinter description: A light freighter often picked by bounty hunters due to its quick acceleration, expedition capable. price: 56800 # ~$43700 on mapinit plus ~30% markup @@ -21,10 +22,6 @@ - Expedition engine: - AME - addComponents: - - type: IFF - color: '#FFFFFFFF' - flags: [IsPlayerShuttle] - type: gameMap id: Sprinter diff --git a/Resources/Prototypes/_NF/Shipyard/Nfsd/broadhead.yml b/Resources/Prototypes/_NF/Shipyard/Nfsd/broadhead.yml index 045013a8460..7480f94e275 100644 --- a/Resources/Prototypes/_NF/Shipyard/Nfsd/broadhead.yml +++ b/Resources/Prototypes/_NF/Shipyard/Nfsd/broadhead.yml @@ -10,6 +10,7 @@ # - type: vessel id: Broadhead + parent: BaseVessel name: NSF Broadhead description: A medium size detective ship with facilities for autopsies, interrogations and detailed investigations. price: 60000 # TODO: fix these values, getting tests to pass - Whatstone @@ -22,10 +23,6 @@ - Detective engine: - Uranium - addComponents: - - type: IFF - color: '#FFFFFFFF' - flags: [IsPlayerShuttle] - type: gameMap id: Broadhead diff --git a/Resources/Prototypes/_NF/Shipyard/Nfsd/cleric.yml b/Resources/Prototypes/_NF/Shipyard/Nfsd/cleric.yml index aac1afc14e4..a3dbb562ce1 100644 --- a/Resources/Prototypes/_NF/Shipyard/Nfsd/cleric.yml +++ b/Resources/Prototypes/_NF/Shipyard/Nfsd/cleric.yml @@ -1,5 +1,6 @@ - type: vessel id: Cleric + parent: BaseVessel name: NSF Cleric description: Micro support vessel used for emergency rescues and first aid. price: 11800 #Appraisal is 10500 @@ -13,10 +14,6 @@ - Medical engine: - APU - addComponents: - - type: IFF - color: '#FFFFFFFF' - flags: [IsPlayerShuttle] - type: gameMap id: Cleric diff --git a/Resources/Prototypes/_NF/Shipyard/Nfsd/empress.yml b/Resources/Prototypes/_NF/Shipyard/Nfsd/empress.yml index 1dc151850c5..9b02a80895b 100644 --- a/Resources/Prototypes/_NF/Shipyard/Nfsd/empress.yml +++ b/Resources/Prototypes/_NF/Shipyard/Nfsd/empress.yml @@ -1,5 +1,6 @@ - type: vessel id: Empress + parent: BaseVessel name: NSF Empress description: A large patrol vessel capable of carrying up to 3 smaller faster attack ships. the flagship vessel of the nfsd. price: 170000 #Appraisal value is 150000 @@ -12,14 +13,6 @@ - Capital engine: - AME - addComponents: - - type: IFF - color: '#FFFFFFFF' - flags: [IsPlayerShuttle] - addComponents: - - type: IFF - color: '#FFFFFFFF' - flags: [IsPlayerShuttle] - type: gameMap id: Empress diff --git a/Resources/Prototypes/_NF/Shipyard/Nfsd/fighter.yml b/Resources/Prototypes/_NF/Shipyard/Nfsd/fighter.yml index 700424b6e96..2cdd4e60724 100644 --- a/Resources/Prototypes/_NF/Shipyard/Nfsd/fighter.yml +++ b/Resources/Prototypes/_NF/Shipyard/Nfsd/fighter.yml @@ -1,5 +1,6 @@ - type: vessel id: Fighter + parent: BaseVessel name: NSF Fighter description: Micro attack vessel used for boarding and transport of prisoners. price: 9000 #not sure how much mark up % to add but the appraisal is 7150$ now @@ -13,10 +14,6 @@ - Fighter engine: - APU - addComponents: - - type: IFF - color: '#FFFFFFFF' - flags: [IsPlayerShuttle] - type: gameMap id: Fighter diff --git a/Resources/Prototypes/_NF/Shipyard/Nfsd/hospitaller.yml b/Resources/Prototypes/_NF/Shipyard/Nfsd/hospitaller.yml index 066a5eb3db7..1b07fd45299 100644 --- a/Resources/Prototypes/_NF/Shipyard/Nfsd/hospitaller.yml +++ b/Resources/Prototypes/_NF/Shipyard/Nfsd/hospitaller.yml @@ -1,5 +1,6 @@ - type: vessel id: Hospitaller + parent: BaseVessel name: NSF Hospitaller description: A small security medical craft designed for emergency response and search and rescue operations. price: 28220 @@ -12,10 +13,6 @@ - Medical engine: - APU - addComponents: - - type: IFF - color: '#FFFFFFFF' - flags: [IsPlayerShuttle] - type: gameMap id: Hospitaller diff --git a/Resources/Prototypes/_NF/Shipyard/Nfsd/interceptor.yml b/Resources/Prototypes/_NF/Shipyard/Nfsd/interceptor.yml index e30a349513c..1cc1eaa79db 100644 --- a/Resources/Prototypes/_NF/Shipyard/Nfsd/interceptor.yml +++ b/Resources/Prototypes/_NF/Shipyard/Nfsd/interceptor.yml @@ -1,5 +1,6 @@ - type: vessel id: Interceptor + parent: BaseVessel name: NSF Interceptor description: A small security vessel specializing in crime scene forensics. price: 21350 @@ -12,10 +13,6 @@ - Detective engine: - Plasma - addComponents: - - type: IFF - color: '#FFFFFFFF' - flags: [IsPlayerShuttle] - type: gameMap id: Interceptor diff --git a/Resources/Prototypes/_NF/Shipyard/Nfsd/paladin.yml b/Resources/Prototypes/_NF/Shipyard/Nfsd/paladin.yml index 559f1194ffb..f36a60d2b11 100644 --- a/Resources/Prototypes/_NF/Shipyard/Nfsd/paladin.yml +++ b/Resources/Prototypes/_NF/Shipyard/Nfsd/paladin.yml @@ -1,5 +1,6 @@ - type: vessel id: Paladin + parent: BaseVessel name: NSF Paladin description: A small security assault craft designed for space combat equipped with an EXP-2100g mounted grenade launcher. price: 34220 @@ -10,10 +11,8 @@ guidebookPage: Null class: - Fighter - addComponents: - - type: IFF - color: '#FFFFFFFF' - flags: [IsPlayerShuttle] + engine: + - APU - type: gameMap id: Paladin diff --git a/Resources/Prototypes/_NF/Shipyard/Nfsd/prowler.yml b/Resources/Prototypes/_NF/Shipyard/Nfsd/prowler.yml index 2bfaa050278..f8f635c986b 100644 --- a/Resources/Prototypes/_NF/Shipyard/Nfsd/prowler.yml +++ b/Resources/Prototypes/_NF/Shipyard/Nfsd/prowler.yml @@ -1,5 +1,6 @@ - type: vessel id: Prowler + parent: BaseVessel name: NSF Prowler description: A medium-sized patrol craft, the Prowler class is a dedicated deep space pursuit vessel with an advanced sensor suite. price: 42000 #Appraises on purchase at ~35000. 20% markup applied due to the presence of the radar. @@ -12,10 +13,6 @@ - Patrol engine: - AME - addComponents: - - type: IFF - color: '#FFFFFFFF' - flags: [IsPlayerShuttle] - type: gameMap id: Prowler diff --git a/Resources/Prototypes/_NF/Shipyard/Nfsd/rogue.yml b/Resources/Prototypes/_NF/Shipyard/Nfsd/rogue.yml index 9052bc99c21..32f2c3acc2b 100644 --- a/Resources/Prototypes/_NF/Shipyard/Nfsd/rogue.yml +++ b/Resources/Prototypes/_NF/Shipyard/Nfsd/rogue.yml @@ -1,5 +1,6 @@ - type: vessel id: Rogue + parent: BaseVessel name: NSF Rogue description: Micro assault vessel with a toggle for going dark in deep space. price: 12200 #the appraisal is 9100$ @@ -13,10 +14,6 @@ - Fighter engine: - APU - addComponents: - - type: IFF - color: '#FFFFFFFF' - flags: [IsPlayerShuttle] - type: gameMap id: Rogue diff --git a/Resources/Prototypes/_NF/Shipyard/Nfsd/templar.yml b/Resources/Prototypes/_NF/Shipyard/Nfsd/templar.yml index 4342327959a..d835b702b74 100644 --- a/Resources/Prototypes/_NF/Shipyard/Nfsd/templar.yml +++ b/Resources/Prototypes/_NF/Shipyard/Nfsd/templar.yml @@ -1,5 +1,6 @@ - type: vessel id: Templar + parent: BaseVessel name: NSF Templar description: A small security assault craft designed for combat interdiction operations. price: 24220 @@ -12,10 +13,6 @@ - Pursuit engine: - APU - addComponents: - - type: IFF - color: '#FFFFFFFF' - flags: [IsPlayerShuttle] - type: gameMap id: Templar diff --git a/Resources/Prototypes/_NF/Shipyard/Nfsd/wasp.yml b/Resources/Prototypes/_NF/Shipyard/Nfsd/wasp.yml index 6ba8f4102f7..e25d9eb03d5 100644 --- a/Resources/Prototypes/_NF/Shipyard/Nfsd/wasp.yml +++ b/Resources/Prototypes/_NF/Shipyard/Nfsd/wasp.yml @@ -1,5 +1,6 @@ - type: vessel id: Wasp + parent: BaseVessel name: NSF Wasp description: A large expedition oriented ship for holding prisoners and making them work planetside. price: 135000 @@ -14,10 +15,6 @@ - Expedition engine: - AME - addComponents: - - type: IFF - color: '#FFFFFFFF' - flags: [IsPlayerShuttle] - type: gameMap id: Wasp diff --git a/Resources/Prototypes/_NF/Shipyard/Nfsd/wendigo.yml b/Resources/Prototypes/_NF/Shipyard/Nfsd/wendigo.yml index 4d30a744825..6eff3aec397 100644 --- a/Resources/Prototypes/_NF/Shipyard/Nfsd/wendigo.yml +++ b/Resources/Prototypes/_NF/Shipyard/Nfsd/wendigo.yml @@ -10,6 +10,7 @@ # - type: vessel id: Wendigo + parent: BaseVessel name: NSF Wendigo description: A light medium ship with a recommended crew of 2 to 3 officers, the Wendigo is a dedicated interdiction vessel outfitted with a powerful EMP device for tackling escaping vessels. price: 34500 @@ -21,10 +22,6 @@ - Pursuit engine: - Uranium - addComponents: - - type: IFF - color: '#FFFFFFFF' - flags: [IsPlayerShuttle] - type: gameMap id: Wendigo diff --git a/Resources/Prototypes/_NF/Shipyard/Scrap/bison.yml b/Resources/Prototypes/_NF/Shipyard/Scrap/bison.yml index 5579291f029..c3d5db9a955 100644 --- a/Resources/Prototypes/_NF/Shipyard/Scrap/bison.yml +++ b/Resources/Prototypes/_NF/Shipyard/Scrap/bison.yml @@ -1,5 +1,6 @@ - type: vessel id: Bison + parent: BaseVessel name: NT Bison description: A heavy duty ship breaker with a durable hull and a substantial amount of living space, built for long journeys with self-sufficiency. price: 166138 @@ -13,10 +14,6 @@ - Civilian engine: - Plasma - addComponents: - - type: IFF - color: '#FFFFFFFF' - flags: [IsPlayerShuttle] - type: gameMap id: Bison diff --git a/Resources/Prototypes/_NF/Shipyard/Scrap/canister.yml b/Resources/Prototypes/_NF/Shipyard/Scrap/canister.yml index 5fcb4c220c8..218fc1f0d2f 100644 --- a/Resources/Prototypes/_NF/Shipyard/Scrap/canister.yml +++ b/Resources/Prototypes/_NF/Shipyard/Scrap/canister.yml @@ -4,6 +4,7 @@ # - type: vessel id: Canister + parent: BaseVessel name: UAC Canister description: Whatever you're bringing, it won't fit. Seats two. Gravity included. price: 8000 @@ -16,10 +17,6 @@ - Civilian engine: - Plasma - addComponents: - - type: IFF - color: '#FFFFFFFF' - flags: [IsPlayerShuttle] - type: gameMap id: Canister diff --git a/Resources/Prototypes/_NF/Shipyard/Scrap/disciple.yml b/Resources/Prototypes/_NF/Shipyard/Scrap/disciple.yml index ce74b6e64cc..d316d8430da 100644 --- a/Resources/Prototypes/_NF/Shipyard/Scrap/disciple.yml +++ b/Resources/Prototypes/_NF/Shipyard/Scrap/disciple.yml @@ -10,6 +10,7 @@ # - type: vessel id: Disciple + parent: BaseVessel name: NSV Disciple description: A cheaply made amalgamation of religious ships. For the seasoned religious assistant. price: 15000 # Appraises at 12179, ~25% margin - TODO: fix this value, getting tests to pass - Whatstone @@ -22,10 +23,6 @@ - Civilian engine: - Plasma - addComponents: - - type: IFF - color: '#FFFFFFFF' - flags: [IsPlayerShuttle] - type: gameMap id: Disciple diff --git a/Resources/Prototypes/_NF/Shipyard/Scrap/nugget.yml b/Resources/Prototypes/_NF/Shipyard/Scrap/nugget.yml index a8d9e78e455..8b76a75c23e 100644 --- a/Resources/Prototypes/_NF/Shipyard/Scrap/nugget.yml +++ b/Resources/Prototypes/_NF/Shipyard/Scrap/nugget.yml @@ -10,6 +10,7 @@ # - type: vessel id: Nugget + parent: BaseVessel name: SV Nugget description: A flying hunk of wood and metal disguised as a kitchen shuttle. Not FDA approved. price: 15950 # +1450 from 10% Markup @@ -22,10 +23,6 @@ - Kitchen engine: - Plasma - addComponents: - - type: IFF - color: '#FFFFFFFF' - flags: [IsPlayerShuttle] - type: gameMap id: Nugget diff --git a/Resources/Prototypes/_NF/Shipyard/Scrap/orange.yml b/Resources/Prototypes/_NF/Shipyard/Scrap/orange.yml index 24015f31439..cc756ab9523 100644 --- a/Resources/Prototypes/_NF/Shipyard/Scrap/orange.yml +++ b/Resources/Prototypes/_NF/Shipyard/Scrap/orange.yml @@ -1,5 +1,6 @@ - type: vessel id: Orange + parent: BaseVessel name: SV Orange description: A cargo slash salvage shuttle made from scavenged wrecks, comes with some damage. price: 18000 #Appraisal is 15800, +5% margin - TODO: fix this value, getting tests to pass - Whatstone @@ -13,10 +14,6 @@ - Salvage engine: - Uranium - addComponents: - - type: IFF - color: '#FFFFFFFF' - flags: [IsPlayerShuttle] - type: gameMap id: Orange diff --git a/Resources/Prototypes/_NF/Shipyard/Scrap/point.yml b/Resources/Prototypes/_NF/Shipyard/Scrap/point.yml index f5cda28fcd2..1b019a6cb0e 100644 --- a/Resources/Prototypes/_NF/Shipyard/Scrap/point.yml +++ b/Resources/Prototypes/_NF/Shipyard/Scrap/point.yml @@ -1,5 +1,6 @@ - type: vessel id: Point + parent: BaseVessel name: SV Point description: Two wrecks welded together that are somehow capable of research. price: 16100 @@ -12,10 +13,6 @@ - Science engine: - Plasma - addComponents: - - type: IFF - color: '#FFFFFFFF' - flags: [IsPlayerShuttle] - type: gameMap id: Point diff --git a/Resources/Prototypes/_NF/Shipyard/Scrap/tide.yml b/Resources/Prototypes/_NF/Shipyard/Scrap/tide.yml index 51863680669..aceda3a808b 100644 --- a/Resources/Prototypes/_NF/Shipyard/Scrap/tide.yml +++ b/Resources/Prototypes/_NF/Shipyard/Scrap/tide.yml @@ -1,5 +1,6 @@ - type: vessel id: Tide + parent: BaseVessel name: SV Tide description: A cheaply made mass-produced shuttle made from salvaged wrecks. For the seasoned assistant. price: 9700 @@ -12,10 +13,6 @@ - Civilian engine: - Plasma - addComponents: - - type: IFF - color: '#FFFFFFFF' - flags: [IsPlayerShuttle] - type: gameMap id: Tide diff --git a/Resources/Prototypes/_NF/Shipyard/Sr/bottleneck.yml b/Resources/Prototypes/_NF/Shipyard/Sr/bottleneck.yml index 1a94a4f5f31..918b8308e7a 100644 --- a/Resources/Prototypes/_NF/Shipyard/Sr/bottleneck.yml +++ b/Resources/Prototypes/_NF/Shipyard/Sr/bottleneck.yml @@ -10,6 +10,7 @@ # - type: vessel id: Bottleneck + parent: BaseVessel name: NT Bottleneck description: A personal transport and mobile office for the station representative. price: 18000 # TODO: fix this value, getting tests to pass - Whatstone @@ -22,10 +23,6 @@ - Civilian engine: - Plasma - addComponents: - - type: IFF - color: '#FFFFFFFF' - flags: [IsPlayerShuttle] - type: gameMap id: Bottleneck diff --git a/Resources/Prototypes/_NF/Shipyard/Sr/broom.yml b/Resources/Prototypes/_NF/Shipyard/Sr/broom.yml index 414d251f5c0..081a2dabcd0 100644 --- a/Resources/Prototypes/_NF/Shipyard/Sr/broom.yml +++ b/Resources/Prototypes/_NF/Shipyard/Sr/broom.yml @@ -10,6 +10,7 @@ # - type: vessel id: Broom + parent: BaseVessel name: LVHI Broom description: A cramped yet reliable shuttle for providing janitorial services. price: 13500 # ~12180$ on mapinit + 5% markup + some extra @@ -22,10 +23,6 @@ - Civilian engine: - Plasma - addComponents: - - type: IFF - color: '#FFFFFFFF' - flags: [IsPlayerShuttle] - type: gameMap id: Broom diff --git a/Resources/Prototypes/_NF/Shipyard/Sr/chauffeur.yml b/Resources/Prototypes/_NF/Shipyard/Sr/chauffeur.yml index 4cf8b014ac8..8000cdfeb10 100644 --- a/Resources/Prototypes/_NF/Shipyard/Sr/chauffeur.yml +++ b/Resources/Prototypes/_NF/Shipyard/Sr/chauffeur.yml @@ -11,6 +11,7 @@ - type: vessel id: Chauffeur + parent: BaseVessel name: NC Chauffeur description: A small transport shuttle with space for 4 passengers. Comes with the latest audio entertainment technology. price: 17500 # $14325 after appraisal + ~$1200 (~5% markup) - TODO: fix this value, getting tests to pass - Whatstone @@ -23,10 +24,6 @@ - Civilian engine: - Plasma - addComponents: - - type: IFF - color: '#FFFFFFFF' - flags: [IsPlayerShuttle] - type: gameMap id: Chauffeur diff --git a/Resources/Prototypes/_NF/Shipyard/Sr/mailpod.yml b/Resources/Prototypes/_NF/Shipyard/Sr/mailpod.yml index 12ba15ea09a..e2297d6b435 100644 --- a/Resources/Prototypes/_NF/Shipyard/Sr/mailpod.yml +++ b/Resources/Prototypes/_NF/Shipyard/Sr/mailpod.yml @@ -10,6 +10,7 @@ # - type: vessel id: MailPod + parent: BaseVessel name: NC Mail Pod description: A cramped yet reliable shuttle for delivering packages. price: 15000 @@ -22,10 +23,6 @@ - Cargo engine: - Plasma - addComponents: - - type: IFF - color: '#FFFFFFFF' - flags: [IsPlayerShuttle] - type: gameMap id: MailPod diff --git a/Resources/Prototypes/_NF/Shipyard/Sr/parcel.yml b/Resources/Prototypes/_NF/Shipyard/Sr/parcel.yml index ba77009eefe..1f8d1667ae5 100644 --- a/Resources/Prototypes/_NF/Shipyard/Sr/parcel.yml +++ b/Resources/Prototypes/_NF/Shipyard/Sr/parcel.yml @@ -10,6 +10,7 @@ # - type: vessel id: Parcel + parent: BaseVessel name: NC Parcel description: A reliable shuttle for delivering mail and packages. price: 18000 @@ -22,10 +23,6 @@ - Cargo engine: - Plasma - addComponents: - - type: IFF - color: '#FFFFFFFF' - flags: [IsPlayerShuttle] - type: gameMap id: Parcel diff --git a/Resources/Prototypes/_NF/Shipyard/Sr/watchdog.yml b/Resources/Prototypes/_NF/Shipyard/Sr/watchdog.yml index 472674d365b..a0ae745f914 100644 --- a/Resources/Prototypes/_NF/Shipyard/Sr/watchdog.yml +++ b/Resources/Prototypes/_NF/Shipyard/Sr/watchdog.yml @@ -11,6 +11,7 @@ - type: vessel id: Watchdog + parent: BaseVessel name: SBI Watchdog description: "A refurbished and repainted older model of the NSF Templar for use for Mercenaries and 'repurposed' for the Station Guard, mind the gap." price: 20000 @@ -23,10 +24,6 @@ - Civilian engine: - Plasma - addComponents: - - type: IFF - color: '#FFFFFFFF' - flags: [IsPlayerShuttle] - type: gameMap id: Watchdog diff --git a/Resources/Prototypes/_NF/Shipyard/Syndicate/hunter.yml b/Resources/Prototypes/_NF/Shipyard/Syndicate/hunter.yml index e044fe8e777..a00ff47dcb3 100644 --- a/Resources/Prototypes/_NF/Shipyard/Syndicate/hunter.yml +++ b/Resources/Prototypes/_NF/Shipyard/Syndicate/hunter.yml @@ -1,5 +1,6 @@ - type: vessel id: Hunter + parent: BaseVesselAntag name: Hunter description: A small armored Syndicate assault shuttle, perfect for devious operations! price: 50000 @@ -11,10 +12,6 @@ - Syndicate engine: - Plasma - addComponents: - - type: IFF - color: '#FFFFFFFF' - flags: [IsPlayerShuttle, HideLabel] - type: gameMap id: Hunter diff --git a/Resources/Prototypes/_NF/Shipyard/Syndicate/infiltrator.yml b/Resources/Prototypes/_NF/Shipyard/Syndicate/infiltrator.yml index 1f5b2130547..a0f9ef726e0 100644 --- a/Resources/Prototypes/_NF/Shipyard/Syndicate/infiltrator.yml +++ b/Resources/Prototypes/_NF/Shipyard/Syndicate/infiltrator.yml @@ -1,5 +1,6 @@ - type: vessel id: Infiltrator + parent: BaseVesselAntag name: Infiltrator description: A Syndicate nuclear operative infiltration ship. price: 85000 @@ -11,10 +12,6 @@ - Syndicate engine: - AME - addComponents: - - type: IFF - color: '#FFFFFFFF' - flags: [IsPlayerShuttle, HideLabel] - type: gameMap id: Infiltrator diff --git a/Resources/Prototypes/_NF/Shipyard/akupara.yml b/Resources/Prototypes/_NF/Shipyard/akupara.yml index 47df633a2b0..e7ca1e5bbf2 100644 --- a/Resources/Prototypes/_NF/Shipyard/akupara.yml +++ b/Resources/Prototypes/_NF/Shipyard/akupara.yml @@ -10,6 +10,7 @@ # hi - type: vessel id: Akupara + parent: BaseVessel name: UW Akupara description: A medium full-feature botanical research biodome equipped to help a botanist fully interact with their plants in almost any way conceivable. price: 52000 @@ -21,10 +22,6 @@ - Botany engine: - Uranium - addComponents: - - type: IFF - color: '#FFFFFFFF' - flags: [IsPlayerShuttle] - type: gameMap id: Akupara diff --git a/Resources/Prototypes/_NF/Shipyard/apothecary.yml b/Resources/Prototypes/_NF/Shipyard/apothecary.yml index 9ccf2307bc0..96487507191 100644 --- a/Resources/Prototypes/_NF/Shipyard/apothecary.yml +++ b/Resources/Prototypes/_NF/Shipyard/apothecary.yml @@ -10,6 +10,7 @@ # - type: vessel id: Apothecary + parent: BaseVessel name: FSB Apothecary description: A small medical and chemistry support vessel. Deployed by the Far Star Biotech company to provide aid and medical services to the Frontier. price: 36500 # Appraises at ~34k, 7% margin; TODO: fix this value, gettings to pass - Whatstone @@ -22,10 +23,6 @@ - Chemistry engine: - Uranium - addComponents: - - type: IFF - color: '#FFFFFFFF' - flags: [IsPlayerShuttle] - type: gameMap id: Apothecary diff --git a/Resources/Prototypes/_NF/Shipyard/barge.yml b/Resources/Prototypes/_NF/Shipyard/barge.yml index 8a88a6a0f0f..27ff6f9f741 100644 --- a/Resources/Prototypes/_NF/Shipyard/barge.yml +++ b/Resources/Prototypes/_NF/Shipyard/barge.yml @@ -10,6 +10,7 @@ # - type: vessel id: Barge + parent: BaseVessel name: NC Barge description: A medium shipping vessel repurposed into a salvage bar. price: 47000 # Appraises for 42901, margin of ~10% - TODO: fix these values, getting tests to pass - Whatstone @@ -23,10 +24,6 @@ engine: - Solar - Plasma - addComponents: - - type: IFF - color: '#FFFFFFFF' - flags: [IsPlayerShuttle] - type: gameMap id: Barge diff --git a/Resources/Prototypes/_NF/Shipyard/bazaar.yml b/Resources/Prototypes/_NF/Shipyard/bazaar.yml index ad2179acc05..dd9e839005f 100644 --- a/Resources/Prototypes/_NF/Shipyard/bazaar.yml +++ b/Resources/Prototypes/_NF/Shipyard/bazaar.yml @@ -10,6 +10,7 @@ # - type: vessel id: Bazaar + parent: BaseVessel name: SLI Bazaar description: The Bazaar is a personal service vessel designed to provide a platform for merchants to sell their goods, it features two locking cargo docks, a spacious cargo hold, and a mercenary post for shop security. price: 80000 # TODO: fix this number, just getting tests to pass - Whatstone @@ -22,10 +23,6 @@ - Civilian engine: - Uranium - addComponents: - - type: IFF - color: '#FFFFFFFF' - flags: [IsPlayerShuttle] - type: gameMap id: Bazaar diff --git a/Resources/Prototypes/_NF/Shipyard/beaker.yml b/Resources/Prototypes/_NF/Shipyard/beaker.yml index cf7205612a0..e2a0750e15f 100644 --- a/Resources/Prototypes/_NF/Shipyard/beaker.yml +++ b/Resources/Prototypes/_NF/Shipyard/beaker.yml @@ -1,5 +1,6 @@ - type: vessel id: Beaker + parent: BaseVessel name: SBI Beaker description: "A fully functional Chemistry Lab. Perfect for the prospecting chemist or high school chemistry teachers. Yeah, Science!" price: 65000 @@ -11,10 +12,6 @@ - Chemistry engine: - Uranium - addComponents: - - type: IFF - color: '#FFFFFFFF' - flags: [IsPlayerShuttle] - type: gameMap id: Beaker diff --git a/Resources/Prototypes/_NF/Shipyard/bocadillo.yml b/Resources/Prototypes/_NF/Shipyard/bocadillo.yml index 093f98c5ae5..3db052872f5 100644 --- a/Resources/Prototypes/_NF/Shipyard/bocadillo.yml +++ b/Resources/Prototypes/_NF/Shipyard/bocadillo.yml @@ -10,6 +10,7 @@ # - type: vessel id: Bocadillo + parent: BaseVessel name: NC Bocadillo description: A tiny food truck perfect for a solo chef. price: 25000 # TODO: fix this value, getting tests to pass - Whatstone @@ -21,10 +22,6 @@ - Kitchen engine: - Plasma - addComponents: - - type: IFF - color: '#FFFFFFFF' - flags: [IsPlayerShuttle] - type: gameMap id: Bocadillo diff --git a/Resources/Prototypes/_NF/Shipyard/bodkin.yml b/Resources/Prototypes/_NF/Shipyard/bodkin.yml index 2271908977d..1020e5b7c3a 100644 --- a/Resources/Prototypes/_NF/Shipyard/bodkin.yml +++ b/Resources/Prototypes/_NF/Shipyard/bodkin.yml @@ -10,6 +10,7 @@ # - type: vessel id: Bodkin + parent: BaseVessel name: SBB Bodkin description: The smaller sibling to the Broadhead, the SBB Bodkin is designed for rockhopping and salvage recovery. price: 39000 #Grid appraises at 35693. Slapped on a ~10% markup. @@ -18,10 +19,6 @@ shuttlePath: /Maps/_NF/Shuttles/bodkin.yml class: - Salvage - addComponents: - - type: IFF - color: '#FFFFFFFF' - flags: [IsPlayerShuttle] - type: gameMap id: Bodkin diff --git a/Resources/Prototypes/_NF/Shipyard/bookworm.yml b/Resources/Prototypes/_NF/Shipyard/bookworm.yml index 060fb3803f2..103aefc6ada 100644 --- a/Resources/Prototypes/_NF/Shipyard/bookworm.yml +++ b/Resources/Prototypes/_NF/Shipyard/bookworm.yml @@ -10,6 +10,7 @@ # - type: vessel id: Bookworm + parent: BaseVessel name: SBB Bookworm description: A cozy medium-size library for travellers who wish to relax with a book or perhaps a board game. price: 31500 # ~29476 after purchase + ~5% markup @@ -21,10 +22,6 @@ - Civilian engine: - Plasma - addComponents: - - type: IFF - color: '#FFFFFFFF' - flags: [IsPlayerShuttle] - type: gameMap id: Bookworm diff --git a/Resources/Prototypes/_NF/Shipyard/bulker.yml b/Resources/Prototypes/_NF/Shipyard/bulker.yml index ad6c68d0c2d..be43ddcf4b9 100644 --- a/Resources/Prototypes/_NF/Shipyard/bulker.yml +++ b/Resources/Prototypes/_NF/Shipyard/bulker.yml @@ -10,6 +10,7 @@ # - type: vessel id: Bulker + parent: BaseVessel name: KL Bulker description: A medium mining vessel designed for deep space missions price: 47500 #41245$ before the +15% (6190$) @@ -21,10 +22,6 @@ - Salvage engine: - Uranium - addComponents: - - type: IFF - color: '#FFFFFFFF' - flags: [IsPlayerShuttle] - type: gameMap id: Bulker diff --git a/Resources/Prototypes/_NF/Shipyard/caduceus.yml b/Resources/Prototypes/_NF/Shipyard/caduceus.yml index 0efcec3b2d8..bf12ec82948 100644 --- a/Resources/Prototypes/_NF/Shipyard/caduceus.yml +++ b/Resources/Prototypes/_NF/Shipyard/caduceus.yml @@ -1,5 +1,6 @@ - type: vessel id: Caduceus + parent: BaseVessel name: NM Caduceus description: A former humanitarian vessel, the Caduceus now works as the best mobile hospital money can buy. price: 115000 # TODO: fix this value, getting tests to pass - Whatstone You will never fix this - Dusty @@ -12,10 +13,6 @@ - Chemistry engine: - AME - addComponents: - - type: IFF - color: '#FFFFFFFF' - flags: [IsPlayerShuttle] - type: gameMap id: Caduceus diff --git a/Resources/Prototypes/_NF/Shipyard/camper.yml b/Resources/Prototypes/_NF/Shipyard/camper.yml index e4fe7bd97db..a42f9af16ec 100644 --- a/Resources/Prototypes/_NF/Shipyard/camper.yml +++ b/Resources/Prototypes/_NF/Shipyard/camper.yml @@ -10,6 +10,7 @@ - type: vessel id: Camper + parent: BaseVessel name: SSS Camper description: A personal camper shuttle for those who prefer to live in emptiness of space. price: 14000 @@ -21,10 +22,6 @@ - Civilian engine: - Plasma - addComponents: - - type: IFF - color: '#FFFFFFFF' - flags: [IsPlayerShuttle] - type: gameMap id: Camper diff --git a/Resources/Prototypes/_NF/Shipyard/ceres.yml b/Resources/Prototypes/_NF/Shipyard/ceres.yml index f6fe8014dd2..6724f1c1c99 100644 --- a/Resources/Prototypes/_NF/Shipyard/ceres.yml +++ b/Resources/Prototypes/_NF/Shipyard/ceres.yml @@ -10,6 +10,7 @@ # - type: vessel id: Ceres + parent: BaseVessel name: SBB Ceres description: A medium-size, high-class restaurant ship with ample seating, integrated botany and a dining room for VIP guests price: 60000 # ~5% markup - TODO: fix this value, just getting tests to pass - Whatstone @@ -21,10 +22,6 @@ - Kitchen engine: - Uranium - addComponents: - - type: IFF - color: '#FFFFFFFF' - flags: [IsPlayerShuttle] - type: gameMap id: Ceres diff --git a/Resources/Prototypes/_NF/Shipyard/chisel.yml b/Resources/Prototypes/_NF/Shipyard/chisel.yml index 6ef72f8f97e..ee9c734d053 100644 --- a/Resources/Prototypes/_NF/Shipyard/chisel.yml +++ b/Resources/Prototypes/_NF/Shipyard/chisel.yml @@ -10,6 +10,7 @@ # - type: vessel id: Chisel + parent: BaseVessel name: ICR Chisel description: Standard small size multipurpose vessel , originally meant to aid in ship scrapping. price: 34615 # on init 30100$, 15% markup 4515$ @@ -22,10 +23,6 @@ - Cargo #??? engine: - Plasma - addComponents: - - type: IFF - color: '#FFFFFFFF' - flags: [IsPlayerShuttle] - type: gameMap id: Chisel diff --git a/Resources/Prototypes/_NF/Shipyard/comet.yml b/Resources/Prototypes/_NF/Shipyard/comet.yml index 441f68aa3b2..74c395011e5 100644 --- a/Resources/Prototypes/_NF/Shipyard/comet.yml +++ b/Resources/Prototypes/_NF/Shipyard/comet.yml @@ -10,6 +10,7 @@ # - type: vessel id: Comet + parent: BaseVessel name: NT Comet description: A mining and construction vessel intended to help build or repair quickly. price: 55000 @@ -22,10 +23,6 @@ - Engineering engine: - AME - addComponents: - - type: IFF - color: '#FFFFFFFF' - flags: [IsPlayerShuttle] - type: gameMap id: Comet diff --git a/Resources/Prototypes/_NF/Shipyard/construct.yml b/Resources/Prototypes/_NF/Shipyard/construct.yml index fd18bc18bff..2a37ec7008e 100644 --- a/Resources/Prototypes/_NF/Shipyard/construct.yml +++ b/Resources/Prototypes/_NF/Shipyard/construct.yml @@ -1,5 +1,6 @@ - type: vessel id: Construct + parent: BaseVessel name: NT Construct description: A technically spacefaring vessel. No livery. price: 10500 @@ -11,10 +12,6 @@ - Engineering engine: - Plasma - addComponents: - - type: IFF - color: '#FFFFFFFF' - flags: [IsPlayerShuttle] - type: gameMap id: Construct diff --git a/Resources/Prototypes/_NF/Shipyard/crescent.yml b/Resources/Prototypes/_NF/Shipyard/crescent.yml index dc0f8a98e5a..fefb2b99891 100644 --- a/Resources/Prototypes/_NF/Shipyard/crescent.yml +++ b/Resources/Prototypes/_NF/Shipyard/crescent.yml @@ -10,6 +10,7 @@ # - type: vessel id: Crescent + parent: BaseVessel name: KC Crescent description: The Crescent, named for its exterior shape, is a vessel focused on providing service, medical aide, and scientific breakthroughs for smaller vessels. price: 350020 # It do be like this. @@ -23,10 +24,6 @@ - Civilian engine: - AME - addComponents: - - type: IFF - color: '#FFFFFFFF' - flags: [IsPlayerShuttle] - type: gameMap id: Crescent diff --git a/Resources/Prototypes/_NF/Shipyard/eagle.yml b/Resources/Prototypes/_NF/Shipyard/eagle.yml index 23136186110..e9f03663422 100644 --- a/Resources/Prototypes/_NF/Shipyard/eagle.yml +++ b/Resources/Prototypes/_NF/Shipyard/eagle.yml @@ -10,6 +10,7 @@ # - type: vessel id: Eagle + parent: BaseVessel name: NM Eagle description: "A modern, medium-sized medical & engineering vessel. Focusing on responding to shuttle distress, Eagle bears the motto 'Recover, Restore, Repair!'." price: 60000 @@ -22,10 +23,6 @@ - Engineering engine: - Uranium - addComponents: - - type: IFF - color: '#FFFFFFFF' - flags: [IsPlayerShuttle] - type: gameMap id: Eagle diff --git a/Resources/Prototypes/_NF/Shipyard/garden.yml b/Resources/Prototypes/_NF/Shipyard/garden.yml index 22f191b64b8..d8d3dd7e6eb 100644 --- a/Resources/Prototypes/_NF/Shipyard/garden.yml +++ b/Resources/Prototypes/_NF/Shipyard/garden.yml @@ -10,6 +10,7 @@ # - type: vessel id: Garden + parent: BaseVessel name: HS Garden description: A small botany vessel dedicated to horiticultural experimentation. price: 28000 @@ -21,10 +22,6 @@ - Botany engine: - Plasma - addComponents: - - type: IFF - color: '#FFFFFFFF' - flags: [IsPlayerShuttle] - type: gameMap id: Garden diff --git a/Resources/Prototypes/_NF/Shipyard/hammer.yml b/Resources/Prototypes/_NF/Shipyard/hammer.yml index 550e0f4e06c..fc02e8c69f9 100644 --- a/Resources/Prototypes/_NF/Shipyard/hammer.yml +++ b/Resources/Prototypes/_NF/Shipyard/hammer.yml @@ -10,6 +10,7 @@ # - type: vessel id: Hammer + parent: BaseVessel name: SBB Hammer description: A mobile engineering platform for deep-space repairs, upgrades and remodelling. price: 44000 # Appraises at 38257, ~15% markup @@ -21,10 +22,6 @@ - Engineering engine: - Plasma - addComponents: - - type: IFF - color: '#FFFFFFFF' - flags: [IsPlayerShuttle] - type: gameMap id: Hammer diff --git a/Resources/Prototypes/_NF/Shipyard/harbormaster.yml b/Resources/Prototypes/_NF/Shipyard/harbormaster.yml index dac197d94bc..4198369f7e7 100644 --- a/Resources/Prototypes/_NF/Shipyard/harbormaster.yml +++ b/Resources/Prototypes/_NF/Shipyard/harbormaster.yml @@ -10,6 +10,7 @@ # - type: vessel id: Harbormaster + parent: BaseVessel name: LVHI Harbormaster description: A small tugboat. Manufactured by Langstad-Voigt Heavy Industries. price: 31500 # ~27196$ on mapinit + 15% markup @@ -21,10 +22,6 @@ - Civilian engine: - Plasma - addComponents: - - type: IFF - color: '#FFFFFFFF' - flags: [IsPlayerShuttle] - type: gameMap id: Harbormaster diff --git a/Resources/Prototypes/_NF/Shipyard/hauler.yml b/Resources/Prototypes/_NF/Shipyard/hauler.yml index deb0ffd3976..db574fa9ce8 100644 --- a/Resources/Prototypes/_NF/Shipyard/hauler.yml +++ b/Resources/Prototypes/_NF/Shipyard/hauler.yml @@ -1,5 +1,6 @@ - type: vessel id: Hauler + parent: BaseVessel name: NC Hauler description: A medium sized vessel specializing in long-haul salvage, mining, and cargo operations. price: 77000 @@ -12,10 +13,6 @@ - Salvage engine: - Uranium - addComponents: - - type: IFF - color: '#FFFFFFFF' - flags: [IsPlayerShuttle] - type: gameMap id: Hauler diff --git a/Resources/Prototypes/_NF/Shipyard/honker.yml b/Resources/Prototypes/_NF/Shipyard/honker.yml index 80afbde6f11..1f88155b78e 100644 --- a/Resources/Prototypes/_NF/Shipyard/honker.yml +++ b/Resources/Prototypes/_NF/Shipyard/honker.yml @@ -10,6 +10,7 @@ # - type: vessel id: Honker + parent: BaseVessel name: NT Honker description: HONK HONK HONK HONK HONK HONK price: 22500 @@ -21,10 +22,6 @@ - Civilian engine: - Plasma - addComponents: - - type: IFF - color: '#FFFFFFFF' - flags: [IsPlayerShuttle] - type: gameMap id: Honker diff --git a/Resources/Prototypes/_NF/Shipyard/investigator.yml b/Resources/Prototypes/_NF/Shipyard/investigator.yml index 432e09bba97..0b9de81f61d 100644 --- a/Resources/Prototypes/_NF/Shipyard/investigator.yml +++ b/Resources/Prototypes/_NF/Shipyard/investigator.yml @@ -10,6 +10,7 @@ # - type: vessel id: Investigator + parent: BaseVessel name: NR Investigator description: A medium research shuttle designed for xenoarcheological studies. price: 42100 # ~36540$ on mapinit + ~5480$ from 15% markup @@ -22,10 +23,6 @@ engine: - Solar - Plasma - addComponents: - - type: IFF - color: '#FFFFFFFF' - flags: [IsPlayerShuttle] - type: gameMap id: Investigator diff --git a/Resources/Prototypes/_NF/Shipyard/kestrel.yml b/Resources/Prototypes/_NF/Shipyard/kestrel.yml index e274e6a5197..a1b8815e867 100644 --- a/Resources/Prototypes/_NF/Shipyard/kestrel.yml +++ b/Resources/Prototypes/_NF/Shipyard/kestrel.yml @@ -10,6 +10,7 @@ # - type: vessel id: Kestrel + parent: BaseVessel name: NC Kestrel description: Once a local shipping lane freighter, this model has been converted for use in debris field mining and salvage operations. price: 52200 # ~45370$ on mapinit + ~6805$ from 15% markup @@ -21,10 +22,6 @@ - Salvage engine: - Uranium - addComponents: - - type: IFF - color: '#FFFFFFFF' - flags: [IsPlayerShuttle] - type: gameMap id: Kestrel diff --git a/Resources/Prototypes/_NF/Shipyard/kilderkin.yml b/Resources/Prototypes/_NF/Shipyard/kilderkin.yml index cb483d8423f..94906f7da23 100644 --- a/Resources/Prototypes/_NF/Shipyard/kilderkin.yml +++ b/Resources/Prototypes/_NF/Shipyard/kilderkin.yml @@ -10,6 +10,7 @@ # - type: vessel id: Kilderkin + parent: BaseVessel name: LVHI Kilderkin description: "Spaceworthy bar/microbrewery with everything one needs to facilitate poor life choices: lots of booze, smokes, and lack of food. Manufactured by Langstad-Voigt Heavy Industries." price: 49500 # ~46564$ on mapinit + 5% markup + some extra @@ -21,10 +22,6 @@ - Civilian engine: - Plasma - addComponents: - - type: IFF - color: '#FFFFFFFF' - flags: [IsPlayerShuttle] - type: gameMap id: Kilderkin diff --git a/Resources/Prototypes/_NF/Shipyard/lantern.yml b/Resources/Prototypes/_NF/Shipyard/lantern.yml index 2602b74987c..4d2ec743ab7 100644 --- a/Resources/Prototypes/_NF/Shipyard/lantern.yml +++ b/Resources/Prototypes/_NF/Shipyard/lantern.yml @@ -10,6 +10,7 @@ # - type: vessel id: Lantern + parent: BaseVessel name: LVHI Lantern description: The Lantern is a medium-sized chapel-vessel equipped with everything chaplain might need in their never ending battle for salvation of NT personnel souls. Manufactured by Langstad-Voigt Heavy Industries. price: 37500 # ~33707$ on mapinit + 10% markup @@ -22,10 +23,6 @@ engine: - Solar - Plasma - addComponents: - - type: IFF - color: '#FFFFFFFF' - flags: [IsPlayerShuttle] - type: gameMap id: Lantern diff --git a/Resources/Prototypes/_NF/Shipyard/legman.yml b/Resources/Prototypes/_NF/Shipyard/legman.yml index cc498cf629a..34e67ba6939 100644 --- a/Resources/Prototypes/_NF/Shipyard/legman.yml +++ b/Resources/Prototypes/_NF/Shipyard/legman.yml @@ -10,6 +10,7 @@ # - type: vessel id: Legman + parent: BaseVessel name: LVHI Legman description: A small maneuverable shuttle with low operational costs for reporters who want to be first on a scene. Manufactured by Langstad-Voigt Heavy Industries. price: 13000 # 12135$ on mapinit + 5% markup @@ -21,10 +22,6 @@ - Civilian engine: - Plasma - addComponents: - - type: IFF - color: '#FFFFFFFF' - flags: [IsPlayerShuttle] - type: gameMap id: Legman diff --git a/Resources/Prototypes/_NF/Shipyard/liquidator.yml b/Resources/Prototypes/_NF/Shipyard/liquidator.yml index aae8ff09b48..e1cd8d53823 100644 --- a/Resources/Prototypes/_NF/Shipyard/liquidator.yml +++ b/Resources/Prototypes/_NF/Shipyard/liquidator.yml @@ -10,6 +10,7 @@ # - type: vessel id: Liquidator + parent: BaseVessel name: LVHI Liquidator description: A small vessel equipped with everything you need to make even the dirtiest ship squeaky clean (ducky slippers included). Manufactured by Langstad-Voigt Heavy Industries. price: 30750 # ~26590$ on mapinit + 15% markup @@ -21,10 +22,6 @@ - Civilian engine: - Uranium - addComponents: - - type: IFF - color: '#FFFFFFFF' - flags: [IsPlayerShuttle] - type: gameMap id: Liquidator diff --git a/Resources/Prototypes/_NF/Shipyard/loader.yml b/Resources/Prototypes/_NF/Shipyard/loader.yml index 1237d1fe5f8..6b270f539c4 100644 --- a/Resources/Prototypes/_NF/Shipyard/loader.yml +++ b/Resources/Prototypes/_NF/Shipyard/loader.yml @@ -10,6 +10,7 @@ # - type: vessel id: Loader + parent: BaseVessel name: NC Loader description: A compact cargo ship designed for hauling shipments. price: 22000 @@ -21,10 +22,6 @@ - Cargo engine: - Plasma - addComponents: - - type: IFF - color: '#FFFFFFFF' - flags: [IsPlayerShuttle] - type: gameMap id: Loader diff --git a/Resources/Prototypes/_NF/Shipyard/lyrae.yml b/Resources/Prototypes/_NF/Shipyard/lyrae.yml index 51d2bd54f5c..3d57150ec18 100644 --- a/Resources/Prototypes/_NF/Shipyard/lyrae.yml +++ b/Resources/Prototypes/_NF/Shipyard/lyrae.yml @@ -10,6 +10,7 @@ # - type: vessel id: Lyrae + parent: BaseVessel name: SBB Lyrae description: A medium size science vessel with laboratories for both anomalous and xenoarchaeology research. price: 60000 # TODO: fix this value, getting tests to pass - Whatstone @@ -21,10 +22,6 @@ - Science engine: - AME - addComponents: - - type: IFF - color: '#FFFFFFFF' - flags: [IsPlayerShuttle] - type: gameMap id: Lyrae diff --git a/Resources/Prototypes/_NF/Shipyard/mccargo.yml b/Resources/Prototypes/_NF/Shipyard/mccargo.yml index aa4eb17cc8a..180c8bb703f 100644 --- a/Resources/Prototypes/_NF/Shipyard/mccargo.yml +++ b/Resources/Prototypes/_NF/Shipyard/mccargo.yml @@ -7,6 +7,7 @@ - type: vessel id: McCargo + parent: BaseVessel name: DC McCargo description: "Your very own McCargo™ franchise! Comes fully stocked and ready for production of McMeals." price: 80000 # TODO: fix these values, getting tests to pass - Whatstone @@ -18,10 +19,6 @@ - Kitchen engine: - Plasma - addComponents: - - type: IFF - color: '#FFFFFFFF' - flags: [IsPlayerShuttle] - type: gameMap id: McCargo diff --git a/Resources/Prototypes/_NF/Shipyard/mcdelivery.yml b/Resources/Prototypes/_NF/Shipyard/mcdelivery.yml index 3a5240921d8..0cb1fc43ea1 100644 --- a/Resources/Prototypes/_NF/Shipyard/mcdelivery.yml +++ b/Resources/Prototypes/_NF/Shipyard/mcdelivery.yml @@ -7,6 +7,7 @@ - type: vessel id: McDelivery + parent: BaseVessel name: DC McDelivery description: "Fast food fast ship, bring the McCargo meals to the people" price: 10000 @@ -18,10 +19,6 @@ - Civilian engine: - Welding - addComponents: - - type: IFF - color: '#FFFFFFFF' - flags: [IsPlayerShuttle] - type: gameMap id: McDelivery diff --git a/Resources/Prototypes/_NF/Shipyard/phoenix.yml b/Resources/Prototypes/_NF/Shipyard/phoenix.yml index ea9ab455e1a..0be781ccfdb 100644 --- a/Resources/Prototypes/_NF/Shipyard/phoenix.yml +++ b/Resources/Prototypes/_NF/Shipyard/phoenix.yml @@ -10,6 +10,7 @@ # - type: vessel id: Phoenix + parent: BaseVessel name: NR Phoenix description: A research and salvage vessel designed for deep space exploration. price: 64000 # TODO - fix this value, getting tests to pass - Whatstone @@ -22,10 +23,6 @@ - Engineering engine: - Plasma - addComponents: - - type: IFF - color: '#FFFFFFFF' - flags: [IsPlayerShuttle] - type: gameMap id: Phoenix diff --git a/Resources/Prototypes/_NF/Shipyard/piecrust.yml b/Resources/Prototypes/_NF/Shipyard/piecrust.yml index 864029d54d8..9c59e7346f9 100644 --- a/Resources/Prototypes/_NF/Shipyard/piecrust.yml +++ b/Resources/Prototypes/_NF/Shipyard/piecrust.yml @@ -10,6 +10,7 @@ # - type: vessel id: Piecrust + parent: BaseVessel name: NC Piecrust description: A combination animal ranch and pie bakery price: 35000 # TODO: fix this value, getting tests to pass - Whatstone @@ -21,10 +22,6 @@ - Kitchen engine: - Plasma - addComponents: - - type: IFF - color: '#FFFFFFFF' - flags: [IsPlayerShuttle] - type: gameMap id: Piecrust diff --git a/Resources/Prototypes/_NF/Shipyard/pioneer.yml b/Resources/Prototypes/_NF/Shipyard/pioneer.yml index 72f5c6ab4b1..f663745f6fd 100644 --- a/Resources/Prototypes/_NF/Shipyard/pioneer.yml +++ b/Resources/Prototypes/_NF/Shipyard/pioneer.yml @@ -10,6 +10,7 @@ # - type: vessel id: Pioneer + parent: BaseVessel name: LVHI Pioneer description: A cargo container outfitted to be space-capable and equipped for salvaging and mining either on its own or as part of a fleet. Manufactured by Langstad-Voigt Heavy Industries. price: 11250 # ~9781$ on mapinit + 15% markup @@ -21,10 +22,6 @@ - Salvage engine: - Plasma - addComponents: - - type: IFF - color: '#FFFFFFFF' - flags: [IsPlayerShuttle] - type: gameMap id: Pioneer diff --git a/Resources/Prototypes/_NF/Shipyard/placebo.yml b/Resources/Prototypes/_NF/Shipyard/placebo.yml index 786565d71d2..4f932fc0de3 100644 --- a/Resources/Prototypes/_NF/Shipyard/placebo.yml +++ b/Resources/Prototypes/_NF/Shipyard/placebo.yml @@ -10,6 +10,7 @@ # - type: vessel id: Placebo + parent: BaseVessel name: NC Placebo description: A small psychology vessel. Named after the famous Placebo effect. price: 20000 @@ -21,10 +22,6 @@ - Medical engine: - Plasma - addComponents: - - type: IFF - color: '#FFFFFFFF' - flags: [IsPlayerShuttle] - type: gameMap id: Placebo diff --git a/Resources/Prototypes/_NF/Shipyard/prospector.yml b/Resources/Prototypes/_NF/Shipyard/prospector.yml index e26d5625090..b79d2cfe8db 100644 --- a/Resources/Prototypes/_NF/Shipyard/prospector.yml +++ b/Resources/Prototypes/_NF/Shipyard/prospector.yml @@ -10,6 +10,7 @@ # - type: vessel id: Prospector + parent: BaseVessel name: NC Prospector description: A small mining vessel designed to assist salvage operations. price: 24500 @@ -21,10 +22,6 @@ - Salvage engine: - Plasma - addComponents: - - type: IFF - color: '#FFFFFFFF' - flags: [IsPlayerShuttle] - type: gameMap id: Prospector diff --git a/Resources/Prototypes/_NF/Shipyard/pts.yml b/Resources/Prototypes/_NF/Shipyard/pts.yml index b65987b2b44..fdf28340c03 100644 --- a/Resources/Prototypes/_NF/Shipyard/pts.yml +++ b/Resources/Prototypes/_NF/Shipyard/pts.yml @@ -10,6 +10,7 @@ # - type: vessel id: PTS + parent: BaseVessel name: NC Personal Transport description: A small transport shuttle with space for 4 passengers. Comes with the latest audio entertainment technology. price: 17500 # $16634 after appraisal + ~5% markup @@ -21,10 +22,6 @@ - Civilian engine: - Plasma - addComponents: - - type: IFF - color: '#FFFFFFFF' - flags: [IsPlayerShuttle] - type: gameMap id: PTS diff --git a/Resources/Prototypes/_NF/Shipyard/searchlight.yml b/Resources/Prototypes/_NF/Shipyard/searchlight.yml index e7daedcaf12..6c9e6abf52a 100644 --- a/Resources/Prototypes/_NF/Shipyard/searchlight.yml +++ b/Resources/Prototypes/_NF/Shipyard/searchlight.yml @@ -10,6 +10,7 @@ # - type: vessel id: Searchlight + parent: BaseVessel name: LVHI Searchlight description: A small vessel outfitted for the search and recovery of wounded NT personnel. Manufactured by Langstad-Voigt Heavy Industries. price: 30000 # ~25988$ on mapinit + 15% markup @@ -21,10 +22,6 @@ - Medical engine: - Plasma - addComponents: - - type: IFF - color: '#FFFFFFFF' - flags: [IsPlayerShuttle] - type: gameMap id: Searchlight diff --git a/Resources/Prototypes/_NF/Shipyard/skipper.yml b/Resources/Prototypes/_NF/Shipyard/skipper.yml index 4b23864caf5..82888ad32a7 100644 --- a/Resources/Prototypes/_NF/Shipyard/skipper.yml +++ b/Resources/Prototypes/_NF/Shipyard/skipper.yml @@ -10,6 +10,7 @@ # - type: vessel id: Skipper + parent: BaseVessel name: NC Skipper description: A small service ship with a full service kitchen and hydroponics garden. price: 33000 @@ -21,10 +22,6 @@ - Kitchen engine: - Plasma - addComponents: - - type: IFF - color: '#FFFFFFFF' - flags: [IsPlayerShuttle] - type: gameMap id: Skipper diff --git a/Resources/Prototypes/_NF/Shipyard/sparrow.yml b/Resources/Prototypes/_NF/Shipyard/sparrow.yml index d2dc5a5c03d..68ed0431ac5 100644 --- a/Resources/Prototypes/_NF/Shipyard/sparrow.yml +++ b/Resources/Prototypes/_NF/Shipyard/sparrow.yml @@ -10,6 +10,7 @@ # - type: vessel id: Sparrow + parent: BaseVessel name: NR Sparrow description: A small research and engineering vessel. price: 41000 # TODO: review ship values - Whatstone @@ -22,10 +23,6 @@ - Engineering engine: - Plasma - addComponents: - - type: IFF - color: '#FFFFFFFF' - flags: [IsPlayerShuttle] - type: gameMap id: Sparrow diff --git a/Resources/Prototypes/_NF/Shipyard/spectre.yml b/Resources/Prototypes/_NF/Shipyard/spectre.yml index d874e5410a6..573a8b0fa17 100644 --- a/Resources/Prototypes/_NF/Shipyard/spectre.yml +++ b/Resources/Prototypes/_NF/Shipyard/spectre.yml @@ -10,6 +10,7 @@ # - type: vessel id: Spectre + parent: BaseVessel name: NR Spectre description: A large, attractive but dated vessel with a pure focus on research and development. It is capable of generating anomalies. price: 185000 # Anomaly spawner @@ -21,10 +22,6 @@ - Science engine: - AME - addComponents: - - type: IFF - color: '#FFFFFFFF' - flags: [IsPlayerShuttle] - type: gameMap id: Spectre diff --git a/Resources/Prototypes/_NF/Shipyard/spirit.yml b/Resources/Prototypes/_NF/Shipyard/spirit.yml index 71c38ffb4b2..a312d2a66b2 100644 --- a/Resources/Prototypes/_NF/Shipyard/spirit.yml +++ b/Resources/Prototypes/_NF/Shipyard/spirit.yml @@ -10,6 +10,7 @@ # - type: vessel id: Spirit + parent: BaseVessel name: FSB Spirit description: A tiny medical search and rescue shuttle, as nimble as it is cramped. Running costs guaranteed* to be 5% lower than competing models! price: 18500 @@ -21,10 +22,6 @@ - Medical engine: - Plasma - addComponents: - - type: IFF - color: '#FFFFFFFF' - flags: [IsPlayerShuttle] - type: gameMap id: Spirit diff --git a/Resources/Prototypes/_NF/Shipyard/stasis.yml b/Resources/Prototypes/_NF/Shipyard/stasis.yml index 0ef23037143..7645a0072ee 100644 --- a/Resources/Prototypes/_NF/Shipyard/stasis.yml +++ b/Resources/Prototypes/_NF/Shipyard/stasis.yml @@ -10,6 +10,7 @@ # - type: vessel id: Stasis + parent: BaseVessel name: FSB Stasis description: A medium medical vessel providing cryogenic and support medical services for the traumas of deep space operations. Designed, developed and deployed by the Far Star Biotech company to render aid wherever it is needed. price: 56000 # Appraises at ~52660, margin of ~6% TODO: fix this value, getting tests to pass - Whatstone @@ -21,10 +22,6 @@ - Medical engine: - Uranium - addComponents: - - type: IFF - color: '#FFFFFFFF' - flags: [IsPlayerShuttle] - type: gameMap id: Stasis diff --git a/Resources/Prototypes/_NF/Shipyard/stellaris.yml b/Resources/Prototypes/_NF/Shipyard/stellaris.yml index d93b7fe3a7f..8a5ef07bb44 100644 --- a/Resources/Prototypes/_NF/Shipyard/stellaris.yml +++ b/Resources/Prototypes/_NF/Shipyard/stellaris.yml @@ -1,5 +1,6 @@ - type: vessel id: Stellaris + parent: BaseVessel name: NT Stellaris description: A mobile theatre perfect for putting on any show. price: 48000 # Appraises for 45469, margin of 7% - TODO: fix this value, getting tests to pass - Whatstone @@ -11,10 +12,6 @@ - Civilian engine: - Plasma - addComponents: - - type: IFF - color: '#FFFFFFFF' - flags: [IsPlayerShuttle] - type: gameMap id: Stellaris diff --git a/Resources/Prototypes/_NF/Shipyard/tyne.yml b/Resources/Prototypes/_NF/Shipyard/tyne.yml index 12575b1a6b1..e4f615d1d0a 100644 --- a/Resources/Prototypes/_NF/Shipyard/tyne.yml +++ b/Resources/Prototypes/_NF/Shipyard/tyne.yml @@ -10,6 +10,7 @@ # - type: vessel id: Tyne + parent: BaseVessel name: SBB Tyne description: A small, agile lifeboat with an exterior deck and survivor cabin for search and rescue operations. price: 20750 #~6% markup as it's a med ship. Appraises at ~19350. @@ -18,10 +19,8 @@ shuttlePath: /Maps/_NF/Shuttles/tyne.yml class: - Medical - addComponents: - - type: IFF - color: '#FFFFFFFF' - flags: [IsPlayerShuttle] + engine: + - Plasma - type: gameMap id: Tyne diff --git a/Resources/Prototypes/_NF/Shipyard/vagabond.yml b/Resources/Prototypes/_NF/Shipyard/vagabond.yml index a1f67c4cd61..494923e66fd 100644 --- a/Resources/Prototypes/_NF/Shipyard/vagabond.yml +++ b/Resources/Prototypes/_NF/Shipyard/vagabond.yml @@ -11,6 +11,7 @@ - type: vessel id: Vagabond + parent: BaseVessel name: NT Vagabond description: A adaptable long-haul industrial freighter that pilots have adapted to many different purposes. price: 60000 @@ -22,10 +23,6 @@ - Cargo engine: - Plasma - addComponents: - - type: IFF - color: '#FFFFFFFF' - flags: [IsPlayerShuttle] - type: gameMap id: Vagabond From 4c8e9e1ffaf00a1069519586d8d55dde8501c53d Mon Sep 17 00:00:00 2001 From: Whatstone Date: Sat, 28 Dec 2024 09:19:19 -0500 Subject: [PATCH 8/9] NFG Bikeshed to AAA Bikeshed (top of list) --- Resources/Prototypes/_NF/Shipyard/Base/base.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/_NF/Shipyard/Base/base.yml b/Resources/Prototypes/_NF/Shipyard/Base/base.yml index 020c1e17256..53f9f206670 100644 --- a/Resources/Prototypes/_NF/Shipyard/Base/base.yml +++ b/Resources/Prototypes/_NF/Shipyard/Base/base.yml @@ -2,7 +2,7 @@ - type: vessel id: BaseVessel abstract: true - name: NFG Bikeshed + name: AAA Bikeshed description: Questionably spaceworthy. price: 50000 category: Medium From b6d3a96f2883ef099d7a8e2cba4b10b41da96e98 Mon Sep 17 00:00:00 2001 From: Whatstone Date: Sat, 28 Dec 2024 09:23:42 -0500 Subject: [PATCH 9/9] Remove IFF from Menace (pushed to Vessel proto) --- Resources/Maps/_NF/Shuttles/BlackMarket/menace.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/Resources/Maps/_NF/Shuttles/BlackMarket/menace.yml b/Resources/Maps/_NF/Shuttles/BlackMarket/menace.yml index 194ccfefab8..270e9178285 100644 --- a/Resources/Maps/_NF/Shuttles/BlackMarket/menace.yml +++ b/Resources/Maps/_NF/Shuttles/BlackMarket/menace.yml @@ -47,8 +47,6 @@ entities: bodyType: Dynamic - type: Fixtures fixtures: {} - - type: IFF - flags: HideLabel - type: OccluderTree - type: SpreaderGrid - type: Shuttle