diff --git a/code/datums/status_effects/buffs.dm b/code/datums/status_effects/buffs.dm index e0ff751ce5..b202ef3647 100644 --- a/code/datums/status_effects/buffs.dm +++ b/code/datums/status_effects/buffs.dm @@ -449,4 +449,4 @@ /datum/status_effect/exercised/Destroy() . = ..() - STOP_PROCESSING(SSprocessing, src) \ No newline at end of file + STOP_PROCESSING(SSprocessing, src) diff --git a/code/modules/food_and_drinks/recipes/drinks_recipes.dm b/code/modules/food_and_drinks/recipes/drinks_recipes.dm index ec626b232e..3ac4ec1cab 100644 --- a/code/modules/food_and_drinks/recipes/drinks_recipes.dm +++ b/code/modules/food_and_drinks/recipes/drinks_recipes.dm @@ -583,3 +583,17 @@ required_reagents = list("quadruple_sec" = 5, "clownstears" = 5, "syndicatebomb" = 5) mix_message = "Judgement is upon you." mix_message = 'sound/items/airhorn2.ogg' + +/datum/chemical_reaction/bastion_bourbon + name = "Bastion Bourbon" + id = "bastion_bourbon" + results = list("bastion_bourbon" = 2) + required_reagents = list("tea" = 1, "creme_de_menthe" = 1, "triple_citrus" = 1, "berryjuice" = 1) //herbal and minty, with a hint of citrus and berry + mix_message = "You catch an aroma of hot tea and fruits as the mix blends into a blue-green color." + +/datum/chemical_reaction/squirt_cider + name = "Squirt Cider" + id = "squirt_cider" + results = list("squirt_cider" = 1) + required_reagents = list("water" = 1, "tomatojuice" = 1, "nutriment" = 1) + mix_message = "The mix swirls and turns a bright red that reminds you of an apple's skin." diff --git a/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm b/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm index 2767512f0d..d9e26e34c2 100644 --- a/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm @@ -1387,3 +1387,58 @@ All effects don't start immediately, but rather get worse over time; the rate is glass_icon_state = "glass_white" glass_name = "Stinger" glass_desc = "You wonder what would happen if you pointed this at a heat source..." + +/datum/reagent/consumable/ethanol/bastion_bourbon + name = "Bastion Bourbon" + id = "bastion_bourbon" + description = "Soothing hot herbal brew with restorative properties. Hints of citrus and berry flavors." + color = "#00FFFF" + boozepwr = 30 + taste_description = "hot herbal brew with a hint of fruit" + metabolization_rate = 2 * REAGENTS_METABOLISM //0.8u per tick + glass_icon_state = "bastion_bourbon" + glass_name = "Bastion Bourbon" + glass_desc = "If you're feeling low, count on the buttery flavor of our own bastion bourbon." + shot_glass_icon_state = "shotglassgreen" + +/datum/reagent/consumable/ethanol/bastion_bourbon/on_mob_add(mob/living/L) + var/heal_points = 10 + if(L.health <= 0) + heal_points = 20 //heal more if we're in softcrit + for(var/i in 1 to min(volume, heal_points)) //only heals 1 point of damage per unit on add, for balance reasons + L.adjustBruteLoss(-1) + L.adjustFireLoss(-1) + L.adjustToxLoss(-1) + L.adjustOxyLoss(-1) + L.adjustStaminaLoss(-1) + L.visible_message("[L] shivers with renewed vigor!", "One taste of [lowertext(name)] fills you with energy!") + if(!L.stat && heal_points == 20) //brought us out of softcrit + L.visible_message("[L] lurches to their feet!", "Up and at 'em, kid.") + +/datum/reagent/consumable/ethanol/bastion_bourbon/on_mob_life(mob/living/L) + if(L.health > 0) + L.adjustBruteLoss(-1) + L.adjustFireLoss(-1) + L.adjustToxLoss(-0.5) + L.adjustOxyLoss(-3) + L.adjustStaminaLoss(-5) + . = TRUE + ..() + +/datum/reagent/consumable/ethanol/squirt_cider + name = "Squirt Cider" + id = "squirt_cider" + description = "Fermented squirt extract with a nose of stale bread and ocean water. Whatever a squirt is." + color = "#FF0000" + boozepwr = 40 + taste_description = "stale bread with a staler aftertaste" + nutriment_factor = 2 * REAGENTS_METABOLISM + glass_icon_state = "squirt_cider" + glass_name = "Squirt Cider" + glass_desc = "Squirt cider will toughen you right up. Too bad about the musty aftertaste." + shot_glass_icon_state = "shotglassgreen" + +/datum/reagent/consumable/ethanol/squirt_cider/on_mob_life(mob/living/M) + M.satiety += 5 //for context, vitamins give 30 satiety per tick + ..() + . = TRUE