From 14194cf2e034b213800d75d6554978b68bd908c9 Mon Sep 17 00:00:00 2001 From: Scribbles0 <91828755+Scribbles0@users.noreply.github.com> Date: Sat, 29 Oct 2022 22:54:03 -0700 Subject: [PATCH] mini jetpack changes (#11682) --- .../prototypes/catalog/cargo/cargo-engineering.ftl | 3 +++ .../catalog/fills/crates/engineering-crates.ftl | 3 +++ .../Prototypes/Catalog/Cargo/cargo_engineering.yml | 10 ++++++++++ .../Prototypes/Catalog/Fills/Crates/engineering.yml | 9 +++++++++ .../Prototypes/Entities/Objects/Tools/jetpacks.yml | 10 +++++++--- 5 files changed, 32 insertions(+), 3 deletions(-) diff --git a/Resources/Locale/en-US/prototypes/catalog/cargo/cargo-engineering.ftl b/Resources/Locale/en-US/prototypes/catalog/cargo/cargo-engineering.ftl index 183a4c15a9..c6e0ce5493 100644 --- a/Resources/Locale/en-US/prototypes/catalog/cargo/cargo-engineering.ftl +++ b/Resources/Locale/en-US/prototypes/catalog/cargo/cargo-engineering.ftl @@ -15,3 +15,6 @@ ent-EngineeringElectricalSupplies = { ent-CrateEngineeringElectricalSupplies } ent-EngineeringJetpack = { ent-CrateEngineeringJetpack } .desc = { ent-CrateEngineeringJetpack.desc } + +ent-EngineeringMiniJetpack = { ent-CrateEngineeringMiniJetpack } + .desc = { ent-CrateEngineeringMiniJetpack.desc } \ No newline at end of file diff --git a/Resources/Locale/en-US/prototypes/catalog/fills/crates/engineering-crates.ftl b/Resources/Locale/en-US/prototypes/catalog/fills/crates/engineering-crates.ftl index 52ed2f2cc3..79bd852472 100644 --- a/Resources/Locale/en-US/prototypes/catalog/fills/crates/engineering-crates.ftl +++ b/Resources/Locale/en-US/prototypes/catalog/fills/crates/engineering-crates.ftl @@ -24,3 +24,6 @@ ent-CrateEngineeringElectricalSupplies = Electrical Supplies Crate ent-CrateEngineeringJetpack = Jetpack crate .desc = Two jetpacks for those who don't know how to use fire extinguishers. + +ent-CrateEngineeringMiniJetpack = Mini jetpack crate + .desc = Two mini jetpacks for those who want an extra challenge. \ No newline at end of file diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_engineering.yml b/Resources/Prototypes/Catalog/Cargo/cargo_engineering.yml index ef0c8b1da3..512900da8c 100644 --- a/Resources/Prototypes/Catalog/Cargo/cargo_engineering.yml +++ b/Resources/Prototypes/Catalog/Cargo/cargo_engineering.yml @@ -57,3 +57,13 @@ cost: 1000 category: Engineering group: market + +- type: cargoProduct + id: EngineeringMiniJetpack + icon: + sprite: Objects/Tanks/Jetpacks/mini.rsi + state: icon + product: CrateEngineeringMiniJetpack + cost: 750 + category: Engineering + group: market \ No newline at end of file diff --git a/Resources/Prototypes/Catalog/Fills/Crates/engineering.yml b/Resources/Prototypes/Catalog/Fills/Crates/engineering.yml index 9124e07630..303a3ec1f4 100644 --- a/Resources/Prototypes/Catalog/Fills/Crates/engineering.yml +++ b/Resources/Prototypes/Catalog/Fills/Crates/engineering.yml @@ -96,3 +96,12 @@ contents: - id: JetpackBlue amount: 2 + +- type: entity + id: CrateEngineeringMiniJetpack + parent: CrateGenericSteel + components: + - type: StorageFill + contents: + - id: JetpackMini + amount: 2 diff --git a/Resources/Prototypes/Entities/Objects/Tools/jetpacks.yml b/Resources/Prototypes/Entities/Objects/Tools/jetpacks.yml index a687ef7d83..8429a94b27 100644 --- a/Resources/Prototypes/Entities/Objects/Tools/jetpacks.yml +++ b/Resources/Prototypes/Entities/Objects/Tools/jetpacks.yml @@ -180,6 +180,10 @@ slots: - Back - suitStorage + - type: GasTank + outputPressure: 42.6 + air: + volume: 4 # Filled mini - type: entity @@ -192,10 +196,10 @@ outputPressure: 42.6 air: temperature: 293.15 - volume: 2 + volume: 4 moles: - - 0.161 - - 0.161 + - 0.747 + - 0.747 #Empty security - type: entity