cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-13 03:33:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #11669 from VOREStation/upstream-merge-8331

Browse Source 
[MIRROR] Rum and Cola fix
This commit is contained in:
Aronai Sieyes
2021-10-27 20:58:26 -04:00
committed by Chompstation Bot
parent b8e4821cb8
commit 3aad9d6f36
1 changed files with 4 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
code/modules/reagents/reactions/instant/drinks.dm
View File

@@ -196,7 +196,7 @@
name = "Cuba Libre" name = "Cuba Libre"
id = "cubalibre" id = "cubalibre"
result = "cubalibre" result = "cubalibre"
required_reagents = list("rumcola" = 3, "limejuice" = 1) required_reagents = list("rumandcola" = 3, "limejuice" = 1)
result_amount = 3 result_amount = 3
/decl/chemical_reaction/instant/drinks/martini /decl/chemical_reaction/instant/drinks/martini
@@ -336,14 +336,7 @@
name = "Long Island Iced Tea" name = "Long Island Iced Tea"
id = "longislandicedtea" id = "longislandicedtea"
result = "longislandicedtea" result = "longislandicedtea"
required_reagents = list("vodka" = 1, "gin" = 1, "tequilla" = 1, "rumcoke" = 3) required_reagents = list("vodka" = 1, "gin" = 1, "tequilla" = 1, "rumandcola" = 3)
result_amount = 6
/decl/chemical_reaction/instant/drinks/icedtea
name = "Long Island Iced Tea"
id = "longislandicedtea"
result = "longislandicedtea"
required_reagents = list("vodka" = 1, "gin" = 1, "tequilla" = 1, "rumcoke" = 3)
result_amount = 6 result_amount = 6
/decl/chemical_reaction/instant/drinks/threemileisland /decl/chemical_reaction/instant/drinks/threemileisland
@@ -1113,7 +1106,7 @@
id = "daiquiri" id = "daiquiri"
result = "daiquiri" result = "daiquiri"
required_reagents = list("rum" = 3, "limejuice" = 2, "sugar" = 1) required_reagents = list("rum" = 3, "limejuice" = 2, "sugar" = 1)
result_amount = 5 result_amount = 6
/decl/chemical_reaction/instant/drinks/mintjulep /decl/chemical_reaction/instant/drinks/mintjulep
name = "Mint Julep" name = "Mint Julep"
@@ -1126,7 +1119,7 @@
name = "Paloma" name = "Paloma"
id = "paloma" id = "paloma"
result = "paloma" result = "paloma"
required_reagents = list("orangejuice" = 1, "sodawater" = 1, "tequilla" = 1) required_reagents = list("sodawater" = 1, "tequillasunrise" = 2)
result_amount = 3 result_amount = 3
/decl/chemical_reaction/instant/drinks/mojito /decl/chemical_reaction/instant/drinks/mojito