diff --git a/code/modules/food_and_drinks/drinks/drinks.dm b/code/modules/food_and_drinks/drinks/drinks.dm index 6e34c0f2ce..1592efb032 100644 --- a/code/modules/food_and_drinks/drinks/drinks.dm +++ b/code/modules/food_and_drinks/drinks/drinks.dm @@ -503,6 +503,13 @@ . = ..() name = "lemon-lime soda" +/obj/item/reagent_containers/food/drinks/soda_cans/sol_dry + name = "Sol Dry" + desc = "Maybe this will help your tummy feel better. Maybe not." + icon_state = "ginger_ale" + list_reagents = list(/datum/reagent/consumable/sol_dry = 30) + foodtype = SUGAR + /obj/item/reagent_containers/food/drinks/soda_cans/space_up name = "Space-Up!" desc = "Tastes like a hull breach in your mouth." diff --git a/code/modules/food_and_drinks/recipes/drinks_recipes.dm b/code/modules/food_and_drinks/recipes/drinks_recipes.dm index 720c44b6e3..ddea024ed7 100644 --- a/code/modules/food_and_drinks/recipes/drinks_recipes.dm +++ b/code/modules/food_and_drinks/recipes/drinks_recipes.dm @@ -234,6 +234,12 @@ results = list(/datum/reagent/consumable/ethanol/black_russian = 5) required_reagents = list(/datum/reagent/consumable/ethanol/vodka = 3, /datum/reagent/consumable/ethanol/kahlua = 2) +/datum/chemical_reaction/hiveminderaser + name = "Hivemind Eraser" + id = /datum/reagent/consumable/ethanol/hiveminderaser + results = list(/datum/reagent/consumable/ethanol/hiveminderaser = 4) + required_reagents = list(/datum/reagent/consumable/ethanol/black_russian = 2, /datum/reagent/consumable/ethanol/thirteenloko = 1, /datum/reagent/consumable/grenadine = 1) + /datum/chemical_reaction/manhattan name = "Manhattan" id = /datum/reagent/consumable/ethanol/manhattan @@ -300,6 +306,13 @@ results = list(/datum/reagent/consumable/ethanol/barefoot = 3) required_reagents = list(/datum/reagent/consumable/berryjuice = 1, /datum/reagent/consumable/cream = 1, /datum/reagent/consumable/ethanol/vermouth = 1) +/datum/chemical_reaction/moscow_mule + name = "Moscow Mule" + id = /datum/reagent/consumable/ethanol/moscow_mule + results = list(/datum/reagent/consumable/ethanol/moscow_mule = 10) + required_reagents = list(/datum/reagent/consumable/sol_dry = 5, /datum/reagent/consumable/ethanol/vodka = 5, /datum/reagent/consumable/limejuice = 1, /datum/reagent/consumable/ice = 1) + mix_sound = 'sound/effects/bubbles2.ogg' + /datum/chemical_reaction/painkiller name = "Painkiller" id = /datum/reagent/consumable/ethanol/painkiller @@ -833,6 +846,12 @@ results = list(/datum/reagent/consumable/red_queen = 10) required_reagents = list(/datum/reagent/consumable/tea = 6, /datum/reagent/mercury = 2, /datum/reagent/consumable/blackpepper = 1, /datum/reagent/growthserum = 1) +/datum/chemical_reaction/mauna_loa + name = "Mauna Loa" + id = /datum/reagent/consumable/ethanol/mauna_loa + results = list(/datum/reagent/consumable/ethanol/mauna_loa = 5) + required_reagents = list(/datum/reagent/consumable/capsaicin = 2, /datum/reagent/consumable/ethanol/kahlua = 1, /datum/reagent/consumable/ethanol/bahama_mama = 2) + /datum/chemical_reaction/catnip_tea name = "Catnip Tea" id = /datum/reagent/consumable/catnip_tea diff --git a/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm b/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm index 37e89b23a1..32fe8af2e3 100644 --- a/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm @@ -1156,6 +1156,17 @@ All effects don't start immediately, but rather get worse over time; the rate is playsound(get_turf(M), 'sound/effects/explosionfar.ogg', 100, 1) return ..() +/datum/reagent/consumable/ethanol/hiveminderaser + name = "Hivemind Eraser" + description = "A vessel of pure flavor." + color = "#FF80FC" // rgb: 255, 128, 252 + boozepwr = 40 + quality = DRINK_GOOD + taste_description = "psychic links" + glass_icon_state = "hiveminderaser" + glass_name = "Hivemind Eraser" + glass_desc = "For when even mindshields can't save you." + /datum/reagent/consumable/ethanol/erikasurprise name = "Erika Surprise" description = "The surprise is, it's green!" @@ -1884,6 +1895,17 @@ All effects don't start immediately, but rather get worse over time; the rate is glass_desc = "A drink that looks as refreshing as it tastes." value = 1 +/datum/reagent/consumable/ethanol/moscow_mule + name = "Moscow Mule" + description = "A chilly drink that reminds you of the Derelict." + color = "#EEF1AA" + boozepwr = 30 + quality = DRINK_GOOD + taste_description = "refreshing spiciness" + glass_icon_state = "moscow_mule" + glass_name = "Moscow Mule" + glass_desc = "A chilly drink that reminds you of the Derelict." + /datum/reagent/consumable/ethanol/fernet name = "Fernet" description = "An incredibly bitter herbal liqueur used as a digestif." @@ -2191,6 +2213,25 @@ All effects don't start immediately, but rather get worse over time; the rate is glass_desc = "Although historians believe the drink was originally created to commemorate the end of an important conflict in man's past, its origins have largely been forgotten and it is today seen more as a general symbol of human supremacy." value = 1 +/datum/reagent/consumable/ethanol/mauna_loa + name = "Mauna Loa" + description = "Extremely hot; not for the faint of heart!" + boozepwr = 40 + color = "#fe8308" // 254, 131, 8 + quality = DRINK_FANTASTIC + taste_description = "fiery, with an aftertaste of burnt flesh" + glass_icon_state = "mauna_loa" + glass_name = "Mauna Loa" + glass_desc = "Lavaland in a drink... mug... volcano... thing." + +/datum/reagent/consumable/ethanol/mauna_loa/on_mob_life(mob/living/carbon/M) + // Heats the user up while the reagent is in the body. Occasionally makes you burst into flames. + M.adjust_bodytemperature(25 * TEMPERATURE_DAMAGE_COEFFICIENT) + if (prob(5)) + M.adjust_fire_stacks(1) + M.IgniteMob() + ..() + /datum/reagent/consumable/ethanol/commander_and_chief name = "Commander and Chief" description = "A cocktail for the captain on the go." diff --git a/code/modules/reagents/chemistry/reagents/drink_reagents.dm b/code/modules/reagents/chemistry/reagents/drink_reagents.dm index 26988e7026..8a33f37c44 100644 --- a/code/modules/reagents/chemistry/reagents/drink_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/drink_reagents.dm @@ -840,6 +840,19 @@ M.adjust_bodytemperature(-5 * TEMPERATURE_DAMAGE_COEFFICIENT, BODYTEMP_NORMAL) ..() +/datum/reagent/consumable/sol_dry + name = "Sol Dry" + description = "A soothing, mellow drink made from ginger." + color = "#f7d26a" + quality = DRINK_NICE + taste_description = "sweet ginger spice" + glass_name = "Sol Dry" + glass_desc = "A soothing, mellow drink made from ginger." + +/datum/reagent/consumable/sol_dry/on_mob_life(mob/living/carbon/M) + M.adjust_disgust(-5) + ..() + /datum/reagent/consumable/red_queen name = "Red Queen" description = "DRINK ME." diff --git a/code/modules/vending/boozeomat.dm b/code/modules/vending/boozeomat.dm index f6e3d8261a..6f42cefd41 100644 --- a/code/modules/vending/boozeomat.dm +++ b/code/modules/vending/boozeomat.dm @@ -26,6 +26,7 @@ /obj/item/reagent_containers/food/drinks/soda_cans/tonic = 8, /obj/item/reagent_containers/food/drinks/soda_cans/cola = 8, /obj/item/reagent_containers/food/drinks/soda_cans/sodawater = 15, + /obj/item/reagent_containers/food/drinks/soda_cans/sol_dry = 8, /obj/item/reagent_containers/food/drinks/drinkingglass = 30, /obj/item/reagent_containers/food/drinks/ice = 10, /obj/item/reagent_containers/food/drinks/drinkingglass/shotglass = 12, diff --git a/code/modules/vending/cola.dm b/code/modules/vending/cola.dm index 502a25ba4e..57cf315209 100644 --- a/code/modules/vending/cola.dm +++ b/code/modules/vending/cola.dm @@ -12,6 +12,7 @@ /obj/item/reagent_containers/food/drinks/soda_cans/space_up = 10, /obj/item/reagent_containers/food/drinks/soda_cans/pwr_game = 10, /obj/item/reagent_containers/food/drinks/soda_cans/lemon_lime = 10, + /obj/item/reagent_containers/food/drinks/soda_cans/sol_dry = 10, /obj/item/reagent_containers/glass/beaker/waterbottle = 10) contraband = list(/obj/item/reagent_containers/food/drinks/soda_cans/thirteenloko = 6, /obj/item/reagent_containers/food/drinks/soda_cans/shamblers = 6) @@ -80,6 +81,7 @@ /obj/item/reagent_containers/food/drinks/soda_cans/space_up = 10, /obj/item/reagent_containers/food/drinks/soda_cans/pwr_game = 10, /obj/item/reagent_containers/food/drinks/soda_cans/lemon_lime = 10, + /obj/item/reagent_containers/food/drinks/soda_cans/sol_dry = 10, /obj/item/reagent_containers/food/drinks/soda_cans/shamblers = 10) product_slogans = "~Shake me up some of that Shambler's Juice!~" product_ads = "Refreshing!;Jyrbv dv lg jfdv fw kyrk Jyrdscvi'j Alztv!;Over 1 trillion souls drank!;Thirsty? Nyp efk uizeb kyv uribevjj?;Kyv Jyrdscvi uizebj kyv ezxyk!;Drink up!;Krjkp." @@ -95,6 +97,7 @@ /obj/item/reagent_containers/food/drinks/soda_cans/space_up = 10, /obj/item/reagent_containers/food/drinks/soda_cans/pwr_game = 10, /obj/item/reagent_containers/food/drinks/soda_cans/lemon_lime = 10, + /obj/item/reagent_containers/food/drinks/soda_cans/sol_dry = 10, /obj/item/reagent_containers/food/drinks/soda_cans/shamblers = 5, /obj/item/reagent_containers/food/drinks/soda_cans/buzz_fuzz = 5,) contraband = list(/obj/item/reagent_containers/food/drinks/soda_cans/thirteenloko = 6) diff --git a/icons/obj/drinks.dmi b/icons/obj/drinks.dmi index 27af94f5c2..551ec42717 100644 Binary files a/icons/obj/drinks.dmi and b/icons/obj/drinks.dmi differ