diff --git a/code/game/machinery/vending.dm b/code/game/machinery/vending.dm index a562a0c00dc..e42b8a1460b 100644 --- a/code/game/machinery/vending.dm +++ b/code/game/machinery/vending.dm @@ -922,7 +922,8 @@ /obj/item/reagent_containers/food/drinks/drinkingglass = 30, /obj/item/reagent_containers/food/drinks/drinkingglass/shotglass = 30, /obj/item/reagent_containers/food/drinks/ice = 9) - contraband = list(/obj/item/reagent_containers/food/drinks/tea = 10) + contraband = list(/obj/item/reagent_containers/food/drinks/tea = 10, + /obj/item/reagent_containers/food/drinks/bottle/fernet = 5) vend_delay = 15 slogan_list = list("I hope nobody asks me for a bloody cup o' tea...","Alcohol is humanity's friend. Would you abandon a friend?","Quite delighted to serve you!","Is nobody thirsty on this station?") ads_list = list("Drink up!","Booze is good for you!","Alcohol is humanity's best friend.","Quite delighted to serve you!","Care for a nice, cold beer?","Nothing cures you like booze!","Have a sip!","Have a drink!","Have a beer!","Beer is good for you!","Only the finest alcohol!","Best quality booze since 2053!","Award-winning wine!","Maximum alcohol!","Man loves beer.","A toast for progress!") diff --git a/code/modules/food_and_drinks/drinks/drinks/bottle.dm b/code/modules/food_and_drinks/drinks/drinks/bottle.dm index f77d4b60ab4..532e5572894 100644 --- a/code/modules/food_and_drinks/drinks/drinks/bottle.dm +++ b/code/modules/food_and_drinks/drinks/drinks/bottle.dm @@ -265,6 +265,12 @@ volume = 50 list_reagents = list("suicider" = 50) +/obj/item/reagent_containers/food/drinks/bottle/fernet + name = "Fernet Bronca" + desc = "A bottle of pure Fernet Bronca, produced in Cordoba Space Station" + icon_state = "fernetbottle" + list_reagents = list("fernet" = 100) + //////////////////////////JUICES AND STUFF /////////////////////// /obj/item/reagent_containers/food/drinks/bottle/orangejuice diff --git a/code/modules/reagents/chemistry/reagents/alcohol.dm b/code/modules/reagents/chemistry/reagents/alcohol.dm index cef2a8735e5..9d3bce17fa1 100644 --- a/code/modules/reagents/chemistry/reagents/alcohol.dm +++ b/code/modules/reagents/chemistry/reagents/alcohol.dm @@ -1391,3 +1391,42 @@ drink_name = "Bacchus' Blessing" drink_desc = "You didn't think it was possible for a liquid to be so utterly revolting. Are you sure about this...?" taste_description = "a wall of bricks" + +/datum/reagent/consumable/ethanol/fernet + name = "Fernet" + id = "fernet" + description = "An incredibly bitter herbal liqueur used as a digestif." + color = "#1B2E24" // rgb: 27, 46, 36 + alcohol_perc = 0.5 + drink_icon = "fernetpuro" + drink_name = "glass of pure fernet" + drink_desc = "Why are you drinking this pure?" + taste_description = "utter bitterness" + var/remove_nutrition = 2 + +/datum/reagent/consumable/ethanol/fernet/on_mob_life(mob/living/M) + var/update_flags = STATUS_UPDATE_NONE + if(!M.nutrition) + switch(rand(1, 3)) + if(1) + to_chat(M, "You feel hungry...") + if(2) + update_flags |= M.adjustToxLoss(1, FALSE) + to_chat(M, "Your stomach grumbles painfully!") + else + if(prob(60)) + M.adjust_nutrition(-remove_nutrition) + M.overeatduration = 0 + return ..() | update_flags + +/datum/reagent/consumable/ethanol/fernet/fernet_cola + name = "Fernet Cola" + id = "fernet_cola" + description = "A very popular and bittersweet digestif, ideal after a heavy meal. Best served on a sawed-off cola bottle as per tradition." + color = "#390600" // rgb: 57, 6, 0 + alcohol_perc = 0.2 + drink_icon = "fernetcola" + drink_name = "glass of fernet cola" + drink_desc = "A sawed-off cola bottle filled with Fernet Cola. You can hear cuarteto music coming from the inside." + taste_description = "low class heaven" + remove_nutrition = 1 diff --git a/code/modules/reagents/chemistry/recipes/drinks.dm b/code/modules/reagents/chemistry/recipes/drinks.dm index d821175eda2..4bcc308b685 100644 --- a/code/modules/reagents/chemistry/recipes/drinks.dm +++ b/code/modules/reagents/chemistry/recipes/drinks.dm @@ -876,3 +876,12 @@ required_reagents = list("ice" = 1, "hot_coco" = 3) result_amount = 4 mix_sound = 'sound/goonstation/misc/drinkfizz.ogg' + +/datum/chemical_reaction/fernet_cola + name = "Fernet Cola" + id = "fernet_cola" + result = "fernet_cola" + required_reagents = list("fernet" = 1, "cola" = 2) + result_amount = 3 + mix_message = "The ingredients mix into a dark brown godly substance" + mix_sound = 'sound/goonstation/misc/drinkfizz.ogg' diff --git a/icons/obj/drinks.dmi b/icons/obj/drinks.dmi index 0b04342a8d2..b88baedb1fa 100644 Binary files a/icons/obj/drinks.dmi and b/icons/obj/drinks.dmi differ