diff --git a/Resources/Locale/en-US/_NF/prototypes/catalog/fills/crates/engines-crates.ftl b/Resources/Locale/en-US/_NF/prototypes/catalog/fills/crates/engines-crates.ftl index f5a1492fa03..3c19c7330bf 100644 --- a/Resources/Locale/en-US/_NF/prototypes/catalog/fills/crates/engines-crates.ftl +++ b/Resources/Locale/en-US/_NF/prototypes/catalog/fills/crates/engines-crates.ftl @@ -3,3 +3,9 @@ ent-CrateThruster = { ent-BaseThruster } ent-CrateGyroscope = { ent-Gyroscope } .desc = { ent-Gyroscope.desc } + +ent-CrateSmallThruster = { ent-SmallThruster } + .desc = { ent-BaseThruster.desc } + +ent-CrateSmallGyroscope = { ent-SmallGyroscope } + .desc = { ent-Gyroscope.desc } diff --git a/Resources/Locale/en-US/_NF/prototypes/entities/shuttles/thrusters.ftl b/Resources/Locale/en-US/_NF/prototypes/entities/shuttles/thrusters.ftl new file mode 100644 index 00000000000..f1535b82c6a --- /dev/null +++ b/Resources/Locale/en-US/_NF/prototypes/entities/shuttles/thrusters.ftl @@ -0,0 +1,5 @@ +ent-SmallThruster = small thruster + .desc = { ent-BaseThruster.desc } + +ent-SmallGyroscope = small gyroscope + .desc = { ent-Gyroscope.desc } diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml index f7fde74674e..44f27ba41ce 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml @@ -385,6 +385,8 @@ - StationMapElectronics - DeepFryerMachineCircuitboard # End Nyano additions + - SmallThrusterMachineCircuitboard # Frontier + - SmallGyroscopeMachineCircuitboard # Frontier - type: MaterialStorage whitelist: tags: diff --git a/Resources/Prototypes/Research/industrial.yml b/Resources/Prototypes/Research/industrial.yml index d5e82e32d19..7761bac7d17 100644 --- a/Resources/Prototypes/Research/industrial.yml +++ b/Resources/Prototypes/Research/industrial.yml @@ -131,6 +131,8 @@ - ThrusterMachineCircuitboard - GyroscopeMachineCircuitboard - MiniGravityGeneratorCircuitboard + - SmallThrusterMachineCircuitboard # Frontier + - SmallGyroscopeMachineCircuitboard # Frontier - type: technology id: RipleyAPLU diff --git a/Resources/Prototypes/_NF/Catalog/Cargo/cargo_shuttle.yml b/Resources/Prototypes/_NF/Catalog/Cargo/cargo_shuttle.yml index 874f44491e0..b9aa9543c70 100644 --- a/Resources/Prototypes/_NF/Catalog/Cargo/cargo_shuttle.yml +++ b/Resources/Prototypes/_NF/Catalog/Cargo/cargo_shuttle.yml @@ -18,13 +18,22 @@ category: Shuttle group: market -# - type: cargoProduct - # id: ShuttlePowerKit - # icon: - # sprite: Structures/Machines/computers.rsi - # state: avionics-systems - # product: CrateEngineeringShuttle - # cost: 3000 - # category: Shuttle - # group: market -# locked: true # only the QM has permission to order by default +- type: cargoProduct + id: ShuttleSmallThruster + icon: + sprite: Structures/Shuttles/thruster.rsi + state: base + product: CrateSmallThruster + cost: 500 + category: Shuttle + group: market + +- type: cargoProduct + id: ShuttleSmallGyroscope + icon: + sprite: Structures/Shuttles/gyroscope.rsi + state: base + product: CrateSmallGyroscope + cost: 500 + category: Shuttle + group: market diff --git a/Resources/Prototypes/_NF/Catalog/Fills/Crates/engines.yml b/Resources/Prototypes/_NF/Catalog/Fills/Crates/engines.yml index 4772b318530..4fd05f4614b 100644 --- a/Resources/Prototypes/_NF/Catalog/Fills/Crates/engines.yml +++ b/Resources/Prototypes/_NF/Catalog/Fills/Crates/engines.yml @@ -13,3 +13,19 @@ - type: StorageFill contents: - id: ThrusterUnanchored + +- type: entity + id: CrateSmallGyroscope + parent: CrateEngineering + components: + - type: StorageFill + contents: + - id: SmallGyroscopeUnanchored + +- type: entity + id: CrateSmallThruster + parent: CrateEngineering + components: + - type: StorageFill + contents: + - id: SmallThrusterUnanchored diff --git a/Resources/Prototypes/_NF/Entities/Objects/Devices/production.yml b/Resources/Prototypes/_NF/Entities/Objects/Devices/production.yml index e23b1465d92..04e9a14fc71 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/Devices/production.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/Devices/production.yml @@ -12,3 +12,32 @@ MatterBin: 1 materialRequirements: Glass: 1 + +- type: entity + id: SmallThrusterMachineCircuitboard + parent: BaseMachineCircuitboard + name: small thruster machine board + components: + - type: MachineBoard + prototype: SmallThruster + requirements: + Capacitor: 4 + materialRequirements: + Steel: 5 + - type: StaticPrice + price: 30 + +- type: entity + id: SmallGyroscopeMachineCircuitboard + parent: BaseMachineCircuitboard + name: small gyroscope machine board + components: + - type: MachineBoard + prototype: SmallGyroscope + requirements: + Manipulator: 2 + Capacitor: 1 + materialRequirements: + Glass: 2 + - type: StaticPrice + price: 12.5 diff --git a/Resources/Prototypes/_NF/Entities/Structures/Shuttles/thrusters.yml b/Resources/Prototypes/_NF/Entities/Structures/Shuttles/thrusters.yml index eaeb9dfd9a2..5ad3f37ad8e 100644 --- a/Resources/Prototypes/_NF/Entities/Structures/Shuttles/thrusters.yml +++ b/Resources/Prototypes/_NF/Entities/Structures/Shuttles/thrusters.yml @@ -86,7 +86,7 @@ - type: entity id: SmallThruster parent: Thruster - suffix: Small + name: small thruster components: - type: Thruster baseThrust: 33 @@ -113,6 +113,18 @@ offset: 0, 1 - type: StaticPrice price: 100 + - type: Machine + board: SmallThrusterMachineCircuitboard + +- type: entity + id: SmallThrusterUnanchored + parent: SmallThruster + suffix: Unanchored + components: + - type: Transform + anchored: false + - type: Physics + bodyType: Dynamic - type: entity id: GyroscopeSecurity @@ -139,22 +151,13 @@ - type: entity id: GyroscopeSecurityUnanchored - parent: GyroscopeUnanchored + parent: GyroscopeSecurity + suffix: Unanchored, Security components: - - type: Sprite - sprite: _NF/Structures/Shuttles/gyroscope.rsi - snapCardinals: true - layers: - - state: base - map: ["enum.ThrusterVisualLayers.Base"] - - state: thrust - map: ["enum.ThrusterVisualLayers.ThrustOn"] - shader: unshaded - visible: false - - state: thrust_burn_unshaded - map: ["enum.ThrusterVisualLayers.ThrustingUnshaded"] - shader: unshaded - visible: false + - type: Transform + anchored: false + - type: Physics + bodyType: Dynamic - type: entity id: DebugGyroscopeSecurity @@ -180,7 +183,8 @@ - type: entity id: SmallGyroscopeSecurity parent: GyroscopeSecurity - suffix: Security, Small + name: small gyroscope + suffix: Security components: - type: Thruster thrusterType: Angular @@ -204,11 +208,25 @@ map: ["enum.ThrusterVisualLayers.ThrustingUnshaded"] shader: unshaded visible: false + - type: StaticPrice + price: 250 + - type: Machine + board: SmallGyroscopeMachineCircuitboard + +- type: entity + id: SmallGyroscopeSecurityUnanchored + parent: SmallGyroscopeSecurity + suffix: Unanchored, Security + components: + - type: Transform + anchored: false + - type: Physics + bodyType: Dynamic - type: entity id: SmallGyroscope parent: Gyroscope - suffix: Small + name: small gyroscope components: - type: Thruster thrusterType: Angular @@ -234,3 +252,15 @@ visible: false - type: StaticPrice price: 250 + - 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/Recipes/Lathes/electronics.yml b/Resources/Prototypes/_NF/Recipes/Lathes/electronics.yml index 43bdfb14daf..5465a5733b7 100644 --- a/Resources/Prototypes/_NF/Recipes/Lathes/electronics.yml +++ b/Resources/Prototypes/_NF/Recipes/Lathes/electronics.yml @@ -5,3 +5,19 @@ completetime: 3 materials: Credit: 1 + +- type: latheRecipe + id: SmallThrusterMachineCircuitboard + result: SmallThrusterMachineCircuitboard + completetime: 4 + materials: + Steel: 140 + Glass: 300 + +- type: latheRecipe + id: SmallGyroscopeMachineCircuitboard + result: SmallGyroscopeMachineCircuitboard + completetime: 4 + materials: + Steel: 50 + Glass: 120