diff --git a/code/modules/food/drinkingglass/metaglass_ch.dm b/code/modules/food/drinkingglass/metaglass_ch.dm deleted file mode 100644 index f0bf9a3aa5..0000000000 --- a/code/modules/food/drinkingglass/metaglass_ch.dm +++ /dev/null @@ -1,121 +0,0 @@ -//////////////////CHOMP////////////////////////// - -/datum/reagent/ethanol/cloverclub - glass_icon_state = "cloverclub" - glass_icon_source = 'icons/obj/drinks_ch.dmi' - glass_center_of_mass = list("x"=16, "y"=8) - -/datum/reagent/ethanol/spiderdrink - glass_icon_state = "glassofspiders" - glass_icon_file = 'icons/obj/drinks_ch.dmi' - -/datum/reagent/drink/tea/minttea - glass_icon_file = "bigteacup" - -/datum/reagent/drink/tea/lemontea - glass_icon_file = "bigteacup" - -/datum/reagent/drink/tea/limetea - glass_icon_file = "bigteacup" - -/datum/reagent/drink/tea/orangetea - glass_icon_file = "bigteacup" - -/datum/reagent/drink/tea/berrytea - glass_icon_file = "bigteacup" - -/datum/reagent/drink/tea/cherrytea - glass_icon_file = "bigteacup" - -/datum/reagent/drink/tea/watermelontea - glass_icon_file = "bigteacup" - -/datum/reagent/drink/bubbleteawatermelon - glass_icon_state = "bubbleteawatermelonglass" - glass_icon_file = 'icons/obj/drinks_ch.dmi' - glass_center_of_mass = list("x"=16, "y"=9) - -/datum/reagent/drink/bubbleteastrawberry - glass_icon_state = "bubbleteastrawberryglass" - glass_icon_file = 'icons/obj/drinks_ch.dmi' - glass_center_of_mass = list("x"=16, "y"=9) - -/datum/reagent/drink/bubbleteacherry - glass_icon_state = "bubbleteacherryglass" - glass_icon_file = 'icons/obj/drinks_ch.dmi' - glass_center_of_mass = list("x"=16, "y"=9) - -/datum/reagent/drink/bubbleteacoffee - glass_icon_state = "bubbleteacoffeeglass" - glass_icon_file = 'icons/obj/drinks_ch.dmi' - glass_center_of_mass = list("x"=16, "y"=9) - -/datum/reagent/drink/bubbleteabanana - glass_icon_state = "bubbleteabananaglass" - glass_icon_file = 'icons/obj/drinks_ch.dmi' - glass_center_of_mass = list("x"=16, "y"=9) - -/datum/reagent/drink/tea/matcha_latte - glass_icon_state = "bigteacup" - -/datum/reagent/drink/horchata - glass_icon_state = "horchata" - glass_icon_file = 'icons/obj/drinks_ch.dmi' - glass_center_of_mass = list("x"=16, "y"=7) - -/datum/reagent/toxin/bluetrain - glass_icon_state = "bluetrain" - glass_icon_file = 'icons/obj/drinks_ch.dmi' - glass_center_of_mass = list("x"=16, "y"=8) - -/datum/reagent/drink/lovepotion - glass_icon_state = "lovepotion" - glass_icon_file = 'icons/obj/drinks_ch.dmi' - -/datum/reagent/drink/lowpower - glass_icon_state = "lowpower" - glass_icon_file = 'icons/obj/drinks_ch.dmi' - -/datum/reagent/ethanol/coffee/jackbrew - glass_icon_state = "jackbrew" - glass_icon_file = 'icons/obj/drinks_ch.dmi' - -/datum/reagent/ethanol/bookwyrm - glass_icon_state = "bookwyrm" - glass_icon_file = 'icons/obj/drinks_ch.dmi' - -/datum/reagent/drink/highpower - glass_icon_state = "highpower" - glass_icon_file = 'icons/obj/drinks_ch.dmi' - -/datum/reagent/ethanol/flapper - glass_icon_state = "flapper" - glass_icon_file = 'icons/obj/drinks_ch.dmi' - -/datum/reagent/toxin/oilslide - glass_icon_state = "oilslide" - glass_icon_file = 'icons/obj/drinks_ch.dmi' - -/datum/reagent/ethanol/sitonmyface - glass_icon_state = "sitonmyface" - glass_icon_file = 'icons/obj/drinks_ch.dmi' - -/datum/reagent/ethanol/hachi - glass_icon_state = "hachi" - glass_icon_file = 'icons/obj/drinks_ch.dmi' - -/datum/reagent/ethanol/mojito - glass_icon_state = "mojito" - glass_icon_file = 'icons/obj/drinks_ch.dmi' - -/datum/reagent/slimedrink - glass_icon_state = "slimedrink" - glass_icon_file = 'icons/obj/drinks_ch.dmi' - -/datum/reagent/ethanol/arachnidslammer - glass_icon_state = "arachnidslammer" - glass_icon_file = 'icons/obj/drinks_ch.dmi' - -/datum/reagent/drink/pilk - glass_icon_state = "whiskeyglass" - glass_icon_file = 'icons/obj/drinks.dmi' \ No newline at end of file diff --git a/icons/obj/drinks_ch.dmi b/icons/obj/drinks_ch.dmi deleted file mode 100644 index 369372f3a5..0000000000 Binary files a/icons/obj/drinks_ch.dmi and /dev/null differ diff --git a/modular_chomp/code/modules/food/drinkgglass/metaglass.dm b/modular_chomp/code/modules/food/drinkgglass/metaglass.dm new file mode 100644 index 0000000000..988fff245a --- /dev/null +++ b/modular_chomp/code/modules/food/drinkgglass/metaglass.dm @@ -0,0 +1,296 @@ +//////////////////CHOMP////////////////////////// + +/datum/reagent/ethanol/cloverclub + glass_icon_state = "cloverclub" + glass_icon_source = 'modular_chomp/icons/obj/drinks.dmi' + glass_center_of_mass = list("x"=16, "y"=8) + +/datum/reagent/ethanol/spiderdrink + glass_icon_state = "glassofspiders" + glass_icon_file = 'modular_chomp/icons/obj/drinks.dmi' + +/datum/reagent/drink/tea/minttea + glass_icon_state = "bigteacup" + +/datum/reagent/drink/tea/lemontea + glass_icon_state = "bigteacup" + +/datum/reagent/drink/tea/limetea + glass_icon_state = "bigteacup" + +/datum/reagent/drink/tea/orangetea + glass_icon_state = "bigteacup" + +/datum/reagent/drink/tea/berrytea + glass_icon_state = "bigteacup" + +/datum/reagent/drink/tea/cherrytea + glass_icon_state = "bigteacup" + +/datum/reagent/drink/tea/watermelontea + glass_icon_state = "bigteacup" + +/datum/reagent/drink/bubbleteawatermelon + glass_icon_state = "bubbleteawatermelonglass" + glass_icon_file = 'modular_chomp/icons/obj/drinks.dmi' + glass_center_of_mass = list("x"=16, "y"=9) + +/datum/reagent/drink/bubbleteastrawberry + glass_icon_state = "bubbleteastrawberryglass" + glass_icon_file = 'modular_chomp/icons/obj/drinks.dmi' + glass_center_of_mass = list("x"=16, "y"=9) + +/datum/reagent/drink/bubbleteacherry + glass_icon_state = "bubbleteacherryglass" + glass_icon_file = 'modular_chomp/icons/obj/drinks.dmi' + glass_center_of_mass = list("x"=16, "y"=9) + +/datum/reagent/drink/bubbleteacoffee + glass_icon_state = "bubbleteacoffeeglass" + glass_icon_file = 'modular_chomp/icons/obj/drinks.dmi' + glass_center_of_mass = list("x"=16, "y"=9) + +/datum/reagent/drink/bubbleteabanana + glass_icon_state = "bubbleteabananaglass" + glass_icon_file = 'modular_chomp/icons/obj/drinks.dmi' + glass_center_of_mass = list("x"=16, "y"=9) + +/datum/reagent/drink/tea/matcha_latte + glass_icon_state = "bigteacup" + +/datum/reagent/drink/horchata + glass_icon_state = "horchata" + glass_icon_file = 'modular_chomp/icons/obj/drinks.dmi' + glass_center_of_mass = list("x"=16, "y"=7) + +/datum/reagent/toxin/bluetrain + glass_icon_state = "bluetrain" + glass_icon_file = 'modular_chomp/icons/obj/drinks.dmi' + glass_center_of_mass = list("x"=16, "y"=8) + +/datum/reagent/drink/lovepotion + glass_icon_state = "lovepotion" + glass_icon_file = 'modular_chomp/icons/obj/drinks.dmi' + +/datum/reagent/drink/lowpower + glass_icon_state = "lowpower" + glass_icon_file = 'modular_chomp/icons/obj/drinks.dmi' + +/datum/reagent/ethanol/coffee/jackbrew + glass_icon_state = "jackbrew" + glass_icon_file = 'modular_chomp/icons/obj/drinks.dmi' + +/datum/reagent/ethanol/bookwyrm + glass_icon_state = "bookwyrm" + glass_icon_file = 'modular_chomp/icons/obj/drinks.dmi' + +/datum/reagent/drink/highpower + glass_icon_state = "highpower" + glass_icon_file = 'modular_chomp/icons/obj/drinks.dmi' + +/datum/reagent/ethanol/flapper + glass_icon_state = "flapper" + glass_icon_file = 'modular_chomp/icons/obj/drinks.dmi' + +/datum/reagent/toxin/oilslide + glass_icon_state = "oilslide" + glass_icon_file = 'modular_chomp/icons/obj/drinks.dmi' + +/datum/reagent/ethanol/sitonmyface + glass_icon_state = "sitonmyface" + glass_icon_file = 'modular_chomp/icons/obj/drinks.dmi' + +/datum/reagent/ethanol/hachi + glass_icon_state = "hachi" + glass_icon_file = 'modular_chomp/icons/obj/drinks.dmi' + +/datum/reagent/ethanol/mojito + glass_icon_state = "mojito" + glass_icon_file = 'modular_chomp/icons/obj/drinks.dmi' + +/datum/reagent/slimedrink + glass_icon_state = "slimedrink" + glass_icon_file = 'modular_chomp/icons/obj/drinks.dmi' + +/datum/reagent/ethanol/arachnidslammer + glass_icon_state = "arachnidslammer" + glass_icon_file = 'modular_chomp/icons/obj/drinks.dmi' + +/datum/reagent/drink/pilk + glass_icon_state = "whiskeyglass" + +//Visual Updates of existing drinks + +/datum/reagent/ethanol/gintonic + glass_icon_state = "gintonicglass" + glass_icon_file = 'modular_chomp/icons/obj/drinks.dmi' + +/datum/reagent/ethanol/coffee/kahlua + glass_icon_state = "kahluaglass" + glass_icon_file = 'modular_chomp/icons/obj/drinks.dmi' + +/datum/reagent/ethanol/wine + glass_icon_state = "wineglass" + glass_icon_file = 'modular_chomp/icons/obj/drinks.dmi' + +/datum/reagent/ethanol/cognac + glass_icon_state = "cognacglass" + glass_icon_file = 'modular_chomp/icons/obj/drinks.dmi' + +/datum/reagent/ethanol/cuba_libre + glass_icon_state = "cubalibreglass" + glass_icon_file = 'modular_chomp/icons/obj/drinks.dmi' + +/datum/reagent/ethanol/manly_dorf + glass_icon_state = "manlydorfglass" + glass_icon_file = 'modular_chomp/icons/obj/drinks.dmi' + +/datum/reagent/ethanol/tequilla_sunrise + glass_icon_state = "tequilasunriseglass" + glass_icon_file = 'modular_chomp/icons/obj/drinks.dmi' + +/datum/reagent/ethanol/screwdrivercocktail + glass_icon_state = "screwdriverglass" + glass_icon_file = 'modular_chomp/icons/obj/drinks.dmi' + +/datum/reagent/ethanol/bloody_mary + glass_icon_state = "bloodymaryglass" + glass_icon_file = 'modular_chomp/icons/obj/drinks.dmi' + +/datum/reagent/ethanol/coffee/brave_bull + glass_icon_state = "bravebullglass" + glass_icon_file = 'modular_chomp/icons/obj/drinks.dmi' + +/datum/reagent/drink/doctor_delight + glass_icon_state = "doctorsdelightglass" + glass_icon_file = 'modular_chomp/icons/obj/drinks.dmi' + +/datum/reagent/drink/soda/space_up + glass_icon_state = "space-up_glass" + glass_icon_file = 'modular_chomp/icons/obj/drinks.dmi' + +/datum/reagent/ethanol/vodkatonic + glass_icon_state = "vodkatonicglass" + glass_icon_file = 'modular_chomp/icons/obj/drinks.dmi' + +/datum/reagent/ethanol/manhattan + glass_icon_state = "manhattanglass" + glass_icon_file = 'modular_chomp/icons/obj/drinks.dmi' + +/datum/reagent/ethanol/manhattan_proj + glass_icon_state = "proj_manhattanglass" + glass_icon_file = 'modular_chomp/icons/obj/drinks.dmi' + +/datum/reagent/ethanol/ginfizz + glass_icon_state = "ginfizzglass" + glass_icon_file = 'modular_chomp/icons/obj/drinks.dmi' + +/datum/reagent/ethanol/longislandicedtea + glass_icon_state = "longislandicedteaglass" + glass_icon_file = 'modular_chomp/icons/obj/drinks.dmi' + +/datum/reagent/ethanol/threemileisland + glass_icon_state = "threemileislandglass" + glass_icon_file = 'modular_chomp/icons/obj/drinks.dmi' + +/datum/reagent/ethanol/margarita + glass_icon_state = "margaritaglass" + glass_icon_file = 'modular_chomp/icons/obj/drinks.dmi' + +/datum/reagent/drink/soda/spacemountainwind + glass_icon_state = "Space_mountain_wind_glass" + glass_icon_file = 'modular_chomp/icons/obj/drinks.dmi' + +/datum/reagent/ethanol/thirteenloko + glass_icon_state = "thirteen_loko_glass" + glass_icon_file = 'modular_chomp/icons/obj/drinks.dmi' + +/datum/reagent/drink/soda/dr_gibb + glass_icon_state = "dr_gibb_glass" + glass_icon_file = 'modular_chomp/icons/obj/drinks.dmi' + +/datum/reagent/adminordrazine + glass_icon_state = "golden_cup" + glass_icon_file = 'modular_chomp/icons/obj/drinks.dmi' + +/datum/reagent/ethanol/singulo + glass_icon_state = "singulo" + glass_icon_file = 'modular_chomp/icons/obj/drinks.dmi' + +/datum/reagent/ethanol/silencer + glass_icon_state = "silencerglass" + glass_icon_file = 'modular_chomp/icons/obj/drinks.dmi' + +/datum/reagent/ethanol/snowwhite + glass_icon_state = "snowwhite" + glass_icon_file = 'modular_chomp/icons/obj/drinks.dmi' + +/datum/reagent/ethanol/antifreeze + glass_icon_state = "antifreeze" + glass_icon_file = 'modular_chomp/icons/obj/drinks.dmi' + +/datum/reagent/ethanol/barefoot + glass_icon_state = "b&p" + glass_icon_file = 'modular_chomp/icons/obj/drinks.dmi' + +/datum/reagent/ethanol/booger + glass_icon_state = "booger" + glass_icon_file = 'modular_chomp/icons/obj/drinks.dmi' + +/datum/reagent/ethanol/devilskiss + glass_icon_state = "devilskiss" + glass_icon_file = 'modular_chomp/icons/obj/drinks.dmi' + +/datum/reagent/ethanol/syndicatebomb + glass_icon_state = "syndicatebomb" + glass_icon_file = 'modular_chomp/icons/obj/drinks.dmi' + +/datum/reagent/ethanol/narsour + glass_icon_state = "narsour" + glass_icon_file = 'modular_chomp/icons/obj/drinks.dmi' + +/datum/reagent/ethanol/cogchamp + glass_icon_state = "cogchamp" + glass_icon_file = 'modular_chomp/icons/obj/drinks.dmi' + +/datum/reagent/ethanol/alliescocktail + glass_icon_state = "alliescocktail" + glass_icon_file = 'modular_chomp/icons/obj/drinks.dmi' + +/datum/reagent/ethanol/erikasurprise + glass_icon_state = "erikasurprise" + glass_icon_file = 'modular_chomp/icons/obj/drinks.dmi' + +//Ported drinks + +/datum/reagent/ethanol/fetching_fizz + glass_icon_state = "fetching_fizz" + glass_icon_file = 'modular_chomp/icons/obj/drinks.dmi' + +/datum/reagent/ethanol/hearty_punch + glass_icon_state = "hearty_punch" + glass_icon_file = 'modular_chomp/icons/obj/drinks.dmi' + +/datum/reagent/ethanol/squirt_cider + glass_icon_state = "squirt_cider" + glass_icon_file = 'modular_chomp/icons/obj/drinks.dmi' + +/datum/reagent/ethanol/fringe_weaver + glass_icon_state = "fringe_weaver" + glass_icon_file = 'modular_chomp/icons/obj/drinks.dmi' + +/datum/reagent/ethanol/crevice_spike + glass_icon_state = "crevice_spike" + glass_icon_file = 'modular_chomp/icons/obj/drinks.dmi' + +/datum/reagent/ethanol/duplex + glass_icon_state = "duplex" + glass_icon_file = 'modular_chomp/icons/obj/drinks.dmi' + +/datum/reagent/ethanol/mauna_loa + glass_icon_state = "mauna_loa" + glass_icon_file = 'modular_chomp/icons/obj/drinks.dmi' + +/datum/reagent/ethanol/hiveminderaser + glass_icon_state = "hiveminderaser" + glass_icon_file = 'modular_chomp/icons/obj/drinks.dmi' diff --git a/code/modules/food/food/drinks/bottle_ch.dm b/modular_chomp/code/modules/food/food/drinks/bottle.dm similarity index 74% rename from code/modules/food/food/drinks/bottle_ch.dm rename to modular_chomp/code/modules/food/food/drinks/bottle.dm index 45110f97c7..c5d3069933 100644 --- a/code/modules/food/food/drinks/bottle_ch.dm +++ b/modular_chomp/code/modules/food/food/drinks/bottle.dm @@ -1,10 +1,10 @@ /obj/item/weapon/reagent_containers/food/drinks/bottle/snaps name = "Akvavit" desc = "This could go well with lunch." - icon = 'icons/obj/drinks_ch.dmi' + icon = 'modular_chomp/icons/obj/drinks.dmi' icon_state = "snapsbottle" center_of_mass = list("x"=17, "y"=3) /obj/item/weapon/reagent_containers/food/drinks/bottle/snaps/Initialize() . = ..() - reagents.add_reagent("snaps", 100) \ No newline at end of file + reagents.add_reagent("snaps", 100) diff --git a/code/modules/reagents/reactions/instant/drinks_ch.dm b/modular_chomp/code/modules/reagents/reactions/instant/drinks.dm similarity index 80% rename from code/modules/reagents/reactions/instant/drinks_ch.dm rename to modular_chomp/code/modules/reagents/reactions/instant/drinks.dm index 72c2e37ade..07481ef4c3 100644 --- a/code/modules/reagents/reactions/instant/drinks_ch.dm +++ b/modular_chomp/code/modules/reagents/reactions/instant/drinks.dm @@ -1,329 +1,399 @@ -/decl/chemical_reaction/instant/drinks/minttea - name = "Mint Tea" - id = "minttea" - result = "minttea" - required_reagents = list("tea" = 5, "mint" = 1) - result_amount = 6 - -/decl/chemical_reaction/instant/drinks/lemontea - name = "Lemon Tea" - id = "lemontea" - result = "lemontea" - required_reagents = list("tea" = 5, "lemonjuice" = 1) - result_amount = 6 - -/decl/chemical_reaction/instant/drinks/limetea - name = "Lime Tea" - id = "limetea" - result = "limetea" - required_reagents = list("tea" = 5, "limejuice" = 1) - result_amount = 6 - -/decl/chemical_reaction/instant/drinks/orangetea - name = "Orange Tea" - id = "orangetea" - result = "orangetea" - required_reagents = list("tea" = 5, "orangejuice" = 1) - result_amount = 6 - -/decl/chemical_reaction/instant/drinks/berrytea - name = "Berry Tea" - id = "berrytea" - result = "berrytea" - required_reagents = list("tea" = 5, "berryjuice" = 1) - result_amount = 6 - -/decl/chemical_reaction/instant/drinks/cherrytea - name = "Cherry Tea" - id = "cherrytea" - result = "cherrytea" - required_reagents = list("tea" = 5, "cherryjelly" = 1) - result_amount = 6 - -/decl/chemical_reaction/instant/drinks/watermelontea - name = "Watermelon Tea" - id = "watermelontea" - result = "watermelontea" - required_reagents = list("tea" = 5, "watermelonjuice" = 1) - result_amount = 6 - -/decl/chemical_reaction/instant/tea/matcha_latte - id = "matcha_latte" - result = "matcha_latte" - required_reagents = list ("matchapowder" = 1, "milk" = 5) - result_amount = 5 - -/decl/chemical_reaction/instant/freshtea/green - id = "freshteagreen" - result = "freshteagreen" - required_reagents = list ("tealeavesgreen" = 1, "hotwater" = 9) - result_amount = 10 - -/decl/chemical_reaction/instant/instantteapowder/green - id = "instantteapowdergreen" - result = "instantteapowdergreen" - required_reagents = list ("teamush" = 10, "frostoil" = 1) - result_amount = 10 - -/decl/chemical_reaction/instant/instanttea/green - id = "instantteagreen" - result = "instantteagreen" - required_reagents = list ("instantteapowdergreen" = 1, "water" = 9) - result_amount = 10 - -/decl/chemical_reaction/instant/matcha - id = "matcha" - result = "matcha" - required_reagents = list ("matchapowder" = 1, "hotwater" = 2) - result_amount = 2 - -/decl/chemical_reaction/instant/drinks/spiderdrink - name = "Brimming glass of spiders" - id = "spiderdrink" - result = "spiderdrink" - required_reagents = list("spidertoxin" = 1, "clonexadone" = 5, "absinthe" = 4) - result_amount = 10 - -/decl/chemical_reaction/instant/drinks/bubbleteawatermelon - name = "Watermelon bubble tea" - id = "bubbleteawatermelon" - result = "bubbleteawatermelon" - required_reagents = list("gelatin" = 2, "watermelontea" = 6, "milk" = 2) - result_amount = 10 - -/decl/chemical_reaction/instant/drinks/bubbleteastrawberry - name = "Strawberry bubble tea" - id = "bubbleteastrawberry" - result = "bubbleteastrawberry" - required_reagents = list("gelatin" = 2, "berrytea" = 6, "milk" = 2) - result_amount = 10 - -/decl/chemical_reaction/instant/drinks/bubbleteacherry - name = "Cherry bubble tea" - id = "bubbleteacherry" - result = "bubbleteacherry" - required_reagents = list("gelatin" = 2, "cherrytea" = 6, "milk" = 2) - result_amount = 10 - -/decl/chemical_reaction/instant/drinks/bubbleteacoffee - name = "Coffee bubble tea" - id = "bubbleteacoffee" - result = "bubbleteacoffee" - required_reagents = list("gelatin" = 2, "tea" = 5, "cafe_latte" = 3) - result_amount = 10 - -/decl/chemical_reaction/instant/drinks/bubbleteabanana - name = "Banana bubble tea" - id = "bubbleteabanana" - result = "bubbleteabanana" - required_reagents = list("gelatin" = 2, "tea" = 5, "banana" = 1, "milk" = 2) - result_amount = 10 - -/decl/chemical_reaction/instant/drinks/horchata - name = "Horchata" - id = "horchata" - result = "horchata" - required_reagents = list("milk" = 1, "sugar" = 2, "rice" = 2) - result_amount = 5 - -/decl/chemical_reaction/instant/drinks/bluetrain - name = "Blue train" - id = "bluetrain" - result = "bluetrain" - required_reagents = list("coolant" = 2, "ethanol" = 2, "nutriment" = 1) - result_amount = 5 - -/decl/chemical_reaction/instant/drinks/lowpower - name = "The low power" - id = "lowpower" - result = "lowpower" - required_reagents = list("lemonade" = 1, "cream" = 1, "limejuice" = 1) - result_amount = 3 - -/decl/chemical_reaction/instant/drinks/jackbrew - name = "Jack's brew" - id = "jackbrew" - result = "jackbrew" - required_reagents = list("irishcoffee" = 1, "hyperzine" = 1) - result_amount = 2 - -/decl/chemical_reaction/instant/drinks/bookwyrm - name = "Bookwyrm's bite" - id = "bookwyrm" - result = "bookwyrm" - required_reagents = list("coldfront" = 1, "limejuice" = 1, "stoxin" = 1) - result_amount = 3 - -/decl/chemical_reaction/instant/drinks/highpower - name = "The high power" - id = "highpower" - result = "highpower" - required_reagents = list("lowpower" = 1, "iron" = 1, "uranium" = 1) - result_amount = 3 - -/decl/chemical_reaction/instant/drinks/flapper - name = "Flapper" - id = "flapper" - result = "flapper" - required_reagents = list("whiskey" = 1, "blood" = 1, "ice" = 1) - result_amount = 3 - -/decl/chemical_reaction/instant/toxin/oilslide - name = "Oil slide" - id = "oilslide" - result = "oilslide" - required_reagents = list("moonshine" = 1, "lube" = 1, "fuel" = 1) - result_amount = 3 - -/decl/chemical_reaction/instant/drinks/sitonmyface - name = "Sit on my face" - id = "sitonmyface" - result = "sitonmyface" - required_reagents = list("kahlua" = 1, "irishcream" = 1, "peanutbutter" = 1) - result_amount = 3 - -/decl/chemical_reaction/instant/drinks/hachi - name = "Hachi" - id = "hachi" - result = "hachi" - required_reagents = list("burbon" = 2, "sake" = 1, "lemonjuice" = 1, "mushroom" = 1) //Whoever coded this never made a mushroom reagent so this can't be created. - result_amount = 5 - -/decl/chemical_reaction/instant/drinks/narsour - name = "Nar'sour" - id = "narsour" - result = "narsour" - required_reagents = list("blood" = 1, "lemonjuice" = 1, "demonsblood" = 1) - mix_message = "The mixture develops a sinister glow." - reaction_sound = 'sound/effects/singlebeat.ogg' - result_amount = 3 - -/decl/chemical_reaction/instant/drinks/cogchamp - name = "CogChamp" - id = "cogchamp" - result = "cogchamp" - required_reagents = list("cognac" = 1, "fuel" = 1, "screwdrivercocktail" = 1) - mix_message = "You hear faint sounds of gears turning as the mixture gives off virulent plumes of steam." - reaction_sound = 'sound/machines/clockcult/steam_whoosh.ogg' - result_amount = 3 - -//thirteen loko possible to make now, so easier to make arachnid slammer - Jack - -/decl/chemical_reaction/instant/drinks/thirteenloko - name = "Thirteen Loko" - id = "thirteenloko" - result = "thirteenloko" - required_reagents = list("beer" = 1, "tequilla" = 1, "coffee" = 1) - result_amount = 3 - -//Arachnid slammer reactions - Jack - -/decl/chemical_reaction/instant/drinks/arachnidslammer - name = "Arachnid Slammer" - id = "arachnidslammer" - result = "arachnidslammer" - required_reagents = list("ale" = 1, "thirteenloko" = 1, "hyperzine" = 1) - mix_message = "The concortion of ale, energy drink and stimulants starts to heavily foam and fizzle, even sparkle a little." - result_amount = 3 - -/decl/chemical_reaction/instant/drinks/enragedarachnidslammer - name = "Enraged Arachnid Slammer" - id = "enragedarachnidslammer" - result = "enragedarachnidslammer" - required_reagents = list("infusedarachnidslammer" = 1, "spidertoxin" = 1) - mix_message = "The dormant Arachnid Slammer bubbles and fizzles loudly as it gets enraged by the spider toxin and breaks it down!" - result_amount = 5 - -/decl/chemical_reaction/instant/drinks/enragedarachnidslammer1 - name = "Enraged Arachnid Slammer" - id = "enragedarachnidslammer" - required_reagents = list("enragedarachnidslammer" = 1, "cyanide" = 1) - result = "enragedarachnidslammer" - result_amount = 0.1 - -/decl/chemical_reaction/instant/drinks/enragedarachnidslammer2 - name = "Enraged Arachnid Slammer" - id = "enragedarachnidslammer" - required_reagents = list("enragedarachnidslammer" = 1, "chloralhydrate" = 1) - result = "enragedarachnidslammer" - result_amount = 0.1 - -/decl/chemical_reaction/instant/drinks/enragedarachnidslammer3 - name = "Enraged Arachnid Slammer" - id = "enragedarachnidslammer" - required_reagents = list("enragedarachnidslammer" = 1, "stimm" = 1) - result = "enragedarachnidslammer" - result_amount = 0.1 - -/decl/chemical_reaction/instant/drinks/enragedarachnidslammer4 - name = "Enraged Arachnid Slammer" - id = "enragedarachnidslammer" - required_reagents = list("enragedarachnidslammer" = 1, "cryotoxin" = 1) - result = "enragedarachnidslammer" - result_amount = 0.1 - -/decl/chemical_reaction/instant/drinks/enragedarachnidslammer5 - name = "Enraged Arachnid Slammer" - id = "enragedarachnidslammer" - required_reagents = list("enragedarachnidslammer" = 1, "cryptobiolin" = 1) - result = "enragedarachnidslammer" - result_amount = 0.1 - -/decl/chemical_reaction/instant/drinks/enragedarachnidslammer6 - name = "Enraged Arachnid Slammer" - id = "enragedarachnidslammer" - required_reagents = list("enragedarachnidslammer" = 1, "stoxin" = 1) - result = "enragedarachnidslammer" - result_amount = 0.1 - -/decl/chemical_reaction/instant/drinks/enragedarachnidslammer7 - name = "Enraged Arachnid Slammer" - id = "enragedarachnidslammer" - required_reagents = list("enragedarachnidslammer" = 1, "condensedcapsaicin_v" = 1) - result = "enragedarachnidslammer" - result_amount = 0.1 - -/decl/chemical_reaction/instant/drinks/enragedarachnidslammer8 - name = "Enraged Arachnid Slammer" - id = "enragedarachnidslammer" - required_reagents = list("enragedarachnidslammer" = 1, "phoron" = 1) - result = "enragedarachnidslammer" - result_amount = 0.1 - -/decl/chemical_reaction/instant/drinks/enragedarachnidslammer9 - name = "Enraged Arachnid Slammer" - id = "enragedarachnidslammer" - required_reagents = list("enragedarachnidslammer" = 1, "thermite_v" = 1) - result = "enragedarachnidslammer" - result_amount = 0.1 - -/decl/chemical_reaction/instant/drinks/enragedarachnidslammer10 - name = "Enraged Arachnid Slammer" - id = "enragedarachnidslammer" - required_reagents = list("enragedarachnidslammer" = 1, "serotrotium_v" = 1) - result = "enragedarachnidslammer" - result_amount = 0.1 - -/decl/chemical_reaction/instant/drinks/pilk - name = "Pilk" - id = "pilk" - result = "pilk" - required_reagents = list("milk" = 1, "cola" = 1) - result_amount = 2 - - - -//YW drinks -/decl/chemical_reaction/instant/drinks/lovepotion_yw - name = "Strawberry Love Potion" - id = "strawberrylovepotion" - result = "strawberrylovepotion" - required_reagents = list("cream" = 1, "berryjuice" = 1, "sugar" = 1) - result_amount = 3 - -/decl/chemical_reaction/instant/drinks/wormblood - name = "Wormblood" - id = "wormblood" - result = "wormblood" - required_reagents = list("booger" = 1, "psilocybin" = 1) - result_amount = 2 +/decl/chemical_reaction/instant/drinks/minttea + name = "Mint Tea" + id = "minttea" + result = "minttea" + required_reagents = list("tea" = 5, "mint" = 1) + result_amount = 6 + +/decl/chemical_reaction/instant/drinks/lemontea + name = "Lemon Tea" + id = "lemontea" + result = "lemontea" + required_reagents = list("tea" = 5, "lemonjuice" = 1) + result_amount = 6 + +/decl/chemical_reaction/instant/drinks/limetea + name = "Lime Tea" + id = "limetea" + result = "limetea" + required_reagents = list("tea" = 5, "limejuice" = 1) + result_amount = 6 + +/decl/chemical_reaction/instant/drinks/orangetea + name = "Orange Tea" + id = "orangetea" + result = "orangetea" + required_reagents = list("tea" = 5, "orangejuice" = 1) + result_amount = 6 + +/decl/chemical_reaction/instant/drinks/berrytea + name = "Berry Tea" + id = "berrytea" + result = "berrytea" + required_reagents = list("tea" = 5, "berryjuice" = 1) + result_amount = 6 + +/decl/chemical_reaction/instant/drinks/cherrytea + name = "Cherry Tea" + id = "cherrytea" + result = "cherrytea" + required_reagents = list("tea" = 5, "cherryjelly" = 1) + result_amount = 6 + +/decl/chemical_reaction/instant/drinks/watermelontea + name = "Watermelon Tea" + id = "watermelontea" + result = "watermelontea" + required_reagents = list("tea" = 5, "watermelonjuice" = 1) + result_amount = 6 + +/decl/chemical_reaction/instant/tea/matcha_latte + id = "matcha_latte" + result = "matcha_latte" + required_reagents = list ("matchapowder" = 1, "milk" = 5) + result_amount = 5 + +/decl/chemical_reaction/instant/freshtea/green + id = "freshteagreen" + result = "freshteagreen" + required_reagents = list ("tealeavesgreen" = 1, "hotwater" = 9) + result_amount = 10 + +/decl/chemical_reaction/instant/instantteapowder/green + id = "instantteapowdergreen" + result = "instantteapowdergreen" + required_reagents = list ("teamush" = 10, "frostoil" = 1) + result_amount = 10 + +/decl/chemical_reaction/instant/instanttea/green + id = "instantteagreen" + result = "instantteagreen" + required_reagents = list ("instantteapowdergreen" = 1, "water" = 9) + result_amount = 10 + +/decl/chemical_reaction/instant/matcha + id = "matcha" + result = "matcha" + required_reagents = list ("matchapowder" = 1, "hotwater" = 2) + result_amount = 2 + +/decl/chemical_reaction/instant/drinks/spiderdrink + name = "Brimming glass of spiders" + id = "spiderdrink" + result = "spiderdrink" + required_reagents = list("spidertoxin" = 1, "clonexadone" = 5, "absinthe" = 4) + result_amount = 10 + +/decl/chemical_reaction/instant/drinks/bubbleteawatermelon + name = "Watermelon bubble tea" + id = "bubbleteawatermelon" + result = "bubbleteawatermelon" + required_reagents = list("gelatin" = 2, "watermelontea" = 6, "milk" = 2) + result_amount = 10 + +/decl/chemical_reaction/instant/drinks/bubbleteastrawberry + name = "Strawberry bubble tea" + id = "bubbleteastrawberry" + result = "bubbleteastrawberry" + required_reagents = list("gelatin" = 2, "berrytea" = 6, "milk" = 2) + result_amount = 10 + +/decl/chemical_reaction/instant/drinks/bubbleteacherry + name = "Cherry bubble tea" + id = "bubbleteacherry" + result = "bubbleteacherry" + required_reagents = list("gelatin" = 2, "cherrytea" = 6, "milk" = 2) + result_amount = 10 + +/decl/chemical_reaction/instant/drinks/bubbleteacoffee + name = "Coffee bubble tea" + id = "bubbleteacoffee" + result = "bubbleteacoffee" + required_reagents = list("gelatin" = 2, "tea" = 5, "cafe_latte" = 3) + result_amount = 10 + +/decl/chemical_reaction/instant/drinks/bubbleteabanana + name = "Banana bubble tea" + id = "bubbleteabanana" + result = "bubbleteabanana" + required_reagents = list("gelatin" = 2, "tea" = 5, "banana" = 1, "milk" = 2) + result_amount = 10 + +/decl/chemical_reaction/instant/drinks/horchata + name = "Horchata" + id = "horchata" + result = "horchata" + required_reagents = list("milk" = 1, "sugar" = 2, "rice" = 2) + result_amount = 5 + +/decl/chemical_reaction/instant/drinks/bluetrain + name = "Blue train" + id = "bluetrain" + result = "bluetrain" + required_reagents = list("coolant" = 2, "ethanol" = 2, "nutriment" = 1) + result_amount = 5 + +/decl/chemical_reaction/instant/drinks/lowpower + name = "The low power" + id = "lowpower" + result = "lowpower" + required_reagents = list("lemonade" = 1, "cream" = 1, "limejuice" = 1) + result_amount = 3 + +/decl/chemical_reaction/instant/drinks/jackbrew + name = "Jack's brew" + id = "jackbrew" + result = "jackbrew" + required_reagents = list("irishcoffee" = 1, "hyperzine" = 1) + result_amount = 2 + +/decl/chemical_reaction/instant/drinks/bookwyrm + name = "Bookwyrm's bite" + id = "bookwyrm" + result = "bookwyrm" + required_reagents = list("coldfront" = 1, "limejuice" = 1, "stoxin" = 1) + result_amount = 3 + +/decl/chemical_reaction/instant/drinks/highpower + name = "The high power" + id = "highpower" + result = "highpower" + required_reagents = list("lowpower" = 1, "iron" = 1, "uranium" = 1) + result_amount = 3 + +/decl/chemical_reaction/instant/drinks/flapper + name = "Flapper" + id = "flapper" + result = "flapper" + required_reagents = list("whiskey" = 1, "blood" = 1, "ice" = 1) + result_amount = 3 + +/decl/chemical_reaction/instant/toxin/oilslide + name = "Oil slide" + id = "oilslide" + result = "oilslide" + required_reagents = list("moonshine" = 1, "lube" = 1, "fuel" = 1) + result_amount = 3 + +/decl/chemical_reaction/instant/drinks/sitonmyface + name = "Sit on my face" + id = "sitonmyface" + result = "sitonmyface" + required_reagents = list("kahlua" = 1, "irishcream" = 1, "peanutbutter" = 1) + result_amount = 3 + +/decl/chemical_reaction/instant/drinks/hachi + name = "Hachi" + id = "hachi" + result = "hachi" + required_reagents = list("burbon" = 2, "sake" = 1, "lemonjuice" = 1, "mushroom" = 1) //Whoever coded this never made a mushroom reagent so this can't be created. + result_amount = 5 + +/decl/chemical_reaction/instant/drinks/narsour + name = "Nar'sour" + id = "narsour" + result = "narsour" + required_reagents = list("blood" = 1, "lemonjuice" = 1, "demonsblood" = 1) + mix_message = "The mixture develops a sinister glow." + reaction_sound = 'sound/effects/singlebeat.ogg' + result_amount = 3 + +/decl/chemical_reaction/instant/drinks/cogchamp + name = "CogChamp" + id = "cogchamp" + result = "cogchamp" + required_reagents = list("cognac" = 1, "fuel" = 1, "screwdrivercocktail" = 1) + mix_message = "You hear faint sounds of gears turning as the mixture gives off virulent plumes of steam." + reaction_sound = 'sound/machines/clockcult/steam_whoosh.ogg' + result_amount = 3 + +//thirteen loko possible to make now, so easier to make arachnid slammer - Jack + +/decl/chemical_reaction/instant/drinks/thirteenloko + name = "Thirteen Loko" + id = "thirteenloko" + result = "thirteenloko" + required_reagents = list("beer" = 1, "tequilla" = 1, "coffee" = 1) + result_amount = 3 + +//Arachnid slammer reactions - Jack + +/decl/chemical_reaction/instant/drinks/arachnidslammer + name = "Arachnid Slammer" + id = "arachnidslammer" + result = "arachnidslammer" + required_reagents = list("ale" = 1, "thirteenloko" = 1, "hyperzine" = 1) + mix_message = "The concortion of ale, energy drink and stimulants starts to heavily foam and fizzle, even sparkle a little." + result_amount = 3 + +/decl/chemical_reaction/instant/drinks/enragedarachnidslammer + name = "Enraged Arachnid Slammer" + id = "enragedarachnidslammer" + result = "enragedarachnidslammer" + required_reagents = list("infusedarachnidslammer" = 1, "spidertoxin" = 1) + mix_message = "The dormant Arachnid Slammer bubbles and fizzles loudly as it gets enraged by the spider toxin and breaks it down!" + result_amount = 5 + +/decl/chemical_reaction/instant/drinks/enragedarachnidslammer1 + name = "Enraged Arachnid Slammer" + id = "enragedarachnidslammer" + required_reagents = list("enragedarachnidslammer" = 1, "cyanide" = 1) + result = "enragedarachnidslammer" + result_amount = 0.1 + +/decl/chemical_reaction/instant/drinks/enragedarachnidslammer2 + name = "Enraged Arachnid Slammer" + id = "enragedarachnidslammer" + required_reagents = list("enragedarachnidslammer" = 1, "chloralhydrate" = 1) + result = "enragedarachnidslammer" + result_amount = 0.1 + +/decl/chemical_reaction/instant/drinks/enragedarachnidslammer3 + name = "Enraged Arachnid Slammer" + id = "enragedarachnidslammer" + required_reagents = list("enragedarachnidslammer" = 1, "stimm" = 1) + result = "enragedarachnidslammer" + result_amount = 0.1 + +/decl/chemical_reaction/instant/drinks/enragedarachnidslammer4 + name = "Enraged Arachnid Slammer" + id = "enragedarachnidslammer" + required_reagents = list("enragedarachnidslammer" = 1, "cryotoxin" = 1) + result = "enragedarachnidslammer" + result_amount = 0.1 + +/decl/chemical_reaction/instant/drinks/enragedarachnidslammer5 + name = "Enraged Arachnid Slammer" + id = "enragedarachnidslammer" + required_reagents = list("enragedarachnidslammer" = 1, "cryptobiolin" = 1) + result = "enragedarachnidslammer" + result_amount = 0.1 + +/decl/chemical_reaction/instant/drinks/enragedarachnidslammer6 + name = "Enraged Arachnid Slammer" + id = "enragedarachnidslammer" + required_reagents = list("enragedarachnidslammer" = 1, "stoxin" = 1) + result = "enragedarachnidslammer" + result_amount = 0.1 + +/decl/chemical_reaction/instant/drinks/enragedarachnidslammer7 + name = "Enraged Arachnid Slammer" + id = "enragedarachnidslammer" + required_reagents = list("enragedarachnidslammer" = 1, "condensedcapsaicin_v" = 1) + result = "enragedarachnidslammer" + result_amount = 0.1 + +/decl/chemical_reaction/instant/drinks/enragedarachnidslammer8 + name = "Enraged Arachnid Slammer" + id = "enragedarachnidslammer" + required_reagents = list("enragedarachnidslammer" = 1, "phoron" = 1) + result = "enragedarachnidslammer" + result_amount = 0.1 + +/decl/chemical_reaction/instant/drinks/enragedarachnidslammer9 + name = "Enraged Arachnid Slammer" + id = "enragedarachnidslammer" + required_reagents = list("enragedarachnidslammer" = 1, "thermite_v" = 1) + result = "enragedarachnidslammer" + result_amount = 0.1 + +/decl/chemical_reaction/instant/drinks/enragedarachnidslammer10 + name = "Enraged Arachnid Slammer" + id = "enragedarachnidslammer" + required_reagents = list("enragedarachnidslammer" = 1, "serotrotium_v" = 1) + result = "enragedarachnidslammer" + result_amount = 0.1 + +/decl/chemical_reaction/instant/drinks/pilk + name = "Pilk" + id = "pilk" + result = "pilk" + required_reagents = list("milk" = 1, "cola" = 1) + result_amount = 2 + +// Drinks from Horizon + +/decl/chemical_reaction/instant/drinks/alliescocktail + name = "Allies Cocktail" + id = "alliescocktail" + result = "alliescocktail" + required_reagents = list("martini" = 1, "vodka" = 1) + result_amount = 2 + +/decl/chemical_reaction/instant/drinks/fetching_fizz + name = "Fetching Fizz" + id = "fetching_fizz" + result = "fetching_fizz" + required_reagents = list("nuka_cola" = 1, "iron" = 1) + result_amount = 3 + +/decl/chemical_reaction/instant/drinks/hearty_punch + name = "Hearty Punch" + id = "hearty_punch" + result = "hearty_punch" + required_reagents = list("bravebull" = 5, "syndicatebomb" = 5, "absinthe" = 5) + result_amount = 1 + +/decl/chemical_reaction/instant/drinks/squirt_cider + name = "Squirt Cider" + id = "squirt_cider" + result = "squirt_cider" + required_reagents = list("water" = 1, "tomatojuice" = 1, "nutriment" = 1) + result_amount = 3 + +/decl/chemical_reaction/instant/drinks/fringe_weaver + name = "Fringe Weaver" + id = "fringe_weaver" + result = "fringe_weaver" + required_reagents = list("ethanol" = 9, "sugar" = 1) + result_amount = 10 + +/decl/chemical_reaction/instant/drinks/crevice_spike + name = "Crevice Spike" + id = "crevice_spike" + result = "crevice_spike" + required_reagents = list("limejuice" = 2, "capsaicin" = 4) + result_amount = 6 + +/decl/chemical_reaction/instant/drinks/duplex + name = "Duplex" + id = "duplex" + result = "duplex" + required_reagents = list("cider" = 2, "applejuice" = 1, "berryjuice" = 1) + result_amount = 4 + +/decl/chemical_reaction/instant/drinks/mauna_loa + name = "Mauna Loa" + id = "mauna_loa" + result = "mauna_loa" + required_reagents = list("capsaicin" = 2, "kahlua" = 1, "bahama_mama" = 2) + result_amount = 5 + +/decl/chemical_reaction/instant/drinks/hiveminderaser + name = "Hivemind Eraser" + id = "hiveminderaser" + result = "hiveminderaser" + required_reagents = list("blackrussian" = 2, "thirteenloko" = 1, "grenadine" = 1) + result_amount = 4 + +/decl/chemical_reaction/instant/drinks/erikasurprise + name = "Erika Surprise" + id = "erikasurprise" + result = "erikasurprise" + required_reagents = list("ale" = 2, "limejuice" = 1, "whiskey" = 1, "banana" = 1, "ice" = 1) + result_amount = 6 + +//YW drinks +/decl/chemical_reaction/instant/drinks/lovepotion_yw + name = "Strawberry Love Potion" + id = "strawberrylovepotion" + result = "strawberrylovepotion" + required_reagents = list("cream" = 1, "berryjuice" = 1, "sugar" = 1) + result_amount = 3 + +/decl/chemical_reaction/instant/drinks/wormblood + name = "Wormblood" + id = "wormblood" + result = "wormblood" + required_reagents = list("booger" = 1, "psilocybin" = 1) + result_amount = 2 diff --git a/code/modules/reagents/reagents/food_drinks_ch.dm b/modular_chomp/code/modules/reagents/reagents/food_drinks.dm similarity index 80% rename from code/modules/reagents/reagents/food_drinks_ch.dm rename to modular_chomp/code/modules/reagents/reagents/food_drinks.dm index af0111de8e..84ca7a4f97 100644 --- a/code/modules/reagents/reagents/food_drinks_ch.dm +++ b/modular_chomp/code/modules/reagents/reagents/food_drinks.dm @@ -1,607 +1,728 @@ -//////////////////////////////////////////////// -/////////DRINKS//////////////////////////////// -////////////////////////////////////////////// - -/datum/reagent/drink/tea/cherrytea - name = "Cherry Tea" - id = "cherrytea" - description = "A tasty mixture of cherries and tea. It's apparently good for you!" - color = "#c15962" - taste_description = "black tea with lots of cherries" - - glass_name = "cherry tea" - glass_desc = "A tasty mixture of cherries and tea. It's apparently good for you!" - - cup_name = "cup of cherry tea" - cup_desc = "A tasty mixture of cherries and tea. It's apparently good for you!" - -/datum/reagent/drink/tea/watermelontea - name = "Watermelon Tea" - id = "watermelontea" - description = "A tasty mixture of watermelon and tea. It's apparently good for you!" - color = "#9f2c2c" - taste_description = "black tea with sweet watermelon for flavouring" - - glass_name = "watermelon tea" - glass_desc = "A tasty mixture of watermelon and tea. It's apparently good for you!" - - cup_name = "cup of watermelon tea" - cup_desc = "A tasty mixture of watermelon and tea. It's apparently good for you!" - -/datum/reagent/drink/tea/matcha_latte //Putting this as tea to inherit tea variables. Should not have the same toxloss as matcha so it can be placed in a dispenser without breaking balance. - name = "Matcha latte" - id = "matcha_latte" - description = "A nice and tasty beverage to enjoy while studying." - taste_description = "creamy, vegetal sweetness" - color = "#b1c48c" - adj_temp = 5 - - glass_name = "matcha latte" - glass_desc = "A nice and refreshing beverage while you are studying." - - cup_icon_state = "cup_latte" - cup_name = "cup of matcha latte" - cup_desc = "A nice and refreshing beverage while you are studying." - -/datum/reagent/drink/tea/dyloteane - name = "The Anti-Irish" - id = "dyloteane" - glass_name = "Medicinal tea cup" - glass_desc = "Goes perfectly with alcohol poisoning!" - taste_description = "The sweet taste of multidepartment cooperation!" - cup_desc = "Goes perfectly with alcohol poisoning!" - cup_name = "Medicinal tea cup" - color = "#00FF00" - -/datum/reagent/drink/tea/dyloteane/affect_blood(var/mob/living/carbon/M, var/alien, var/removed) - if(alien == IS_DIONA) - return - if(M.ingested) - for(var/datum/reagent/R in M.ingested.reagent_list) - if(istype(R, /datum/reagent/ethanol)) - R.remove_self(removed * 3) - if(M.bloodstr) - for(var/datum/reagent/R in M.bloodstr.reagent_list) - if(istype(R, /datum/reagent/ethanol)) - R.remove_self(removed * 10) - -/datum/reagent/drink/tea/dyloteane/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed) - var/chem_effective = 1 - if(alien != IS_DIONA) - M.drowsyness = max(0, M.drowsyness - 6 * removed * chem_effective) - M.hallucination = max(0, M.hallucination - 9 * removed * chem_effective) - M.adjustToxLoss(-1 * removed * chem_effective) - -/datum/reagent/slimedrink - name = "Slime" - id = "slimedrink" - description = "A gooey semi-liquid produced from your fellow slimey crew members." - taste_description = "jiggly" - taste_mult = 1.3 - reagent_state = LIQUID - color = "#8bdce5" - - glass_name = "Slime" - glass_desc = "Slime thats safe to drink (relatively)" - -/datum/reagent/drink/soda - ingest_met = REM * 5 //Makes it so soda metabolizes faster, since without this increase, the nutrients it currently gives does nothing. Also, metabolises faster then normal nutrients due to being soda. - -/datum/reagent/ethanol/spiderdrink - name = "Brimming glass of spiders" - id = "spiderdrink" - description = "A fresh drink consisting of cloned spiderlings who are intoxicated by a healthy dose of absinthe." - taste_description = "TOO MANY LEGS" - color = "#526062" // rgb(82, 96, 98) - strength = 15 - - glass_name = "Brimming glass of spiders" - glass_desc = "A glass filled to the brim with tiny drunk spiderlings. Lets hope they dont escape." - -/datum/reagent/ethanol/snaps - name = "Akvavit" - id = "snaps" - description = "Burns the nose and throat and soothes it with a herby aftertaste...Barely." - taste_description = "strong spirit and a little dill" - color = "e6d670" // rgb: 230, 214, 112 - strength = 15 - - glass_name = "akvavit" - glass_desc = "Burns the nose and throat, and soothes it with a herby aftertaste...Barely." - -/datum/reagent/ethanol/bluetrain - name = "blue train" - id = "bluetrain" - description = "A drink only a fool or a very desperate creature would consume." - taste_description = "someone who decided to pour ice cold motor oil down your throat and finish it off with a large shot of burning pure alcohol." - color = "#c8a5dc" - adj_temp = -10 - targ_temp = 220 - strength = 10 - - glass_name = "blue train" - glass_desc = "A glass of what can only be described as the bastard child between coolant and alcohol made by a madman." - -/datum/reagent/drink/lowpower - name = "The low power" - id = "lowpower" - description = "Smells, and tastes like lemon.. with a hint of Ozone, for whatever reason. It glows softly." - taste_description = "creamy lemonade, with some zest" - color = "#5d8d39" - - glass_name = "lowpower" - glass_desc = "Smells, and tastes like lemon.. with a hint of Ozone, for whatever reason. It glows softly." - -/datum/reagent/drink/lowpower/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed) - ..() - if(alien == IS_DIONA) - return - M.adjustToxLoss(-0.5 * removed) - -/datum/reagent/drink/highpower - name = "The High power" - id = "highpower" - description = "A strange, softly crackling drink, smelling just like lightning's just struck, twice. It's rather difficult to make this without busting the lights." - taste_description = "copper, ozone, and pain" - color = "#a2f563" - - glass_name = "highpower" - glass_desc = "A strange, softly crackling drink, smelling just like lightning's just struck, twice. It's rather difficult to make this without busting the lights." - -/datum/reagent/drink/highpower/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed) - if(alien == IS_DIONA) - return - if(prob(5)) - M.say("!skin's crackles with energy and seems to be in pain.") - M.custom_pain("You feel painful electricity running through your body, like adrenaline, and like your blood's boiling!",30) - M.AdjustWeakened(3) //Getting sapped makes the victim fall - M.Stun(3) - M.add_chemical_effect(CE_SPEEDBOOST, 1) - -/datum/reagent/ethanol/coffee/jackbrew - name = "Rush hour" - id = "jackbrew" - description = "Irish coffee, and hyperzine. A common mix for panicked drinkers, EMTS, Paramedics, and CMOs alone on the job." - taste_description = "wishing you could give up on the day" - color = "#4C3100" - strength = 15 - - glass_name = "Rush hour" - glass_desc = "Irish coffee, and hyperzine. A common mix for panicked drinkers, EMTS, Paramedics, and CMOs alone on the job." - -/datum/reagent/ethanol/coffee/jackbrew/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed) - if(alien == IS_TAJARA) - removed *= 1.25 - if(alien == IS_SLIME) - M.make_jittery(4) //Hyperactive fluid pumping results in unstable 'skeleton', resulting in vibration. - if(dose >= 5) - M.nutrition = (M.nutrition - (removed * 2)) //Sadly this movement starts burning food in higher doses. - ..() - if(prob(5)) - M.emote(pick("twitch", "blink_r", "shiver", "weh", "weh", "weh")) // weh - Jack - M.add_chemical_effect(CE_SPEEDBOOST, 1) - -/datum/reagent/ethanol/bookwyrm - name = "Bookwyrm's bite" - id = "bookwyrm" - description = "You'd probably fancy a nice nap by the fireplace after drinking this." - taste_description = "Mint, lime and a cold cozy nap" - color = "#5678c3" - strength = 20 - adj_temp = -10 - targ_temp = 273 //Dilluted cold front wont be the death of anyone who cant handle sipping liquid nitrogen. - - glass_name = "Bookwyrm's bite" - glass_desc = "A cold lime mint drink. Dont drink to much or you might fall asleep." - -/datum/reagent/ethanol/bookwyrm/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed) - if(alien == IS_DIONA) - return - - var/threshold = 1 - if(alien == IS_SKRELL) - threshold = 1.2 - - if(alien == IS_SLIME) - threshold = 6 //Evens to 3 due to the fact they are considered 'small' for flaps. - - var/effective_dose = dose - if(issmall(M)) - effective_dose *= 2 - - if(effective_dose < 1 * threshold) - if(effective_dose == metabolism * 2 || prob(5)) - M.emote("yawn") - else if(effective_dose < 1.5 * threshold) - M.eye_blurry = max(M.eye_blurry, 10) - else if(effective_dose < 5 * threshold) - if(prob(50)) - M.Weaken(2) - M.drowsyness = max(M.drowsyness, 20) - else - if(alien == IS_SLIME) //They don't have eyes, and they don't really 'sleep'. Fumble their general senses. - M.eye_blurry = max(M.eye_blurry, 30) - if(prob(20)) - M.ear_deaf = max(M.ear_deaf, 4) - M.Confuse(2) - else - M.Weaken(2) - else - M.sleeping = max(M.sleeping, 20) - M.drowsyness = max(M.drowsyness, 60) - -/datum/reagent/ethanol/flapper - name = "Flapper" - id = "flapper" - description = "A common drink among blood-drinkers, and those who just wanna drink. Tinnibat be damned." - taste_description = "a bloody good time" - color = "#763424" - strength = 15 - - glass_name = "flapper" - glass_desc = "A common drink among blood-drinkers, and those who just wanna drink. Tinnibat be damned." - -/datum/reagent/toxin/oilslide - name = "Oil slide" - id = "oilslide" - description = "Tasty, if you're a synth, not so much for organics." - taste_description = "oil, slime, and fuel! Tastes also like synthetic backwash" - color = "#331a1a" - - glass_name = "oilslide" - glass_desc = "Tasty, if you're a synth, not so much for organics." - -/datum/reagent/ethanol/sitonmyface - name = "Sit on my face" - id = "sitonmyface" - description = "A drink made of irish coffee and nuts, mostly known for its vulgar name. Makes for a great pickup line though!" - taste_description = "creamy coffee and alcohol, and nuts" - color = "#896750" - strength = 15 - - glass_name = "Sit on my face" - glass_desc = "A drink made of irish coffee and nuts, mostly known for its vulgar name. Makes for a great pickup line though!" - -/datum/reagent/ethanol/hachi - name = "Hachi" - id = "hachi" - description = "An unusual fusion of bourbon and sake infused with lemon juice, and mushrooms. Sweet, savory, but mostly weird." - taste_description = "sweet lemons, black pepper, and savory mushroom" - color = "#DC971D" - strength = 20 - -/datum/reagent/drink/freshtea - name = "Green tea" - id = "freshtea" //Not meant to be obtainable, this is to define effects for teas made from grown teas. - description = "Tasty green tea, it has antioxidants, it's good for you! Fresh means it's even healthier!" - taste_description = "green tea" - color = "#cac162" - adj_dizzy = -4 - adj_drowsy = -1 - adj_sleepy = -3 - adj_temp = 20 - - glass_name = "green tea" - glass_desc = "Tasty green tea, it has antioxidants, it's good for you!" - - cup_icon_state = "cup_tea" - cup_name = "cup of tea" - cup_desc = "Tasty green tea, it has antioxidants, it's good for you!" - -/datum/reagent/drink/freshtea/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed) - ..() - if(alien == IS_DIONA) - return - M.adjustToxLoss(-2 * removed) //Higher toxin removal than other tea to reflect difficulty in preparing, still worse than dylovene. - -/datum/reagent/drink/freshtea/green - name = "Green tea" - id = "freshteagreen" - description = "Floral green tea, it has antioxidants, it's good for you! Fresh means it's even healthier!" - taste_description = "floral with vegetal notes and a slightly bitter aftertaste" - color = "#cac162" - - glass_name = "green tea" - glass_desc = "Floral green tea, it has antioxidants, it's fresh and good for you!" - - cup_icon_state = "cup_tea" - cup_name = "cup of tea" - cup_desc = "Floral green tea, it has antioxidants, it's fresh and good for you!" - -/datum/reagent/drink/tealeavesgreen - name = "Green tea leaves" - id = "tealeavesgreen" - description = "Prepared green tea, just waiting for hot water." - taste_description = "overwhelmingly bitter with faint floral notes" - color = "#56761d" - - glass_name = "tea leaves" - glass_desc = "Dry tea leaves in a cup. Just add hot water!" - -/datum/reagent/drink/teamush - name = "Tea mush" - id = "teamush" - description = "Mashed tea leaves, a bit like grass clippings. You can't make proper tea out of this now." - taste_description = "overwhelmingly bitter plant" - color = "#7db72d" - - glass_name = "blended plant" - glass_desc = "Chunky, mashed up plant of some sort. Looks kinda gross." - -/datum/reagent/drink/instantteapowdergreen - name = "Instant green tea powder" - id = "instantteapowdergreen" - description = "Green tea powder missing all the goodness of green tea." //Heathen. - taste_description = "strong bitterness with a subtle chemical aftertaste" - color = "#56761d" - - glass_name = "tea powder" - glass_desc = "Instant green tea powder. Just add water for imitation green tea!" - -/datum/reagent/drink/instantteagreen - name = "Instant green tea" - id = "instantteagreen" - description = "Convenient green tea missing all the goodness of actual green tea." //It's not even hot. - taste_description = "bitterness with a subtle chemical aftertaste" - color = "#cac162" - - glass_name = "green tea" - glass_desc = "Green tea. It smells a bit off." - - cup_icon_state = "cup_tea" - cup_name = "cup of tea" - cup_desc = "Green tea. It smells a bit off." - -/datum/reagent/drink/matchapowder - name = "Matcha powder" - id = "matchapowder" - description = "Finely ground green tea. This is about the highest quality matcha you can prepare without traditional methods." - taste_description = "heavy bitterness" - color = "#86a443" - - glass_name = "matcha powder" - glass_desc = "Matcha powder, waiting for brewing." - -/datum/reagent/drink/matcha - name = "Matcha" - id = "matcha" - description = "A form of green tea where the leaf is ground and suspended in water rather than steeped. This is considered cooking grade." - taste_description = "floral, full-bodied bitterness with a subtle, earthy sweetness" - color = "#9bc265" - adj_dizzy = -4 - adj_drowsy = -1 - adj_sleepy = -3 - adj_temp = 20 - - glass_name = "matcha" - glass_desc = "Heavenly matcha. Good for body and spirit." - - cup_icon_state = "cup_tea" - cup_name = "cup of matcha" - cup_desc = "Heavenly matcha. Good for body and spirit." - -/datum/reagent/drink/matcha/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed) - ..() - if(alien == IS_DIONA) - return - M.adjustToxLoss(-3 * removed) //Almost on par with dylovene despite being harder to obtain in bulk. Nerf if this causes problems. - -/datum/reagent/drink/juice/gelatin - name = "Gelatin" - id = "gelatin" - description = "It doesnt taste like anything." - taste_description = "nothing" - nutrition = 0 - color = "#aaabcf" - - glass_name = "Gelatin" - glass_desc = "It's like flavourless slime." - -/datum/reagent/drink/bubbleteawatermelon - name = "Watermelon bubble tea" - id = "bubbleteawatermelon" - description = "A tea with milk and watermelon in it and gelatin balls as well." - taste_description = "creamy tea and watermelon" - color = "#b83333" - - glass_name = "watermelon bubble tea" - glass_desc = "A sweet tea with tasty little flavoured gelatin balls in it, this one is with watermelon." - -/datum/reagent/drink/bubbleteastrawberry - name = "Strawberry bubble tea" - id = "bubbleteastrawberry" - description = "A tea with milk and strawberry in it and gelatin balls as well." - taste_description = "creamy tea and strawberry" - color = "#eb6c77" - - glass_name = "strawberry bubble tea" - glass_desc = "A sweet tea with tasty little flavoured gelatin balls in it, this one is with strawberry." - -/datum/reagent/drink/bubbleteacherry - name = "Cherry bubble tea" - id = "bubbleteacherry" - description = "A tea with milk and cherry in it and gelatin balls as well." - taste_description = "creamy tea and cherry" - color = "#801e28" - - glass_name = "cherry bubble tea" - glass_desc = "A sweet tea with tasty little flavoured gelatin balls in it, this one is with cherry." - -/datum/reagent/drink/bubbleteacoffee - name = "Coffee bubble tea" - id = "bubbleteacoffee" - description = "A tea with milk and coffee in it and gelatin balls as well." - taste_description = "creamy tea and coffee" - color = "#482910" - - glass_name = "coffee bubble tea" - glass_desc = "A sweet tea with tasty little flavoured gelatin balls in it, this one is with coffee." - -/datum/reagent/drink/bubbleteabanana - name = "Banana bubble tea" - id = "bubbleteabanana" - description = "A tea with milk and banana in it and gelatin balls as well." - taste_description = "creamy tea and banana" - color = "#c3af00" - - glass_name = "banana bubble tea" - glass_desc = "A sweet tea with tasty little flavoured gelatin balls in it, this one is with banana." - -/datum/reagent/drink/horchata - name = "Horchata" - id = "horchata" - description = "A sweet and cold rice milk beverage." - taste_description = "sweet rice milk and cinnamon" - color = "#ebcdc1" - adj_temp = -5 - - glass_name = "horchata" - glass_desc = "A sweet and cold rice milk beverage." - -/datum/reagent/ethanol/snaps - name = "Akvavit" - id = "snaps" - description = "Burns the nose and throat and soothes it with a herby aftertaste...Barely." - taste_description = "strong spirit and a little dill" - color = "e6d670" // rgb: 230, 214, 112 - strength = 15 - - glass_name = "akvavit" - glass_desc = "Burns the nose and throat, and soothes it with a herby aftertaste...Barely." - -/datum/reagent/ethanol/narsour - name = "Nar'Sour" - id = "narsour" - description = "Side effects include self-mutilation and hoarding plasteel." - taste_description = "blood and runes" - color = "#7D1717" - strength = 10 - - glass_icon_state = "narsour" - glass_name = "Nar'Sour" - glass_desc = "A new hit cocktail inspired by THE ARM Breweries will have you shouting Fuu ma'jin in no time!" - glass_icon_state = "narsour" - glass_icon_file = 'icons/obj/drinks_ch.dmi' - - -/datum/reagent/ethanol/cogchamp - name = "CogChamp" - id = "cogchamp" - description = "Now you can fill yourself with the power of Ratvar!" - taste_description = "brass taste with a hint of oil" - color = rgb(255, 201, 49) - strength = 10 - - glass_icon_state = "cogchamp" - glass_name = "CogChamp" - glass_desc = "Not even Ratvar's Four Generals could withstand this! Qevax Jryy!" - glass_icon_state = "cogchamp" - glass_icon_file = 'icons/obj/drinks_ch.dmi' - -//Arachnid slammer states - Jack - -/datum/reagent/ethanol/arachnidslammer - name = "Arachnid Slammer" - id = "arachnidslammer" - description = "An adventurous mix of a cheap, powerful ale with an equally cheap, powerful energy drink and combat drugs. The result should have been undrikable, and yet it sure does put a spring in your step." - taste_description = "hearty barley ale, almost illegal energy drink, combat stimulants, and the urge to go mine and wrestle a spider" - color = "#594219" - strength = 30 - nutriment_factor = 1 - - glass_name = "arachnid slammer" - glass_desc = "A freezing pint of delicious Araching Slammer, it foams constantly with the air crisp around it." - allergen_type = ALLERGEN_GRAINS //Barley is grain - -/datum/reagent/ethanol/arachnidslammer/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed) - .=..() - M.reagents.add_reagent("infusedarachnidslammer", removed * 5) -/datum/reagent/ethanol/arachnidslammer/affect_blood(var/mob/living/carbon/M, var/alien, var/removed) - .=..() - M.reagents.add_reagent("infusedarachnidslammer", removed * 5) - -/datum/reagent/infusedarachnidslammer - name = "Infused Arachnid Slammer" - id = "infusedarachnidslammer" - description = "When Arachnid Slammer is metabolized you get a concortion of chemicals that breaks down slower. While the alcohol is burned off, the new compounds seems dormant, like they're waiting for some malicious toxin.." - taste_description = "flat watered down Arachnid Slammer and a brewing tempest" - reagent_state = LIQUID - color = "#8040FF" - scannable = 1 - metabolism = REM - ingest_met = REM - - glass_name = "infused arachnid slammer" - glass_desc = "A pint of metabolized Arachnid Slammer. Even if its flat it still somehow foams and sparkles as well as bubbles more actively when spiders are nearby." - -/datum/reagent/infusedarachnidslammer/enragedarachnidslammer - name = "Enraged Arachnid Slammer" - id = "enragedarachnidslammer" - description = "The best term to scientifically describe this concortion is that the compounds of the Arachnid Slammer are going into a raging frenzy from spider toxin. Its now functioning like a form of potent chemical-based white blood cells that aims to break down harmful compounds and repair the body." - taste_description = "cold burning liquid rage and the urge to destroy any spider you see" - - glass_name = "enraged arachnid slammer" - glass_desc = "A pint of Enraged Arachnid Slammer. It bubbles and sparkles fiercly as if it was in a berserking state!" - -/datum/reagent/infusedarachnidslammer/enragedarachnidslammer/affect_blood(var/mob/living/carbon/M, var/alien, var/removed) - var/chem_effective = 1 * M.species.chem_strength_heal - - M.adjustOxyLoss(-1.5 * removed * chem_effective) - M.adjustToxLoss(-1.5 * removed * chem_effective) - M.heal_organ_damage(1.5 * removed, 1.5 * removed * chem_effective) - M.add_chemical_effect(CE_PAINKILLER, 80 * chem_effective) - M.add_chemical_effect(CE_SPEEDBOOST, 0) - -/datum/reagent/drink/pilk - name = "Pilk" - id = "pilk" - description = "A forbidden mixture that dates back to the early days of space civilization, its creation is known to have caused at least one or two massacres." - taste_description = "heresy" - color = "#4C3100" - - glass_name = "Pilk" - glass_desc = "Why would you do this to yourself?" - - cup_name = "glass of Pilk" - cup_desc = "A glass of regret." - -//////////////////////////////////////////////// -/////////FOODSTUFF///////////////////////////// -////////////////////////////////////////////// - -/datum/reagent/cinnamonpowder - name = "ground cinnamon" - id = "cinnamonpowder" - description = "Cinnamon, a spice made from tree bark, ground into a fine powder. Probably not a good idea to eat on its own!" - taste_description= "sweet spice with a hint of wood" - color = "#a96622" - - glass_name = "ground cinnamon" - glass_desc = "A glass of ground cinnamon. Dare you take the challenge?" - -//YW drinks -/datum/reagent/drink/lovepotion_yw - name = "Strawberry Love Potion" - id = "strawberrylovepotion" - description = "Creamy strawberries and sugar, simple and sweet." - taste_description = "strawberries and cream" - color = "#fc8a8a" // rgb(252, 138, 138) - - glass_name = "Love Potion" - glass_desc = "Love me tender, love me sweet." - - -/datum/reagent/ethanol/wormblood - name = "Worm Blood" - id = "wormblood" - description = "Who had the grand idea to bottle THE BLOOD OF A WORM." - taste_description = "Wriggly cave fungus" - color = "#827A00" - strength = 30 - druggy = 10 - - glass_name = "Worm blood" - glass_desc = "Who had the grand idea to bottle THE BLOOD OF A WORM." - glass_icon_state = "wormblood" - glass_center_of_mass = list("x"=16, "y"=8) - glass_icon_file = 'icons/obj/drinks_yw.dmi' +//////////////////////////////////////////////// +/////////DRINKS//////////////////////////////// +////////////////////////////////////////////// + +/datum/reagent/drink/tea/cherrytea + name = "Cherry Tea" + id = "cherrytea" + description = "A tasty mixture of cherries and tea. It's apparently good for you!" + color = "#c15962" + taste_description = "black tea with lots of cherries" + + glass_name = "cherry tea" + glass_desc = "A tasty mixture of cherries and tea. It's apparently good for you!" + + cup_name = "cup of cherry tea" + cup_desc = "A tasty mixture of cherries and tea. It's apparently good for you!" + +/datum/reagent/drink/tea/watermelontea + name = "Watermelon Tea" + id = "watermelontea" + description = "A tasty mixture of watermelon and tea. It's apparently good for you!" + color = "#9f2c2c" + taste_description = "black tea with sweet watermelon for flavouring" + + glass_name = "watermelon tea" + glass_desc = "A tasty mixture of watermelon and tea. It's apparently good for you!" + + cup_name = "cup of watermelon tea" + cup_desc = "A tasty mixture of watermelon and tea. It's apparently good for you!" + +/datum/reagent/drink/tea/matcha_latte //Putting this as tea to inherit tea variables. Should not have the same toxloss as matcha so it can be placed in a dispenser without breaking balance. + name = "Matcha latte" + id = "matcha_latte" + description = "A nice and tasty beverage to enjoy while studying." + taste_description = "creamy, vegetal sweetness" + color = "#b1c48c" + adj_temp = 5 + + glass_name = "matcha latte" + glass_desc = "A nice and refreshing beverage while you are studying." + + cup_icon_state = "cup_latte" + cup_name = "cup of matcha latte" + cup_desc = "A nice and refreshing beverage while you are studying." + +/datum/reagent/drink/tea/dyloteane + name = "The Anti-Irish" + id = "dyloteane" + glass_name = "Medicinal tea cup" + glass_desc = "Goes perfectly with alcohol poisoning!" + taste_description = "The sweet taste of multidepartment cooperation!" + cup_desc = "Goes perfectly with alcohol poisoning!" + cup_name = "Medicinal tea cup" + color = "#00FF00" + +/datum/reagent/drink/tea/dyloteane/affect_blood(var/mob/living/carbon/M, var/alien, var/removed) + if(alien == IS_DIONA) + return + if(M.ingested) + for(var/datum/reagent/R in M.ingested.reagent_list) + if(istype(R, /datum/reagent/ethanol)) + R.remove_self(removed * 3) + if(M.bloodstr) + for(var/datum/reagent/R in M.bloodstr.reagent_list) + if(istype(R, /datum/reagent/ethanol)) + R.remove_self(removed * 10) + +/datum/reagent/drink/tea/dyloteane/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed) + var/chem_effective = 1 + if(alien != IS_DIONA) + M.drowsyness = max(0, M.drowsyness - 6 * removed * chem_effective) + M.hallucination = max(0, M.hallucination - 9 * removed * chem_effective) + M.adjustToxLoss(-1 * removed * chem_effective) + +/datum/reagent/slimedrink + name = "Slime" + id = "slimedrink" + description = "A gooey semi-liquid produced from your fellow slimey crew members." + taste_description = "jiggly" + taste_mult = 1.3 + reagent_state = LIQUID + color = "#8bdce5" + + glass_name = "Slime" + glass_desc = "Slime thats safe to drink (relatively)" + +/datum/reagent/drink/soda + ingest_met = REM * 5 //Makes it so soda metabolizes faster, since without this increase, the nutrients it currently gives does nothing. Also, metabolises faster then normal nutrients due to being soda. + +/datum/reagent/ethanol/spiderdrink + name = "Brimming glass of spiders" + id = "spiderdrink" + description = "A fresh drink consisting of cloned spiderlings who are intoxicated by a healthy dose of absinthe." + taste_description = "TOO MANY LEGS" + color = "#526062" // rgb(82, 96, 98) + strength = 15 + + glass_name = "Brimming glass of spiders" + glass_desc = "A glass filled to the brim with tiny drunk spiderlings. Lets hope they dont escape." + +/datum/reagent/ethanol/snaps + name = "Akvavit" + id = "snaps" + description = "Burns the nose and throat and soothes it with a herby aftertaste...Barely." + taste_description = "strong spirit and a little dill" + color = "e6d670" // rgb: 230, 214, 112 + strength = 15 + + glass_name = "akvavit" + glass_desc = "Burns the nose and throat, and soothes it with a herby aftertaste...Barely." + +/datum/reagent/ethanol/bluetrain + name = "blue train" + id = "bluetrain" + description = "A drink only a fool or a very desperate creature would consume." + taste_description = "someone who decided to pour ice cold motor oil down your throat and finish it off with a large shot of burning pure alcohol." + color = "#c8a5dc" + adj_temp = -10 + targ_temp = 220 + strength = 10 + + glass_name = "blue train" + glass_desc = "A glass of what can only be described as the bastard child between coolant and alcohol made by a madman." + +/datum/reagent/drink/lowpower + name = "The low power" + id = "lowpower" + description = "Smells, and tastes like lemon.. with a hint of Ozone, for whatever reason. It glows softly." + taste_description = "creamy lemonade, with some zest" + color = "#5d8d39" + + glass_name = "lowpower" + glass_desc = "Smells, and tastes like lemon.. with a hint of Ozone, for whatever reason. It glows softly." + +/datum/reagent/drink/lowpower/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed) + ..() + if(alien == IS_DIONA) + return + M.adjustToxLoss(-0.5 * removed) + +/datum/reagent/drink/highpower + name = "The High power" + id = "highpower" + description = "A strange, softly crackling drink, smelling just like lightning's just struck, twice. It's rather difficult to make this without busting the lights." + taste_description = "copper, ozone, and pain" + color = "#a2f563" + + glass_name = "highpower" + glass_desc = "A strange, softly crackling drink, smelling just like lightning's just struck, twice. It's rather difficult to make this without busting the lights." + +/datum/reagent/drink/highpower/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed) + if(alien == IS_DIONA) + return + if(prob(5)) + M.say("!skin's crackles with energy and seems to be in pain.") + M.custom_pain("You feel painful electricity running through your body, like adrenaline, and like your blood's boiling!",30) + M.AdjustWeakened(3) //Getting sapped makes the victim fall + M.Stun(3) + M.add_chemical_effect(CE_SPEEDBOOST, 1) + +/datum/reagent/ethanol/coffee/jackbrew + name = "Rush hour" + id = "jackbrew" + description = "Irish coffee, and hyperzine. A common mix for panicked drinkers, EMTS, Paramedics, and CMOs alone on the job." + taste_description = "wishing you could give up on the day" + color = "#4C3100" + strength = 15 + + glass_name = "Rush hour" + glass_desc = "Irish coffee, and hyperzine. A common mix for panicked drinkers, EMTS, Paramedics, and CMOs alone on the job." + +/datum/reagent/ethanol/coffee/jackbrew/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed) + if(alien == IS_TAJARA) + removed *= 1.25 + if(alien == IS_SLIME) + M.make_jittery(4) //Hyperactive fluid pumping results in unstable 'skeleton', resulting in vibration. + if(dose >= 5) + M.nutrition = (M.nutrition - (removed * 2)) //Sadly this movement starts burning food in higher doses. + ..() + if(prob(5)) + M.emote(pick("twitch", "blink_r", "shiver", "weh", "weh", "weh")) // weh - Jack + M.add_chemical_effect(CE_SPEEDBOOST, 1) + +/datum/reagent/ethanol/bookwyrm + name = "Bookwyrm's bite" + id = "bookwyrm" + description = "You'd probably fancy a nice nap by the fireplace after drinking this." + taste_description = "Mint, lime and a cold cozy nap" + color = "#5678c3" + strength = 20 + adj_temp = -10 + targ_temp = 273 //Dilluted cold front wont be the death of anyone who cant handle sipping liquid nitrogen. + + glass_name = "Bookwyrm's bite" + glass_desc = "A cold lime mint drink. Dont drink to much or you might fall asleep." + +/datum/reagent/ethanol/bookwyrm/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed) + if(alien == IS_DIONA) + return + + var/threshold = 1 + if(alien == IS_SKRELL) + threshold = 1.2 + + if(alien == IS_SLIME) + threshold = 6 //Evens to 3 due to the fact they are considered 'small' for flaps. + + var/effective_dose = dose + if(issmall(M)) + effective_dose *= 2 + + if(effective_dose < 1 * threshold) + if(effective_dose == metabolism * 2 || prob(5)) + M.emote("yawn") + else if(effective_dose < 1.5 * threshold) + M.eye_blurry = max(M.eye_blurry, 10) + else if(effective_dose < 5 * threshold) + if(prob(50)) + M.Weaken(2) + M.drowsyness = max(M.drowsyness, 20) + else + if(alien == IS_SLIME) //They don't have eyes, and they don't really 'sleep'. Fumble their general senses. + M.eye_blurry = max(M.eye_blurry, 30) + if(prob(20)) + M.ear_deaf = max(M.ear_deaf, 4) + M.Confuse(2) + else + M.Weaken(2) + else + M.sleeping = max(M.sleeping, 20) + M.drowsyness = max(M.drowsyness, 60) + +/datum/reagent/ethanol/flapper + name = "Flapper" + id = "flapper" + description = "A common drink among blood-drinkers, and those who just wanna drink. Tinnibat be damned." + taste_description = "a bloody good time" + color = "#763424" + strength = 15 + + glass_name = "flapper" + glass_desc = "A common drink among blood-drinkers, and those who just wanna drink. Tinnibat be damned." + +/datum/reagent/toxin/oilslide + name = "Oil slide" + id = "oilslide" + description = "Tasty, if you're a synth, not so much for organics." + taste_description = "oil, slime, and fuel! Tastes also like synthetic backwash" + color = "#331a1a" + + glass_name = "oilslide" + glass_desc = "Tasty, if you're a synth, not so much for organics." + +/datum/reagent/ethanol/sitonmyface + name = "Sit on my face" + id = "sitonmyface" + description = "A drink made of irish coffee and nuts, mostly known for its vulgar name. Makes for a great pickup line though!" + taste_description = "creamy coffee and alcohol, and nuts" + color = "#896750" + strength = 15 + + glass_name = "Sit on my face" + glass_desc = "A drink made of irish coffee and nuts, mostly known for its vulgar name. Makes for a great pickup line though!" + +/datum/reagent/ethanol/hachi + name = "Hachi" + id = "hachi" + description = "An unusual fusion of bourbon and sake infused with lemon juice, and mushrooms. Sweet, savory, but mostly weird." + taste_description = "sweet lemons, black pepper, and savory mushroom" + color = "#DC971D" + strength = 20 + +/datum/reagent/drink/freshtea + name = "Green tea" + id = "freshtea" //Not meant to be obtainable, this is to define effects for teas made from grown teas. + description = "Tasty green tea, it has antioxidants, it's good for you! Fresh means it's even healthier!" + taste_description = "green tea" + color = "#cac162" + adj_dizzy = -4 + adj_drowsy = -1 + adj_sleepy = -3 + adj_temp = 20 + + glass_name = "green tea" + glass_desc = "Tasty green tea, it has antioxidants, it's good for you!" + + cup_icon_state = "cup_tea" + cup_name = "cup of tea" + cup_desc = "Tasty green tea, it has antioxidants, it's good for you!" + +/datum/reagent/drink/freshtea/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed) + ..() + if(alien == IS_DIONA) + return + M.adjustToxLoss(-2 * removed) //Higher toxin removal than other tea to reflect difficulty in preparing, still worse than dylovene. + +/datum/reagent/drink/freshtea/green + name = "Green tea" + id = "freshteagreen" + description = "Floral green tea, it has antioxidants, it's good for you! Fresh means it's even healthier!" + taste_description = "floral with vegetal notes and a slightly bitter aftertaste" + color = "#cac162" + + glass_name = "green tea" + glass_desc = "Floral green tea, it has antioxidants, it's fresh and good for you!" + + cup_icon_state = "cup_tea" + cup_name = "cup of tea" + cup_desc = "Floral green tea, it has antioxidants, it's fresh and good for you!" + +/datum/reagent/drink/tealeavesgreen + name = "Green tea leaves" + id = "tealeavesgreen" + description = "Prepared green tea, just waiting for hot water." + taste_description = "overwhelmingly bitter with faint floral notes" + color = "#56761d" + + glass_name = "tea leaves" + glass_desc = "Dry tea leaves in a cup. Just add hot water!" + +/datum/reagent/drink/teamush + name = "Tea mush" + id = "teamush" + description = "Mashed tea leaves, a bit like grass clippings. You can't make proper tea out of this now." + taste_description = "overwhelmingly bitter plant" + color = "#7db72d" + + glass_name = "blended plant" + glass_desc = "Chunky, mashed up plant of some sort. Looks kinda gross." + +/datum/reagent/drink/instantteapowdergreen + name = "Instant green tea powder" + id = "instantteapowdergreen" + description = "Green tea powder missing all the goodness of green tea." //Heathen. + taste_description = "strong bitterness with a subtle chemical aftertaste" + color = "#56761d" + + glass_name = "tea powder" + glass_desc = "Instant green tea powder. Just add water for imitation green tea!" + +/datum/reagent/drink/instantteagreen + name = "Instant green tea" + id = "instantteagreen" + description = "Convenient green tea missing all the goodness of actual green tea." //It's not even hot. + taste_description = "bitterness with a subtle chemical aftertaste" + color = "#cac162" + + glass_name = "green tea" + glass_desc = "Green tea. It smells a bit off." + + cup_icon_state = "cup_tea" + cup_name = "cup of tea" + cup_desc = "Green tea. It smells a bit off." + +/datum/reagent/drink/matchapowder + name = "Matcha powder" + id = "matchapowder" + description = "Finely ground green tea. This is about the highest quality matcha you can prepare without traditional methods." + taste_description = "heavy bitterness" + color = "#86a443" + + glass_name = "matcha powder" + glass_desc = "Matcha powder, waiting for brewing." + +/datum/reagent/drink/matcha + name = "Matcha" + id = "matcha" + description = "A form of green tea where the leaf is ground and suspended in water rather than steeped. This is considered cooking grade." + taste_description = "floral, full-bodied bitterness with a subtle, earthy sweetness" + color = "#9bc265" + adj_dizzy = -4 + adj_drowsy = -1 + adj_sleepy = -3 + adj_temp = 20 + + glass_name = "matcha" + glass_desc = "Heavenly matcha. Good for body and spirit." + + cup_icon_state = "cup_tea" + cup_name = "cup of matcha" + cup_desc = "Heavenly matcha. Good for body and spirit." + +/datum/reagent/drink/matcha/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed) + ..() + if(alien == IS_DIONA) + return + M.adjustToxLoss(-3 * removed) //Almost on par with dylovene despite being harder to obtain in bulk. Nerf if this causes problems. + +/datum/reagent/drink/juice/gelatin + name = "Gelatin" + id = "gelatin" + description = "It doesnt taste like anything." + taste_description = "nothing" + nutrition = 0 + color = "#aaabcf" + + glass_name = "Gelatin" + glass_desc = "It's like flavourless slime." + +/datum/reagent/drink/bubbleteawatermelon + name = "Watermelon bubble tea" + id = "bubbleteawatermelon" + description = "A tea with milk and watermelon in it and gelatin balls as well." + taste_description = "creamy tea and watermelon" + color = "#b83333" + + glass_name = "watermelon bubble tea" + glass_desc = "A sweet tea with tasty little flavoured gelatin balls in it, this one is with watermelon." + +/datum/reagent/drink/bubbleteastrawberry + name = "Strawberry bubble tea" + id = "bubbleteastrawberry" + description = "A tea with milk and strawberry in it and gelatin balls as well." + taste_description = "creamy tea and strawberry" + color = "#eb6c77" + + glass_name = "strawberry bubble tea" + glass_desc = "A sweet tea with tasty little flavoured gelatin balls in it, this one is with strawberry." + +/datum/reagent/drink/bubbleteacherry + name = "Cherry bubble tea" + id = "bubbleteacherry" + description = "A tea with milk and cherry in it and gelatin balls as well." + taste_description = "creamy tea and cherry" + color = "#801e28" + + glass_name = "cherry bubble tea" + glass_desc = "A sweet tea with tasty little flavoured gelatin balls in it, this one is with cherry." + +/datum/reagent/drink/bubbleteacoffee + name = "Coffee bubble tea" + id = "bubbleteacoffee" + description = "A tea with milk and coffee in it and gelatin balls as well." + taste_description = "creamy tea and coffee" + color = "#482910" + + glass_name = "coffee bubble tea" + glass_desc = "A sweet tea with tasty little flavoured gelatin balls in it, this one is with coffee." + +/datum/reagent/drink/bubbleteabanana + name = "Banana bubble tea" + id = "bubbleteabanana" + description = "A tea with milk and banana in it and gelatin balls as well." + taste_description = "creamy tea and banana" + color = "#c3af00" + + glass_name = "banana bubble tea" + glass_desc = "A sweet tea with tasty little flavoured gelatin balls in it, this one is with banana." + +/datum/reagent/drink/horchata + name = "Horchata" + id = "horchata" + description = "A sweet and cold rice milk beverage." + taste_description = "sweet rice milk and cinnamon" + color = "#ebcdc1" + adj_temp = -5 + + glass_name = "horchata" + glass_desc = "A sweet and cold rice milk beverage." + +/datum/reagent/ethanol/snaps + name = "Akvavit" + id = "snaps" + description = "Burns the nose and throat and soothes it with a herby aftertaste...Barely." + taste_description = "strong spirit and a little dill" + color = "e6d670" // rgb: 230, 214, 112 + strength = 15 + + glass_name = "akvavit" + glass_desc = "Burns the nose and throat, and soothes it with a herby aftertaste...Barely." + +/datum/reagent/ethanol/narsour + name = "Nar'Sour" + id = "narsour" + description = "Side effects include self-mutilation and hoarding plasteel." + taste_description = "blood and runes" + color = "#7D1717" + strength = 10 + + glass_icon_state = "narsour" + glass_name = "Nar'Sour" + glass_desc = "A new hit cocktail inspired by THE ARM Breweries will have you shouting Fuu ma'jin in no time!" + +/datum/reagent/ethanol/cogchamp + name = "CogChamp" + id = "cogchamp" + description = "Now you can fill yourself with the power of Ratvar!" + taste_description = "brass taste with a hint of oil" + color = rgb(255, 201, 49) + strength = 10 + + glass_icon_state = "cogchamp" + glass_name = "CogChamp" + glass_desc = "Not even Ratvar's Four Generals could withstand this! Qevax Jryy!" + +//Arachnid slammer states - Jack + +/datum/reagent/ethanol/arachnidslammer + name = "Arachnid Slammer" + id = "arachnidslammer" + description = "An adventurous mix of a cheap, powerful ale with an equally cheap, powerful energy drink and combat drugs. The result should have been undrikable, and yet it sure does put a spring in your step." + taste_description = "hearty barley ale, almost illegal energy drink, combat stimulants, and the urge to go mine and wrestle a spider" + color = "#594219" + strength = 30 + nutriment_factor = 1 + + glass_name = "arachnid slammer" + glass_desc = "A freezing pint of delicious Araching Slammer, it foams constantly with the air crisp around it." + allergen_type = ALLERGEN_GRAINS //Barley is grain + +/datum/reagent/ethanol/arachnidslammer/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed) + .=..() + M.reagents.add_reagent("infusedarachnidslammer", removed * 5) +/datum/reagent/ethanol/arachnidslammer/affect_blood(var/mob/living/carbon/M, var/alien, var/removed) + .=..() + M.reagents.add_reagent("infusedarachnidslammer", removed * 5) + +/datum/reagent/infusedarachnidslammer + name = "Infused Arachnid Slammer" + id = "infusedarachnidslammer" + description = "When Arachnid Slammer is metabolized you get a concortion of chemicals that breaks down slower. While the alcohol is burned off, the new compounds seems dormant, like they're waiting for some malicious toxin.." + taste_description = "flat watered down Arachnid Slammer and a brewing tempest" + reagent_state = LIQUID + color = "#8040FF" + scannable = 1 + metabolism = REM + ingest_met = REM + + glass_name = "infused arachnid slammer" + glass_desc = "A pint of metabolized Arachnid Slammer. Even if its flat it still somehow foams and sparkles as well as bubbles more actively when spiders are nearby." + +/datum/reagent/infusedarachnidslammer/enragedarachnidslammer + name = "Enraged Arachnid Slammer" + id = "enragedarachnidslammer" + description = "The best term to scientifically describe this concortion is that the compounds of the Arachnid Slammer are going into a raging frenzy from spider toxin. Its now functioning like a form of potent chemical-based white blood cells that aims to break down harmful compounds and repair the body." + taste_description = "cold burning liquid rage and the urge to destroy any spider you see" + + glass_name = "enraged arachnid slammer" + glass_desc = "A pint of Enraged Arachnid Slammer. It bubbles and sparkles fiercly as if it was in a berserking state!" + +/datum/reagent/infusedarachnidslammer/enragedarachnidslammer/affect_blood(var/mob/living/carbon/M, var/alien, var/removed) + var/chem_effective = 1 * M.species.chem_strength_heal + + M.adjustOxyLoss(-1.5 * removed * chem_effective) + M.adjustToxLoss(-1.5 * removed * chem_effective) + M.heal_organ_damage(1.5 * removed, 1.5 * removed * chem_effective) + M.add_chemical_effect(CE_PAINKILLER, 80 * chem_effective) + M.add_chemical_effect(CE_SPEEDBOOST, 0) + +/datum/reagent/drink/pilk + name = "Pilk" + id = "pilk" + description = "A forbidden mixture that dates back to the early days of space civilization, its creation is known to have caused at least one or two massacres." + taste_description = "heresy" + color = "#4C3100" + + glass_name = "Pilk" + glass_desc = "Why would you do this to yourself?" + + cup_name = "glass of Pilk" + cup_desc = "A glass of regret." + +//Ported Drinks +/datum/reagent/ethanol/alliescocktail + name = "Allies Cocktail" + id = "alliescocktail" + description = "A drink made from your allies. Not as sweet as those made from your enemies." + taste_description = "bitter yet free" + color = "#60f8f8" // rgb(96, 248, 248) + strength = 45 + + glass_name = "Allies cocktail" + glass_desc = "A drink made from your allies." + +/datum/reagent/ethanol/fetching_fizz + name = "Fetching Fizz" + id = "fetching_fizz" + description = "Cola/iron/uranium mixture resulting in a highly magnetic slurry. Mild alcohol content." + taste_description = "charged metal" + color = "#FF5B0F" // rgb(255, 91, 15) + strength = 90 + + glass_name = "Fetching Fizz" + glass_desc = "Induces magnetism in the imbiber. Started as a barroom prank but evolved to become popular with miners and scrappers. Metallic aftertaste." + +/datum/reagent/ethanol/fetching_fizz/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed) + for(var/obj/item/weapon/ore/O in orange(3, M)) + step_towards(O, get_turf(M)) + +/datum/reagent/ethanol/hearty_punch + name = "Hearty Punch" + id = "hearty_punch" + description = "Brave bull/syndicate bomb/absinthe mixture resulting in an energizing beverage. Mild alcohol content." + taste_description = "bravado in the face of disaster" + color = "#8C0000" // rgb(140, 0, 0) + strength = 90 + glass_name = "Hearty Punch" + glass_desc = "Aromatic beverage served piping hot. According to folk tales it can almost wake the dead." + +/datum/reagent/ethanol/hearty_punch/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed) + if(M.health<=0) + M.adjustBruteLoss(-3 * removed) + M.adjustFireLoss(-3 * removed) + M.adjustCloneLoss(-5 * removed) + M.adjustOxyLoss(-4 * removed) + M.adjustToxLoss(-3 * removed) + +/datum/reagent/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." + taste_description = "stale bread with a staler aftertaste" + color = "#FF0000" // rgb(255, 0, 0) + strength = 40 + glass_name = "Squirt Cider" + glass_desc = "Squirt cider will toughen you right up. Too bad about the musty aftertaste." + nutriment_factor = 2 + +/datum/reagent/ethanol/fringe_weaver + name = "Fringe Weaver" + id = "fringe_weaver" + description = "Bubbly, classy, and undoubtedly strong - a Glitch City classic." + taste_description = "ethylic alcohol with a hint of sugar" + color = "#FFEAC4" // rgb(255, 234, 197) + strength = 10 + glass_name = "Fringe Weaver" + glass_desc = "It's a wonder it doesn't spill out of the glass." + +/datum/reagent/ethanol/crevice_spike + name = "Crevice Spike" + id = "crevice_spike" + description = "Sour, bitter, and smashingly sobering." + taste_description = "a bitter SPIKE with a sour aftertaste" + color = "#5BD231" // rgb(91, 210, 49) + strength = 200 + glass_name = "Crevice Spike" + glass_desc = "It'll either knock the drunkenness out of you or knock you out cold. Both, probably." + +/datum/reagent/ethanol/crevice_spike/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed) + M.adjustBruteLoss(50 * removed) + for(var/datum/reagent/R in M.ingested.reagent_list) + if(istype(R, /datum/reagent/ethanol)) + R.remove_self(50 * removed) + +/datum/reagent/ethanol/duplex + name = "Duplex" + id = "duplex" + description = "An inseparable combination of two fruity drinks." + taste_description = "green apples and blue raspberries" + color = "#50e5cf" // rgb(80, 229, 207) + strength = 50 + glass_name = "Duplex" + glass_desc = "To imbibe one component separately from the other is consider a great faux pas." + +/datum/reagent/ethanol/mauna_loa + name = "Mauna Loa" + id = "mauna_loa" + description = "Extremely hot; not for the faint of heart!" + taste_description = "fiery, with an aftertaste of burnt flesh" + color = "#fe8308" // rgb(254, 131, 8) + strength = 50 + glass_name = "Mauna Loa" + glass_desc = "Lava in a drink... mug... volcano... thing." + +/datum/reagent/ethanol/mauna_loa/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed) + if(prob(10)) + M.adjust_fire_stacks(5*removed) + M.IgniteMob() + +/datum/reagent/ethanol/hiveminderaser + name = "Hivemind Eraser" + id = "hiveminderaser" + description = "A vessel of pure flavor." + taste_description = "psychic links" + color = "#FF80FC" // rgb(255, 128, 252) + strength = 50 + glass_name = "Hivemind Eraser" + glass_desc = "For when even mindshields can't save you." + +/datum/reagent/ethanol/erikasurprise + name = "Erika Surprise" + id = "erikasurprise" + description = "The surprise is, it's green!" + taste_description = "tartness and bananas" + color = "#2E6671" // rgb(46, 102, 113) + strength = 75 + glass_name = "Erika Surprise" + glass_desc = "The surprise is, it's green!" + +//////////////////////////////////////////////// +/////////FOODSTUFF///////////////////////////// +////////////////////////////////////////////// + +/datum/reagent/cinnamonpowder + name = "ground cinnamon" + id = "cinnamonpowder" + description = "Cinnamon, a spice made from tree bark, ground into a fine powder. Probably not a good idea to eat on its own!" + taste_description= "sweet spice with a hint of wood" + color = "#a96622" + + glass_name = "ground cinnamon" + glass_desc = "A glass of ground cinnamon. Dare you take the challenge?" + +//YW drinks +/datum/reagent/drink/lovepotion_yw + name = "Strawberry Love Potion" + id = "strawberrylovepotion" + description = "Creamy strawberries and sugar, simple and sweet." + taste_description = "strawberries and cream" + color = "#fc8a8a" // rgb(252, 138, 138) + + glass_name = "Love Potion" + glass_desc = "Love me tender, love me sweet." + +/datum/reagent/ethanol/wormblood + name = "Worm Blood" + id = "wormblood" + description = "Who had the grand idea to bottle THE BLOOD OF A WORM." + taste_description = "Wriggly cave fungus" + color = "#827A00" + strength = 30 + druggy = 10 + + glass_name = "Worm blood" + glass_desc = "Who had the grand idea to bottle THE BLOOD OF A WORM." + glass_icon_state = "wormblood" + glass_center_of_mass = list("x"=16, "y"=8) + glass_icon_file = 'icons/obj/drinks_yw.dmi' diff --git a/modular_chomp/icons/obj/drinks.dmi b/modular_chomp/icons/obj/drinks.dmi new file mode 100644 index 0000000000..3a51730298 Binary files /dev/null and b/modular_chomp/icons/obj/drinks.dmi differ diff --git a/vorestation.dme b/vorestation.dme index 8d07ea8cb9..2e8f1328dc 100644 --- a/vorestation.dme +++ b/vorestation.dme @@ -2429,7 +2429,6 @@ #include "code\modules\food\drinkingglass\glass_boxes.dm" #include "code\modules\food\drinkingglass\glass_types.dm" #include "code\modules\food\drinkingglass\metaglass.dm" -#include "code\modules\food\drinkingglass\metaglass_ch.dm" #include "code\modules\food\drinkingglass\metaglass_vr.dm" #include "code\modules\food\drinkingglass\mugs.dm" #include "code\modules\food\drinkingglass\serving_glasses.dm" @@ -2447,7 +2446,6 @@ #include "code\modules\food\food\thecake_ch.dm" #include "code\modules\food\food\z_custom_food_vr.dm" #include "code\modules\food\food\drinks\bottle.dm" -#include "code\modules\food\food\drinks\bottle_ch.dm" #include "code\modules\food\food\drinks\cup.dm" #include "code\modules\food\food\drinks\drinkingglass.dm" #include "code\modules\food\food\drinks\jar.dm" @@ -3948,7 +3946,6 @@ #include "code\modules\reagents\reactions\distilling\distilling.dm" #include "code\modules\reagents\reactions\fusion\fusion.dm" #include "code\modules\reagents\reactions\instant\drinks.dm" -#include "code\modules\reagents\reactions\instant\drinks_ch.dm" #include "code\modules\reagents\reactions\instant\drinks_vr.dm" #include "code\modules\reagents\reactions\instant\food.dm" #include "code\modules\reagents\reactions\instant\food_ch.dm" @@ -3980,7 +3977,6 @@ #include "code\modules\reagents\reagents\dispenser.dm" #include "code\modules\reagents\reagents\drugs.dm" #include "code\modules\reagents\reagents\food_drinks.dm" -#include "code\modules\reagents\reagents\food_drinks_ch.dm" #include "code\modules\reagents\reagents\food_drinks_vr.dm" #include "code\modules\reagents\reagents\medicine.dm" #include "code\modules\reagents\reagents\medicine_ch.dm" @@ -4503,6 +4499,8 @@ #include "modular_chomp\code\modules\datums\supplypacks\medical.dm" #include "modular_chomp\code\modules\datums\supplypacks\munitions.dm" #include "modular_chomp\code\modules\emotes\definitions\audiable.dm" +#include "modular_chomp\code\modules\food\drinkgglass\metaglass.dm" +#include "modular_chomp\code\modules\food\food\drinks\bottle.dm" #include "modular_chomp\code\modules\mob\holder.dm" #include "modular_chomp\code\modules\mob\mob.dm" #include "modular_chomp\code\modules\mob\living\emote.dm" @@ -4537,6 +4535,8 @@ #include "modular_chomp\code\modules\power\cells\device_cells.dm" #include "modular_chomp\code\modules\power\cells\esoteric_cells.dm" #include "modular_chomp\code\modules\power\cells\power_cells.dm" +#include "modular_chomp\code\modules\reagents\reactions\instant\drinks.dm" +#include "modular_chomp\code\modules\reagents\reagents\food_drinks.dm" #include "modular_chomp\code\modules\research\designs\power_cells.dm" #include "modular_chomp\code\modules\research\designs\weapons.dm" #include "modular_chomp\code\modules\vore\eating\exportpanel_ch.dm"