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

Merge branch 'master' into upstream-merge-11579

Browse Source
This commit is contained in:
Nadyr
2021-10-22 20:03:36 -04:00
committed by GitHub
parent ffadbf101f 5a39b650bb
commit 3995a66fca
45 changed files with 713 additions and 517 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -185,11 +185,18 @@
required_reagents = list("gin" = 2, "tonic" = 1)
result_amount = 3
/decl/chemical_reaction/instant/drinks/rum_and_cola
name = "Rum and Cola"
id = "rumandcola"
result = "rumandcola"
required_reagents = list("rum" = 2, "cola" = 1)
result_amount = 3
/decl/chemical_reaction/instant/drinks/cuba_libre
name = "Cuba Libre"
id = "cubalibre"
result = "cubalibre"
required_reagents = list("rum" = 2, "cola" = 1)
required_reagents = list("rumcola" = 3, "limejuice" = 1)
result_amount = 3
/decl/chemical_reaction/instant/drinks/martini
@@ -329,14 +336,14 @@
name = "Long Island Iced Tea"
id = "longislandicedtea"
result = "longislandicedtea"
required_reagents = list("vodka" = 1, "gin" = 1, "tequilla" = 1, "cubalibre" = 3)
required_reagents = list("vodka" = 1, "gin" = 1, "tequilla" = 1, "rumcoke" = 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, "cubalibre" = 3)
required_reagents = list("vodka" = 1, "gin" = 1, "tequilla" = 1, "rumcoke" = 3)
result_amount = 6
/decl/chemical_reaction/instant/drinks/threemileisland

54
code/modules/reagents/reagents/food_drinks.dm
View File

@@ -3185,59 +3185,29 @@
glass_desc = "Damn, the bartender even stirred it, not shook it."
allergen_type = ALLERGEN_FRUIT //Made from gin(fruit) and vermouth(fruit)
/datum/reagent/ethanol/cuba_libre
name = "Cuba Libre"
id = "cubalibre"
<<<<<<< HEAD
description = "Rum, mixed with cola. Viva la revolucion."
||||||| parent of 147dddcf38... Merge pull request #11579 from VOREStation/upstream-merge-8283
description = "Rum, mixed with cola and a splash of lime. Viva la revolucion."
taste_description = "cola with lime"
color = "#3E1B00"
strength = 30
glass_name = "Cuba Libre"
glass_desc = "A classic mix of rum, cola, and lime."
/datum/reagent/ethanol/rum_and_cola
name = "Rum and Cola"
id = "rumandcola"
description = "A classic mix of sugar with more sugar."
=======
description = "Rum, mixed with cola and a splash of lime. Viva la revolucion."
taste_description = "cola with lime"
color = "#3E1B00"
strength = 30
glass_name = "Cuba Libre"
glass_desc = "A classic mix of rum, cola, and lime."
allergen_type = ALLERGEN_STIMULANT //Cola
/datum/reagent/ethanol/rum_and_cola
name = "Rum and Cola"
id = "rumandcola"
description = "A classic mix of sugar with more sugar."
taste_description = "cola"
color = "#3E1B00"
strength = 30
glass_name = "Cuba Libre"
glass_desc = "A classic mix of rum, cola, and lime."
/datum/reagent/ethanol/rum_and_cola
name = "Rum and Cola"
id = "rumandcola"
description = "A classic mix of sugar with more sugar."
>>>>>>> 147dddcf38... Merge pull request #11579 from VOREStation/upstream-merge-8283
taste_description = "cola"
nutriment_factor = 1.5 //CHOMPStation addition
color = "#3E1B00"
strength = 30
glass_name = "Cuba Libre"
glass_desc = "A classic mix of rum, cola, and lime."
/datum/reagent/ethanol/rum_and_cola
name = "Rum and Cola"
id = "rumandcola"
description = "A classic mix of sugar with more sugar."
taste_description = "cola"
color = "#3E1B00"
strength = 30
glass_name = "rum and cola"
glass_desc = "A classic mix of rum and cola."
allergen_type = ALLERGEN_STIMULANT // Cola
/datum/reagent/ethanol/demonsblood
name = "Demons Blood"