Skip to content
This repository was archived by the owner on May 22, 2025. It is now read-only.

Commit d0f9c33

Browse files
authored
Caffeine junkie quirk + drink tweaks (#22385)
* whoops i sorta featurecrept the pr * Update negative.dm * Update drink_reagents.dm * more * Update drinks_recipes.dm * Update drinks_recipes.dm * Update negative.dm * tweaks * Update drug_reagents.dm * Update negative.dm
1 parent 3c677e9 commit d0f9c33

File tree

25 files changed

+425
-356
lines changed

25 files changed

+425
-356
lines changed

code/datums/traits/negative.dm

Lines changed: 22 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -642,14 +642,29 @@
642642
drug_container_type = pick(/obj/item/reagent_containers/food/drinks/beer/light/plastic)
643643
. = ..()
644644

645+
/datum/quirk/junkie/caffeine
646+
name = "Caffeine Addict"
647+
desc = "Whether it's punching through drywall while on Grey Bull, or downing 100 cups of coffee in a day, you can't get enough caffeine."
648+
icon = "mug-hot"
649+
value = -2
650+
mood_quirk = TRUE
651+
gain_text = span_danger("You could really use some caffeine right about now.")
652+
lose_text = span_notice("You no longer feel dependent on caffeine to function.")
653+
medical_record_text = "Patient is known to be dependent on caffeine."
654+
reagent_type = /datum/reagent/drug/caffeine
655+
junkie_warning = "You suddenly feel like you need some caffeine..."
656+
var/list/weighted_items = list(
657+
/obj/item/reagent_containers/food/drinks/coffee = 200,
658+
/obj/item/reagent_containers/food/drinks/soda_cans/grey_bull = 100,
659+
/obj/item/reagent_containers/food/drinks/soda_cans/monkey_energy = 100,
660+
/obj/item/reagent_containers/food/drinks/mug/tea = 50,
661+
/obj/item/reagent_containers/food/drinks/soda_cans/thirteenloko = 1, //super rare because it's dangerous
662+
/obj/item/reagent_containers/food/drinks/bottle/nukacola = 1 //super rare to get nuka cola because it's actually kinda bad (irradiates you)
663+
)
645664

646-
/datum/quirk/junkie/drunkard/check_quirk(datum/preferences/prefs)
647-
var/datum/species/species_type = prefs.read_preference(/datum/preference/choiced/species)
648-
var/disallowed_trait = !(initial(species_type.inherent_biotypes) & MOB_ORGANIC) //if you can't process organic chems you couldn't get addicted in the first place
649-
650-
if(disallowed_trait)
651-
return "You don't process normal chemicals!"
652-
return FALSE
665+
/datum/quirk/junkie/caffeine/on_spawn()
666+
drug_container_type = pickweight(weighted_items)
667+
return ..()
653668

654669
/datum/quirk/unstable
655670
name = "Unstable"

code/modules/cargo/bounties/reagent.dm

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
var/static/list/possible_reagents = list(\
4141
/datum/reagent/consumable/ethanol/antifreeze,\
4242
/datum/reagent/consumable/ethanol/andalusia,\
43-
/datum/reagent/consumable/tea/arnold_palmer,\
43+
/datum/reagent/consumable/tea/hot/arnold_palmer,\
4444
/datum/reagent/consumable/ethanol/b52,\
4545
/datum/reagent/consumable/ethanol/bananahonk,\
4646
/datum/reagent/consumable/ethanol/beepsky_smash,\
@@ -66,8 +66,8 @@
6666
/datum/reagent/consumable/ethanol/rum_coke,\
6767
/datum/reagent/consumable/ethanol/screwdrivercocktail,\
6868
/datum/reagent/consumable/ethanol/snowwhite,\
69-
/datum/reagent/consumable/soy_latte,\
70-
/datum/reagent/consumable/cafe_latte,\
69+
/datum/reagent/consumable/coffee/hot/latte/soy,\
70+
/datum/reagent/consumable/coffee/hot/latte,\
7171
/datum/reagent/consumable/ethanol/syndicatebomb,\
7272
/datum/reagent/consumable/ethanol/tequila_sunrise,\
7373
/datum/reagent/consumable/ethanol/manly_dorf,\
@@ -112,7 +112,7 @@
112112
/datum/reagent/consumable/ethanol/silencer,\
113113
/datum/reagent/consumable/ethanol/peppermint_patty,\
114114
/datum/reagent/consumable/ethanol/aloe,\
115-
/datum/reagent/consumable/pumpkin_latte)
115+
/datum/reagent/consumable/coffee/hot/latte/pumpkin)
116116

117117
var/reagent_type = pick(possible_reagents)
118118
wanted_reagent = new reagent_type

code/modules/food_and_drinks/coffeemaker.dm

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -404,7 +404,7 @@
404404
icon = 'icons/obj/machines/coffeemaker.dmi'
405405
icon_state = "cartridge_basic"
406406
var/charges = 4
407-
var/list/drink_type = list(/datum/reagent/consumable/coffee = 120)
407+
var/list/drink_type = list(/datum/reagent/consumable/coffee/hot = 120)
408408

409409
/obj/item/coffee_cartridge/examine(mob/user)
410410
. = ..()
@@ -716,7 +716,7 @@
716716
if(!try_brew())
717717
return
718718
operate_for(brew_time)
719-
coffeepot.reagents.add_reagent_list(list(/datum/reagent/consumable/coffee = 120))
719+
coffeepot.reagents.add_reagent_list(list(/datum/reagent/consumable/coffee/hot = 120))
720720
coffee.Cut(1,2) //remove the first item from the list
721721
coffee_amount--
722722
update_appearance(UPDATE_OVERLAYS)

code/modules/food_and_drinks/drinks/drinks.dm

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -206,7 +206,7 @@
206206
desc = "Careful, the beverage you're about to enjoy is extremely hot."
207207
icon = 'icons/obj/food/containers.dmi'
208208
icon_state = "coffee"
209-
list_reagents = list(/datum/reagent/consumable/coffee = 30)
209+
list_reagents = list(/datum/reagent/consumable/coffee/hot = 30)
210210
resistance_flags = FREEZE_PROOF
211211
isGlass = FALSE
212212
foodtype = BREAKFAST
@@ -252,7 +252,7 @@
252252
/obj/item/reagent_containers/food/drinks/mug/tea
253253
name = "Duke Purple tea"
254254
desc = "An insult to Duke Purple is an insult to the Space Queen! Any proper gentleman will fight you, if you sully this tea."
255-
list_reagents = list(/datum/reagent/consumable/tea = 30)
255+
list_reagents = list(/datum/reagent/consumable/tea/hot = 30)
256256

257257
/obj/item/reagent_containers/food/drinks/mug/coco
258258
name = "Dutch hot coco"
@@ -493,7 +493,7 @@
493493
desc = "A soft drink made from roots. Non-Alcoholic."
494494
custom_price = 10
495495
icon_state = "Rootbeer_Mug"
496-
list_reagents = list(/datum/reagent/consumable/rootbeer = 30)
496+
list_reagents = list(/datum/reagent/consumable/space_cola/rootbeer = 30)
497497
foodtype = SUGAR
498498

499499
/obj/item/reagent_containers/food/drinks/soda_cans/rootbeer/Initialize(mapload)
@@ -551,7 +551,7 @@
551551
name = "Space Mountain Wind"
552552
desc = "Blows right through you like a space wind."
553553
icon_state = "space_mountain_wind"
554-
list_reagents = list(/datum/reagent/consumable/spacemountainwind = 30)
554+
list_reagents = list(/datum/reagent/consumable/space_cola/spacemountainwind = 30)
555555
foodtype = SUGAR | JUNKFOOD
556556

557557
/obj/item/reagent_containers/food/drinks/soda_cans/thirteenloko
@@ -565,7 +565,7 @@
565565
name = "Dr. Gibb"
566566
desc = "A delicious mixture of 42 different flavors."
567567
icon_state = "dr_gibb"
568-
list_reagents = list(/datum/reagent/consumable/dr_gibb = 30)
568+
list_reagents = list(/datum/reagent/consumable/space_cola/dr_gibb = 30)
569569
foodtype = SUGAR | JUNKFOOD
570570

571571
/obj/item/reagent_containers/food/drinks/soda_cans/pwr_game
@@ -585,14 +585,14 @@
585585
name = "Grey Bull"
586586
desc = "Grey Bull, it gives you gloves!"
587587
icon_state = "energy_drink"
588-
list_reagents = list(/datum/reagent/consumable/grey_bull = 20)
588+
list_reagents = list(/datum/reagent/consumable/energy_drink/grey_bull = 20)
589589
foodtype = SUGAR | JUNKFOOD
590590

591591
/obj/item/reagent_containers/food/drinks/soda_cans/monkey_energy
592592
name = "Monkey Energy"
593593
desc = "Unleash the ape!"
594594
icon_state = "monkey_energy"
595-
list_reagents = list(/datum/reagent/consumable/monkey_energy = 50)
595+
list_reagents = list(/datum/reagent/consumable/energy_drink/monkey_energy = 50)
596596
foodtype = SUGAR | JUNKFOOD
597597

598598
/obj/item/reagent_containers/food/drinks/soda_cans/sprited_cranberry

code/modules/food_and_drinks/drinks/drinks/bottle.dm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -499,7 +499,7 @@
499499
name = "Nuka Cola"
500500
desc = "Don't cry, Don't raise your eye, it's only nuclear wasteland."
501501
icon_state = "nuka_colaglass"
502-
list_reagents = list(/datum/reagent/consumable/nuka_cola = 50)
502+
list_reagents = list(/datum/reagent/consumable/energy_drink/nuka_cola = 50)
503503

504504
////////////////////////// MOLOTOV ///////////////////////
505505
/obj/item/reagent_containers/food/drinks/bottle/molotov

code/modules/food_and_drinks/drinks/drinks/drinkingglass.dm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@
9292

9393
/obj/item/reagent_containers/food/drinks/drinkingglass/filled/nuka_cola
9494
name = "Nuka Cola"
95-
list_reagents = list(/datum/reagent/consumable/nuka_cola = 50)
95+
list_reagents = list(/datum/reagent/consumable/energy_drink/nuka_cola = 50)
9696

9797
/obj/item/reagent_containers/food/drinks/drinkingglass/attackby(obj/item/I, mob/user, params)
9898
if(istype(I, /obj/item/reagent_containers/food/snacks/egg)) //breaking eggs

code/modules/food_and_drinks/food/snacks_frozen.dm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -301,7 +301,7 @@
301301
name = "Space Mountain Wind snowcone"
302302
desc = "Space Mountain Wind drizzled over a snowball in a paper cup."
303303
icon_state = "mountainwind_sc"
304-
list_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/spacemountainwind = 5)
304+
list_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/space_cola/spacemountainwind = 5)
305305
tastes = list("ice" = 1, "water" = 1, "mountain wind" = 5)
306306

307307
/obj/item/reagent_containers/food/snacks/snowcones/pwrgame

code/modules/food_and_drinks/food/snacks_pastry.dm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -579,7 +579,7 @@
579579
desc = "Spooky! It's got delicious coffee flavouring!"
580580
icon = 'icons/obj/halloween_items.dmi'
581581
icon_state = "coffincookie"
582-
list_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/consumable/sugar = 3, /datum/reagent/consumable/coffee = 3)
582+
list_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/consumable/sugar = 3, /datum/reagent/consumable/coffee/hot = 3)
583583
tastes = list("cookie" = 2, "coffee" = 1, "sweetness" = 1)
584584

585585
/obj/item/reagent_containers/food/snacks/chococornet

code/modules/food_and_drinks/kitchen_machinery/grill.dm

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -64,10 +64,10 @@
6464
grill_loop.start()
6565
return
6666
else
67-
if(I.reagents.has_reagent(/datum/reagent/consumable/monkey_energy))
68-
grill_fuel += (20 * (I.reagents.get_reagent_amount(/datum/reagent/consumable/monkey_energy)))
67+
if(I.reagents.has_reagent(/datum/reagent/consumable/energy_drink/monkey_energy))
68+
grill_fuel += (20 * (I.reagents.get_reagent_amount(/datum/reagent/consumable/energy_drink/monkey_energy)))
6969
to_chat(user, span_notice("You pour the Monkey Energy in [src]."))
70-
I.reagents.remove_reagent(/datum/reagent/consumable/monkey_energy, I.reagents.get_reagent_amount(/datum/reagent/consumable/monkey_energy))
70+
I.reagents.remove_reagent(/datum/reagent/consumable/energy_drink/monkey_energy, I.reagents.get_reagent_amount(/datum/reagent/consumable/energy_drink/monkey_energy))
7171
update_appearance(UPDATE_ICON)
7272
return
7373
..()

code/modules/food_and_drinks/recipes/drinks_recipes.dm

Lines changed: 35 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -33,20 +33,20 @@
3333

3434
/datum/chemical_reaction/icetea
3535
name = "Iced Tea"
36-
id = /datum/reagent/consumable/icetea
37-
results = list(/datum/reagent/consumable/icetea = 4)
38-
required_reagents = list(/datum/reagent/consumable/ice = 1, /datum/reagent/consumable/tea = 3)
36+
id = /datum/reagent/consumable/tea/cold
37+
results = list(/datum/reagent/consumable/tea/cold = 4)
38+
required_reagents = list(/datum/reagent/consumable/ice = 1, /datum/reagent/consumable/tea/hot = 3)
3939

4040
/datum/chemical_reaction/icecoffee
4141
name = "Iced Coffee"
42-
id = /datum/reagent/consumable/icecoffee
43-
results = list(/datum/reagent/consumable/icecoffee = 4)
44-
required_reagents = list(/datum/reagent/consumable/ice = 1, /datum/reagent/consumable/coffee = 3)
42+
id = /datum/reagent/consumable/coffee/ice
43+
results = list(/datum/reagent/consumable/coffee/ice = 4)
44+
required_reagents = list(/datum/reagent/consumable/ice = 1, /datum/reagent/consumable/coffee/hot = 3)
4545

4646
/datum/chemical_reaction/nuka_cola
4747
name = "Nuka Cola"
48-
id = /datum/reagent/consumable/nuka_cola
49-
results = list(/datum/reagent/consumable/nuka_cola = 6)
48+
id = /datum/reagent/consumable/energy_drink/nuka_cola
49+
results = list(/datum/reagent/consumable/energy_drink/nuka_cola = 6)
5050
required_reagents = list(/datum/reagent/uranium = 1, /datum/reagent/consumable/space_cola = 6)
5151

5252
/datum/chemical_reaction/moonshine
@@ -58,9 +58,9 @@
5858

5959
/datum/chemical_reaction/gravedigger
6060
name = "Grave-Digger"
61-
id = /datum/reagent/consumable/graveyard
62-
results = list(/datum/reagent/consumable/gravedigger = 3)
63-
required_reagents = list(/datum/reagent/consumable/space_cola = 1, /datum/reagent/consumable/dr_gibb = 1, /datum/reagent/consumable/space_up = 1) //soda
61+
id = /datum/reagent/consumable/space_cola/gravedigger
62+
results = list(/datum/reagent/consumable/space_cola/gravedigger = 3)
63+
required_reagents = list(/datum/reagent/consumable/space_cola = 1, /datum/reagent/consumable/space_cola/dr_gibb = 1, /datum/reagent/consumable/space_up = 1) //soda
6464

6565
/datum/chemical_reaction/wine
6666
name = "Wine"
@@ -87,7 +87,7 @@
8787
name = "Kahlua"
8888
id = /datum/reagent/consumable/ethanol/kahlua
8989
results = list(/datum/reagent/consumable/ethanol/kahlua = 5)
90-
required_reagents = list(/datum/reagent/consumable/coffee = 5, /datum/reagent/consumable/sugar = 5)
90+
required_reagents = list(/datum/reagent/consumable/coffee/hot = 5, /datum/reagent/consumable/sugar = 5)
9191
required_catalysts = list(/datum/reagent/consumable/enzyme = 5)
9292

9393
/datum/chemical_reaction/gin_tonic
@@ -209,7 +209,7 @@
209209
name = "Irish Coffee"
210210
id = /datum/reagent/consumable/ethanol/irishcoffee
211211
results = list(/datum/reagent/consumable/ethanol/irishcoffee = 2)
212-
required_reagents = list(/datum/reagent/consumable/ethanol/irish_cream = 1, /datum/reagent/consumable/coffee = 1)
212+
required_reagents = list(/datum/reagent/consumable/ethanol/irish_cream = 1, /datum/reagent/consumable/coffee/hot = 1)
213213

214214
/datum/chemical_reaction/b52
215215
name = "B-52"
@@ -299,7 +299,7 @@
299299
name = "Demons Blood"
300300
id = /datum/reagent/consumable/ethanol/demonsblood
301301
results = list(/datum/reagent/consumable/ethanol/demonsblood = 4)
302-
required_reagents = list(/datum/reagent/consumable/ethanol/rum = 1, /datum/reagent/consumable/spacemountainwind = 1, /datum/reagent/blood = 1, /datum/reagent/consumable/dr_gibb = 1)
302+
required_reagents = list(/datum/reagent/consumable/ethanol/rum = 1, /datum/reagent/consumable/space_cola/spacemountainwind = 1, /datum/reagent/blood = 1, /datum/reagent/consumable/space_cola/dr_gibb = 1)
303303

304304
/datum/chemical_reaction/booger
305305
name = "Booger"
@@ -372,15 +372,15 @@
372372

373373
/datum/chemical_reaction/soy_latte
374374
name = "Soy Latte"
375-
id = /datum/reagent/consumable/soy_latte
376-
results = list(/datum/reagent/consumable/soy_latte = 2)
377-
required_reagents = list(/datum/reagent/consumable/coffee = 1, /datum/reagent/consumable/soymilk = 1)
375+
id = /datum/reagent/consumable/coffee/hot/latte/soy
376+
results = list(/datum/reagent/consumable/coffee/hot/latte/soy = 2)
377+
required_reagents = list(/datum/reagent/consumable/coffee/hot = 1, /datum/reagent/consumable/soymilk = 1)
378378

379379
/datum/chemical_reaction/cafe_latte
380380
name = "Cafe Latte"
381-
id = /datum/reagent/consumable/cafe_latte
382-
results = list(/datum/reagent/consumable/cafe_latte = 2)
383-
required_reagents = list(/datum/reagent/consumable/coffee = 1, /datum/reagent/consumable/milk = 1)
381+
id = /datum/reagent/consumable/coffee/hot/latte
382+
results = list(/datum/reagent/consumable/coffee/hot/latte = 2)
383+
required_reagents = list(/datum/reagent/consumable/coffee/hot = 1, /datum/reagent/consumable/milk = 1)
384384

385385
/datum/chemical_reaction/acidspit
386386
name = "Acid Spit"
@@ -476,7 +476,7 @@
476476
name = "Thirteen Loko"
477477
id = /datum/reagent/consumable/ethanol/thirteenloko
478478
results = list(/datum/reagent/consumable/ethanol/thirteenloko = 3)
479-
required_reagents = list(/datum/reagent/consumable/ethanol/vodka = 1, /datum/reagent/consumable/coffee = 1, /datum/reagent/consumable/limejuice = 1)
479+
required_reagents = list(/datum/reagent/consumable/ethanol/vodka = 1, /datum/reagent/consumable/coffee/hot = 1, /datum/reagent/consumable/limejuice = 1)
480480

481481
/datum/chemical_reaction/chocolatepudding
482482
name = "Chocolate Pudding"
@@ -510,15 +510,15 @@
510510

511511
/datum/chemical_reaction/pumpkin_latte
512512
name = "Pumpkin space latte"
513-
id = /datum/reagent/consumable/pumpkin_latte
514-
results = list(/datum/reagent/consumable/pumpkin_latte = 15)
515-
required_reagents = list(/datum/reagent/consumable/pumpkinjuice = 5, /datum/reagent/consumable/coffee = 5, /datum/reagent/consumable/cream = 5)
513+
id = /datum/reagent/consumable/coffee/hot/latte/pumpkin
514+
results = list(/datum/reagent/consumable/coffee/hot/latte/pumpkin = 15)
515+
required_reagents = list(/datum/reagent/consumable/pumpkinjuice = 5, /datum/reagent/consumable/coffee/hot = 5, /datum/reagent/consumable/cream = 5)
516516

517517
/datum/chemical_reaction/gibbfloats
518518
name = "Gibb Floats"
519-
id = /datum/reagent/consumable/gibbfloats
520-
results = list(/datum/reagent/consumable/gibbfloats = 15)
521-
required_reagents = list(/datum/reagent/consumable/dr_gibb = 5, /datum/reagent/consumable/ice = 5, /datum/reagent/consumable/cream = 5)
519+
id = /datum/reagent/consumable/space_cola/dr_gibb/float
520+
results = list(/datum/reagent/consumable/space_cola/dr_gibb/float = 15)
521+
required_reagents = list(/datum/reagent/consumable/space_cola/dr_gibb = 5, /datum/reagent/consumable/ice = 5, /datum/reagent/consumable/cream = 5)
522522

523523
/datum/chemical_reaction/triple_citrus
524524
name = "Triple Citrus"
@@ -550,7 +550,7 @@
550550
name = "Fetching Fizz"
551551
id = /datum/reagent/consumable/ethanol/fetching_fizz
552552
results = list(/datum/reagent/consumable/ethanol/fetching_fizz = 3)
553-
required_reagents = list(/datum/reagent/consumable/nuka_cola = 1, /datum/reagent/iron = 1) //Manufacturable from only the mining station
553+
required_reagents = list(/datum/reagent/consumable/energy_drink/nuka_cola = 1, /datum/reagent/iron = 1) //Manufacturable from only the mining station
554554
mix_message = "The mixture slightly vibrates before settling."
555555

556556
/datum/chemical_reaction/hearty_punch
@@ -577,9 +577,9 @@
577577

578578
/datum/chemical_reaction/arnold_palmer
579579
name = "Arnold Palmer"
580-
id = /datum/reagent/consumable/tea/arnold_palmer
581-
results = list(/datum/reagent/consumable/tea/arnold_palmer = 2)
582-
required_reagents = list(/datum/reagent/consumable/tea = 1, /datum/reagent/consumable/lemonade = 1)
580+
id = /datum/reagent/consumable/tea/hot/arnold_palmer
581+
results = list(/datum/reagent/consumable/tea/hot/arnold_palmer = 2)
582+
required_reagents = list(/datum/reagent/consumable/tea/hot = 1, /datum/reagent/consumable/lemonade = 1)
583583
mix_message = "The smells of fresh green grass and sand traps waft through the air as the mixture turns a friendly yellow-orange."
584584

585585
/datum/chemical_reaction/chocolate_milk
@@ -636,7 +636,7 @@
636636
name = "Bastion Bourbon"
637637
id = /datum/reagent/consumable/ethanol/bastion_bourbon
638638
results = list(/datum/reagent/consumable/ethanol/bastion_bourbon = 2)
639-
required_reagents = list(/datum/reagent/consumable/tea = 1, /datum/reagent/consumable/ethanol/creme_de_menthe = 1, /datum/reagent/consumable/triple_citrus = 1, /datum/reagent/consumable/berryjuice = 1) //herbal and minty, with a hint of citrus and berry
639+
required_reagents = list(/datum/reagent/consumable/tea/hot = 1, /datum/reagent/consumable/ethanol/creme_de_menthe = 1, /datum/reagent/consumable/triple_citrus = 1, /datum/reagent/consumable/berryjuice = 1) //herbal and minty, with a hint of citrus and berry
640640
mix_message = "You catch an aroma of hot tea and fruits as the mix blends into a blue-green color."
641641

642642
/datum/chemical_reaction/squirt_cider
@@ -734,7 +734,7 @@
734734
name = "Blank Paper"
735735
id = /datum/reagent/consumable/ethanol/blank_paper
736736
results = list(/datum/reagent/consumable/ethanol/blank_paper = 3)
737-
required_reagents = list(/datum/reagent/consumable/ethanol/silencer = 1, /datum/reagent/consumable/nothing = 1, /datum/reagent/consumable/nuka_cola = 1)
737+
required_reagents = list(/datum/reagent/consumable/ethanol/silencer = 1, /datum/reagent/consumable/nothing = 1, /datum/reagent/consumable/energy_drink/nuka_cola = 1)
738738

739739
/datum/chemical_reaction/wizz_fizz
740740
name = "Wizz Fizz"
@@ -775,7 +775,7 @@
775775
name = "Rubberneck"
776776
id = /datum/reagent/consumable/ethanol/rubberneck
777777
results = list(/datum/reagent/consumable/ethanol/rubberneck = 10)
778-
required_reagents = list(/datum/reagent/consumable/ethanol = 4, /datum/reagent/consumable/grey_bull = 5, /datum/reagent/consumable/astrotame = 1)
778+
required_reagents = list(/datum/reagent/consumable/ethanol = 4, /datum/reagent/consumable/energy_drink/grey_bull = 5, /datum/reagent/consumable/astrotame = 1)
779779

780780
/datum/chemical_reaction/duplex
781781
name = "Duplex"
@@ -812,7 +812,7 @@
812812
name = "Red Queen"
813813
id = /datum/reagent/consumable/red_queen
814814
results = list(/datum/reagent/consumable/red_queen = 10)
815-
required_reagents = list(/datum/reagent/consumable/tea = 6, /datum/reagent/mercury = 2, /datum/reagent/consumable/blackpepper = 1, /datum/reagent/growthserum = 1)
815+
required_reagents = list(/datum/reagent/consumable/tea/hot = 6, /datum/reagent/mercury = 2, /datum/reagent/consumable/blackpepper = 1, /datum/reagent/growthserum = 1)
816816

817817
/datum/chemical_reaction/catsip
818818
name = "Catsip"

0 commit comments

Comments
 (0)