From 53c9cbec6b43e8b049c7a8008793e65caa7815f8 Mon Sep 17 00:00:00 2001 From: AurouraPlays <150855752+AurouraPlays@users.noreply.github.com> Date: Sat, 13 Jun 2026 15:19:08 -0700 Subject: [PATCH] Removes recipe conflict between Vampiro and Margarita (#32095) * Removes recipe conflict between Vampiro and Tequila * Fixes the amount of Vampiro returned to match the sum of its parts. * Fixes Tequila Sunrise's ID in the vampiro recipe * Correcting formatting in manuals.dm Co-authored-by: Alan Signed-off-by: AurouraPlays <150855752+AurouraPlays@users.noreply.github.com> --------- Signed-off-by: AurouraPlays <150855752+AurouraPlays@users.noreply.github.com> Co-authored-by: Alan --- code/game/objects/items/weapons/manuals.dm | 2 +- code/modules/reagents/chemistry/recipes/drinks_reactions.dm | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/code/game/objects/items/weapons/manuals.dm b/code/game/objects/items/weapons/manuals.dm index 689f89d052d..96553e1930a 100644 --- a/code/game/objects/items/weapons/manuals.dm +++ b/code/game/objects/items/weapons/manuals.dm @@ -911,7 +911,7 @@

Uplink: ยง

Mix one part each of synthanol, rum, vodka, tequila, and whiskey.

Vampiro:

- Mix two parts tomato juice to one part each of lime juice and tequila. + Mix one part tomato juice with one part Tequila Sunrise.

Vodka Martini:

Mix two parts vodka to one part vermouth.

Vodka and Tonic:

diff --git a/code/modules/reagents/chemistry/recipes/drinks_reactions.dm b/code/modules/reagents/chemistry/recipes/drinks_reactions.dm index 4d79ec4d2b6..45b529970b4 100644 --- a/code/modules/reagents/chemistry/recipes/drinks_reactions.dm +++ b/code/modules/reagents/chemistry/recipes/drinks_reactions.dm @@ -1471,8 +1471,8 @@ name = "Vampiro" id = "vampiro" result = "vampiro" - required_reagents = list("tequila" = 1, "tomatojuice" = 2, "limejuice" = 1) - result_amount = 4 + required_reagents = list("tequilasunrise" = 1, "tomatojuice" = 1) + result_amount = 2 mix_message = "Mariachi sounds loudly in the container." mix_sound = 'sound/goonstation/misc/drinkfizz.ogg'