cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2025-12-25 09:31:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4590 from Cerebulon/teafix

Browse Source 
Fixes duplicate tea recipe.
This commit is contained in:
Anewbe
2018-01-19 20:13:36 -06:00
committed by GitHub
parent a190ec5725 a5de13cdb9
commit 93b4df4517
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm
View File

@@ -2486,13 +2486,13 @@
/datum/reagent/ethanol/euphoria
name = "Euphoria"
id = "euphoria"
description = "Invented by a Eutopian marketing team, this is one of the most expensive cocktails in existance."
description = "Invented by a Eutopian marketing team, this is one of the most expensive cocktails in existence."
taste_description = "impossibly rich alcohol"
color = "#614126"
strength = 9
glass_name = "Euphoria"
glass_desc = "Invented by a Eutopian marketing team, this is one of the most expensive cocktails in existance."
glass_desc = "Invented by a Eutopian marketing team, this is one of the most expensive cocktails in existence."
/datum/reagent/ethanol/xanaducannon
name = "Xanadu Cannon"
@@ -2580,7 +2580,7 @@
/datum/reagent/ethanol/winebrandy
name = "Wine Brandy"
id = "winebrandy"
description = "An premium spirit made from distilled wine."
description = "A premium spirit made from distilled wine."
taste_description = "very sweet dried fruit with many elegant notes"
color = "#4C130B" // rgb(76,19,11)
strength = 20
@@ -2732,7 +2732,7 @@
color = "#a0692e" // rgb(160, 105, 46)
strength = 20
glass_name = "Whisker Sour"
glass_name = "Whiskey Sour"
glass_desc = "A smokey, refreshing lemoned whiskey."
/datum/reagent/ethanol/oldfashioned

2
code/modules/reagents/Chemistry-Recipes.dm
View File

@@ -1863,7 +1863,7 @@
required_reagents = list("tea" = 5, "limejuice" = 1)
result_amount = 6
/datum/chemical_reaction/drinks/limetea
/datum/chemical_reaction/drinks/orangetea
name = "Orange Tea"
id = "orangetea"
result = "orangetea"