Adds Fernet, a digestif that reduces your satiety. (#37869)

* Added Fernet and subdrinks

Added sprites for Fernet (bottle), and glasses of pure Fernet, Fernet Cola, Fanciulli and Branca Menta

* Adds Fernet and drinks made out of it

Added Fernet, Fernet Cola, Fanciulli and Branca Menta

* Adds reactions to fernet

* Adds Bottle of Fernet to the list

Spriting by the wonderful NeoExperiences

* Adds Fernet to the Borg's Shaker

They can help you indulge in more hedonism now.

* Adds Fernet to the Booze Dispenser

* Adds Bottle of Fernet to the list

* Updated Fanciulli, Branca Menta

Oops, nearly made two of the drinks not cause the satiety reduction.

* Fixed a missing comma on reagent list

I'm dumb, I forgot this was a list

* Fixed the procs on stamina and hunger

I'm sorry I'm sleepy and retarded to mistake an L for an M

* Changes the recipe of Fanciulli to include Manhattan

They were conflicting, and the description of the glass already says it's just Manhattan with Fernet, so it's consistent.

* Removes glass_icon_state from pure fernet

Cobby said it was pointless since the spritework was lazy
This commit is contained in:
ThePainkiller
2018-05-17 12:19:19 -03:00
committed by yogstation13-bot
parent 9b59c55bb4
commit a53dc59d0b
7 changed files with 118 additions and 4 deletions

View File

@@ -315,6 +315,12 @@
desc += " Awoo." desc += " Awoo."
icon_state = "sakebottle_i" 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)
//////////////////////////JUICES AND STUFF /////////////////////// //////////////////////////JUICES AND STUFF ///////////////////////
/obj/item/reagent_containers/food/drinks/bottle/orangejuice /obj/item/reagent_containers/food/drinks/bottle/orangejuice

View File

@@ -663,3 +663,21 @@
results = list("mojito" = 5) results = list("mojito" = 5)
required_reagents = list("rum" = 1, "sugar" = 1, "limejuice" = 1, "sodawater" = 1, "menthol" = 1) required_reagents = list("rum" = 1, "sugar" = 1, "limejuice" = 1, "sodawater" = 1, "menthol" = 1)
/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)

View File

@@ -468,7 +468,8 @@ obj/machinery/chem_dispenser/proc/work_animation()
"creme_de_menthe", "creme_de_menthe",
"creme_de_cacao", "creme_de_cacao",
"triple_sec", "triple_sec",
"sake" "sake",
"fernet"
) )
emagged_reagents = list( emagged_reagents = list(
"ethanol", "ethanol",

View File

@@ -1612,4 +1612,92 @@ All effects don't start immediately, but rather get worse over time; the rate is
taste_description = "refreshing mint" taste_description = "refreshing mint"
glass_icon_state = "mojito" glass_icon_state = "mojito"
glass_name = "Mojito" glass_name = "Mojito"
glass_desc = "A drink that looks as refreshing as it tastes." glass_desc = "A drink that looks as refreshing as it tastes."
/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
..()

View File

@@ -180,7 +180,7 @@ Borg Shaker
recharge_time = 3 recharge_time = 3
accepts_reagent_upgrades = FALSE accepts_reagent_upgrades = FALSE
reagent_ids = list("beer", "orangejuice", "grenadine" ,"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")
/obj/item/reagent_containers/borghypo/borgshaker/attack(mob/M, mob/user) /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 return //Can't inject stuff with a shaker, can we? //not with that attitude

View File

@@ -16,6 +16,7 @@
/obj/item/reagent_containers/food/drinks/bottle/absinthe = 5, /obj/item/reagent_containers/food/drinks/bottle/absinthe = 5,
/obj/item/reagent_containers/food/drinks/bottle/grappa = 5, /obj/item/reagent_containers/food/drinks/bottle/grappa = 5,
/obj/item/reagent_containers/food/drinks/bottle/sake = 5, /obj/item/reagent_containers/food/drinks/bottle/sake = 5,
/obj/item/reagent_containers/food/drinks/bottle/fernet = 5,
/obj/item/reagent_containers/food/drinks/ale = 6, /obj/item/reagent_containers/food/drinks/ale = 6,
/obj/item/reagent_containers/food/drinks/bottle/orangejuice = 4, /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/tomatojuice = 4,
@@ -41,4 +42,4 @@
machine_name = "Booze-O-Mat" machine_name = "Booze-O-Mat"
icon_state = "refill_booze" icon_state = "refill_booze"
charges = list(61, 4, 0)//of 182 standard, 12 contraband charges = list(61, 4, 0)//of 182 standard, 12 contraband
init_charges = list(61, 4, 0) init_charges = list(61, 4, 0)

Binary file not shown.

Before

Width:  |  Height:  |  Size: 70 KiB

After

Width:  |  Height:  |  Size: 70 KiB