diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_shuttle.yml b/Resources/Prototypes/Catalog/Cargo/cargo_shuttle.yml index 68eb121ee2a..278104caed1 100644 --- a/Resources/Prototypes/Catalog/Cargo/cargo_shuttle.yml +++ b/Resources/Prototypes/Catalog/Cargo/cargo_shuttle.yml @@ -1,24 +1,22 @@ -# Frontier - Moved to crate -#- type: cargoProduct -# id: ShuttleThruster -# icon: -# sprite: Structures/Shuttles/thruster.rsi -# state: base -# product: CrateEngineeringThruster -# cost: 1500 -# category: cargoproduct-category-name-shuttle -# group: market +- type: cargoProduct + id: ShuttleThruster + icon: + sprite: Structures/Shuttles/thruster.rsi + state: base + product: CrateEngineeringThruster + cost: 1500 + category: cargoproduct-category-name-shuttle + group: market -# Frontier - Moved to crate -#- type: cargoProduct -# id: ShuttleGyroscope -# icon: -# sprite: Structures/Shuttles/gyroscope.rsi -# state: base -# product: CrateEngineeringGyroscope -# cost: 4000 -# category: cargoproduct-category-name-shuttle -# group: market +- type: cargoProduct + id: ShuttleGyroscope + icon: + sprite: Structures/Shuttles/gyroscope.rsi + state: base + product: CrateEngineeringGyroscope + cost: 4000 + category: cargoproduct-category-name-shuttle + group: market # - type: cargoProduct # id: ShuttlePowerKit diff --git a/Resources/Prototypes/_NF/Catalog/Cargo/cargo_shuttle.yml b/Resources/Prototypes/_NF/Catalog/Cargo/cargo_shuttle.yml index d38e263f3b6..4214f03ec90 100644 --- a/Resources/Prototypes/_NF/Catalog/Cargo/cargo_shuttle.yml +++ b/Resources/Prototypes/_NF/Catalog/Cargo/cargo_shuttle.yml @@ -1,29 +1,9 @@ -- type: cargoProduct - id: ShuttleThruster - icon: - sprite: Structures/Shuttles/thruster.rsi - state: base - product: CrateThruster - cost: 1500 - category: cargoproduct-category-name-shuttle - group: market - -- type: cargoProduct - id: ShuttleGyroscope - icon: - sprite: Structures/Shuttles/gyroscope.rsi - state: base - product: CrateGyroscope - cost: 4000 - category: cargoproduct-category-name-shuttle - group: market - - type: cargoProduct id: ShuttleSmallThruster icon: sprite: Structures/Shuttles/thruster.rsi state: base - product: CrateSmallThruster + product: CrateEngineeringSmallThruster cost: 500 category: cargoproduct-category-name-shuttle group: market @@ -33,7 +13,7 @@ icon: sprite: Structures/Shuttles/gyroscope.rsi state: base - product: CrateSmallGyroscope + product: CrateEngineeringSmallGyroscope cost: 500 category: cargoproduct-category-name-shuttle group: market diff --git a/Resources/Prototypes/_NF/Catalog/Fills/Crates/engines.yml b/Resources/Prototypes/_NF/Catalog/Fills/Crates/engines.yml index ce859351b5e..eff29da654e 100644 --- a/Resources/Prototypes/_NF/Catalog/Fills/Crates/engines.yml +++ b/Resources/Prototypes/_NF/Catalog/Fills/Crates/engines.yml @@ -1,31 +1,17 @@ - type: entity - id: CrateGyroscope parent: CrateEngineering + id: CrateEngineeringSmallThruster + name: small thruster crate components: - type: StorageFill contents: - - id: GyroscopeUnanchoredFlatpack + - id: SmallThrusterFlatpack - type: entity - id: CrateThruster parent: CrateEngineering + id: CrateEngineeringSmallGyroscope + name: small gyroscope crate components: - type: StorageFill contents: - - id: ThrusterUnanchoredFlatpack - -- type: entity - id: CrateSmallGyroscope - parent: CrateEngineering - components: - - type: StorageFill - contents: - - id: SmallGyroscopeUnanchoredFlatpack - -- type: entity - id: CrateSmallThruster - parent: CrateEngineering - components: - - type: StorageFill - contents: - - id: SmallThrusterUnanchoredFlatpack + - id: SmallGyroscopeFlatpack diff --git a/Resources/Prototypes/_NF/Entities/Objects/Devices/flatpacks.yml b/Resources/Prototypes/_NF/Entities/Objects/Devices/flatpacks.yml index fc544e21dd8..3ef62352561 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/Devices/flatpacks.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/Devices/flatpacks.yml @@ -135,45 +135,21 @@ - type: entity parent: BaseNFFlatpack - id: GyroscopeUnanchoredFlatpack - name: gyroscope flatpack - description: A flatpack used for constructing a gyroscope. - components: - - type: Flatpack - entity: GyroscopeUnanchored - - type: Sprite - layers: - - state: engineering_gyroscope - -- type: entity - parent: BaseNFFlatpack - id: SmallGyroscopeUnanchoredFlatpack + id: SmallGyroscopeFlatpack name: small gyroscope flatpack description: A flatpack used for constructing a small gyroscope. components: - type: Flatpack - entity: SmallGyroscopeUnanchored - -- type: entity - parent: BaseNFFlatpack - id: ThrusterUnanchoredFlatpack - name: thruster flatpack - description: A flatpack used for constructing a thruster. - components: - - type: Flatpack - entity: ThrusterUnanchored - - type: Sprite - layers: - - state: engineering_thruster + entity: SmallGyroscope - type: entity parent: BaseNFFlatpack - id: SmallThrusterUnanchoredFlatpack + id: SmallThrusterFlatpack name: small thruster flatpack description: A flatpack used for constructing a small thruster. components: - type: Flatpack - entity: SmallThrusterUnanchored + entity: SmallThruster # Science - type: entity diff --git a/Resources/Prototypes/_NF/Entities/Objects/Devices/production.yml b/Resources/Prototypes/_NF/Entities/Objects/Devices/production.yml index bec4aa3edb2..a9efdb10a2d 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/Devices/production.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/Devices/production.yml @@ -77,7 +77,7 @@ name: nfsd thruster machine board components: - type: MachineBoard - prototype: ThrusterNFSD + prototype: ThrusterNfsd requirements: Capacitor: 3 materialRequirements: diff --git a/Resources/Prototypes/_NF/Entities/Structures/Shuttles/thrusters.yml b/Resources/Prototypes/_NF/Entities/Structures/Shuttles/thrusters.yml index 17f9411354a..721dd786a35 100644 --- a/Resources/Prototypes/_NF/Entities/Structures/Shuttles/thrusters.yml +++ b/Resources/Prototypes/_NF/Entities/Structures/Shuttles/thrusters.yml @@ -31,16 +31,6 @@ - type: Machine board: SmallThrusterMachineCircuitboard -- type: entity - id: SmallThrusterUnanchored - parent: SmallThruster - suffix: Unanchored - components: - - type: Transform - anchored: false - - type: Physics - bodyType: Dynamic - - type: entity id: SmallGyroscope parent: Gyroscope @@ -72,13 +62,3 @@ price: 100 - type: Machine board: SmallGyroscopeMachineCircuitboard - -- type: entity - id: SmallGyroscopeUnanchored - parent: SmallGyroscope - suffix: Unanchored - components: - - type: Transform - anchored: false - - type: Physics - bodyType: Dynamic diff --git a/Resources/Prototypes/_NF/Entities/Structures/Shuttles/thrusters_nfsd.yml b/Resources/Prototypes/_NF/Entities/Structures/Shuttles/thrusters_nfsd.yml index 401946a97b2..3023fc7a07a 100644 --- a/Resources/Prototypes/_NF/Entities/Structures/Shuttles/thrusters_nfsd.yml +++ b/Resources/Prototypes/_NF/Entities/Structures/Shuttles/thrusters_nfsd.yml @@ -1,6 +1,6 @@ - type: entity id: ThrusterNfsd - parent: [ BaseStructureUnanchorable, ThrusterSecurity ] + parent: ThrusterSecurity suffix: NFSD components: - type: Sprite @@ -8,19 +8,9 @@ - type: Machine board: ThrusterNfsdMachineCircuitboard -- type: entity - id: ThrusterNfsdUnanchored - parent: ThrusterSecurityUnanchored - suffix: Unanchored, NFSD - components: - - type: Sprite - sprite: _NF/Structures/Shuttles/thrusternfsd.rsi - - type: Machine - board: ThrusterNfsdMachineCircuitboard - - type: entity id: DebugThrusterNfsd - parent: [BaseStructureDisableToolUse, DebugThrusterSecurity] + parent: DebugThrusterSecurity suffix: DEBUG, NFSD components: - type: Sprite @@ -39,17 +29,6 @@ - type: Machine board: GyroscopeNfsdMachineCircuitboard -- type: entity - id: GyroscopeNfsdUnanchored - parent: GyroscopeSecurityUnanchored - suffix: Unanchored, NFSD - components: - - type: Sprite - sprite: _NF/Structures/Shuttles/nfsdgyroscope.rsi - snapCardinals: true - - type: Machine - board: GyroscopeNfsdMachineCircuitboard - - type: entity id: DebugGyroscopeNfsd parent: DebugGyroscopeSecurity @@ -73,15 +52,3 @@ snapCardinals: true - type: Machine board: SmallGyroscopeNfsdMachineCircuitboard - -- type: entity - id: SmallGyroscopeNfsdUnanchored - parent: SmallGyroscopeSecurityUnanchored - suffix: Unanchored, NFSD - components: - - type: Sprite - scale: 0.8, 0.8 - sprite: _NF/Structures/Shuttles/nfsdgyroscope.rsi - snapCardinals: true - - type: Machine - board: SmallGyroscopeNfsdMachineCircuitboard diff --git a/Resources/Prototypes/_NF/Entities/Structures/Shuttles/thrusters_security.yml b/Resources/Prototypes/_NF/Entities/Structures/Shuttles/thrusters_security.yml index 63ddf34568d..f19386485f3 100644 --- a/Resources/Prototypes/_NF/Entities/Structures/Shuttles/thrusters_security.yml +++ b/Resources/Prototypes/_NF/Entities/Structures/Shuttles/thrusters_security.yml @@ -17,24 +17,6 @@ - type: Machine board: ThrusterSecurityMachineCircuitboard -- type: entity - id: ThrusterSecurityUnanchored - parent: ThrusterUnanchored - suffix: Unanchored, Security - components: - - type: Sprite - sprite: _NF/Structures/Shuttles/thrustersecurity.rsi - - type: Destructible - thresholds: - - trigger: - !type:DamageTrigger - damage: 600 # Considering we need a lot of thrusters didn't want to make an individual one too tanky - behaviors: - - !type:DoActsBehavior - acts: ["Destruction"] - - type: Machine - board: ThrusterSecurityMachineCircuitboard - - type: entity id: DebugThrusterSecurity parent: [BaseStructureDisableToolUse, DebugThruster] @@ -65,18 +47,6 @@ - type: Machine board: GyroscopeSecurityMachineCircuitboard -- type: entity - id: GyroscopeSecurityUnanchored - parent: GyroscopeSecurity - suffix: Unanchored, Security - components: - - type: Transform - anchored: false - - type: Physics - bodyType: Dynamic - - type: Machine - board: GyroscopeSecurityMachineCircuitboard - - type: entity id: DebugGyroscopeSecurity parent: [BaseStructureDisableToolUse, DebugGyroscope] @@ -110,15 +80,3 @@ price: 100 - type: Machine board: SmallGyroscopeSecurityMachineCircuitboard - -- type: entity - id: SmallGyroscopeSecurityUnanchored - parent: SmallGyroscopeSecurity - suffix: Unanchored, Security - components: - - type: Transform - anchored: false - - type: Physics - bodyType: Dynamic - - type: Machine - board: SmallGyroscopeSecurityMachineCircuitboard