From b83e3e07d3bc2d1f9e180083e7c39058d0578475 Mon Sep 17 00:00:00 2001 From: Emisse <99158783+Emisse@users.noreply.github.com> Date: Fri, 8 Dec 2023 03:58:25 -0700 Subject: [PATCH 1/2] hellfire (#22243) --- Resources/Prototypes/Recipes/Reactions/chemicals.yml | 6 +++--- Resources/Prototypes/Recipes/Reactions/pyrotechnic.yml | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Resources/Prototypes/Recipes/Reactions/chemicals.yml b/Resources/Prototypes/Recipes/Reactions/chemicals.yml index b5c2308f1e..ffd445a99c 100644 --- a/Resources/Prototypes/Recipes/Reactions/chemicals.yml +++ b/Resources/Prototypes/Recipes/Reactions/chemicals.yml @@ -102,10 +102,10 @@ effects: - !type:ExplosionReactionEffect explosionType: Default - maxIntensity: 5 + maxIntensity: 100 intensityPerUnit: 0.5 # 50+50 reagent for maximum explosion - intensitySlope: .5 - maxTotalIntensity: 30 + intensitySlope: 4 + maxTotalIntensity: 100 - type: reaction id: Smoke diff --git a/Resources/Prototypes/Recipes/Reactions/pyrotechnic.yml b/Resources/Prototypes/Recipes/Reactions/pyrotechnic.yml index a53184c74b..615e38bf09 100644 --- a/Resources/Prototypes/Recipes/Reactions/pyrotechnic.yml +++ b/Resources/Prototypes/Recipes/Reactions/pyrotechnic.yml @@ -41,10 +41,10 @@ # TODO solution temperature!! - !type:ExplosionReactionEffect explosionType: Default # 15 damage per intensity. - maxIntensity: 1 # at most 15 damage per tile. - intensityPerUnit: 3 # 12 total input reagent units reach max total intensity - intensitySlope: 0.5 - maxTotalIntensity: 9 + maxIntensity: 200 + intensityPerUnit: 5 + intensitySlope: 5 + maxTotalIntensity: 200 - !type:PopupMessage messages: [ "clf3-explosion" ] type: Pvs From dbdb9bc3ff667132bc1b87b8a9f05328517a5f6a Mon Sep 17 00:00:00 2001 From: PJBot Date: Fri, 8 Dec 2023 05:59:28 -0500 Subject: [PATCH 2/2] Automatic changelog update --- Resources/Changelog/Changelog.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index 05a32b0c95..3cf2ed3ebf 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,9 +1,4 @@ Entries: -- author: DrSmugleaf - changes: - - {message: Fixed not being able to use vehicle horns., type: Fix} - id: 4788 - time: '2023-09-09T23:39:29.0000000+00:00' - author: deltanedas changes: - {message: Monkeys can now bump doors open and strip mobs like people can., type: Tweak} @@ -2897,3 +2892,8 @@ Entries: - {message: Adds a bed for the psychologist's office., type: Add} id: 5287 time: '2023-12-08T05:24:35.0000000+00:00' +- author: Emisse + changes: + - {message: Chemical explosions are powerful again., type: Tweak} + id: 5288 + time: '2023-12-08T10:58:25.0000000+00:00'