|
33 | 33 |
|
34 | 34 | /datum/chemical_reaction/icetea |
35 | 35 | 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) |
39 | 39 |
|
40 | 40 | /datum/chemical_reaction/icecoffee |
41 | 41 | 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) |
45 | 45 |
|
46 | 46 | /datum/chemical_reaction/nuka_cola |
47 | 47 | 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) |
50 | 50 | required_reagents = list(/datum/reagent/uranium = 1, /datum/reagent/consumable/space_cola = 6) |
51 | 51 |
|
52 | 52 | /datum/chemical_reaction/moonshine |
|
58 | 58 |
|
59 | 59 | /datum/chemical_reaction/gravedigger |
60 | 60 | 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 |
64 | 64 |
|
65 | 65 | /datum/chemical_reaction/wine |
66 | 66 | name = "Wine" |
|
87 | 87 | name = "Kahlua" |
88 | 88 | id = /datum/reagent/consumable/ethanol/kahlua |
89 | 89 | 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) |
91 | 91 | required_catalysts = list(/datum/reagent/consumable/enzyme = 5) |
92 | 92 |
|
93 | 93 | /datum/chemical_reaction/gin_tonic |
|
209 | 209 | name = "Irish Coffee" |
210 | 210 | id = /datum/reagent/consumable/ethanol/irishcoffee |
211 | 211 | 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) |
213 | 213 |
|
214 | 214 | /datum/chemical_reaction/b52 |
215 | 215 | name = "B-52" |
|
299 | 299 | name = "Demons Blood" |
300 | 300 | id = /datum/reagent/consumable/ethanol/demonsblood |
301 | 301 | 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) |
303 | 303 |
|
304 | 304 | /datum/chemical_reaction/booger |
305 | 305 | name = "Booger" |
|
372 | 372 |
|
373 | 373 | /datum/chemical_reaction/soy_latte |
374 | 374 | 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) |
378 | 378 |
|
379 | 379 | /datum/chemical_reaction/cafe_latte |
380 | 380 | 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) |
384 | 384 |
|
385 | 385 | /datum/chemical_reaction/acidspit |
386 | 386 | name = "Acid Spit" |
|
476 | 476 | name = "Thirteen Loko" |
477 | 477 | id = /datum/reagent/consumable/ethanol/thirteenloko |
478 | 478 | 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) |
480 | 480 |
|
481 | 481 | /datum/chemical_reaction/chocolatepudding |
482 | 482 | name = "Chocolate Pudding" |
|
510 | 510 |
|
511 | 511 | /datum/chemical_reaction/pumpkin_latte |
512 | 512 | 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) |
516 | 516 |
|
517 | 517 | /datum/chemical_reaction/gibbfloats |
518 | 518 | 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) |
522 | 522 |
|
523 | 523 | /datum/chemical_reaction/triple_citrus |
524 | 524 | name = "Triple Citrus" |
|
550 | 550 | name = "Fetching Fizz" |
551 | 551 | id = /datum/reagent/consumable/ethanol/fetching_fizz |
552 | 552 | 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 |
554 | 554 | mix_message = "The mixture slightly vibrates before settling." |
555 | 555 |
|
556 | 556 | /datum/chemical_reaction/hearty_punch |
|
577 | 577 |
|
578 | 578 | /datum/chemical_reaction/arnold_palmer |
579 | 579 | 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) |
583 | 583 | mix_message = "The smells of fresh green grass and sand traps waft through the air as the mixture turns a friendly yellow-orange." |
584 | 584 |
|
585 | 585 | /datum/chemical_reaction/chocolate_milk |
|
636 | 636 | name = "Bastion Bourbon" |
637 | 637 | id = /datum/reagent/consumable/ethanol/bastion_bourbon |
638 | 638 | 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 |
640 | 640 | mix_message = "You catch an aroma of hot tea and fruits as the mix blends into a blue-green color." |
641 | 641 |
|
642 | 642 | /datum/chemical_reaction/squirt_cider |
|
734 | 734 | name = "Blank Paper" |
735 | 735 | id = /datum/reagent/consumable/ethanol/blank_paper |
736 | 736 | 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) |
738 | 738 |
|
739 | 739 | /datum/chemical_reaction/wizz_fizz |
740 | 740 | name = "Wizz Fizz" |
|
775 | 775 | name = "Rubberneck" |
776 | 776 | id = /datum/reagent/consumable/ethanol/rubberneck |
777 | 777 | 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) |
779 | 779 |
|
780 | 780 | /datum/chemical_reaction/duplex |
781 | 781 | name = "Duplex" |
|
812 | 812 | name = "Red Queen" |
813 | 813 | id = /datum/reagent/consumable/red_queen |
814 | 814 | 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) |
816 | 816 |
|
817 | 817 | /datum/chemical_reaction/catsip |
818 | 818 | name = "Catsip" |
|
0 commit comments