From 9de7ac067e5d960937c4a767a9de4182719f01b2 Mon Sep 17 00:00:00 2001 From: Delta-V bot <135767721+DeltaV-Bot@users.noreply.github.com> Date: Sat, 26 Oct 2024 03:46:45 +0200 Subject: [PATCH 1/3] Automatic changelog update --- Resources/Changelog/DeltaVChangelog.yml | 13 +++++++------ .../Prototypes/DeltaV/Recipes/Reactions/drinks.yml | 12 ++++++++++++ 2 files changed, 19 insertions(+), 6 deletions(-) diff --git a/Resources/Changelog/DeltaVChangelog.yml b/Resources/Changelog/DeltaVChangelog.yml index 4b051af5d1c..1a70adb6eb6 100644 --- a/Resources/Changelog/DeltaVChangelog.yml +++ b/Resources/Changelog/DeltaVChangelog.yml @@ -1,10 +1,4 @@ Entries: -- author: FluffiestFloof - changes: - - message: Removed the carp suit bundle from the syndicate uplink. - type: Remove - id: 123 - time: '2023-11-06T14:54:09.0000000+00:00' - author: Colin-Tel changes: - message: Fixed a few issues with Asterisk, including getting stuck on Epi's park @@ -3687,3 +3681,10 @@ id: 622 time: '2024-10-25T00:15:01.0000000+00:00' url: https://github.com/DeltaV-Station/Delta-v/pull/2038 +- author: Radezolid + changes: + - message: Pie cannons can now be fired by pacifists! + type: Tweak + id: 623 + time: '2024-10-26T01:46:26.0000000+00:00' + url: https://github.com/DeltaV-Station/Delta-v/pull/2046 diff --git a/Resources/Prototypes/DeltaV/Recipes/Reactions/drinks.yml b/Resources/Prototypes/DeltaV/Recipes/Reactions/drinks.yml index 60bb26eaa2f..43fda8cd110 100644 --- a/Resources/Prototypes/DeltaV/Recipes/Reactions/drinks.yml +++ b/Resources/Prototypes/DeltaV/Recipes/Reactions/drinks.yml @@ -1,3 +1,15 @@ +- type: reaction + id: DeadRum + reactants: + TableSalt: + amount: 1 + Saline: + amount: 1 + Rum: + amount: 1 + products: + DeadRum: 3 + - type: reaction id: HealthViolation reactants: From 3deca44a18676ee26c79060fabefbc65e1e10334 Mon Sep 17 00:00:00 2001 From: jtbill Date: Fri, 15 Nov 2024 02:18:14 -0500 Subject: [PATCH 2/3] Created a recipe for deadrum, as it currently is only abled to be on salvage in one specific map. --- .../Prototypes/DeltaV/Recipes/Reactions/drinks.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Resources/Prototypes/DeltaV/Recipes/Reactions/drinks.yml b/Resources/Prototypes/DeltaV/Recipes/Reactions/drinks.yml index 43fda8cd110..8eb4dd50070 100644 --- a/Resources/Prototypes/DeltaV/Recipes/Reactions/drinks.yml +++ b/Resources/Prototypes/DeltaV/Recipes/Reactions/drinks.yml @@ -1,14 +1,14 @@ - type: reaction id: DeadRum reactants: - TableSalt: - amount: 1 - Saline: - amount: 1 - Rum: - amount: 1 + Saline: + amount: 1 + Rum: + amount: 1 + TableSalt: + amount: 1 products: - DeadRum: 3 + Deadrum: 3 - type: reaction id: HealthViolation From 45c237a3fe9ff1d05ba0983dd071c79737217867 Mon Sep 17 00:00:00 2001 From: jtbill Date: Fri, 15 Nov 2024 02:33:45 -0500 Subject: [PATCH 3/3] Made R capital to hope it dosn't crash --- Resources/Prototypes/DeltaV/Recipes/Reactions/drinks.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/DeltaV/Recipes/Reactions/drinks.yml b/Resources/Prototypes/DeltaV/Recipes/Reactions/drinks.yml index 8eb4dd50070..2a425cdab17 100644 --- a/Resources/Prototypes/DeltaV/Recipes/Reactions/drinks.yml +++ b/Resources/Prototypes/DeltaV/Recipes/Reactions/drinks.yml @@ -8,7 +8,7 @@ TableSalt: amount: 1 products: - Deadrum: 3 + DeadRum: 3 - type: reaction id: HealthViolation