mirror of
https://github.com/Citadel-Station-13/Citadel-Station-13-RP.git
synced 2026-08-24 16:36:55 +01:00
Blud changes, seasonal consumables, new cocktail recipe, and other miscellaneous fixes. (#7592)
## About The Pull Request This PR includes a few different things mostly revolving around food and drinks: 1) **BLUD REBALANCE** Blud has been changed significantly. This change will be accompanied by an IC bulletin and OOC dev blog post, the changes are as follows: - Blud can now always be consumed, even when you're starving. - Blud is now metabolized after ingestion at the same rate as regular blood (a lot faster than previously). - Blud's blood_content values have been bumped significantly. 30u of real Blood restores ~120 nutrition, while 30u of Blud restores 25% less nutrition, at ~90 (tested in-game). - Blud boxes now contain 50u instead of 30u. For reference, regular-sized milk cartons are 50u and mini milk cartons are 30u. - Cargo's Vetalan Care Package now consists of 5 boxes of Blud MAX and another 5 boxes of Blud MAX Light, for a total of 250u of real Blood and 250u of Synthblood. Previously it consisted of 3 bags of AB+ which are 200u each for 600u of Blood. The suit that comes in the care package was also deleted, but it still comes in a nice coffin. 2) **SEASONAL ITEMS** All of the items from last year's Christmas testmerge have been re-added with a few minor updates. New Halloween themed items have also been added. These seasonal items are fully functional, but **can't be obtained currently since they're not taking advantage of the seasonal item rotation code at this time.** The full list of items is as follows: - Two new cigarette varieties, Temperamento Vanilla (Xmas) and Kaiju Cherry (Halloween) - Three new types of bottled alcohol, Caramel Whiskey (Xmas), Sour Apple Schnapps (Halloween) and Candy Corn Flavored Vodka (Halloween) - Seven new cocktails using seasonal ingredients, Caramel White Russian (Xmas), Salted Caramel Cider (Xmas), Appletini (Halloween), Sour Apple Mimosa (Halloween), Sour Apple Fizz (Halloween), Candy Corn Martini (Halloween) and Halloween Punch (Halloween). - There is also a "food synthesis" recipe for turning the candy corn martini into edible jello shots using water and protein. - Three new snacks, Gingerbread Cookies (Xmas), Stroopwafels (Xmas) and Holiday Cake (Xmas, Contraband). Halloween snacks will hopefully be added later down the line. - Four new soda varieties: Space Cola Cinnamon (Xmas), Space-Up Cranberry (Xmas), Space Cola Licorice (Halloween) and Dr. Gibb Mystery (Halloween). - One new canned coffee variety: Peppermint Mocha (Xmas). Halloween variety will hopefully come along with the snacks. It's a lot of spriting work. 3) **ASSORTED FIXES AND QOL IMPROVEMENTS** - Bar and Cafe vendors now stock canned Pineapple juice year-round, this is generally useful but especially handy for the halloween vodka cocktails. - One new year-round cocktail recipe: The AMF. - Robust Softdrinks no longer stocks KyoCola, Ocha Midori and Ramune, since those are already present in the NipponTan vending machines. This cuts down on that particular menu's bloat a little. - Temperamento Menthol Company now called Temperamento Tobacco Company - CC's Hard Rootbeer proof is now calculated as VODKA/2, slightly lowering it's proof from 50 to 40. This was done because the bottle desc for this drink states it's regular rootbeer with vodka added. - BludBox MAX no longer calls donors "free-range", the blood is now "ethically-sourced" instead. - The lore entry on Vetalan Outreach Society has been brushed up and also had typos corrected. ## Why It's Good For The Game 1) Vetalans, Medical and Blud have been in need of addressing for a while now, and this is the mechanical part of the effort, making Vetalans less reliant on blood bags. 2) The seasonal item system is here. The groundwork and the first batch of items are laid out, I just need to figure out how to implement and test the seasonal rotations. 3) Most of these are QoL and fixes. The AMF came into being very late at night after the brainworms won. ## Changelog 🆑 add: Added two new brands of seasonal cigarette. add: Added three new brands of seasonal alcohol. add: Added four new varieties of seasonal soda. add: Added seven new varieties of seasonal cocktails. add: Added one seasonal variety of food synthesis reaction. add: Added three new varieties of seasonal snack food. add: Added one seasonal variety of canned coffee. add: Added one new regular cocktail. add: Added Pineapple Juice cans to Bar and Cafe vendors. del: Removed NipponTan drinks from Robust Softdrinks stock. tweak: Temperamento Menthol Company renamed to Temperamento Tobacco Company. tweak: Small changes to the Vetalan Outreach Society advertisement. tweak: Small changes to BludBox MAX description. tweak: Blud now always nourishes Vetalans regardless of nutrition status. tweak: Blud now metabolizes at the same rate as Blood when ingested. tweak: Blud now provides Vetalans with 75% the nutritional value compared to Blood. tweak: Vetalan Care Package now contains BludBox MAX and BludBox MAX Light cartons instead of AB+ Blood Packs. tweak: Vetalan Care Package no longer contains a suit. tweak: BludBox cartons now hold 50u, up from 30u. tweak: CC's Hard Rootbeer proof now calculated in a more lore-friendly manner. fix: Pineapple juice no longer purple when poured into a metamorphic glass. imageadd: added sprites for all item additions listed above. /🆑
This commit is contained in:
AlphaM01
@@ -1772,6 +1772,13 @@
|
||||
required_reagents = list("rum" = 1, "pineapplejuice" = 1, "coconutmilk" = 1, "ice" = 1)
|
||||
result_amount = 3
|
||||
|
||||
/datum/chemical_reaction/drinks/adiosmotherfucker
|
||||
name = "Adios, Motherfucker"
|
||||
id = "adiosmotherfucker"
|
||||
result = "adiosmotherfucker"
|
||||
required_reagents = list("vodka" = 1, "gin" = 1, "rum" = 1, "tequila" = 1, "bluecuracao" = 1, "lemonjuice" = 1, "space_up" = 2)
|
||||
result_amount = 8
|
||||
|
||||
|
||||
//Blud-based Cocktails
|
||||
//All of these drinks should contain some level of blood_content in their reagent code
|
||||
@@ -1918,3 +1925,57 @@
|
||||
required_reagents = list("unathijuice" = 2, "protein" = 1)
|
||||
result_amount = 3
|
||||
reaction_message_instant = "The mixture turns a deep orange."
|
||||
|
||||
//Drinks that require seasonal ingredients
|
||||
//Seasonals - Xmas
|
||||
|
||||
/datum/chemical_reaction/drinks/caramel_russian_russian
|
||||
name = "Caramel White Russian"
|
||||
id = "caramelrussian"
|
||||
result = "caramelrussian"
|
||||
required_reagents = list("kahlua" = 1, "caramelwhiskey" = 1, "cream" = 1)
|
||||
result_amount = 3
|
||||
|
||||
/datum/chemical_reaction/drinks/caramel_cider
|
||||
name = "Salted Caramel Cider"
|
||||
id = "caramelcider"
|
||||
result = "caramelcider"
|
||||
required_reagents = list("caramelwhiskey" = 1, "cider" = 2)
|
||||
result_amount = 3
|
||||
|
||||
//Seasonals - Halloween
|
||||
|
||||
/datum/chemical_reaction/drinks/appletini
|
||||
name = "Appletini"
|
||||
id = "appletini"
|
||||
result = "appletini"
|
||||
required_reagents = list("vodka" = 2, "sourappleschnapps" = 1, "lemonjuice" = 1)
|
||||
result_amount = 4
|
||||
|
||||
/datum/chemical_reaction/drinks/sourapplemimosa
|
||||
name = "Sour Apple Mimosa"
|
||||
id = "sourapplemimosa"
|
||||
result = "sourapplemimosa"
|
||||
required_reagents = list("sourappleschnapps" = 1, "champagne" = 2)
|
||||
result_amount = 3
|
||||
|
||||
/datum/chemical_reaction/drinks/sourapplefizz
|
||||
name = "Sour Apple Fizz"
|
||||
id = "sourapplefizz"
|
||||
result = "sourapplefizz"
|
||||
required_reagents = list("sourappleschnapps" = 1, "limejuice" = 1, "sodawater" = 2)
|
||||
result_amount = 4
|
||||
|
||||
/datum/chemical_reaction/drinks/candycornmartini
|
||||
name = "Candy Corn Martini"
|
||||
id = "candycornmartini"
|
||||
result = "candycornmartini"
|
||||
required_reagents = list("candycornvodka" = 1, "pineapplejuice" = 1, "cream" = 1)
|
||||
result_amount = 3
|
||||
|
||||
/datum/chemical_reaction/drinks/halloweenpunch
|
||||
name = "Halloween Punch"
|
||||
id = "halloweenpunch"
|
||||
result = "halloweenpunch"
|
||||
required_reagents = list("candycornvodka" = 1, "pineapplejuice" = 1, "orangejuice" = 1)
|
||||
result_amount = 3
|
||||
|
||||
@@ -98,3 +98,11 @@
|
||||
catalysts = list("enzyme" = 5)
|
||||
|
||||
synthesis_product_path = /obj/item/reagent_containers/food/snacks/tofu
|
||||
|
||||
//Seasonal drinks - Halloween
|
||||
/datum/chemical_reaction/food/synthesis/candycornjelloshot
|
||||
name = "Candy Corn Jello Shot"
|
||||
id = "candycornjelloshot"
|
||||
required_reagents = list("candycornmartini" = 5, "water" = 2, "protein" = 1)
|
||||
|
||||
synthesis_product_path = /obj/item/reagent_containers/food/snacks/candycornjelloshot
|
||||
|
||||
@@ -250,13 +250,13 @@ GLOBAL_LIST_INIT(name2reagent, build_name2reagent())
|
||||
|
||||
/datum/reagent/proc/handle_vampire(var/mob/living/carbon/M, var/alien, var/removed, var/is_vampire)
|
||||
if(blood_content > 0 && is_vampire)
|
||||
#define blud_warn_timer 3000
|
||||
if(blood_content < 4) //Are we drinking real blood or something else?
|
||||
if(M.nutrition <= 0.333 * M.species.max_nutrition || M.nutrition > 0.778 * M.species.max_nutrition) //Vampires who are starving or peckish get nothing from fake blood.
|
||||
if(M.last_blood_warn + blud_warn_timer < world.time)
|
||||
to_chat(M, "<span class='warning'>This isn't enough. You need something stronger.</span>")
|
||||
M.last_blood_warn = world.time //If we're drinking fake blood, make sure we're warned appropriately.
|
||||
return
|
||||
//#define blud_warn_timer 3000
|
||||
//if(blood_content < 4) //Are we drinking real blood or something else?
|
||||
// if(M.nutrition <= 0.333 * M.species.max_nutrition || M.nutrition > 0.778 * M.species.max_nutrition) //Vampires who are starving or peckish get nothing from fake blood.
|
||||
// if(M.last_blood_warn + blud_warn_timer < world.time)
|
||||
// to_chat(M, "<span class='warning'>This isn't enough. You need something stronger.</span>")
|
||||
// M.last_blood_warn = world.time //If we're drinking fake blood, make sure we're warned appropriately.
|
||||
// return
|
||||
M.nutrition += removed * blood_content //We should always be able to process real blood.
|
||||
|
||||
/datum/reagent/proc/legacy_affect_overdose(mob/living/carbon/M, alien, removed, datum/reagent_metabolism/metabolism)
|
||||
|
||||
@@ -2203,8 +2203,9 @@
|
||||
description = "A sweet mix of blood-like additives. Vampiric."
|
||||
taste_description = "an odd blend of metals and sugar"
|
||||
color = "#993c49"
|
||||
blood_content = 1
|
||||
nutrition=1
|
||||
blood_content = 2 //Regular blood is 4
|
||||
ingest_met = REM * 10 //Same speed as regular blood
|
||||
nutrition = 1
|
||||
|
||||
glass_name = "Blud"
|
||||
glass_desc = "A sweet mix of blood-like additives. Vampiric."
|
||||
@@ -2216,7 +2217,8 @@
|
||||
description = "An artificially sweetened mix of blood-like additives. Vampiric and low in calories!"
|
||||
taste_description = "an awful blend of metals and artificial sweeteners"
|
||||
color = "#793c44"
|
||||
blood_content = 1
|
||||
blood_content = 2
|
||||
ingest_met = REM * 10
|
||||
|
||||
glass_name = "Blud Light"
|
||||
glass_desc = "An artificially sweetened mix of blood-like additives. Vampiric and low in calories!"
|
||||
@@ -2738,7 +2740,7 @@
|
||||
id = "alcsassafras"
|
||||
description = "Doesn't matter if you're drunk when you have a horse to take you home!"
|
||||
taste_description = "bitter vanilla with a sharp burn"
|
||||
proof = 50
|
||||
proof = VODKA/2
|
||||
|
||||
glass_name = "CC's Hard Rootbeer"
|
||||
glass_desc = "You'd better carry two guns if you're gonna keep drinking these!"
|
||||
@@ -3309,7 +3311,7 @@
|
||||
taste_description = "sweet and salty alcohol"
|
||||
color = "#C73C00"
|
||||
proof = MEAD/2
|
||||
blood_content = 0.5
|
||||
blood_content = 0.8
|
||||
|
||||
glass_name = "Red Mead"
|
||||
glass_desc = "A true Viking's beverage, though its color is strange."
|
||||
@@ -4187,7 +4189,7 @@
|
||||
description = "The perfect drink for when you want to dance and fiddle all night. Does it work? You be The Judge."
|
||||
taste_description = "lingering regret, gunpowder, and blood"
|
||||
proof = 40
|
||||
blood_content = 0.4
|
||||
blood_content = 0.6
|
||||
|
||||
glass_name = "Blood Meridian"
|
||||
glass_desc = "The perfect drink for when you want to dance and fiddle all night. Does it work? You be The Judge."
|
||||
@@ -4295,7 +4297,7 @@
|
||||
taste_description = "copper, tomatoes, and heretical sweetness"
|
||||
color = "#B40000"
|
||||
proof = (VODKA/3+VODKA)/5
|
||||
blood_content = 0.2
|
||||
blood_content = 0.4
|
||||
|
||||
glass_name = "Mary On a Cross"
|
||||
glass_desc = "Not just another Bloody Mary. Mary on a cross."
|
||||
@@ -4357,6 +4359,17 @@
|
||||
glass_name = "Mimosa"
|
||||
glass_desc = "A bubbly and tangy refreshment."
|
||||
|
||||
/datum/reagent/ethanol/adiosmotherfucker
|
||||
name = "Adios, Motherfucker"
|
||||
id = "adiosmotherfucker"
|
||||
description = "The liquor cabinet, topped with lemon and Space-Up. Dangerously drinkable."
|
||||
taste_description = "fizzy alcoholic lemonade"
|
||||
color = "#00b7ff"
|
||||
proof = (VODKA+GIN+TEQUILA+RUM+CURACAO)/8
|
||||
|
||||
glass_name = "Adios, Motherfucker"
|
||||
glass_desc = "You have a sneaking suspicion the Motherfucker in question is you."
|
||||
|
||||
//Never Fade Away
|
||||
/datum/reagent/ethanol/silverhand
|
||||
name = "Johnny Silverhand"
|
||||
@@ -5283,3 +5296,167 @@
|
||||
color = COLOR_WHITE // rgb: 255, 255, 255
|
||||
taste_mult = 8
|
||||
taste_description = "sweetness"
|
||||
|
||||
// Seasonals - Xmas
|
||||
|
||||
/datum/reagent/drink/soda/cinnamon
|
||||
name = "Space Cola Cinnamon"
|
||||
id = "cinnamoncola"
|
||||
description = "The classic taste of Space Cola with a hint of warm cinnamon flavor."
|
||||
taste_description = "cinnamon cola"
|
||||
|
||||
glass_name = "Space Cola Cinnamon"
|
||||
glass_desc = "A glass of limited-edition Space Cola Cinnamon."
|
||||
|
||||
/datum/reagent/drink/soda/space_up/cranberry
|
||||
name = "Space-Up Cranberry"
|
||||
id = "space_upcranberry"
|
||||
description = "Space-Up with a cranberry and spice twist."
|
||||
taste_description = "cranberry soda"
|
||||
color = "#c21e26"
|
||||
|
||||
glass_name = "Space-Up Cranberry"
|
||||
glass_desc = "Space-Up Cranberry. Citrus intermingles with tart cranberry and a hint of spice."
|
||||
|
||||
/datum/reagent/drink/coffee/peppermint_mocha
|
||||
name = "Vanilla Peppermint Mocha"
|
||||
id = "peppermint_mocha"
|
||||
description = "A nice, tasty beverage for the holiday season."
|
||||
taste_description = "creamy, minty vanilla"
|
||||
color = "#9C714C"
|
||||
adj_temp = 5
|
||||
nutrition = 1
|
||||
|
||||
glass_name = "Vanilla Peppermint Mocha"
|
||||
glass_desc = "A nice, tasty beverage for the holiday season."
|
||||
|
||||
/datum/reagent/ethanol/caramelwhiskey
|
||||
name = "Caramel Whiskey"
|
||||
id = "caramelwhiskey"
|
||||
description = "A decadent caramel-flavored whiskey."
|
||||
taste_description = "boozy caramel"
|
||||
color = "#AB5A11"
|
||||
proof = SCHNAPPS
|
||||
|
||||
glass_name = "Caramel Whiskey"
|
||||
glass_desc = "A cloyingly sweet mixture of whiskey and salted caramel."
|
||||
|
||||
/datum/reagent/ethanol/caramel_russian
|
||||
name = "Caramel White Russian"
|
||||
id = "caramelrussian"
|
||||
description = "Caramel whiskey, coffee liqueur and a generous serving of cream for good measure."
|
||||
taste_description = "caramel icecream"
|
||||
color = "#A68340"
|
||||
proof = (SCHNAPPS+KAHLUA)/3
|
||||
|
||||
glass_name = "Caramel White Russian"
|
||||
glass_desc = "Who's to say russians can't drink whiskey once in a while?"
|
||||
|
||||
/datum/reagent/ethanol/caramel_cider
|
||||
name = "Salted Caramel Cider"
|
||||
id = "caramelcider"
|
||||
description = "Caramel whiskey that has been diluted in hard cider."
|
||||
taste_description = "alcoholic caramel apples"
|
||||
color = "#A68340"
|
||||
proof = (SCHNAPPS+CIDER*2)/3
|
||||
|
||||
glass_name = "Salted Caramel Cider"
|
||||
glass_desc = "The sweet union of crisp apple and smooth caramel. And alcohol, obviously."
|
||||
|
||||
// Seasonals - Halloween
|
||||
|
||||
/datum/reagent/drink/soda/licorice
|
||||
name = "Space Cola Licorice"
|
||||
id = "licoricecola"
|
||||
description = "The classic taste of Space Cola infused with black and red licorice mix."
|
||||
taste_description = "fizzy black and red licorice"
|
||||
|
||||
glass_name = "Space Cola Licorice"
|
||||
glass_desc = "A glass of limited-edition Space Cola Licorice."
|
||||
|
||||
/datum/reagent/drink/soda/dr_gibb/mystery
|
||||
name = "Dr. Gibb Mystery"
|
||||
id = "dr_gibbmystery"
|
||||
description = "A proudly mysterious halloween-themed variant of Dr. Gibb."
|
||||
taste_description = "assorted fruit candy"
|
||||
|
||||
glass_name = "Dr. Gibb Mystery"
|
||||
glass_desc = "A glass of limited-edition Dr. Gibb Mystery."
|
||||
glass_special = list(DRINK_FIZZ)
|
||||
|
||||
/datum/reagent/ethanol/sourappleschnapps
|
||||
name = "Sour Apple Schnapps"
|
||||
id = "sourappleschnapps"
|
||||
description = "A strong artificially-flavoured liqueur meant for mixing."
|
||||
taste_description = "extremely tart and sweet apple"
|
||||
color = "#009619"
|
||||
proof = SCHNAPPS
|
||||
|
||||
glass_name = "Sour Apple Schnapps"
|
||||
glass_desc = "Something tells you it would be unwise to drink this straight."
|
||||
|
||||
/datum/reagent/ethanol/candycornvodka
|
||||
name = "Candy Corn Vodka"
|
||||
id = "candycornvodka"
|
||||
description = "Vodka infused with an assortment of artificial flavourings to mimic the taste of candy corn."
|
||||
taste_description = "strong alcohol with tones of marshmallow and caramel"
|
||||
color = "#ff7b00"
|
||||
proof = VODKA*0.9
|
||||
|
||||
glass_name = "Candy Corn Vodka"
|
||||
glass_desc = "Practically candy in a glass."
|
||||
|
||||
/datum/reagent/ethanol/appletini
|
||||
name = "Appletini"
|
||||
id = "appletini"
|
||||
description = "A bright-green cocktail originally designed to not taste like alcohol."
|
||||
taste_description = "green apple candy"
|
||||
color = "#9be720"
|
||||
proof = (2*VODKA+SCHNAPPS)/4
|
||||
|
||||
glass_name = "Appletini"
|
||||
glass_desc = "If it goes in the V-shaped glass, it's a Martini. Simple as."
|
||||
|
||||
/datum/reagent/ethanol/sourapplemimosa
|
||||
name = "Sour Apple Mimosa"
|
||||
id = "sourapplemimosa"
|
||||
description = "An green apple-based twist on the Mimosa. Just as refreshing."
|
||||
taste_description = "fizzy apple sourness"
|
||||
color = "#119400"
|
||||
proof = (2*WINE+SCHNAPPS)/3
|
||||
|
||||
glass_name = "Sour Apple Mimosa"
|
||||
glass_desc = "A bubbly and tart refreshment."
|
||||
|
||||
/datum/reagent/ethanol/sourapplefizz
|
||||
name = "Sour Apple Fizz"
|
||||
id = "sourapplefizz"
|
||||
description = "A low-proof drink consisting of sour apple schnapps and lime juice diluted into soda water."
|
||||
taste_description = "airy green apple soda"
|
||||
color = "#2bf32b"
|
||||
proof = SCHNAPPS/4
|
||||
|
||||
glass_name = "Sour Apple Fizz"
|
||||
glass_desc = "The Mojito wishes it could be this green."
|
||||
|
||||
/datum/reagent/ethanol/candycornmartini
|
||||
name = "Candy Corn Martini"
|
||||
id = "candycornmartini"
|
||||
description = "A classic halloween cocktail, meant to be carefully layered in the glass to look like the candy."
|
||||
taste_description = "creamy vanilla and honey"
|
||||
color = "#ee8b19"
|
||||
proof = (VODKA)/3
|
||||
|
||||
glass_name = "Candy Corn Martini"
|
||||
glass_desc = "If it goes in the V-shaped glass, it's a Martini. This one even has a colored sugar rim."
|
||||
|
||||
/datum/reagent/ethanol/halloweenpunch
|
||||
name = "Halloween Punch"
|
||||
id = "halloweenpunch"
|
||||
description = "A neon-orange beverage consisting of fruit juices and flavoured vodka. Commonly made in large quantities for halloween parties."
|
||||
taste_description = "sweet tangy citrus"
|
||||
color = "#ff9c00"
|
||||
proof = (VODKA)/3
|
||||
|
||||
glass_name = "Halloween Punch"
|
||||
glass_desc = "It's staring at you!"
|
||||
|
||||
Reference in New Issue
Block a user