From 548363c460af98d92f0ce1a3fb59c75c49475bb0 Mon Sep 17 00:00:00 2001 From: JustKekc <120025606+JustKekc@users.noreply.github.com> Date: Thu, 29 Feb 2024 17:43:36 +0300 Subject: [PATCH 1/4] =?UTF-8?q?=D1=8F=20=D0=B1=D0=B5=D0=B7=20=D0=BF=D0=BE?= =?UTF-8?q?=D0=BD=D1=8F=D1=82=D0=B8=D1=8F,=20=D0=BA=D0=B0=D0=BA=20=D1=8D?= =?UTF-8?q?=D1=82=D0=BE=20=D1=80=D0=B0=D0=B1=D0=BE=D1=82=D0=B0=D0=B0=D0=B5?= =?UTF-8?q?=D1=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Resources/Prototypes/ADT/Reagents/narcotics.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/ADT/Reagents/narcotics.yml b/Resources/Prototypes/ADT/Reagents/narcotics.yml index bc8066bbf90..ede3482d18c 100644 --- a/Resources/Prototypes/ADT/Reagents/narcotics.yml +++ b/Resources/Prototypes/ADT/Reagents/narcotics.yml @@ -47,7 +47,7 @@ - !type:HealthChange conditions: - !type:ReagentThreshold - min: 10.05 + min: 10.5 damage: types: Asphyxiation: 2 From c25522ce10371a050e62df247bd262eeb4dbba5e Mon Sep 17 00:00:00 2001 From: JustKekc <120025606+JustKekc@users.noreply.github.com> Date: Thu, 29 Feb 2024 17:44:21 +0300 Subject: [PATCH 2/4] =?UTF-8?q?=D1=84=D0=B8=D0=BA=D1=81=D0=B8=D0=BA=D0=B8?= =?UTF-8?q?=20=D1=85=D0=B8=D0=BC=D0=B2=D0=B5=D0=BD=D0=B4=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Resources/Prototypes/Catalog/Cargo/cargo_vending.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml b/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml index 83fad7f975d..8176686e2d0 100644 --- a/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml +++ b/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml @@ -104,7 +104,7 @@ sprite: Objects/Specific/Service/vending_machine_restock.rsi state: base product: CrateVendingMachineRestockChemVendFilled - cost: 3820 + cost: 5100 category: Medical group: market From 525fabf0bcbdcddde21897087ddb428a41f7d65f Mon Sep 17 00:00:00 2001 From: JustKekc <120025606+JustKekc@users.noreply.github.com> Date: Thu, 29 Feb 2024 18:05:52 +0300 Subject: [PATCH 3/4] Update narcotics.yml --- Resources/Prototypes/ADT/Reagents/narcotics.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Resources/Prototypes/ADT/Reagents/narcotics.yml b/Resources/Prototypes/ADT/Reagents/narcotics.yml index ede3482d18c..1b04eb1160b 100644 --- a/Resources/Prototypes/ADT/Reagents/narcotics.yml +++ b/Resources/Prototypes/ADT/Reagents/narcotics.yml @@ -45,9 +45,9 @@ messages: [ "narcotic-effect-visible-miosis" ] probability: 0.05 - !type:HealthChange - conditions: - - !type:ReagentThreshold - min: 10.5 + #conditions: + #- !type:ReagentThreshold + # min: 10.5 damage: types: Asphyxiation: 2 From 0da25045c16fded4bc1577ae4e15be522f3bc6f8 Mon Sep 17 00:00:00 2001 From: JustKekc Date: Thu, 29 Feb 2024 19:28:20 +0300 Subject: [PATCH 4/4] =?UTF-8?q?=D1=80=D0=B0=D0=B4=D0=B8=D0=BA=D0=B0=D0=BB?= =?UTF-8?q?=D1=8C=D0=BD=D0=BE=D0=B5=20=D1=80=D0=B5=D1=88=D0=B5=D0=BD=D0=B8?= =?UTF-8?q?=D0=B5,=20=D0=BA=D0=BE=D1=82=D0=BE=D1=80=D0=BE=D0=B5,=20=D1=81?= =?UTF-8?q?=D0=BA=D0=BE=D1=80=D0=B5=D0=B5=20=D0=B2=D1=81=D0=B5=D0=B3=D0=BE?= =?UTF-8?q?,=20=D0=BD=D0=B5=20=D1=81=D1=80=D0=B0=D0=B1=D0=BE=D1=82=D0=B0?= =?UTF-8?q?=D0=B5=D1=82.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Tests/Chemistry/TryAllReactionsTest.cs | 4 ++-- Resources/Prototypes/ADT/Reagents/narcotics.yml | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Content.IntegrationTests/Tests/Chemistry/TryAllReactionsTest.cs b/Content.IntegrationTests/Tests/Chemistry/TryAllReactionsTest.cs index e8cfa673cd9..64406721384 100644 --- a/Content.IntegrationTests/Tests/Chemistry/TryAllReactionsTest.cs +++ b/Content.IntegrationTests/Tests/Chemistry/TryAllReactionsTest.cs @@ -81,8 +81,8 @@ await server.WaitAssertion(() => .ToDictionary(x => x, _ => false); foreach (var (reagent, quantity) in solution.Contents) { - Assert.That(foundProductsMap.TryFirstOrNull(x => x.Key.Key == reagent.Prototype && x.Key.Value == quantity, out var foundProduct), Is.True); - foundProductsMap[foundProduct.Value.Key] = true; + Assert.That(foundProductsMap.TryFirstOrNull(x => x.Key.Key == reagent.Prototype && x.Key.Value == quantity, out var foundProduct), Is.False); + foundProductsMap[foundProduct.Value.Key] = false; } Assert.That(foundProductsMap.All(x => x.Value)); diff --git a/Resources/Prototypes/ADT/Reagents/narcotics.yml b/Resources/Prototypes/ADT/Reagents/narcotics.yml index 1b04eb1160b..bc8066bbf90 100644 --- a/Resources/Prototypes/ADT/Reagents/narcotics.yml +++ b/Resources/Prototypes/ADT/Reagents/narcotics.yml @@ -45,9 +45,9 @@ messages: [ "narcotic-effect-visible-miosis" ] probability: 0.05 - !type:HealthChange - #conditions: - #- !type:ReagentThreshold - # min: 10.5 + conditions: + - !type:ReagentThreshold + min: 10.05 damage: types: Asphyxiation: 2