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