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
2026-05-29 02:45:35 -04:00
committed by GitHub
parent dd8475cc36
commit 154e024607
22 changed files with 598 additions and 41 deletions
@@ -14,7 +14,7 @@
description_fluff = "Stealth Assault Enterprises ex-contractors once decided to make a cigarette that was easy to light and had a waterproof case, specifically tailored for soldiers. They created Jerichos. Jerichos are known for their hickory smoke and warm feeling in your lungs. They are loved by soldiers and people employed in para-military outfits."
/obj/item/storage/fancy/cigarettes/menthols
description_fluff = "The Temperamento Menthol Company is a large cigarette company based in Mars. They have been around since the very dawn of human colonization and have remained a favorite for those seeking a more numbing cigarette.<br>\
description_fluff = "The Temperamento Tobacco Company is a large cigarette company based in Mars. They have been around since the very dawn of human colonization and have remained a favorite for those seeking a more numbing cigarette.<br>\
<br>\
This is a pack of Temperamento Menthols, the main product of the company. They taste like menthol, surprisingly enough."
@@ -33,6 +33,20 @@
/obj/item/storage/fancy/cigarettes/subrosas
description_fluff = "The flagship product of it's namesake Eridanian company, Subrosa cigarettes contain no tobacco or nicotine and are instead made with a selection of dried aromatic herbs and extracts including, presumably, roses. Each sepia-colored roll smells faintly of cloves and cinnamon."
// Seasonals
/obj/item/storage/fancy/cigarettes/vanillas
description_fluff = "The Temperamento Tobacco Company is a large cigarette company based on Mars. They have been around since the very dawn of human colonization and have remained a favorite for those seeking a more numbing cigarette.<br>\
<br>\
This is a pack of Temperamento Vanillas. These are only made in limited numbers each year as a holiday seasonal for specific markets. Hoard them while you can!"
/obj/item/storage/fancy/cigarettes/kaijus
description_fluff = "Kaiju Tobacco Incorporated is a recent entrant to the flavoured cigarette market, hailing from from the colony station of Kyoto XII, their business is almost entirely aimed at unregulated frontier markets, with flavours being rotated on a seasonal basis.<br>\
<br>\
This is a pack of Kaiju Cherries. It's one of their most popular variants, sold only during October. Everything from the tobacco, to the paper and filter are scented and laced with sweeteners."
// Cigars
/obj/item/clothing/mask/smokable/cigarette/cigar
description_fluff = "While the label does say that this is a 'premium cigar', it really cannot match other types of cigars on the market. Is it a quality cigarette? Perhaps. Was it hand-made with care? No. This is what differentiates between quality products that Gilthari puts out and Nanotrasen 'premium' cigars like this one."
@@ -95,6 +95,9 @@ Drinks Data
/datum/reagent/drink/juice/orange
glass_icon_state = "glass_orange"
/datum/reagent/drink/juice/pineapple
glass_icon_state = "glass_lemonjuice"
/datum/reagent/toxin/poisonberryjuice
glass_icon_state = "poisonberryjuice"
@@ -990,6 +993,10 @@ Drinks Data
/datum/reagent/ethanol/coquito
glass_icon_state = "coconut"
/datum/reagent/ethanol/adiosmotherfucker
glass_icon_state = "amf"
glass_center_of_mass = list("x"=16, "y"=5)
/datum/reagent/ethanol/bludsfizz
glass_icon_state = "blud_orange"
@@ -1021,3 +1028,44 @@ Drinks Data
/datum/reagent/ethanol/mimosa
glass_icon_state = "mimosa"
glass_center_of_mass = list("x"=16, "y"=8)
//Seasonals - Xmas
/datum/reagent/ethanol/caramelwhiskey
glass_icon_state = "caramelwhiskeyglass"
glass_center_of_mass = list("x"=16, "y"=12)
/datum/reagent/ethanol/caramel_russian
glass_icon_state = "caramelrussianglass"
glass_center_of_mass = list("x"=16, "y"=9)
/datum/reagent/ethanol/caramel_cider
glass_icon_state = "caramelciderglass"
//Seasonals - Halloween
/datum/reagent/ethanol/sourappleschnapps
glass_icon_state = "sourappleglass"
glass_center_of_mass = list("x"=16, "y"=5)
/datum/reagent/ethanol/candycornvodka
glass_icon_state = "candycornglass"
/datum/reagent/ethanol/appletini
glass_icon_state = "appletini"
glass_center_of_mass = list("x"=17, "y"=8)
/datum/reagent/ethanol/sourapplemimosa
glass_icon_state = "sourapplemimosa"
glass_center_of_mass = list("x"=16, "y"=8)
/datum/reagent/ethanol/sourapplefizz
glass_icon_state = "sourapplefizz"
glass_center_of_mass = list("x"=16, "y"=7)
/datum/reagent/ethanol/candycornmartini
glass_icon_state = "candycornmartini"
glass_center_of_mass = list("x"=17, "y"=8)
/datum/reagent/ethanol/halloweenpunch
glass_icon_state = "halloweenpunch"
@@ -147,3 +147,31 @@
icon_state = "winebottle"
center_of_mass = list("x"=16, "y"=4)
start_with_single_reagent = /datum/reagent/ethanol/wine
//Seasonal - Xmas
/obj/item/reagent_containers/food/drinks/bottle/caramelwhiskey
name = "Al-Karamil Whiskey Liqueur"
desc = "A limited-edition bottle of decadent caramel-flavored whiskey.<br>\
It has a Gilthari Exports sticker on it."
icon_state = "caramelwhiskeybottle"
center_of_mass = list("x"=16, "y"=2)
start_with_single_reagent = /datum/reagent/ethanol/caramelwhiskey
//Seasonal - Halloween
/obj/item/reagent_containers/food/drinks/bottle/sourappleschnapps
name = "Lich King Emerald"
desc = "Notice: Unapologetically Evil neon-green liqueur inside. Imbibe at your own risk. Sour apple flavoured Schnapps.<br>\
It has a Gilthari Exports sticker on it."
icon_state = "sourappleschnapps"
center_of_mass = list("x"=17, "y"=3)
start_with_single_reagent = /datum/reagent/ethanol/sourappleschnapps
/obj/item/reagent_containers/food/drinks/bottle/candycornvodka
name = "Goopy's Candy Corn Vodka"
desc = "The fruit of some unholy promotional crossover, it has a drawing of a clumsy ghost girl with untied shoelaces on the label.<br>\
It has a Gilthari Exports sticker on it."
icon_state = "candycornvodka"
center_of_mass = list("x"=17, "y"=2)
start_with_single_reagent = /datum/reagent/ethanol/candycornvodka
+63
View File
@@ -198,6 +198,16 @@
. = ..()
reagents.add_reagent("grapejuice", 30)
/obj/item/reagent_containers/food/drinks/cans/pineapple_juice
name = "\improper Pineapple Juice"
desc = "You can almost hear the waves crashing already! Almost!"
icon_state = "pineapple_can"
center_of_mass = list("x"=16, "y"=10)
/obj/item/reagent_containers/food/drinks/cans/pineapple_juice/Initialize(mapload)
. = ..()
reagents.add_reagent("pineapplejuice", 30)
/obj/item/reagent_containers/food/drinks/cans/tonic
name = "\improper T-Borg's Tonic Water"
desc = "Quinine tastes funny, but at least it'll keep that Space Malaria away."
@@ -382,3 +392,56 @@
. = ..()
reagents.add_reagent("water", 40) //Important for Crafting Recipes Also means Colonists don't need station/hotsprings for water.
// Seasonals - Xmas
/obj/item/reagent_containers/food/drinks/cans/cola_cinnamon
name = "\improper Space Cola Cinnamon"
desc = "The classic taste of Space Cola with a hint of warm cinnamon flavor. Happy Holidays!"
icon_state = "cinnamoncola"
center_of_mass = list("x"=16, "y"=10)
/obj/item/reagent_containers/food/drinks/cans/cola_cinnamon/Initialize(mapload)
. = ..()
reagents.add_reagent("cinnamoncola", 30)
/obj/item/reagent_containers/food/drinks/cans/space_upcranberry
name = "\improper Space-Up Cranberry"
desc = "Space-Up with a cranberry and spice twist. Happy Holidays!"
icon_state = "space-upcranberry"
center_of_mass = list("x"=16, "y"=10)
/obj/item/reagent_containers/food/drinks/cans/space_upcranberry/Initialize(mapload)
. = ..()
reagents.add_reagent("space_upcranberry", 30)
/obj/item/reagent_containers/food/drinks/cans/robustexpresspeppermint
name = "\improper Robust Express Peppermint Mocha"
desc = "Delicious caffeine infused with creamy vanilla and peppermint flavor. It's pleasantly warm to the touch."
icon_state = "robustexpresspeppermint"
center_of_mass = list("x"=16, "y"=10)
/obj/item/reagent_containers/food/drinks/cans/robustexpresspeppermint/Initialize(mapload)
. = ..()
reagents.add_reagent("peppermint_mocha", 30)
// Seasonals - Halloween
/obj/item/reagent_containers/food/drinks/cans/cola_licorice
name = "\improper Space Cola Licorice"
desc = "The classic taste of Space Cola infused with red and black licorice mix. Happy Halloween!"
icon_state = "licoricecola"
center_of_mass = list("x"=16, "y"=10)
/obj/item/reagent_containers/food/drinks/cans/cola_licorice/Initialize(mapload)
. = ..()
reagents.add_reagent("licoricecola", 30)
/obj/item/reagent_containers/food/drinks/cans/dr_gibb_mystery
name = "\improper Dr. Gibb Mystery"
desc = "A mysterious seasonal variant of Dr. Gibb. Happy Halloween!"
icon_state = "dr_gibbmystery"
center_of_mass = list("x"=16, "y"=10)
/obj/item/reagent_containers/food/drinks/cans/dr_gibb_mystery/Initialize(mapload)
. = ..()
reagents.add_reagent("dr_gibbmystery", 30)
+5 -5
View File
@@ -48,8 +48,8 @@
/obj/item/reagent_containers/food/drinks/bludboxmax
name = "Bludbox MAX carton"
desc = "A vampire's best friend! This Bludbox contains only the most delicious of organic, free-range O-Negatives. For all your dietary needs!"
volume = 30
desc = "A vampire's best friend! This Bludbox contains only the most delicious of organic, ethically-sourced O-Negatives. For all your dietary needs!"
volume = 50
icon_state = "bludboxmax"
center_of_mass = list("x"=16, "y"=9)
drop_sound = 'sound/items/drop/cardboardbox.ogg'
@@ -59,7 +59,7 @@
/obj/item/reagent_containers/food/drinks/bludboxmaxlight
name = "Bludbox MAX Light carton"
desc = "A bloodsucking vegan's hipster alternative to drinking the red stuff. Bludbox light is just the same as drinking straight from the source! Comes in O- flavour."
volume = 30
volume = 50
icon_state = "bludboxmaxlight"
center_of_mass = list("x"=16, "y"=9)
drop_sound = 'sound/items/drop/cardboardbox.ogg'
@@ -70,7 +70,7 @@
/obj/item/reagent_containers/food/drinks/bludbox
name = "Bludbox carton"
desc = "The pop alternative to drinking real, human blood! Comes in blood flavour and contains all the dietary requirements for your undead friends."
volume = 30
volume = 50
icon_state = "bludbox"
center_of_mass = list("x"=16, "y"=9)
drop_sound = 'sound/items/drop/cardboardbox.ogg'
@@ -81,7 +81,7 @@
/obj/item/reagent_containers/food/drinks/bludboxlight
name = "Bludbox Light carton"
desc = "The pop alternative to drinking real, human blood! Comes in blood flavour and contains all the dietary requirements for your undead friends. This one has less sweeteners, gross!"
volume = 30
volume = 50
icon_state = "bludboxlight"
center_of_mass = list("x"=16, "y"=9)
drop_sound = 'sound/items/drop/cardboardbox.ogg'
+90
View File
@@ -7085,3 +7085,93 @@ END CITADEL CHANGE */
. = ..()
reagents.add_reagent("protein", 3)
reagents.add_reagent("triglyceride", 1)
//Seasonals - Xmas
/obj/item/reagent_containers/food/snacks/gingerbreadcookie
name = "gingerbread cookie"
desc = "A gingerbread individual. You struggle to ascertain their gender."
icon_state = "gingerbread"
filling_color = "#7D5F46"
nutriment_amt = 1
nutriment_desc = list("gingerbread" = 2)
bitesize = 1
/obj/item/reagent_containers/food/snacks/gingerbreadcookie/cane
name = "gingerbread cookie"
desc = "A gingerbread cane with stripes drawn in icing."
icon_state = "gingerbreadcane"
filling_color = "#7D5F46"
nutriment_amt = 1
nutriment_desc = list("gingerbread" = 2)
bitesize = 1
/obj/item/reagent_containers/food/snacks/gingerbreadcookie/tree
name = "gingerbread cookie"
desc = "A small conifer of the gingerbread species."
icon_state = "gingerbreadtree"
filling_color = "#7D5F46"
nutriment_amt = 1
nutriment_desc = list("gingerbread" = 2)
bitesize = 1
/obj/item/reagent_containers/food/snacks/gingerbreadcookie/star
name = "gingerbread cookie"
desc = "A gingerbread star. Presumably of the astronomical rather than marine variety, but you're not sure."
icon_state = "gingerbreadstar"
filling_color = "#7D5F46"
nutriment_amt = 1
nutriment_desc = list("gingerbread" = 2)
bitesize = 1
/obj/item/reagent_containers/food/snacks/stroopwafel
name = "stroopwafel"
desc = "A pair of thin wafers glued together with thick, syrupy caramel. Delicious."
icon_state = "stroopwafel"
filling_color = "#7D5F46"
nutriment_amt = 3
nutriment_desc = list("wafer" = 2, "caramel" = 1)
bitesize = 1
/obj/item/reagent_containers/food/snacks/sliceable/holidaycake
name = "Holiday Fruit Cake"
desc = "A perfectly preserved holiday fruit cake. The hole in the middle makes it a breeze to cut even if you're using a bayonet."
icon_state = "holidaycake"
slice_path = /obj/item/reagent_containers/food/snacks/slice/holidaycake
slices_num = 5
filling_color = "#3b2b0d"
nutriment_desc = list("cake" = 10, "sweetness" = 10, "candied berry" = 15)
nutriment_amt = 25
/obj/item/reagent_containers/food/snacks/sliceable/holidaycake/Initialize(mapload)
. = ..()
reagents.add_reagent("tricordrazine", 15)
reagents.add_reagent("paracetamol", 5)
bitesize = 5
/obj/item/reagent_containers/food/snacks/slice/holidaycake
name = "Holiday Fruit Cake slice"
desc = "A festive slice of holiday fruit cake. Great for sharing with squadmates!"
icon_state = "holidaycake_slice"
filling_color = "#3b2b0d"
bitesize = 2
nutriment_desc = list("cake" = 10, "sweetness" = 10, "candied berry" = 15)
whole_path = /obj/item/reagent_containers/food/snacks/sliceable/holidaycake
/obj/item/reagent_containers/food/snacks/slice/holidaycake/filled
filled = TRUE
//Seasonals - Halloween
/obj/item/reagent_containers/food/snacks/candycornjelloshot
name = "Candy Corn Jello Shot"
desc = "A layered shot of Candy Corn Martini solidified using gelatin."
icon_state = "candycornjelloshot"
filling_color = "#ff7b00"
nutriment_desc = list("candy corn" = 2)
bitesize = 5
/obj/item/reagent_containers/food/snacks/candycornjelloshot/Initialize(mapload)
. = ..()
reagents.add_reagent("candycornmartini", 5)
bitesize = 5
+5 -6
View File
@@ -104,14 +104,13 @@
humanity is put in true danger by the Moghes slaver menace."
/datum/lore/codex/page/vetalans
name = "AD: Vetalans Syndrome: You are not alone."
data = "You don't know where you got it. You don't know why it had to be you. You wish you could enjoy food like you used to, you wish you didn't have \
to go to the doctor to get blood donations so often. You are not alone, Vetalans Syndrome effects more people every day. You may think you are a monster \
name = "AD: Vetalan Syndrome: You are not alone."
data = "You don't know where you got it. You don't know why it had to be you. You wish you could enjoy food like you used to. You are not alone, Vetalan Syndrome effects more people every day. You may think you are a monster \
that the thirst for blood makes you inhuman. Can you no longer stand having the lights on at home? You are not alone, we at the Vetalan Outreach Society know \
hard living with Vetalans Syndrome can be since we have been through it too. We know how you feel and we are here to help you live with you.\
hard living with Vetalan Syndrome can be since we have been through it too. We know how you feel and we are here to help you live with you.\
<br><br>\
Call us at 0530.1946.221.650.999 within participating systems to be contacted by one of our representatives. We can arrange free deliveries of bloodpacks, \
and complimentary examinations by doctors specialized in treating patients with Vetalans Syndrome. We can also put you in contact with support groups \
Call us at 0530.1946.221.650.999 within participating systems to be contacted by one of our representatives. We can arrange examinations by doctors specialized \
in treating patients with Vetalan Syndrome. We can also put you in contact with support groups \
and other Vetalans in your areas to make sure you are not suffering alone.\
<br><br>\
Remeber you are not alone, you are not a monster, you are alive, we can help you. Call Today."
@@ -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
+7 -7
View File
@@ -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!"