diff --git a/code/modules/food_and_drinks/drinks/drinks/bottle.dm b/code/modules/food_and_drinks/drinks/drinks/bottle.dm index ee5dc7e328..664d2e0bc2 100644 --- a/code/modules/food_and_drinks/drinks/drinks/bottle.dm +++ b/code/modules/food_and_drinks/drinks/drinks/bottle.dm @@ -344,6 +344,15 @@ list_reagents = list("limejuice" = 100) foodtype = FRUIT +/obj/item/reagent_containers/food/drinks/bottle/menthol + name = "menthol" + desc = "Tastes naturally minty, and imparts a very mild numbing sensation." + icon_state = "mentholbox" + item_state = "carton" + lefthand_file = 'icons/mob/inhands/equipment/kitchen_lefthand.dmi' + righthand_file = 'icons/mob/inhands/equipment/kitchen_righthand.dmi' + isGlass = FALSE + list_reagents = list("menthol" = 100) ////////////////////////// MOLOTOV /////////////////////// /obj/item/reagent_containers/food/drinks/bottle/molotov diff --git a/code/modules/food_and_drinks/recipes/drinks_recipes.dm b/code/modules/food_and_drinks/recipes/drinks_recipes.dm index 71cfe6c75c..2a081f3a2f 100644 --- a/code/modules/food_and_drinks/recipes/drinks_recipes.dm +++ b/code/modules/food_and_drinks/recipes/drinks_recipes.dm @@ -623,4 +623,42 @@ id = "crevice_spike" results = list("crevice_spike" = 6) required_reagents = list("limejuice" = 2, "capsaicin" = 4) //2 powdered delta (sour), 4 flanergide (spicy) - mix_message = "The mixture stings your eyes as it settles." \ No newline at end of file + mix_message = "The mixture stings your eyes as it settles." + +/datum/chemical_reaction/sake + name = "sake" + id = "sake" + results = list("sake" = 10) + required_reagents = list("rice" = 10) + required_catalysts = list("enzyme" = 5) + mix_message = "The rice grains ferment into a clear, sweet-smelling liquid." + +/datum/chemical_reaction/alexander + name = "Alexander" + id = "alexander" + results = list("alexander" = 3) + required_reagents = list("cognac" = 1, "creme_de_cacao" = 1, "cream" = 1) + +/datum/chemical_reaction/sidecar + name = "Sidecar" + id = "sidecar" + results = list("sidecar" = 4) + required_reagents = list("cognac" = 2, "triple_sec" = 1, "lemonjuice" = 1) + +/datum/chemical_reaction/between_the_sheets + name = "Between the Sheets" + id = "between_the_sheets" + results = list("between_the_sheets" = 5) + required_reagents = list("rum" = 1, "sidecar" = 4) + +/datum/chemical_reaction/kamikaze + name = "Kamikaze" + id = "kamikaze" + results = list("kamikaze" = 3) + required_reagents = list("vodka" = 1, "triple_sec" = 1, "limejuice" = 1) + +/datum/chemical_reaction/mojito + name = "Mojito" + id = "mojito" + results = list("mojito" = 5) + required_reagents = list("rum" = 1, "sugar" = 1, "limejuice" = 1, "sodawater" = 1, "menthol" = 1) diff --git a/code/modules/reagents/chemistry/machinery/chem_dispenser.dm b/code/modules/reagents/chemistry/machinery/chem_dispenser.dm index ff05a66d47..20db99fca1 100644 --- a/code/modules/reagents/chemistry/machinery/chem_dispenser.dm +++ b/code/modules/reagents/chemistry/machinery/chem_dispenser.dm @@ -433,7 +433,8 @@ obj/machinery/chem_dispenser/proc/work_animation() "orangejuice", "limejuice", "tomatojuice", - "lemonjuice" + "lemonjuice", + "menthol" ) emagged_reagents = list( "thirteenloko", @@ -465,7 +466,8 @@ obj/machinery/chem_dispenser/proc/work_animation() "hcider", "creme_de_menthe", "creme_de_cacao", - "triple_sec" + "triple_sec", + "sake" ) emagged_reagents = list( "ethanol", diff --git a/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm b/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm index 4be808f873..5230ea26f6 100644 --- a/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm @@ -1546,4 +1546,70 @@ All effects don't start immediately, but rather get worse over time; the rate is glass_desc = "It'll either knock the drunkenness out of you or knock you out cold. Both, probably." /datum/reagent/consumable/ethanol/crevice_spike/on_mob_add(mob/living/L) //damage only applies when drink first enters system and won't again until drink metabolizes out - L.adjustBruteLoss(3 * min(5,volume)) //minimum 3 brute damage on ingestion to limit non-drink means of injury - a full 5 unit gulp of the drink trucks you for the full 15 \ No newline at end of file + L.adjustBruteLoss(3 * min(5,volume)) //minimum 3 brute damage on ingestion to limit non-drink means of injury - a full 5 unit gulp of the drink trucks you for the full 15 + +/datum/reagent/consumable/ethanol/sake + name = "Sake" + id = "sake" + description = "A sweet rice wine of questionable legality and extreme potency." + color = "#DDDDDD" + boozepwr = 70 + taste_description = "sweet rice wine" + glass_icon_state = "sakecup" + glass_name = "cup of sake" + glass_desc = "A traditional cup of sake." + +/datum/reagent/consumable/ethanol/alexander + name = "Alexander" + id = "alexander" + description = "A creamy, indulgent delight that is stronger than it seems." + color = "#F5E9D3" + boozepwr = 80 + taste_description = "bitter, creamy cacao" + glass_icon_state = "alexander" + glass_name = "Alexander" + glass_desc = "A creamy, indulgent delight that is stronger than it seems." + +/datum/reagent/consumable/ethanol/sidecar + name = "Sidecar" + id = "sidecar" + description = "The one ride you’ll gladly give up the wheel for." + color = "#FFC55B" + boozepwr = 80 + taste_description = "delicious freedom" + glass_icon_state = "sidecar" + glass_name = "Sidecar" + glass_desc = "The one ride you’ll gladly give up the wheel for." + +/datum/reagent/consumable/ethanol/between_the_sheets + name = "Between the Sheets" + id = "between_the_sheets" + description = "A provocatively named classic." + color = "#F4C35A" + boozepwr = 80 + taste_description = "seduction" + glass_icon_state = "between_the_sheets" + glass_name = "Between the Sheets" + glass_desc = "A provocatively named classic." + +/datum/reagent/consumable/ethanol/kamikaze + name = "Kamikaze" + id = "kamikaze" + description = "Divinely windy." + color = "#EEF191" + boozepwr = 60 + taste_description = "divine windiness" + glass_icon_state = "kamikaze" + glass_name = "Kamikaze" + glass_desc = "Divinely windy." + +/datum/reagent/consumable/ethanol/mojito + name = "Mojito" + id = "mojito" + description = "A drink that looks as refreshing as it tastes." + color = "#DFFAD9" + boozepwr = 30 + taste_description = "refreshing mint" + glass_icon_state = "mojito" + glass_name = "Mojito" + glass_desc = "A drink that looks as refreshing as it tastes." diff --git a/code/modules/reagents/chemistry/reagents/drink_reagents.dm b/code/modules/reagents/chemistry/reagents/drink_reagents.dm index 673b6e7059..5d5fdf2183 100644 --- a/code/modules/reagents/chemistry/reagents/drink_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/drink_reagents.dm @@ -721,3 +721,13 @@ description = "Milk for cool kids." color = "#7D4E29" taste_description = "chocolate milk" + +/datum/reagent/consumable/menthol + name = "Menthol" + id = "menthol" + description = "Tastes naturally minty, and imparts a very mild numbing sensation." + color = "#80AF9C" + taste_description = "mint" + glass_icon_state = "glass_green" + glass_name = "glass of menthol" + glass_desc = "Tastes naturally minty, and imparts a very mild numbing sensation." diff --git a/code/modules/reagents/chemistry/reagents/drug_reagents.dm b/code/modules/reagents/chemistry/reagents/drug_reagents.dm index 32b96d2780..dd932f6215 100644 --- a/code/modules/reagents/chemistry/reagents/drug_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/drug_reagents.dm @@ -57,15 +57,6 @@ ..() . = 1 -/datum/reagent/drug/menthol - name = "Menthol" - id = "menthol" - description = "Tastes naturally minty, and imparts a very mild numbing sensation." - taste_description = "mint" - reagent_state = LIQUID - color = "#80AF9C" - trippy = FALSE - /datum/reagent/drug/crank name = "Crank" id = "crank" diff --git a/code/modules/vending/boozeomat.dm b/code/modules/vending/boozeomat.dm index eddb01171b..59b41d4cef 100644 --- a/code/modules/vending/boozeomat.dm +++ b/code/modules/vending/boozeomat.dm @@ -19,6 +19,7 @@ /obj/item/reagent_containers/food/drinks/bottle/orangejuice = 4, /obj/item/reagent_containers/food/drinks/bottle/tomatojuice = 4, /obj/item/reagent_containers/food/drinks/bottle/limejuice = 4, + /obj/item/reagent_containers/food/drinks/bottle/menthol = 4, /obj/item/reagent_containers/food/drinks/bottle/cream = 4, /obj/item/reagent_containers/food/drinks/soda_cans/tonic = 8, /obj/item/reagent_containers/food/drinks/soda_cans/cola = 8, @@ -37,5 +38,5 @@ /obj/item/vending_refill/boozeomat machine_name = "Booze-O-Mat" icon_state = "refill_booze" - charges = list(58, 4, 0)//of 174 standard, 12 contraband - init_charges = list(58, 4, 0) + charges = list(59, 4, 0)//of 178 standard, 12 contraband + init_charges = list(59, 4, 0)