cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 02:09:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1803 from CHOMPStation2/Razgriz1032-patch-5

Browse Source 
Removed some duplicate teas
This commit is contained in:
Razgriz
2021-04-12 02:41:40 -07:00
committed by GitHub
parent 82edcebb98 43df25a5e5
commit 3c78d5bae6
1 changed files with 1 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

67
code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents_ch.dm
View File

@@ -366,71 +366,6 @@
/////////DRINKS////////////////////////////////
//////////////////////////////////////////////
/datum/reagent/drink/tea/minttea
name = "Mint Tea"
id = "minttea"
description = "A tasty mixture of mint and tea. It's apparently good for you!"
color = "#A8442C"
taste_description = "black tea with tones of mint"
glass_name = "mint tea"
glass_desc = "A tasty mixture of mint and tea. It's apparently good for you!"
cup_name = "cup of mint tea"
cup_desc = "A tasty mixture of mint and tea. It's apparently good for you!"
/datum/reagent/drink/tea/lemontea
name = "Lemon Tea"
id = "lemontea"
description = "A tasty mixture of lemon and tea. It's apparently good for you!"
color = "#FC6A00"
taste_description = "black tea with tones of lemon"
glass_name = "lemon tea"
glass_desc = "A tasty mixture of lemon and tea. It's apparently good for you!"
cup_name = "cup of lemon tea"
cup_desc = "A tasty mixture of lemon and tea. It's apparently good for you!"
/datum/reagent/drink/tea/limetea
name = "Lime Tea"
id = "limetea"
description = "A tasty mixture of lime and tea. It's apparently good for you!"
color = "#DE4300"
taste_description = "black tea with tones of lime"
glass_name = "lime tea"
glass_desc = "A tasty mixture of lime and tea. It's apparently good for you!"
cup_name = "cup of berry tea"
cup_desc = "A tasty mixture of lime and tea. It's apparently good for you!"
/datum/reagent/drink/tea/orangetea
name = "Orange Tea"
id = "orangetea"
description = "A tasty mixture of orange and tea. It's apparently good for you!"
color = "#FB4F06"
taste_description = "black tea with tones of orange"
glass_name = "orange tea"
glass_desc = "A tasty mixture of orange and tea. It's apparently good for you!"
cup_name = "cup of orange tea"
cup_desc = "A tasty mixture of orange and tea. It's apparently good for you!"
/datum/reagent/drink/tea/berrytea
name = "Berry Tea"
id = "berrytea"
description = "A tasty mixture of berries and tea. It's apparently good for you!"
color = "#A60735"
taste_description = "black tea with tones of berries"
glass_name = "berry tea"
glass_desc = "A tasty mixture of berries and tea. It's apparently good for you!"
cup_name = "cup of berry tea"
cup_desc = "A tasty mixture of berries and tea. It's apparently good for you!"
/datum/reagent/drink/tea/cherrytea
name = "Cherry Tea"
id = "cherrytea"
@@ -919,4 +854,4 @@
if(istype(L) && L.faction)
if(L.faction == "plants") //This would be better with a variable but I'm not adding that because upstream conflicts. If you send this upstream please do this.
L.adjustToxLoss(15 * amount)
L.visible_message("<span class='warning'>[L] withers rapidly!</span>", "<span class='danger'>The chemical burns you!</span>")
L.visible_message("<span class='warning'>[L] withers rapidly!</span>", "<span class='danger'>The chemical burns you!</span>")