From 9202d7ac6c5f23b90dbace64b6b8cd346322f76e Mon Sep 17 00:00:00 2001 From: Eugeny Date: Sat, 17 Aug 2024 19:48:34 +0400 Subject: [PATCH 1/2] =?UTF-8?q?=D0=A0=D0=B5=D1=88=D0=B5=D0=BD=D0=B8=D0=B5?= =?UTF-8?q?=20=D1=8D=D0=BD=D0=B5=D1=80=D0=B3=D0=B5=D1=82=D0=B8=D1=87=D0=B5?= =?UTF-8?q?=D1=81=D0=BA=D0=BE=D0=B3=D0=BE=20=D0=BA=D1=80=D0=B8=D0=B7=D0=B8?= =?UTF-8?q?=D1=81=D0=B0=20=D1=81=D1=82=D0=B0=D0=BD=D1=86=D0=B8=D0=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Solar/Components/SolarPanelComponent.cs | 2 +- .../ADT/Catalog/Cargo/cargo_engineering.yml | 20 +++++++++++++++++++ .../Catalog/Fills/Crates/engines.yml | 2 +- 3 files changed, 22 insertions(+), 2 deletions(-) diff --git a/Content.Server/Solar/Components/SolarPanelComponent.cs b/Content.Server/Solar/Components/SolarPanelComponent.cs index 870b4c78ef1..db8aa638a8f 100644 --- a/Content.Server/Solar/Components/SolarPanelComponent.cs +++ b/Content.Server/Solar/Components/SolarPanelComponent.cs @@ -15,7 +15,7 @@ public sealed partial class SolarPanelComponent : Component /// Maximum supply output by this panel (coverage = 1) /// [DataField("maxSupply")] - public int MaxSupply = 750; + public int MaxSupply = 1875; ///ADT_Tweak /// /// Current coverage of this panel (from 0 to 1). diff --git a/Resources/Prototypes/ADT/Catalog/Cargo/cargo_engineering.yml b/Resources/Prototypes/ADT/Catalog/Cargo/cargo_engineering.yml index 4f87a292d97..4ad120979ab 100644 --- a/Resources/Prototypes/ADT/Catalog/Cargo/cargo_engineering.yml +++ b/Resources/Prototypes/ADT/Catalog/Cargo/cargo_engineering.yml @@ -17,3 +17,23 @@ cost: 800 category: cargoproduct-category-name-engineering group: market + +- type: cargoProduct + id: EngineeringAMEShielding + icon: + sprite: Objects/Devices/flatpack.rsi + state: ame-part + product: CrateEngineeringAMEShielding + cost: 7500 + category: cargoproduct-category-name-engineering + group: market + +- type: cargoProduct + id: EngineeringAMEControl + icon: + sprite: Structures/Power/Generation/ame.rsi + state: control + product: CrateEngineeringAMEControl + cost: 2500 + category: cargoproduct-category-name-engineering + group: market diff --git a/Resources/Prototypes/Catalog/Fills/Crates/engines.yml b/Resources/Prototypes/Catalog/Fills/Crates/engines.yml index c37b7b7535a..3254419ba2c 100644 --- a/Resources/Prototypes/Catalog/Fills/Crates/engines.yml +++ b/Resources/Prototypes/Catalog/Fills/Crates/engines.yml @@ -9,7 +9,7 @@ - type: StorageFill contents: - id: AmePartFlatpack - amount: 9 + amount: 12 #ADT_Tweaks - type: entity id: CrateEngineeringAMEJar From 140a433d8cbeb6c3ce6dadf0383a1510389ff96e Mon Sep 17 00:00:00 2001 From: Eugeny Date: Sat, 17 Aug 2024 20:15:02 +0400 Subject: [PATCH 2/2] =?UTF-8?q?=D1=84=D0=B8=D0=BA=D1=81=20=D0=BF=D0=BE=20?= =?UTF-8?q?=D1=80=D0=B5=D0=B2=D1=8C=D1=8E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ADT/Catalog/Cargo/cargo_engineering.yml | 20 ------------------- .../ADT/Catalog/Cargo/cargo_engines.yml | 20 +++++++++++++++++++ 2 files changed, 20 insertions(+), 20 deletions(-) create mode 100644 Resources/Prototypes/ADT/Catalog/Cargo/cargo_engines.yml diff --git a/Resources/Prototypes/ADT/Catalog/Cargo/cargo_engineering.yml b/Resources/Prototypes/ADT/Catalog/Cargo/cargo_engineering.yml index 4ad120979ab..4f87a292d97 100644 --- a/Resources/Prototypes/ADT/Catalog/Cargo/cargo_engineering.yml +++ b/Resources/Prototypes/ADT/Catalog/Cargo/cargo_engineering.yml @@ -17,23 +17,3 @@ cost: 800 category: cargoproduct-category-name-engineering group: market - -- type: cargoProduct - id: EngineeringAMEShielding - icon: - sprite: Objects/Devices/flatpack.rsi - state: ame-part - product: CrateEngineeringAMEShielding - cost: 7500 - category: cargoproduct-category-name-engineering - group: market - -- type: cargoProduct - id: EngineeringAMEControl - icon: - sprite: Structures/Power/Generation/ame.rsi - state: control - product: CrateEngineeringAMEControl - cost: 2500 - category: cargoproduct-category-name-engineering - group: market diff --git a/Resources/Prototypes/ADT/Catalog/Cargo/cargo_engines.yml b/Resources/Prototypes/ADT/Catalog/Cargo/cargo_engines.yml new file mode 100644 index 00000000000..94545d0cd5f --- /dev/null +++ b/Resources/Prototypes/ADT/Catalog/Cargo/cargo_engines.yml @@ -0,0 +1,20 @@ + +- type: cargoProduct + id: EngineeringAMEShielding + icon: + sprite: Objects/Devices/flatpack.rsi + state: ame-part + product: CrateEngineeringAMEShielding + cost: 7500 + category: cargoproduct-category-name-engineering + group: market + +- type: cargoProduct + id: EngineeringAMEControl + icon: + sprite: Structures/Power/Generation/ame.rsi + state: control + product: CrateEngineeringAMEControl + cost: 2500 + category: cargoproduct-category-name-engineering + group: market