From e2bcf82341745320b46367926d71e8dff6e4880b Mon Sep 17 00:00:00 2001 From: ThePainkiller Date: Thu, 17 May 2018 12:19:19 -0300 Subject: [PATCH 1/6] Adds Fernet, a digestif that reduces your satiety. --- .../food_and_drinks/drinks/drinks/bottle.dm | 26 ++++++ .../food_and_drinks/recipes/drinks_recipes.dm | 22 +++++ .../chemistry/machinery/chem_dispenser.dm | 3 +- .../chemistry/reagents/alcohol_reagents.dm | 91 +++++++++++++++++++ .../reagents/reagent_containers/borghydro.dm | 4 + code/modules/vending/boozeomat.dm | 10 ++ 6 files changed, 155 insertions(+), 1 deletion(-) diff --git a/code/modules/food_and_drinks/drinks/drinks/bottle.dm b/code/modules/food_and_drinks/drinks/drinks/bottle.dm index 664d2e0bc2..0108b8d2f6 100644 --- a/code/modules/food_and_drinks/drinks/drinks/bottle.dm +++ b/code/modules/food_and_drinks/drinks/drinks/bottle.dm @@ -298,6 +298,32 @@ icon_state = "grappabottle" list_reagents = list("grappa" = 100) +<<<<<<< HEAD +======= +/obj/item/reagent_containers/food/drinks/bottle/sake + name = "Ryo's traditional sake" + desc = "Sweet as can be, and burns like fire going down." + icon_state = "sakebottle" + list_reagents = list("sake" = 100) + +/obj/item/reagent_containers/food/drinks/bottle/sake/Initialize() + . = ..() + if(prob(10)) + name = "Fluffy Tail Sake" + desc += " On the bottle is a picture of a kitsune with nine touchable tails." + icon_state = "sakebottle_k" + else if(prob(10)) + name = "Inubashiri's Home Brew" + desc += " Awoo." + icon_state = "sakebottle_i" + +/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) + +>>>>>>> 703ab07... Adds Fernet, a digestif that reduces your satiety. (#37869) //////////////////////////JUICES AND STUFF /////////////////////// /obj/item/reagent_containers/food/drinks/bottle/orangejuice diff --git a/code/modules/food_and_drinks/recipes/drinks_recipes.dm b/code/modules/food_and_drinks/recipes/drinks_recipes.dm index 2a081f3a2f..965433113f 100644 --- a/code/modules/food_and_drinks/recipes/drinks_recipes.dm +++ b/code/modules/food_and_drinks/recipes/drinks_recipes.dm @@ -662,3 +662,25 @@ id = "mojito" results = list("mojito" = 5) required_reagents = list("rum" = 1, "sugar" = 1, "limejuice" = 1, "sodawater" = 1, "menthol" = 1) +<<<<<<< HEAD +======= + +/datum/chemical_reaction/fernet_cola + name = "Fernet Cola" + id = "fernet_cola" + results = list("fernet_cola" = 2) + required_reagents = list("fernet" = 1, "cola" = 1) + + +/datum/chemical_reaction/fanciulli + name = "Fanciulli" + id = "fanciulli" + results = list("fanciulli" = 2) + required_reagents = list("manhattan" = 1, "fernet" = 1) + +/datum/chemical_reaction/branca_menta + name = "Branca Menta" + id = "branca_menta" + results = list("branca_menta" = 3) + required_reagents = list("fernet" = 1, "creme_de_menthe" = 1, "ice" = 1) +>>>>>>> 703ab07... Adds Fernet, a digestif that reduces your satiety. (#37869) diff --git a/code/modules/reagents/chemistry/machinery/chem_dispenser.dm b/code/modules/reagents/chemistry/machinery/chem_dispenser.dm index 20db99fca1..a464c23294 100644 --- a/code/modules/reagents/chemistry/machinery/chem_dispenser.dm +++ b/code/modules/reagents/chemistry/machinery/chem_dispenser.dm @@ -467,7 +467,8 @@ obj/machinery/chem_dispenser/proc/work_animation() "creme_de_menthe", "creme_de_cacao", "triple_sec", - "sake" + "sake", + "fernet" ) 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 5230ea26f6..413cd8649b 100644 --- a/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm @@ -1613,3 +1613,94 @@ All effects don't start immediately, but rather get worse over time; the rate is glass_icon_state = "mojito" glass_name = "Mojito" glass_desc = "A drink that looks as refreshing as it tastes." +<<<<<<< HEAD +======= + +/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 + boozepwr = 80 + taste_description = "utter bitterness" + glass_name = "glass of fernet" + glass_desc = "A glass of pure Fernet. Only an absolute madman would drink this alone." //Hi Kevum + +/datum/reagent/consumable/ethanol/fernet/on_mob_life(mob/living/M) + + if(M.nutrition <= NUTRITION_LEVEL_STARVING) + M.adjustToxLoss(1*REM, 0) + M.nutrition = max(M.nutrition - 5, 0) + M.overeatduration = 0 + return ..() + +/datum/reagent/consumable/ethanol/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 + boozepwr = 25 + taste_description = "sweet relief" + glass_icon_state = "godlyblend" + glass_name = "glass of fernet cola" + glass_desc = "A sawed-off cola bottle filled with Fernet Cola. Nothing better after eating like a lardass." + +/datum/reagent/consumable/ethanol/fernetcola/on_mob_life(mob/living/M) + + if(M.nutrition <= NUTRITION_LEVEL_STARVING) + M.adjustToxLoss(0.5*REM, 0) + M.nutrition = max(M.nutrition - 3, 0) + M.overeatduration = 0 + return ..() + +/datum/reagent/consumable/ethanol/fanciulli + + name = "Fanciulli" + id = "fanciulli" + description = "What if the Manhattan coctail ACTUALLY used a bitter herb liquour? Helps you sobers up." //also causes a bit of stamina damage to symbolize the afterdrink lazyness + color = "#CA933F" // rgb: 202, 147, 63 + boozepwr = -10 + taste_description = "a sweet sobering mix" + glass_icon_state = "fanciulli" + glass_name = "glass of fanciulli" + glass_desc = "A glass of Fanciulli. It's just Manhattan with Fernet." + +/datum/reagent/consumable/ethanol/fanciulli/on_mob_life(mob/living/M) + + M.nutrition = max(M.nutrition - 5, 0) + M.overeatduration = 0 + return ..() + +/datum/reagent/consumable/ethanol/fanciulli/on_mob_add(mob/living/M) + if(M.health > 0) + M.adjustStaminaLoss(20) + . = TRUE + ..() + + +/datum/reagent/consumable/ethanol/branca_menta + name = "Branca Menta" + id = "branca_menta" + description = "A refreshing mixture of bitter Fernet with mint creme liquour." + color = "#4B5746" // rgb: 75, 87, 70 + boozepwr = 35 + taste_description = "a bitter freshness" + glass_icon_state= "minted_fernet" + glass_name = "glass of branca menta" + glass_desc = "A glass of Branca Menta, perfect for those lazy and hot sunday summer afternoons." //Get lazy literally by drinking this + + +/datum/reagent/consumable/ethanol/branca_menta/on_mob_life(mob/living/M) + M.adjust_bodytemperature(-20 * TEMPERATURE_DAMAGE_COEFFICIENT, T0C) + if(M.nutrition <= NUTRITION_LEVEL_STARVING) + M.adjustToxLoss(1*REM, 0) + M.nutrition = max(M.nutrition - 5, 0) + M.overeatduration = 0 + return ..() + +/datum/reagent/consumable/ethanol/branca_menta/on_mob_add(mob/living/M) + if(M.health > 0) + M.adjustStaminaLoss(35) + . = TRUE + ..() +>>>>>>> 703ab07... Adds Fernet, a digestif that reduces your satiety. (#37869) diff --git a/code/modules/reagents/reagent_containers/borghydro.dm b/code/modules/reagents/reagent_containers/borghydro.dm index ef41c7951e..3f641f1c9f 100644 --- a/code/modules/reagents/reagent_containers/borghydro.dm +++ b/code/modules/reagents/reagent_containers/borghydro.dm @@ -180,7 +180,11 @@ Borg Shaker recharge_time = 3 accepts_reagent_upgrades = FALSE +<<<<<<< HEAD reagent_ids = list("beer", "orangejuice", "limejuice", "tomatojuice", "cola", "tonic", "sodawater", "ice", "cream", "whiskey", "vodka", "rum", "gin", "tequila", "vermouth", "wine", "kahlua", "cognac", "ale") +======= + reagent_ids = list("beer", "orangejuice", "grenadine" ,"limejuice", "tomatojuice", "cola", "tonic", "sodawater", "ice", "cream", "whiskey", "vodka", "rum", "gin", "tequila", "vermouth", "wine", "kahlua", "cognac", "ale", "fernet") +>>>>>>> 703ab07... Adds Fernet, a digestif that reduces your satiety. (#37869) /obj/item/reagent_containers/borghypo/borgshaker/attack(mob/M, mob/user) return //Can't inject stuff with a shaker, can we? //not with that attitude diff --git a/code/modules/vending/boozeomat.dm b/code/modules/vending/boozeomat.dm index 59b41d4cef..0809cfd1ab 100644 --- a/code/modules/vending/boozeomat.dm +++ b/code/modules/vending/boozeomat.dm @@ -15,6 +15,11 @@ /obj/item/reagent_containers/food/drinks/bottle/hcider = 5, /obj/item/reagent_containers/food/drinks/bottle/absinthe = 5, /obj/item/reagent_containers/food/drinks/bottle/grappa = 5, +<<<<<<< HEAD +======= + /obj/item/reagent_containers/food/drinks/bottle/sake = 5, + /obj/item/reagent_containers/food/drinks/bottle/fernet = 5, +>>>>>>> 703ab07... Adds Fernet, a digestif that reduces your satiety. (#37869) /obj/item/reagent_containers/food/drinks/ale = 6, /obj/item/reagent_containers/food/drinks/bottle/orangejuice = 4, /obj/item/reagent_containers/food/drinks/bottle/tomatojuice = 4, @@ -38,5 +43,10 @@ /obj/item/vending_refill/boozeomat machine_name = "Booze-O-Mat" icon_state = "refill_booze" +<<<<<<< HEAD charges = list(59, 4, 0)//of 178 standard, 12 contraband init_charges = list(59, 4, 0) +======= + charges = list(61, 4, 0)//of 182 standard, 12 contraband + init_charges = list(61, 4, 0) +>>>>>>> 703ab07... Adds Fernet, a digestif that reduces your satiety. (#37869) From eb96fe9d02d774b03a655bbf75e8051ea4405451 Mon Sep 17 00:00:00 2001 From: LetterJay Date: Thu, 17 May 2018 23:44:27 -0500 Subject: [PATCH 2/6] Update bottle.dm --- code/modules/food_and_drinks/drinks/drinks/bottle.dm | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/code/modules/food_and_drinks/drinks/drinks/bottle.dm b/code/modules/food_and_drinks/drinks/drinks/bottle.dm index 0108b8d2f6..8972ceba12 100644 --- a/code/modules/food_and_drinks/drinks/drinks/bottle.dm +++ b/code/modules/food_and_drinks/drinks/drinks/bottle.dm @@ -298,8 +298,6 @@ icon_state = "grappabottle" list_reagents = list("grappa" = 100) -<<<<<<< HEAD -======= /obj/item/reagent_containers/food/drinks/bottle/sake name = "Ryo's traditional sake" desc = "Sweet as can be, and burns like fire going down." @@ -322,8 +320,7 @@ desc = "A bottle of pure Fernet Bronca, produced in Cordoba Space Station" icon_state = "fernetbottle" list_reagents = list("fernet" = 100) - ->>>>>>> 703ab07... Adds Fernet, a digestif that reduces your satiety. (#37869) + //////////////////////////JUICES AND STUFF /////////////////////// /obj/item/reagent_containers/food/drinks/bottle/orangejuice From 2b0a4f67375e0ce75106b9a176a8ffdd32a15d16 Mon Sep 17 00:00:00 2001 From: LetterJay Date: Thu, 17 May 2018 23:44:36 -0500 Subject: [PATCH 3/6] Update drinks_recipes.dm --- code/modules/food_and_drinks/recipes/drinks_recipes.dm | 3 --- 1 file changed, 3 deletions(-) diff --git a/code/modules/food_and_drinks/recipes/drinks_recipes.dm b/code/modules/food_and_drinks/recipes/drinks_recipes.dm index 965433113f..0ee01ae9e2 100644 --- a/code/modules/food_and_drinks/recipes/drinks_recipes.dm +++ b/code/modules/food_and_drinks/recipes/drinks_recipes.dm @@ -662,8 +662,6 @@ id = "mojito" results = list("mojito" = 5) required_reagents = list("rum" = 1, "sugar" = 1, "limejuice" = 1, "sodawater" = 1, "menthol" = 1) -<<<<<<< HEAD -======= /datum/chemical_reaction/fernet_cola name = "Fernet Cola" @@ -683,4 +681,3 @@ id = "branca_menta" results = list("branca_menta" = 3) required_reagents = list("fernet" = 1, "creme_de_menthe" = 1, "ice" = 1) ->>>>>>> 703ab07... Adds Fernet, a digestif that reduces your satiety. (#37869) From 348b3502957bcd66050fecee7b692933557eb198 Mon Sep 17 00:00:00 2001 From: LetterJay Date: Thu, 17 May 2018 23:44:47 -0500 Subject: [PATCH 4/6] Update alcohol_reagents.dm --- code/modules/reagents/chemistry/reagents/alcohol_reagents.dm | 3 --- 1 file changed, 3 deletions(-) diff --git a/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm b/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm index 413cd8649b..3134226543 100644 --- a/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm @@ -1613,8 +1613,6 @@ All effects don't start immediately, but rather get worse over time; the rate is glass_icon_state = "mojito" glass_name = "Mojito" glass_desc = "A drink that looks as refreshing as it tastes." -<<<<<<< HEAD -======= /datum/reagent/consumable/ethanol/fernet name = "Fernet" @@ -1703,4 +1701,3 @@ All effects don't start immediately, but rather get worse over time; the rate is M.adjustStaminaLoss(35) . = TRUE ..() ->>>>>>> 703ab07... Adds Fernet, a digestif that reduces your satiety. (#37869) From 204043bc2600c7b6dca3d891739c0c16c5fbda12 Mon Sep 17 00:00:00 2001 From: LetterJay Date: Thu, 17 May 2018 23:44:58 -0500 Subject: [PATCH 5/6] Update borghydro.dm --- code/modules/reagents/reagent_containers/borghydro.dm | 5 ----- 1 file changed, 5 deletions(-) diff --git a/code/modules/reagents/reagent_containers/borghydro.dm b/code/modules/reagents/reagent_containers/borghydro.dm index 3f641f1c9f..d384b7dd8d 100644 --- a/code/modules/reagents/reagent_containers/borghydro.dm +++ b/code/modules/reagents/reagent_containers/borghydro.dm @@ -179,12 +179,7 @@ Borg Shaker charge_cost = 20 //Lots of reagents all regenerating at once, so the charge cost is lower. They also regenerate faster. recharge_time = 3 accepts_reagent_upgrades = FALSE - -<<<<<<< HEAD - reagent_ids = list("beer", "orangejuice", "limejuice", "tomatojuice", "cola", "tonic", "sodawater", "ice", "cream", "whiskey", "vodka", "rum", "gin", "tequila", "vermouth", "wine", "kahlua", "cognac", "ale") -======= reagent_ids = list("beer", "orangejuice", "grenadine" ,"limejuice", "tomatojuice", "cola", "tonic", "sodawater", "ice", "cream", "whiskey", "vodka", "rum", "gin", "tequila", "vermouth", "wine", "kahlua", "cognac", "ale", "fernet") ->>>>>>> 703ab07... Adds Fernet, a digestif that reduces your satiety. (#37869) /obj/item/reagent_containers/borghypo/borgshaker/attack(mob/M, mob/user) return //Can't inject stuff with a shaker, can we? //not with that attitude From 047fc2a8587ccdf6012d733d6e908d20b159ec8a Mon Sep 17 00:00:00 2001 From: LetterJay Date: Thu, 17 May 2018 23:45:11 -0500 Subject: [PATCH 6/6] Update boozeomat.dm --- code/modules/vending/boozeomat.dm | 8 -------- 1 file changed, 8 deletions(-) diff --git a/code/modules/vending/boozeomat.dm b/code/modules/vending/boozeomat.dm index 0809cfd1ab..67c7753c59 100644 --- a/code/modules/vending/boozeomat.dm +++ b/code/modules/vending/boozeomat.dm @@ -15,11 +15,8 @@ /obj/item/reagent_containers/food/drinks/bottle/hcider = 5, /obj/item/reagent_containers/food/drinks/bottle/absinthe = 5, /obj/item/reagent_containers/food/drinks/bottle/grappa = 5, -<<<<<<< HEAD -======= /obj/item/reagent_containers/food/drinks/bottle/sake = 5, /obj/item/reagent_containers/food/drinks/bottle/fernet = 5, ->>>>>>> 703ab07... Adds Fernet, a digestif that reduces your satiety. (#37869) /obj/item/reagent_containers/food/drinks/ale = 6, /obj/item/reagent_containers/food/drinks/bottle/orangejuice = 4, /obj/item/reagent_containers/food/drinks/bottle/tomatojuice = 4, @@ -43,10 +40,5 @@ /obj/item/vending_refill/boozeomat machine_name = "Booze-O-Mat" icon_state = "refill_booze" -<<<<<<< HEAD - charges = list(59, 4, 0)//of 178 standard, 12 contraband - init_charges = list(59, 4, 0) -======= charges = list(61, 4, 0)//of 182 standard, 12 contraband init_charges = list(61, 4, 0) ->>>>>>> 703ab07... Adds Fernet, a digestif that reduces your satiety. (#37869)