diff --git a/code/__DEFINES/construction.dm b/code/__DEFINES/construction.dm index b2bdc2b99d1103..c82490579dbaba 100644 --- a/code/__DEFINES/construction.dm +++ b/code/__DEFINES/construction.dm @@ -90,6 +90,7 @@ #define CAT_LIZARD "Lizard Food" #define CAT_MEAT "Meats" #define CAT_SEAFOOD "Seafood" +#define CAT_MARTIAN "Martian Food" #define CAT_MISCFOOD "Misc. Food" #define CAT_MEXICAN "Mexican Food" #define CAT_MOTH "Mothic Food" @@ -112,6 +113,7 @@ GLOBAL_LIST_INIT(crafting_category_food, list( CAT_LIZARD, CAT_MEAT, CAT_SEAFOOD, + CAT_MARTIAN, CAT_MISCFOOD, CAT_MEXICAN, CAT_MOTH, diff --git a/code/game/machinery/computer/orders/order_items/cook/order_milk_eggs.dm b/code/game/machinery/computer/orders/order_items/cook/order_milk_eggs.dm index d3fb31fec302a5..12ceaee8d3f0cd 100644 --- a/code/game/machinery/computer/orders/order_items/cook/order_milk_eggs.dm +++ b/code/game/machinery/computer/orders/order_items/cook/order_milk_eggs.dm @@ -31,6 +31,11 @@ item_path = /obj/item/food/fishmeat cost_per_order = 12 +/datum/orderable_item/milk_eggs/octopus + name = "Octopus Tentacle" + item_path = /obj/item/food/fishmeat/octopus + cost_per_order = 12 + /datum/orderable_item/milk_eggs/spider_eggs name = "Spider Eggs" item_path = /obj/item/food/spidereggs @@ -65,6 +70,16 @@ item_path = /obj/item/food/canned/pine_nuts cost_per_order = 20 +/datum/orderable_item/milk_eggs/canned_squid_ink + name = "Canned Squid Ink" + item_path = /obj/item/food/canned/squid_ink + cost_per_order = 20 + +/datum/orderable_item/milk_eggs/chap + name = "Can of CHAP" + item_path = /obj/item/food/canned/chap + cost_per_order = 20 + /datum/orderable_item/milk_eggs/ready_donk name = "Ready-Donk Meal: Bachelor Chow" item_path = /obj/item/food/ready_donk @@ -80,6 +95,16 @@ item_path = /obj/item/food/ready_donk/donkhiladas cost_per_order = 40 +/datum/orderable_item/milk_eggs/ready_donk_nachos + name = "Ready-Donk Meal: Donk Sol Series Boritos Nachos Grandes" + item_path = /obj/item/food/ready_donk/nachos_grandes + cost_per_order = 40 + +/datum/orderable_item/milk_eggs/ready_donk_orange + name = "Ready-Donk Meal: Donk-range Chicken" + item_path = /obj/item/food/ready_donk/donkrange_chicken + cost_per_order = 40 + /datum/orderable_item/milk_eggs/tiziran_goods name = "Tiziran Farm-Fresh Pack" item_path = /obj/item/storage/box/tiziran_goods diff --git a/code/game/machinery/computer/orders/order_items/cook/order_reagents.dm b/code/game/machinery/computer/orders/order_items/cook/order_reagents.dm index fd680aa7778e1e..d6b4728d10496e 100644 --- a/code/game/machinery/computer/orders/order_items/cook/order_reagents.dm +++ b/code/game/machinery/computer/orders/order_items/cook/order_reagents.dm @@ -65,3 +65,33 @@ name = "Cherry Jelly" item_path = /obj/item/reagent_containers/condiment/cherryjelly cost_per_order = 30 + +/datum/orderable_item/reagents/worcestershire + name = "Worcestershire Sauce" + item_path = /obj/item/reagent_containers/condiment/worcestershire + cost_per_order = 30 + +/datum/orderable_item/reagents/red_bay + name = "Red Bay Seasoning" + item_path = /obj/item/reagent_containers/condiment/red_bay + cost_per_order = 30 + +/datum/orderable_item/reagents/curry_powder + name = "Curry Powder" + item_path = /obj/item/reagent_containers/condiment/curry_powder + cost_per_order = 30 + +/datum/orderable_item/reagents/dashi_concentrate + name = "Dashi Concentrate" + item_path = /obj/item/reagent_containers/condiment/dashi_concentrate + cost_per_order = 30 + +/datum/orderable_item/reagents/coconut_milk + name = "Coconut Milk" + item_path = /obj/item/reagent_containers/condiment/coconut_milk + cost_per_order = 30 + +/datum/orderable_item/reagents/grounding_solution + name = "Grounding Solution" + item_path = /obj/item/reagent_containers/condiment/grounding_solution + cost_per_order = 30 diff --git a/code/game/machinery/computer/orders/order_items/cook/order_veggies.dm b/code/game/machinery/computer/orders/order_items/cook/order_veggies.dm index 8b0f9d71a4c223..996972c61d255e 100644 --- a/code/game/machinery/computer/orders/order_items/cook/order_veggies.dm +++ b/code/game/machinery/computer/orders/order_items/cook/order_veggies.dm @@ -84,3 +84,8 @@ name = "Jar of pickles" item_path = /obj/item/storage/fancy/pickles_jar cost_per_order = 60 + +/datum/orderable_item/veggies/pickled_voltvine + name = "Pickled Voltvine" + item_path = /obj/item/food/pickled_voltvine + cost_per_order = 5 diff --git a/code/game/objects/items/food/martian.dm b/code/game/objects/items/food/martian.dm index 8e2c1fcd29182a..819a2636417100 100644 --- a/code/game/objects/items/food/martian.dm +++ b/code/game/objects/items/food/martian.dm @@ -166,7 +166,6 @@ food_reagents = list( /datum/reagent/consumable/nutriment = 15 ) - burns_in_oven = TRUE tastes = list("bread" = 10) foodtypes = GRAIN | VEGETABLES venue_value = FOOD_PRICE_TRASH @@ -1177,8 +1176,6 @@ /datum/reagent/consumable/nutriment = 6, /datum/reagent/consumable/salt = 1, ) - burns_on_grill = TRUE - burns_in_oven = TRUE tastes = list("bread" = 1, "salt" = 1) foodtypes = GRAIN w_class = WEIGHT_CLASS_SMALL @@ -1208,7 +1205,6 @@ /datum/reagent/consumable/nutriment/protein = 6, /datum/reagent/consumable/nutriment = 4, ) - burns_on_grill = TRUE tastes = list("chicken" = 1, "umami sauce" = 1) foodtypes = MEAT w_class = WEIGHT_CLASS_SMALL diff --git a/code/game/objects/items/food/meatdish.dm b/code/game/objects/items/food/meatdish.dm index 668e136980ce15..5002fabdcab219 100644 --- a/code/game/objects/items/food/meatdish.dm +++ b/code/game/objects/items/food/meatdish.dm @@ -89,6 +89,16 @@ desc = "The dreaded donkfish fillet. No sane spaceman would eat this, and it does not get better when cooked." icon_state = "donkfillet" +/obj/item/food/fishmeat/octopus + name = "octopus tentacle" + desc = "A large tentacle from an octopus." + icon = 'icons/obj/food/martian.dmi' + icon_state = "octopus_fillet" + food_reagents = list(/datum/reagent/consumable/nutriment/protein = 3) + +/obj/item/food/fishmeat/octopus/make_grillable() + AddComponent(/datum/component/grillable, /obj/item/food/grilled_octopus, rand(15 SECONDS, 25 SECONDS), TRUE, TRUE) + /obj/item/food/fishfingers name = "fish fingers" desc = "A finger of fish." diff --git a/code/game/objects/items/food/packaged.dm b/code/game/objects/items/food/packaged.dm index 752ff667836f17..2eaad9f74aded9 100644 --- a/code/game/objects/items/food/packaged.dm +++ b/code/game/objects/items/food/packaged.dm @@ -147,6 +147,53 @@ playsound(loc, 'sound/items/eatfood.ogg', rand(30, 50), TRUE) qdel(src) +/obj/item/food/canned/squid_ink + name = "canned squid ink" + desc = "An odd ingredient in typical cooking, squid ink lends a taste of the sea to any dish- while also dyeing it jet black in the process." + icon_state = "squidinkcan" + trash_type = /obj/item/trash/can/food/squid_ink + food_reagents = list(/datum/reagent/consumable/nutriment = 5, /datum/reagent/consumable/salt = 5) + tastes = list("seafood" = 7, "tin" = 1) + foodtypes = SEAFOOD + +/obj/item/food/canned/chap + name = "can of CHAP" + desc = "CHAP: Chopped Ham And Pork. The classic American canned meat product that won a world war, then sent millions of servicemen home with heart congestion." + icon_state = "chapcan" + trash_type = /obj/item/trash/can/food/chap + food_reagents = list(/datum/reagent/consumable/nutriment = 5, /datum/reagent/consumable/salt = 5) + tastes = list("meat" = 7, "tin" = 1) + foodtypes = MEAT + +/obj/item/food/canned/chap/make_processable() + AddElement(/datum/element/processable, TOOL_KNIFE, /obj/item/food/chapslice, 5, 3 SECONDS, table_required = TRUE, screentip_verb = "Cut") + +/obj/item/food/chapslice + name = "slice of chap" + desc = "A thin slice of chap. Useful for frying, or making sandwiches." + icon = 'icons/obj/food/martian.dmi' + icon_state = "chapslice" + food_reagents = list( + /datum/reagent/consumable/nutriment/vitamin = 3 + ) + tastes = list("meat" = 1) + foodtypes = MEAT + w_class = WEIGHT_CLASS_SMALL + +/obj/item/food/chapslice/make_grillable() + AddComponent(/datum/component/grillable, /obj/item/food/grilled_chapslice, rand(20 SECONDS, 40 SECONDS), TRUE, TRUE) + +/obj/item/food/grilled_chapslice + name = "grilled slice of chap" + desc = "A greasy hot slice of chap. Forms a good part of a balanced meal." + icon = 'icons/obj/food/martian.dmi' + icon_state = "chapslice_grilled" + food_reagents = list( + /datum/reagent/consumable/nutriment/vitamin = 3 + ) + tastes = list("meat" = 1) + foodtypes = MEAT + w_class = WEIGHT_CLASS_SMALL // DONK DINNER: THE INNOVATIVE WAY TO GET YOUR DAILY RECOMMENDED ALLOWANCE OF SALT... AND THEN SOME! /obj/item/food/ready_donk @@ -220,6 +267,35 @@ tastes = list("enchiladas" = 2, "laziness" = 1) foodtypes = GRAIN | DAIRY | MEAT | VEGETABLES | JUNKFOOD +/obj/item/food/ready_donk/nachos_grandes //which translates to... big nachos + name = "\improper Ready-Donk: Donk Sol Series Boritos Nachos Grandes" + desc = "Get ready for game day with Donk's classic Nachos Grandes, sponsors of the Donk Sol Series! Boritos chips loaded with cheese, spicy meat and beans, alongside separate guac, pico and donk sauce. Batter up!" + tastes = list("nachos" = 2, "laziness" = 1) + foodtypes = GRAIN | DAIRY | MEAT | VEGETABLES | JUNKFOOD + + warm_type = /obj/item/food/ready_donk/warm/nachos_grandes + +/obj/item/food/ready_donk/warm/nachos_grandes + name = "warm Ready-Donk: Donk Sol Series Boritos Nachos Grandes" + desc = "Get ready for game day with Donk's classic Nachos Grandes, sponsors of the Donk Sol Series! Boritos chips loaded with cheese, spicy meat and beans, alongside separate guac, pico and donk sauce. Served hotter than Sakamoto's fastball!" + icon_state = "ready_donk_warm_nachos" + tastes = list("nachos" = 2, "laziness" = 1) + foodtypes = GRAIN | DAIRY | MEAT | VEGETABLES | JUNKFOOD + +/obj/item/food/ready_donk/donkrange_chicken + name = "\improper Ready-Donk: Donk-range Chicken" + desc = "A Chinese classic, it's Donk's original spicy orange chicken with stir-fried peppers and onions, all over steamed rice." + tastes = list("orange chicken" = 2, "laziness" = 1) + foodtypes = GRAIN | MEAT | VEGETABLES | JUNKFOOD + + warm_type = /obj/item/food/ready_donk/warm/donkrange_chicken + +/obj/item/food/ready_donk/warm/donkrange_chicken + name = "warm Ready-Donk: Ready-Donk: Donk-range Chicken" + desc = "A Chinese classic, it's Donk's original spicy orange chicken with stir-fried peppers and onions, all over steamed rice and served hotter than a dragon's breath." + icon_state = "ready_donk_warm_orange" + tastes = list("orange chicken" = 2, "laziness" = 1) + foodtypes = GRAIN | MEAT | VEGETABLES | JUNKFOOD // Rations /obj/item/food/rationpack diff --git a/code/game/objects/items/trash.dm b/code/game/objects/items/trash.dm index bd1124dcf1f442..408aac83849acd 100644 --- a/code/game/objects/items/trash.dm +++ b/code/game/objects/items/trash.dm @@ -180,3 +180,46 @@ desc = "It's been Donk-decimated." icon_state = "ready_donk" +/obj/item/trash/can/food/squid_ink + name = "canned squid ink" + icon_state = "squidinkcan_empty" + +/obj/item/trash/can/food/chap + name = "can of CHAP" + icon_state = "chapcan_empty" + +/obj/item/trash/hot_shots + name = "\improper Hot Shots box" + icon_state = "hot_shots" + +/obj/item/trash/sticko + name = "\improper Sticko box" + icon_state = "sticko" + +/obj/item/trash/sticko/matcha + icon_state = "sticko_matcha" + +/obj/item/trash/sticko/nutty + icon_state = "sticko_nutty" + +/obj/item/trash/sticko/pineapple + icon_state = "sticko_pineapple" + +/obj/item/trash/sticko/yuyake + icon_state = "sticko_yuyake" + +/obj/item/trash/shok_roks + name = "\improper Shok-Roks packet" + icon_state = "shok_roks" + +/obj/item/trash/shok_roks/citrus + icon_state = "shok_roks_citrus" + +/obj/item/trash/shok_roks/berry + icon_state = "shok_roks_berry" + +/obj/item/trash/shok_roks/tropical + icon_state = "shok_roks_tropical" + +/obj/item/trash/shok_roks/lanternfruit + icon_state = "shok_roks_lanternfruit" diff --git a/code/modules/food_and_drinks/machinery/stove.dm b/code/modules/food_and_drinks/machinery/stove.dm index 85a93868ed577b..76b548887fbf57 100644 --- a/code/modules/food_and_drinks/machinery/stove.dm +++ b/code/modules/food_and_drinks/machinery/stove.dm @@ -178,11 +178,18 @@ // Clearing reagents Will do this for us already, but if we have no reagents this is a failsafe dump_ingredients() -/obj/item/reagent_containers/cup/soup_pot/proc/dump_ingredients(atom/drop_loc = drop_location()) +/** + * Dumps all inside ingredients to a spot + * + * * drop_loc - Where to drop the ingredients, defaults to drop loc + * * x_offset - How much pixel X offset to give every ingredient, if not set will be random + * * y_offset - How much pixel Y offset to give every ingredient, if not set will be random + */ +/obj/item/reagent_containers/cup/soup_pot/proc/dump_ingredients(atom/drop_loc = drop_location(), x_offset, y_offset) for(var/obj/item/ingredient as anything in added_ingredients) ingredient.forceMove(drop_loc) - ingredient.pixel_x += rand(-4, 4) - ingredient.pixel_y += rand(-4, 4) + ingredient.pixel_x += (isnum(x_offset) ? x_offset : rand(-4, 4)) + ingredient.pixel_y += (isnum(y_offset) ? x_offset : rand(-4, 4)) ingredient.SpinAnimation(loops = 1) update_appearance(UPDATE_OVERLAYS) diff --git a/code/modules/food_and_drinks/recipes/drinks/drinks_alcoholic.dm b/code/modules/food_and_drinks/recipes/drinks/drinks_alcoholic.dm index c3c7f6e5c20611..1da96fc0aae706 100644 --- a/code/modules/food_and_drinks/recipes/drinks/drinks_alcoholic.dm +++ b/code/modules/food_and_drinks/recipes/drinks/drinks_alcoholic.dm @@ -586,3 +586,78 @@ mix_message = "Arcs of lightning fly from the mixture." mix_sound = 'sound/weapons/zapbang.ogg' +/datum/chemical_reaction/drink/yuyakita + results = list(/datum/reagent/consumable/ethanol/yuyakita = 4) + required_reagents = list(/datum/reagent/consumable/ethanol/tequila = 2, /datum/reagent/consumable/limejuice = 1, /datum/reagent/consumable/ethanol/yuyake = 1) + +/datum/chemical_reaction/drink/saibasan + results = list(/datum/reagent/consumable/ethanol/saibasan = 10) + required_reagents = list(/datum/reagent/consumable/ethanol/shochu = 2, /datum/reagent/consumable/ethanol/yuyake = 2, /datum/reagent/consumable/triple_citrus = 3, /datum/reagent/consumable/cherryjelly = 3) + +/datum/chemical_reaction/drink/banzai_ti + results = list(/datum/reagent/consumable/ethanol/banzai_ti = 10) + required_reagents = list(/datum/reagent/consumable/ethanol/yuyake = 1, /datum/reagent/consumable/ethanol/triple_sec = 1, /datum/reagent/consumable/ethanol/gin = 1, /datum/reagent/consumable/ethanol/rum = 1, /datum/reagent/consumable/ethanol/tequila = 1, /datum/reagent/consumable/ethanol/vodka = 1, /datum/reagent/consumable/triple_citrus = 2, /datum/reagent/consumable/sodawater = 2) + +/datum/chemical_reaction/drink/sanraizusoda + results = list(/datum/reagent/consumable/ethanol/sanraizusoda = 5) + required_reagents = list(/datum/reagent/consumable/ethanol/yuyake = 1, /datum/reagent/consumable/sodawater = 2, /datum/reagent/consumable/ice = 1, /datum/reagent/consumable/cream = 1) + +/datum/chemical_reaction/drink/kumicho + results = list(/datum/reagent/consumable/ethanol/kumicho = 4) + required_reagents = list(/datum/reagent/consumable/ethanol/godfather = 2, /datum/reagent/consumable/ethanol/shochu = 1, /datum/reagent/consumable/ethanol/bitters = 1) + +/datum/chemical_reaction/drink/red_planet + results = list(/datum/reagent/consumable/ethanol/red_planet = 8) + required_reagents = list(/datum/reagent/consumable/ethanol/shochu = 2, /datum/reagent/consumable/ethanol/triple_sec = 2, /datum/reagent/consumable/ethanol/vermouth = 2, /datum/reagent/consumable/grenadine = 1, /datum/reagent/consumable/ethanol/bitters = 1) + +/datum/chemical_reaction/drink/amaterasu + results = list(/datum/reagent/consumable/ethanol/amaterasu = 10) + required_reagents = list(/datum/reagent/consumable/ethanol/shochu = 1, /datum/reagent/consumable/ethanol/vodka = 1, /datum/reagent/consumable/grenadine = 1, /datum/reagent/consumable/berryjuice = 2, /datum/reagent/consumable/sodawater = 5) + +/datum/chemical_reaction/drink/nekomimosa + results = list(/datum/reagent/consumable/ethanol/nekomimosa = 5) + required_reagents = list(/datum/reagent/consumable/ethanol/yuyake = 2, /datum/reagent/consumable/watermelonjuice = 2, /datum/reagent/consumable/ethanol/champagne = 1) + +/datum/chemical_reaction/drink/sentai_quencha + results = list(/datum/reagent/consumable/ethanol/sentai_quencha = 5) + required_reagents = list(/datum/reagent/consumable/ethanol/shochu = 1, /datum/reagent/consumable/ethanol/curacao = 1, /datum/reagent/consumable/triple_citrus = 1, /datum/reagent/consumable/melon_soda = 2) + +/datum/chemical_reaction/drink/bosozoku + results = list(/datum/reagent/consumable/ethanol/bosozoku = 2) + required_reagents = list(/datum/reagent/consumable/ethanol/rice_beer = 1, /datum/reagent/consumable/lemonade = 1) + +/datum/chemical_reaction/drink/ersatzche + results = list(/datum/reagent/consumable/ethanol/ersatzche = 10) + required_reagents = list(/datum/reagent/consumable/ethanol/rice_beer = 5, /datum/reagent/consumable/pineapplejuice = 3, /datum/reagent/consumable/capsaicin = 1, /datum/reagent/consumable/sugar = 1) + +/datum/chemical_reaction/drink/red_city_am + results = list(/datum/reagent/consumable/ethanol/red_city_am = 10) + required_reagents = list(/datum/reagent/consumable/ethanol/rice_beer = 5, /datum/reagent/consumable/limejuice = 1, /datum/reagent/consumable/red_bay = 1, /datum/reagent/consumable/soysauce = 1, /datum/reagent/consumable/tomatojuice = 2) + +/datum/chemical_reaction/drink/kings_ransom + results = list(/datum/reagent/consumable/ethanol/kings_ransom = 10) + required_reagents = list(/datum/reagent/consumable/ethanol/rice_beer = 5, /datum/reagent/consumable/ethanol/gin = 2, /datum/reagent/consumable/berryjuice = 2, /datum/reagent/consumable/ethanol/bitters = 1) + +/datum/chemical_reaction/drink/four_bit + results = list(/datum/reagent/consumable/ethanol/four_bit = 5) + required_reagents = list(/datum/reagent/consumable/ethanol/rum = 2, /datum/reagent/consumable/hakka_mate = 2, /datum/reagent/consumable/limejuice = 1) + +/datum/chemical_reaction/drink/white_hawaiian + results = list(/datum/reagent/consumable/ethanol/white_hawaiian = 4) + required_reagents = list(/datum/reagent/consumable/ethanol/kahlua = 1, /datum/reagent/consumable/ethanol/coconut_rum = 1, /datum/reagent/consumable/coconut_milk = 2) + +/datum/chemical_reaction/drink/maui_sunrise + results = list(/datum/reagent/consumable/ethanol/maui_sunrise = 10) + required_reagents = list(/datum/reagent/consumable/ethanol/coconut_rum = 2, /datum/reagent/consumable/pineapplejuice = 2, /datum/reagent/consumable/ethanol/yuyake = 1, /datum/reagent/consumable/triple_citrus = 1, /datum/reagent/consumable/lemon_lime = 4) + +/datum/chemical_reaction/drink/imperial_mai_tai + results = list(/datum/reagent/consumable/ethanol/imperial_mai_tai = 5) + required_reagents = list(/datum/reagent/consumable/ethanol/navy_rum = 1, /datum/reagent/consumable/ethanol/rum = 1, /datum/reagent/consumable/ethanol/triple_sec = 1, /datum/reagent/consumable/limejuice = 1, /datum/reagent/consumable/korta_nectar = 1) + +/datum/chemical_reaction/drink/konococo_rumtini + results = list(/datum/reagent/consumable/ethanol/konococo_rumtini = 10) + required_reagents = list(/datum/reagent/consumable/ethanol/coconut_rum = 2, /datum/reagent/consumable/ethanol/kahlua = 3, /datum/reagent/consumable/coffee = 3, /datum/reagent/consumable/sugar = 2) + +/datum/chemical_reaction/drink/blue_hawaiian + results = list(/datum/reagent/consumable/ethanol/blue_hawaiian = 5) + required_reagents = list(/datum/reagent/consumable/ethanol/coconut_rum = 2, /datum/reagent/consumable/pineapplejuice = 1, /datum/reagent/consumable/lemonjuice = 1, /datum/reagent/consumable/ethanol/curacao = 1) diff --git a/code/modules/food_and_drinks/recipes/food_mixtures.dm b/code/modules/food_and_drinks/recipes/food_mixtures.dm index 22bf38512fdf78..3ae0c3c0d58dba 100644 --- a/code/modules/food_and_drinks/recipes/food_mixtures.dm +++ b/code/modules/food_and_drinks/recipes/food_mixtures.dm @@ -260,4 +260,17 @@ /datum/chemical_reaction/food/vinegar results = list(/datum/reagent/consumable/vinegar = 5) required_reagents = list(/datum/reagent/consumable/ethanol/wine = 1, /datum/reagent/water = 1, /datum/reagent/consumable/sugar = 1) - + reaction_flags = REACTION_INSTANT + +/datum/chemical_reaction/food/grounding_neutralise + results = list(/datum/reagent/consumable/salt = 2) + required_reagents = list(/datum/reagent/consumable/liquidelectricity/enriched = 2, /datum/reagent/consumable/grounding_solution = 1) + mix_message = "The mixture lets off a sharp snap as the electricity discharges." + mix_sound = 'sound/weapons/taser.ogg' + reaction_flags = REACTION_INSTANT + +/datum/chemical_reaction/food/martian_batter + results = list(/datum/reagent/consumable/martian_batter = 2) + required_reagents = list(/datum/reagent/consumable/flour = 1, /datum/reagent/consumable/nutriment/soup/dashi = 1) + mix_message = "A smooth batter forms." + reaction_flags = REACTION_INSTANT diff --git a/code/modules/food_and_drinks/recipes/soup_guide.dm b/code/modules/food_and_drinks/recipes/soup_guide.dm index fd8976dbb14021..3a9ba05ff0c738 100644 --- a/code/modules/food_and_drinks/recipes/soup_guide.dm +++ b/code/modules/food_and_drinks/recipes/soup_guide.dm @@ -2,10 +2,27 @@ machinery = list(/obj/machinery/stove) category = CAT_SOUP non_craftable = TRUE - + /// What contained is this reaction expected to be served in? + /// Used to determine the icon to display in the crafting UI. var/expected_container = /obj/item/reagent_containers/cup/bowl +/datum/crafting_recipe/food/reaction/soup/New() + // What are ya using this path for if it's not a food reaction? + if(!ispath(reaction, /datum/chemical_reaction/food)) + return ..() + + var/datum/chemical_reaction/food/soup_reaction = reaction + // If the reaction has a solid food item result, it is prioritized over reagent results + if(ispath(initial(soup_reaction.resulting_food_path), /obj/item/food)) + result = initial(soup_reaction.resulting_food_path) + result_amount = 1 + + return ..() + /datum/crafting_recipe/food/reaction/soup/crafting_ui_data() + if(ispath(result, /obj/item/food)) + return ..() + var/list/data = list() var/datum/glass_style/has_foodtype/soup_style = GLOB.glass_style_singletons[expected_container][result] @@ -19,7 +36,7 @@ if(!istype(chemical_reaction)) return for(var/obj/item/ingredienttype as anything in chemical_reaction.required_ingredients) - reqs[ingredienttype] = chemical_reaction.required_ingredients[ingredienttype] + LAZYSET(reqs, ingredienttype, chemical_reaction.required_ingredients[ingredienttype]) /datum/crafting_recipe/food/reaction/soup/meatball_soup reaction = /datum/chemical_reaction/food/soup/meatballsoup diff --git a/code/modules/food_and_drinks/recipes/soup_mixtures.dm b/code/modules/food_and_drinks/recipes/soup_mixtures.dm index 448a32d2e85bc1..b4ece401fdf5c9 100644 --- a/code/modules/food_and_drinks/recipes/soup_mixtures.dm +++ b/code/modules/food_and_drinks/recipes/soup_mixtures.dm @@ -91,6 +91,12 @@ if(!length(required_ingredients)) return + // This only happens if we're being instant reacted so let's just skip to what we really want + if(isnull(reaction)) + testing("Soup reaction of type [type] instant reacted, cleaning up.") + clean_up(holder) + return + if(isnull(total_ingredient_max)) total_ingredient_max = 0 // We only need to calculate this once, effectively static per-type @@ -164,9 +170,21 @@ var/obj/item/reagent_containers/cup/soup_pot/pot = holder.my_atom if(!istype(pot)) CRASH("[pot ? "Non-pot atom" : "Null pot"]) made it to the end of the [type] reaction chain.") - reaction.data["ingredients"] = null testing("Soup reaction finished with a total react volume of [react_vol] and [length(pot.added_ingredients)] ingredients. Cleaning up.") + clean_up(holder, reaction, react_vol) + +/** + * Cleans up the ingredients and adds whatever leftover reagents to the mixture + * + * * holder: The sou ppot + * * reaction: The reaction being cleaned up, note this CAN be null if being instant reacted + * * react_vol: How much soup was produced + */ +/datum/chemical_reaction/food/soup/proc/clean_up(datum/reagents/holder, datum/equilibrium/reaction, react_vol) + var/obj/item/reagent_containers/cup/soup_pot/pot = holder.my_atom + + reaction?.data["ingredients"] = null if(length(outputted_ingredients)) var/repeating_amount = 0 @@ -199,11 +217,28 @@ if (!Nonsouprecipe) //monkeedit ingredient.AddElement(/datum/element/fried_item, 30) - //LAZYNULL(pot.added_ingredients) + // Spawning physical food results + if(resulting_food_path) + var/obj/item/created = new resulting_food_path(get_turf(pot)) + created.pixel_y += 8 + + // Anything left in the ingredient list will get dumped out + pot.dump_ingredients(get_turf(pot), y_offset = 8) // Blackbox log the chemical reaction used, to account for soup reaction that don't produce typical results BLACKBOX_LOG_FOOD_MADE(type) +/** + * Transfers reagents from the passed reagent to the soup pot, as a "result" + * + * Also handles deleting a portion of nutriment reagents present, pseudo-converting it into soup reagent + * + * * ingredient: The ingredient to transfer reagents from + * * holder: The reagent holder of the soup pot the reaction is taking place in + * * amount: The amount of reagents to transfer, if null will transfer all reagents + */ /datum/chemical_reaction/food/soup/proc/transfer_ingredient_reagents(obj/item/ingredient, datum/reagents/holder, amount) + if(ingredient_reagent_multiplier <= 0) + return var/datum/reagents/ingredient_pool = ingredient.reagents // Some ingredients are purely flavor (no pun intended) and will have reagents if(isnull(ingredient_pool) || ingredient_pool.total_volume <= 0) @@ -219,6 +254,7 @@ // The other half of the nutriment, and the rest of the reagents, will get put directly into the pot ingredient_pool.trans_to(holder, amount, ingredient_reagent_multiplier, no_react = TRUE) +/// Called whenever the soup pot overfills with reagent. /datum/chemical_reaction/food/soup/proc/boil_over(datum/reagents/holder) var/obj/item/reagent_containers/cup/soup_pot/pot = holder.my_atom var/turf/below_pot = get_turf(pot) diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_guide.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_guide.dm index c33a54badda88b..4e816904ea2f48 100644 --- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_guide.dm +++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_guide.dm @@ -38,7 +38,7 @@ /datum/crafting_recipe/food/reaction/New() . = ..() - if(!reaction) + if(!ispath(reaction, /datum/chemical_reaction)) return if(length(GLOB.chemical_reactions_list)) diff --git a/code/modules/reagents/chemistry/machinery/chem_dispenser.dm b/code/modules/reagents/chemistry/machinery/chem_dispenser.dm index b434d20a3bc2aa..6110adf5c81e6c 100644 --- a/code/modules/reagents/chemistry/machinery/chem_dispenser.dm +++ b/code/modules/reagents/chemistry/machinery/chem_dispenser.dm @@ -497,6 +497,7 @@ /datum/reagent/consumable/lemonjuice, /datum/reagent/consumable/lemon_lime, /datum/reagent/consumable/limejuice, + /datum/reagent/consumable/melon_soda, /datum/reagent/consumable/menthol, /datum/reagent/consumable/orangejuice, /datum/reagent/consumable/pineapplejuice, @@ -571,6 +572,7 @@ /datum/reagent/consumable/ethanol/ale, /datum/reagent/consumable/ethanol/applejack, /datum/reagent/consumable/ethanol/beer, + /datum/reagent/consumable/ethanol/coconut_rum, /datum/reagent/consumable/ethanol/cognac, /datum/reagent/consumable/ethanol/creme_de_cacao, /datum/reagent/consumable/ethanol/creme_de_coconut, @@ -581,6 +583,7 @@ /datum/reagent/consumable/ethanol/kahlua, /datum/reagent/consumable/ethanol/beer/maltliquor, /datum/reagent/consumable/ethanol/navy_rum, + /datum/reagent/consumable/ethanol/rice_beer, /datum/reagent/consumable/ethanol/rum, /datum/reagent/consumable/ethanol/sake, /datum/reagent/consumable/ethanol/tequila, @@ -589,6 +592,7 @@ /datum/reagent/consumable/ethanol/vodka, /datum/reagent/consumable/ethanol/whiskey, /datum/reagent/consumable/ethanol/wine, + /datum/reagent/consumable/ethanol/yuyake, ) upgrade_reagents = null emagged_reagents = list( diff --git a/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm b/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm index ae230e1c3abd51..4f614e12c38e14 100644 --- a/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm @@ -3813,5 +3813,215 @@ var/obj/item/organ/internal/stomach/ethereal/stomach = exposed_carbon.get_organ_slot(ORGAN_SLOT_STOMACH) if(istype(stomach)) stomach.adjust_charge(reac_volume * 5) + +// Welcome to the Blue Room Bar and Grill, home to Mars' finest cocktails +/datum/reagent/consumable/ethanol/rice_beer + name = "Rice Beer" + description = "A light, rice-based lagered beer popular on Mars. Considered a hate crime against Bavarians under the Reinheitsgebot Act of 1516." + boozepwr = 20 + color = "#664300" + quality = DRINK_NICE + taste_description = "mild carbonated malt" + chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + +/datum/reagent/consumable/ethanol/shochu + name = "Shochu" + description = "Also known as soju or baijiu, this drink is made from fermented rice, much like sake, but at a generally higher proof making it more similar to a true spirit." + boozepwr = 20 + color = "#DDDDDD" + quality = DRINK_NICE + taste_description = "stiff rice wine" + chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + +/datum/reagent/consumable/ethanol/yuyake + name = "Yūyake" + description = "A sweet melon liqueur from Japan. Considered a relic of the 1980s by most, it has some niche use in cocktail making, in part due to its bright red colour." + boozepwr = 20 + color = "#F54040" + quality = DRINK_NICE + taste_description = "sweet melon" + chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + +/datum/reagent/consumable/ethanol/coconut_rum + name = "Coconut Rum" + description = "The distilled essence of the beach. Tastes like bleach-blonde hair and suncream." + boozepwr = 20 + color = "#F54040" + quality = DRINK_NICE + taste_description = "coconut rum" + chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + +// Mixed Martian Drinks +/datum/reagent/consumable/ethanol/yuyakita + name = "Yūyakita" + description = "A hell unleashed upon the world by an unnamed patron." + boozepwr = 20 + color = "#F54040" + quality = DRINK_NICE + taste_description = "death" + chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + +/datum/reagent/consumable/ethanol/saibasan + name = "Saibāsan" + description = "A drink glorifying Cybersun's enduring business." + boozepwr = 20 + color = "#F54040" + quality = DRINK_NICE + taste_description = "betrayal" + chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + +/datum/reagent/consumable/ethanol/banzai_ti + name = "Banzai-Tī" + description = "A variation on the Long Island Iced Tea, made with yuyake for an alternative flavour that's hard to place." + boozepwr = 20 + color = "#F54040" + quality = DRINK_NICE + taste_description = "an asian twist on the liquor cabinet" + chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + +/datum/reagent/consumable/ethanol/sanraizusoda + name = "Sanraizusōda" + description = "It's a melon cream soda, except with alcohol- what's not to love? Well... possibly the hangovers." + boozepwr = 20 + color = "#F54040" + quality = DRINK_NICE + taste_description = "creamy melon soda" + chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + +/datum/reagent/consumable/ethanol/kumicho + name = "Kumichō" + description = "A new take on a classic cocktail, the Kumicho takes the Godfather formula and adds shochu for an Asian twist." + boozepwr = 20 + color = "#F54040" + quality = DRINK_NICE + taste_description = "rice and rye" + chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + +/datum/reagent/consumable/ethanol/red_planet + name = "Red Planet" + description = "Made in celebration of the Martian Concession, the Red Planet is based on the classic El Presidente, and is as patriotic as it is bright crimson." + boozepwr = 20 + color = "#F54040" + quality = DRINK_NICE + taste_description = "the spirit of freedom" + chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + +/datum/reagent/consumable/ethanol/amaterasu + name = "Amaterasu" + description = "Named for Amaterasu, the Shinto Goddess of the Sun, this cocktail embodies radiance- or something like that, anyway." + boozepwr = 20 + color = "#F54040" + quality = DRINK_NICE + taste_description = "sweet nectar of the gods" + chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + +/datum/reagent/consumable/ethanol/nekomimosa + name = "Nekomimosa" + description = "An overly sweet cocktail, made with melon liqueur, melon juice, and champagne (which contains no melon, unfortunately)." + boozepwr = 20 + color = "#FF0C8D" + quality = DRINK_NICE + taste_description = "MELON" + chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + +/datum/reagent/consumable/ethanol/sentai_quencha //melon soda, triple citrus, shochu, blue curacao + name = "Sentai Quencha" + description = "Based on the galaxy-famous \"Kyūkyoku no Ninja Pawā Sentai\", the Sentai Quencha is a favourite at anime conventions and weeb bars." + boozepwr = 20 + color = "#F54040" + quality = DRINK_NICE + taste_description = "ultimate ninja power" + chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + +/datum/reagent/consumable/ethanol/bosozoku + name = "Bōsōzoku" + description = "A simple summer drink from Mars, made from a 1:1 mix of rice beer and lemonade." + boozepwr = 20 + color = "#F54040" + quality = DRINK_NICE + taste_description = "bittersweet lemon" + chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + +/datum/reagent/consumable/ethanol/ersatzche + name = "Ersatzche" + description = "Sweet, bitter, spicy- that's a great combination." + boozepwr = 20 + color = "#F54040" + quality = DRINK_NICE + taste_description = "spicy pineapple beer" + chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + +/datum/reagent/consumable/ethanol/red_city_am + name = "Red City AM" + description = "A breakfast drink from New Osaka, for when you really need to get drunk at 9:30 in the morning in more socially acceptable manner than drinking bagwine on the bullet train. Not that you should drink this on the bullet train either." + boozepwr = 20 + color = "#F54040" + quality = DRINK_NICE + taste_description = "breakfast in a glass" + chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + +/datum/reagent/consumable/ethanol/kings_ransom + name = "King's Ransom" + description = "A stiff, bitter drink with an odd name and odder recipe." + boozepwr = 20 + color = "#F54040" + quality = DRINK_NICE + taste_description = "bitter raspberry" + chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + +/datum/reagent/consumable/ethanol/four_bit + name = "Four Bit" + description = "A drink to power your typing hands." + boozepwr = 20 + color = "#F54040" + quality = DRINK_NICE + taste_description = "cyberspace" + chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + +/datum/reagent/consumable/ethanol/white_hawaiian //coconut milk, coconut rum, coffee liqueur + name = "White Hawaiian" + description = "A take on the classic White Russian, subbing out the classics for some tropical flavours." + boozepwr = 20 + color = "#F54040" + quality = DRINK_NICE + taste_description = "COCONUT" + chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + +/datum/reagent/consumable/ethanol/maui_sunrise //coconut rum, pineapple juice, yuyake, triple citrus, lemon-lime soda + name = "Maui Sunrise" + description = "Behind this drink's red facade lurks a sharp, complex flavour." + boozepwr = 20 + color = "#F54040" + quality = DRINK_NICE + taste_description = "sunrise over the pacific" + chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + +/datum/reagent/consumable/ethanol/imperial_mai_tai //navy rum, rum, lime, triple sec, korta nectar + name = "Imperial Mai Tai" + description = "For when orgeat is in short supply, do as the spacers do- make do and mend." + boozepwr = 20 + color = "#F54040" + quality = DRINK_NICE + taste_description = "spicy nutty rum" + chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + +/datum/reagent/consumable/ethanol/konococo_rumtini //todo: add espresso | coffee, coffee liqueur, coconut rum, sugar + name = "Konococo Rumtini" + description = "Coconut rum, coffee liqueur, and espresso- an odd combination, to be sure, but a welcomed one." + boozepwr = 20 + color = "#F54040" + quality = DRINK_NICE + taste_description = "coconut coffee" + chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + +/datum/reagent/consumable/ethanol/blue_hawaiian //pineapple juice, lemon juice, coconut rum, blue curacao + name = "Blue Hawaiian" + description = "Sweet, sharp and coconutty." + boozepwr = 20 + color = "#F54040" + quality = DRINK_NICE + taste_description = "the aloha state" + chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + #undef ALCOHOL_EXPONENT #undef ALCOHOL_THRESHOLD_MODIFIER diff --git a/code/modules/reagents/chemistry/reagents/drinks/glass_styles/alcohol.dm b/code/modules/reagents/chemistry/reagents/drinks/glass_styles/alcohol.dm new file mode 100644 index 00000000000000..bb9e5869ca8048 --- /dev/null +++ b/code/modules/reagents/chemistry/reagents/drinks/glass_styles/alcohol.dm @@ -0,0 +1,266 @@ +/datum/glass_style/drinking_glass/beer + required_drink_type = /datum/reagent/consumable/ethanol/beer + name = "glass of beer" + desc = "A freezing pint of beer." + icon_state = "beerglass" + +/datum/glass_style/drinking_glass/beer/light + required_drink_type = /datum/reagent/consumable/ethanol/beer/light + name = "glass of light beer" + desc = "A freezing pint of watery light beer." + +/datum/glass_style/drinking_glass/beer/light + required_drink_type = /datum/reagent/consumable/ethanol/beer/maltliquor + name = "glass of malt liquor" + desc = "A freezing pint of malt liquor." + +/datum/glass_style/drinking_glass/beer/green + required_drink_type = /datum/reagent/consumable/ethanol/beer/green + name = "glass of green beer" + desc = "A freezing pint of green beer. Festive." + icon_state = "greenbeerglass" + +/datum/glass_style/drinking_glass/kahlua + required_drink_type = /datum/reagent/consumable/ethanol/kahlua + name = "glass of RR coffee liquor" + desc = "DAMN, THIS THING LOOKS ROBUST!" + icon_state ="kahluaglass" + +/datum/glass_style/drinking_glass/whiskey + required_drink_type = /datum/reagent/consumable/ethanol/whiskey + name = "glass of whiskey" + desc = "The silky, smokey whiskey goodness inside the glass makes the drink look very classy." + icon_state = "whiskeyglass" + +/datum/glass_style/drinking_glass/whiskey/kong + required_drink_type = /datum/reagent/consumable/ethanol/whiskey/kong + name = "glass of Kong" + desc = "Makes You Go Ape!®" + +/datum/glass_style/drinking_glass/whiskey/candycorn + required_drink_type = /datum/reagent/consumable/ethanol/whiskey/candycorn + name = "glass of candy corn liquor" + desc = "Good for your Imagination." + +/datum/glass_style/drinking_glass/thirteenloko + required_drink_type = /datum/reagent/consumable/ethanol/thirteenloko + name = "glass of Thirteen Loko" + desc = "This is a glass of Thirteen Loko, it appears to be of the highest quality. The drink, not the glass." + icon_state = "thirteen_loko_glass" + +/datum/glass_style/drinking_glass/vodka + required_drink_type = /datum/reagent/consumable/ethanol/vodka + name = "glass of vodka" + desc = "The glass contain wodka. Xynta." + icon_state = "ginvodkaglass" + +/datum/glass_style/drinking_glass/gin + required_drink_type = /datum/reagent/consumable/ethanol/gin + name = "glass of gin" + desc = "A crystal clear glass of Griffeater gin." + icon_state = "ginvodkaglass" + +/datum/glass_style/drinking_glass/rum + required_drink_type = /datum/reagent/consumable/ethanol/rum + name = "glass of rum" + desc = "Now you want to pray for a pirate suit, don't you?" + icon_state = "rumglass" + +/datum/glass_style/drinking_glass/tequila + required_drink_type = /datum/reagent/consumable/ethanol/tequila + name = "glass of tequila" + desc = "Now all that's missing is the weird colored shades!" + icon_state = "tequilaglass" + +/datum/glass_style/drinking_glass/vermouth + required_drink_type = /datum/reagent/consumable/ethanol/vermouth + name = "glass of vermouth" + desc = "You wonder why you're even drinking this straight." + icon_state = "vermouthglass" + +/datum/glass_style/drinking_glass/wine + required_drink_type = /datum/reagent/consumable/ethanol/wine + name = "glass of wine" + desc = "A very classy looking drink." + icon_state = "wineglass" + +/datum/glass_style/drinking_glass/grappa + required_drink_type = /datum/reagent/consumable/ethanol/grappa + name = "glass of grappa" + desc = "A fine drink originally made to prevent waste by using the leftovers from winemaking." + icon_state = "grappa" + +/datum/glass_style/drinking_glass/amaretto + required_drink_type = /datum/reagent/consumable/ethanol/amaretto + name = "glass of amaretto" + desc = "A sweet and syrupy looking drink." + icon_state = "amarettoglass" +/datum/glass_style/drinking_glass/cognac + required_drink_type = /datum/reagent/consumable/ethanol/cognac + name = "glass of cognac" + desc = "Damn, you feel like some kind of French aristocrat just by holding this." + icon_state = "cognacglass" + +/datum/glass_style/drinking_glass/absinthe + required_drink_type = /datum/reagent/consumable/ethanol/absinthe + name = "glass of absinthe" + desc = "It's as strong as it smells." + icon_state = "absinthe" + +/datum/glass_style/drinking_glass/hooch + required_drink_type = /datum/reagent/consumable/ethanol/hooch + name = "glass of ale" + desc = "A freezing pint of delicious Ale." + icon_state = "aleglass" + +/datum/glass_style/drinking_glass/goldschlager + required_drink_type = /datum/reagent/consumable/ethanol/goldschlager + name = "glass of goldschlager" + desc = "100% proof that teen girls will drink anything with gold in it." + icon = 'icons/obj/drinks/mixed_drinks.dmi' + icon_state = "goldschlagerglass" + +/datum/glass_style/drinking_glass/patron + required_drink_type = /datum/reagent/consumable/ethanol/patron + name = "glass of patron" + desc = "Drinking patron in the bar, with all the subpar ladies." + icon = 'icons/obj/drinks/mixed_drinks.dmi' + icon_state = "patronglass" + +/datum/glass_style/drinking_glass/sake + required_drink_type = /datum/reagent/consumable/ethanol/sake + name = "cup of sake" + desc = "A traditional cup of sake." + icon_state = "sakecup" + +/datum/glass_style/drinking_glass/fernet + required_drink_type = /datum/reagent/consumable/ethanol/fernet + name = "glass of fernet" + desc = "A glass of pure Fernet. Only an absolute madman would drink this alone." //Hi Kevum + +/datum/glass_style/drinking_glass/fruit_wine + required_drink_type = /datum/reagent/consumable/ethanol/fruit_wine + // This should really be dynamic like "glass of pineapple wine" or something + // but seeing as fruit wine half doesn't work already I'm not inclined to add support for that now + name = "glass of fruit wine" + desc = "A wine made from grown plants." + +/datum/glass_style/drinking_glass/champagne + required_drink_type = /datum/reagent/consumable/ethanol/champagne + name = "Champagne" + desc = "The flute clearly displays the slowly rising bubbles." + icon_state = "champagne_glass" + +/datum/glass_style/drinking_glass/pruno + required_drink_type = /datum/reagent/consumable/ethanol/pruno + name = "glass of pruno" + desc = "Fermented prison wine made from fruit, sugar, and despair. Security loves to confiscate this, which is the only kind thing Security has ever done." + icon_state = "glass_orange" + +/datum/glass_style/drinking_glass/navy_rum + required_drink_type = /datum/reagent/consumable/ethanol/navy_rum + name = "glass of navy rum" + desc = "Splice the mainbrace, and God save the King." + icon_state = "ginvodkaglass" + +/datum/glass_style/drinking_glass/curacao + required_drink_type = /datum/reagent/consumable/ethanol/curacao + name = "glass of curaçao" + desc = "It's blue, da ba dee." + icon_state = "curacao" + +/datum/glass_style/drinking_glass/bitters + required_drink_type = /datum/reagent/consumable/ethanol/bitters + name = "glass of bitters" + desc = "Typically you'd want to mix this with something- but you do you." + icon_state = "bitters" + +/datum/glass_style/drinking_glass/coconut_rum + required_drink_type = /datum/reagent/consumable/ethanol/coconut_rum + name = "glass of coconut rum" + desc = "Breathe in and relax, you're on vacation until this glass is empty." + icon = 'icons/obj/drinks/drinks.dmi' + icon_state = "ginvodkaglass" + +/datum/glass_style/drinking_glass/yuyake + required_drink_type = /datum/reagent/consumable/ethanol/yuyake + name = "glass of yūyake" + desc = "It's the saccharine essence of the 70s in a glass... the 1970s, that is!" + icon = 'icons/obj/drinks/drinks.dmi' + icon_state = "glass_red" + +/datum/glass_style/drinking_glass/shochu + required_drink_type = /datum/reagent/consumable/ethanol/shochu + name = "glass of shochu" + desc = "A glass of strong rice wine." + icon = 'icons/obj/drinks/drinks.dmi' + icon_state = "ginvodkaglass" + +/datum/glass_style/drinking_glass/rice_beer + required_drink_type = /datum/reagent/consumable/ethanol/rice_beer + name = "glass of rice beer" + desc = "A glass of fine, light rice beer. Best enjoyed cold." + icon = 'icons/obj/drinks/drinks.dmi' + icon_state = "rice_beer" + +// Shot glasses + +/datum/glass_style/shot_glass/kahlua + required_drink_type = /datum/reagent/consumable/ethanol/kahlua + icon_state ="shotglasscream" + +/datum/glass_style/shot_glass/whiskey + required_drink_type = /datum/reagent/consumable/ethanol/whiskey + icon_state = "shotglassbrown" + +/datum/glass_style/shot_glass/whiskey/kong + required_drink_type = /datum/reagent/consumable/ethanol/whiskey/kong + +/datum/glass_style/shot_glass/whiskey/candycorn + required_drink_type = /datum/reagent/consumable/ethanol/whiskey/candycorn + +/datum/glass_style/shot_glass/vodka + required_drink_type = /datum/reagent/consumable/ethanol/vodka + icon_state = "shotglassclear" + +/datum/glass_style/shot_glass/rum + required_drink_type = /datum/reagent/consumable/ethanol/rum + icon_state = "shotglassbrown" + +/datum/glass_style/shot_glass/tequila + required_drink_type = /datum/reagent/consumable/ethanol/tequila + icon_state = "shotglassgold" + +/datum/glass_style/shot_glass/vermouth + required_drink_type = /datum/reagent/consumable/ethanol/vermouth + icon_state = "shotglassclear" + +/datum/glass_style/shot_glass/wine + required_drink_type = /datum/reagent/consumable/ethanol/wine + icon_state = "shotglassred" + +/datum/glass_style/shot_glass/amaretto + required_drink_type = /datum/reagent/consumable/ethanol/amaretto + icon_state = "shotglassgold" + +/datum/glass_style/shot_glass/cognac + required_drink_type = /datum/reagent/consumable/ethanol/cognac + icon_state = "shotglassbrown" + +/datum/glass_style/shot_glass/absinthe + required_drink_type = /datum/reagent/consumable/ethanol/absinthe + icon_state = "shotglassgreen" + +/datum/glass_style/drinking_glass/hooch + required_drink_type = /datum/reagent/consumable/ethanol/hooch + name = "Hooch" + desc = "You've really hit rock bottom now... your liver packed its bags and left last night." + icon_state = "glass_brown2" + +/datum/glass_style/shot_glass/goldschlager + required_drink_type = /datum/reagent/consumable/ethanol/goldschlager + icon_state = "shotglassgold" + +/datum/glass_style/shot_glass/patron + required_drink_type = /datum/reagent/consumable/ethanol/patron + icon_state = "shotglassclear" diff --git a/code/modules/reagents/chemistry/reagents/drinks/glass_styles/dairy.dm b/code/modules/reagents/chemistry/reagents/drinks/glass_styles/dairy.dm new file mode 100644 index 00000000000000..e788a589ad1256 --- /dev/null +++ b/code/modules/reagents/chemistry/reagents/drinks/glass_styles/dairy.dm @@ -0,0 +1,41 @@ +// Dairy + +/datum/glass_style/has_foodtype/drinking_glass/milk + required_drink_type = /datum/reagent/consumable/milk + name = "glass of milk" + desc = "White and nutritious goodness!" + icon_state = "glass_white" + drink_type = DAIRY | BREAKFAST + +/datum/glass_style/has_foodtype/juicebox/milk + required_drink_type = /datum/reagent/consumable/milk + name = "carton of milk" + desc = "An excellent source of calcium for growing space explorers." + icon_state = "milkbox" + drink_type = DAIRY | BREAKFAST + +/datum/glass_style/has_foodtype/juicebox/chocolate_milk + required_drink_type = /datum/reagent/consumable/milk/chocolate_milk + name = "carton of chocolate milk" + desc = "Milk for cool kids!" + icon_state = "chocolatebox" + drink_type = SUGAR | DAIRY + +/datum/glass_style/drinking_glass/soymilk + required_drink_type = /datum/reagent/consumable/soymilk + name = "glass of soy milk" + desc = "White and nutritious soy goodness!" + icon_state = "glass_white" + +/datum/glass_style/drinking_glass/cream + required_drink_type = /datum/reagent/consumable/cream + name = "glass of cream" + desc = "Ewwww..." + icon_state = "glass_white" + +/datum/glass_style/drinking_glass/coconut_milk + required_drink_type = /datum/reagent/consumable/coconut_milk + name = "glass of coconut milk" + desc = "The essence of the tropics, contained safely within a glass." + icon = 'icons/obj/drinks/drinks.dmi' + icon_state = "glass_white" diff --git a/code/modules/reagents/chemistry/reagents/drinks/glass_styles/mixed_alcohol.dm b/code/modules/reagents/chemistry/reagents/drinks/glass_styles/mixed_alcohol.dm new file mode 100644 index 00000000000000..67802b9af20c49 --- /dev/null +++ b/code/modules/reagents/chemistry/reagents/drinks/glass_styles/mixed_alcohol.dm @@ -0,0 +1,1067 @@ +/datum/glass_style/drinking_glass/bilk + required_drink_type = /datum/reagent/consumable/ethanol/bilk + name = "glass of bilk" + desc = "A brew of milk and beer. For those alcoholics who fear osteoporosis." + icon_state = "glass_brown" + +/datum/glass_style/drinking_glass/threemileisland + required_drink_type = /datum/reagent/consumable/ethanol/threemileisland + name = "Three Mile Island Ice Tea" + desc = "A glass of this is sure to prevent a meltdown." + icon = 'icons/obj/drinks/mixed_drinks.dmi' + icon_state = "threemileislandglass" + +/datum/glass_style/drinking_glass/gintonic + required_drink_type = /datum/reagent/consumable/ethanol/gintonic + name = "Gin and Tonic" + desc = "A mild but still great cocktail. Drink up, like a true Englishman." + icon = 'icons/obj/drinks/mixed_drinks.dmi' + icon_state = "gintonicglass" + +/datum/glass_style/drinking_glass/rum_coke + required_drink_type = /datum/reagent/consumable/ethanol/rum_coke + name = "Rum and Coke" + desc = "The classic go-to of space-fratboys." + icon_state = "whiskeycolaglass" + +/datum/glass_style/drinking_glass/cuba_libre + required_drink_type = /datum/reagent/consumable/ethanol/cuba_libre + name = "Cuba Libre" + desc = "A classic mix of rum, cola, and lime. A favorite of revolutionaries everywhere!" + icon = 'icons/obj/drinks/mixed_drinks.dmi' + icon_state = "cubalibreglass" + +/datum/glass_style/drinking_glass/whiskey_cola + required_drink_type = /datum/reagent/consumable/ethanol/whiskey_cola + name = "whiskey cola" + desc = "An innocent-looking mixture of cola and whiskey. Delicious." + icon_state = "whiskeycolaglass" + +/datum/glass_style/drinking_glass/martini + required_drink_type = /datum/reagent/consumable/ethanol/martini + name = "Classic Martini" + desc = "Damn, the bartender even stirred it, not shook it." + icon_state = "martiniglass" + +/datum/glass_style/drinking_glass/vodkamartini + required_drink_type = /datum/reagent/consumable/ethanol/vodkamartini + name = "Vodka martini" + desc = "A bastardisation of the classic martini. Still great." + icon_state = "martiniglass" + +/datum/glass_style/drinking_glass/white_russian + required_drink_type = /datum/reagent/consumable/ethanol/white_russian + name = "White Russian" + desc = "A very nice looking drink. But that's just, like, your opinion, man." + icon = 'icons/obj/drinks/mixed_drinks.dmi' + icon_state = "whiterussianglass" + +/datum/glass_style/drinking_glass/screwdrivercocktail + required_drink_type = /datum/reagent/consumable/ethanol/screwdrivercocktail + name = "Screwdriver" + desc = "A simple, yet superb mixture of Vodka and orange juice. Just the thing for the tired engineer." + icon = 'icons/obj/drinks/mixed_drinks.dmi' + icon_state = "screwdriverglass" + +/datum/glass_style/drinking_glass/booger + required_drink_type = /datum/reagent/consumable/ethanol/booger + name = "Booger" + desc = "Ewww..." + icon = 'icons/obj/drinks/mixed_drinks.dmi' + icon_state = "booger" + +/datum/glass_style/drinking_glass/bloody_mary + required_drink_type = /datum/reagent/consumable/ethanol/bloody_mary + name = "Bloody Mary" + desc = "Tomato juice, mixed with Vodka and a li'l bit of lime. Tastes like liquid murder." + icon = 'icons/obj/drinks/mixed_drinks.dmi' + icon_state = "bloodymaryglass" + +/datum/glass_style/drinking_glass/brave_bull + required_drink_type = /datum/reagent/consumable/ethanol/brave_bull + name = "Brave Bull" + desc = "Tequila and Coffee liqueur, brought together in a mouthwatering mixture. Drink up." + icon = 'icons/obj/drinks/mixed_drinks.dmi' + icon_state = "bravebullglass" + +/datum/glass_style/drinking_glass/tequila_sunrise + required_drink_type = /datum/reagent/consumable/ethanol/tequila_sunrise + name = "tequila Sunrise" + desc = "Oh great, now you feel nostalgic about sunrises back on Terra..." + icon = 'icons/obj/drinks/mixed_drinks.dmi' + icon_state = "tequilasunriseglass" + +/datum/glass_style/drinking_glass/toxins_special + required_drink_type = /datum/reagent/consumable/ethanol/toxins_special + name = "Toxins Special" + desc = "Whoah, this thing is on FIRE!" + icon = 'icons/obj/drinks/mixed_drinks.dmi' + icon_state = "toxinsspecialglass" + +/datum/glass_style/drinking_glass/beepsky_smash + required_drink_type = /datum/reagent/consumable/ethanol/beepsky_smash + name = "Beepsky Smash" + desc = "Heavy, hot and strong. Just like the Iron fist of the LAW." + icon = 'icons/obj/drinks/mixed_drinks.dmi' + icon_state = "beepskysmashglass" + +/datum/glass_style/drinking_glass/irish_cream + required_drink_type = /datum/reagent/consumable/ethanol/irish_cream + name = "Irish Cream" + desc = "It's cream, mixed with whiskey. What else would you expect from the Irish?" + icon_state = "irishcreamglass" + +/datum/glass_style/drinking_glass/manly_dorf + required_drink_type = /datum/reagent/consumable/ethanol/manly_dorf + name = "The Manly Dorf" + desc = "A manly concoction made from Ale and Beer. Intended for true men only." + icon = 'icons/obj/drinks/mixed_drinks.dmi' + icon_state = "manlydorfglass" + +/datum/glass_style/drinking_glass/longislandicedtea + required_drink_type = /datum/reagent/consumable/ethanol/longislandicedtea + name = "Long Island Iced Tea" + desc = "The liquor cabinet, brought together in a delicious mix. Intended for middle-aged alcoholic women only." + icon = 'icons/obj/drinks/mixed_drinks.dmi' + icon_state = "longislandicedteaglass" + +/datum/glass_style/drinking_glass/moonshine + required_drink_type = /datum/reagent/consumable/ethanol/moonshine + name = "Moonshine" + desc = "You've really hit rock bottom now... your liver packed its bags and left last night." + icon_state = "glass_clear" + +/datum/glass_style/drinking_glass/b52 + required_drink_type = /datum/reagent/consumable/ethanol/b52 + name = "B-52" + desc = "Kahlua, Irish Cream, and cognac. You will get bombed." + icon = 'icons/obj/drinks/mixed_drinks.dmi' + icon_state = "b52glass" + +/datum/glass_style/drinking_glass/irishcoffee + required_drink_type = /datum/reagent/consumable/ethanol/irishcoffee + name = "Irish Coffee" + desc = "Coffee and alcohol. More fun than a Mimosa to drink in the morning." + icon = 'icons/obj/drinks/coffee.dmi' + icon_state = "irishcoffeeglass" + +/datum/glass_style/drinking_glass/margarita + required_drink_type = /datum/reagent/consumable/ethanol/margarita + name = "Margarita" + desc = "On the rocks with salt on the rim. Arriba~!" + icon = 'icons/obj/drinks/mixed_drinks.dmi' + icon_state = "margaritaglass" + +/datum/glass_style/drinking_glass/black_russian + required_drink_type = /datum/reagent/consumable/ethanol/black_russian + name = "Black Russian" + desc = "For the lactose-intolerant. Still as classy as a White Russian." + icon = 'icons/obj/drinks/mixed_drinks.dmi' + icon_state = "blackrussianglass" + +/datum/glass_style/drinking_glass/manhattan + required_drink_type = /datum/reagent/consumable/ethanol/manhattan + name = "Manhattan" + desc = "The Detective's undercover drink of choice. He never could stomach gin..." + icon = 'icons/obj/drinks/mixed_drinks.dmi' + icon_state = "manhattanglass" + +/datum/glass_style/drinking_glass/manhattan_proj + required_drink_type = /datum/reagent/consumable/ethanol/manhattan_proj + name = "Manhattan Project" + desc = "A scientist's drink of choice, for thinking how to blow up the station." + icon = 'icons/obj/drinks/mixed_drinks.dmi' + icon_state = "proj_manhattanglass" + +/datum/glass_style/drinking_glass/whiskeysoda + required_drink_type = /datum/reagent/consumable/ethanol/whiskeysoda + name = "whiskey soda" + desc = "Ultimate refreshment." + icon_state = "whiskeysodaglass2" + +/datum/glass_style/drinking_glass/antifreeze + required_drink_type = /datum/reagent/consumable/ethanol/antifreeze + name = "Anti-freeze" + desc = "The ultimate refreshment." + icon = 'icons/obj/drinks/mixed_drinks.dmi' + icon_state = "antifreeze" + +/datum/glass_style/drinking_glass/barefoot + required_drink_type = /datum/reagent/consumable/ethanol/barefoot + name = "Barefoot" + desc = "Barefoot and pregnant." + icon = 'icons/obj/drinks/mixed_drinks.dmi' + icon_state = "b&p" + +/datum/glass_style/drinking_glass/snowwhite + required_drink_type = /datum/reagent/consumable/ethanol/snowwhite + name = "Snow White" + desc = "A cold refreshment." + icon = 'icons/obj/drinks/mixed_drinks.dmi' + icon_state = "snowwhite" + +/datum/glass_style/drinking_glass/demonsblood + required_drink_type = /datum/reagent/consumable/ethanol/demonsblood + name = "Demons Blood" + desc = "Just looking at this thing makes the hair at the back of your neck stand up." + icon = 'icons/obj/drinks/mixed_drinks.dmi' + icon_state = "demonsblood" + +/datum/glass_style/drinking_glass/devilskiss + required_drink_type = /datum/reagent/consumable/ethanol/devilskiss + name = "Devils Kiss" + desc = "Creepy time!" + icon = 'icons/obj/drinks/mixed_drinks.dmi' + icon_state = "devilskiss" + +/datum/glass_style/drinking_glass/vodkatonic + required_drink_type = /datum/reagent/consumable/ethanol/vodkatonic + name = "vodka and tonic" + desc = "For when a gin and tonic isn't Russian enough." + icon = 'icons/obj/drinks/mixed_drinks.dmi' + icon_state = "vodkatonicglass" + +/datum/glass_style/drinking_glass/ginfizz + required_drink_type = /datum/reagent/consumable/ethanol/ginfizz + name = "gin fizz" + desc = "Refreshingly lemony, deliciously dry." + icon = 'icons/obj/drinks/mixed_drinks.dmi' + icon_state = "ginfizzglass" + +/datum/glass_style/drinking_glass/bahama_mama + required_drink_type = /datum/reagent/consumable/ethanol/bahama_mama + name = "Bahama Mama" + desc = "A tropical cocktail with a complex blend of flavors." + icon = 'icons/obj/drinks/mixed_drinks.dmi' + icon_state = "bahama_mama" + +/datum/glass_style/drinking_glass/singulo + required_drink_type = /datum/reagent/consumable/ethanol/singulo + name = "Singulo" + desc = "A blue-space beverage." + icon = 'icons/obj/drinks/mixed_drinks.dmi' + icon_state = "singulo" + +/datum/glass_style/drinking_glass/sbiten + required_drink_type = /datum/reagent/consumable/ethanol/sbiten + name = "Sbiten" + desc = "A spicy mix of Vodka and Spice. Very hot." + icon = 'icons/obj/drinks/mixed_drinks.dmi' + icon_state = "sbitenglass" + +/datum/glass_style/drinking_glass/red_mead + required_drink_type = /datum/reagent/consumable/ethanol/red_mead + name = "Red Mead" + desc = "A true Viking's beverage, made with the blood of their enemies." + icon = 'icons/obj/drinks/mixed_drinks.dmi' + icon_state = "red_meadglass" + +/datum/glass_style/drinking_glass/mead + required_drink_type = /datum/reagent/consumable/ethanol/mead + name = "Mead" + desc = "A drink from Valhalla." + icon = 'icons/obj/drinks/mixed_drinks.dmi' + icon_state = "meadglass" + +/datum/glass_style/drinking_glass/iced_beer + required_drink_type = /datum/reagent/consumable/ethanol/iced_beer + name = "iced beer" + desc = "A beer so frosty, the air around it freezes." + icon_state = "iced_beerglass" + +/datum/glass_style/drinking_glass/grog + required_drink_type = /datum/reagent/consumable/ethanol/grog + name = "Grog" + desc = "A fine and cepa drink for Space." + icon = 'icons/obj/drinks/mixed_drinks.dmi' + icon_state = "grogglass" + +/datum/glass_style/drinking_glass/aloe + required_drink_type = /datum/reagent/consumable/ethanol/aloe + name = "Aloe" + desc = "Very, very, very good." + icon_state = "aloe" + +/datum/glass_style/drinking_glass/andalusia + required_drink_type = /datum/reagent/consumable/ethanol/andalusia + name = "Andalusia" + desc = "A nice, strangely named drink." + icon_state = "andalusia" + +/datum/glass_style/drinking_glass/alliescocktail + required_drink_type = /datum/reagent/consumable/ethanol/alliescocktail + name = "Allies cocktail" + desc = "A drink made from your allies." + icon = 'icons/obj/drinks/mixed_drinks.dmi' + icon_state = "alliescocktail" + +/datum/glass_style/drinking_glass/acid_spit + required_drink_type = /datum/reagent/consumable/ethanol/acid_spit + name = "Acid Spit" + desc = "A drink from Nanotrasen. Made from live aliens." + icon_state = "acidspitglass" + +/datum/glass_style/drinking_glass/amasec + required_drink_type = /datum/reagent/consumable/ethanol/amasec + name = "Amasec" + desc = "Always handy before COMBAT!!!" + icon = 'icons/obj/drinks/mixed_drinks.dmi' + icon_state = "amasecglass" + +/datum/glass_style/drinking_glass/changelingsting + required_drink_type = /datum/reagent/consumable/ethanol/changelingsting + name = "Changeling Sting" + desc = "A stingy drink." + icon = 'icons/obj/drinks/soda.dmi' + icon_state = "changelingsting" + +/datum/glass_style/drinking_glass/irishcarbomb + required_drink_type = /datum/reagent/consumable/ethanol/irishcarbomb + name = "Irish Car Bomb" + desc = "An Irish car bomb." + icon_state = "irishcarbomb" + +/datum/glass_style/drinking_glass/syndicatebomb + required_drink_type = /datum/reagent/consumable/ethanol/syndicatebomb + name = "Syndicate Bomb" + desc = "A syndicate bomb." + icon = 'icons/obj/drinks/mixed_drinks.dmi' + icon_state = "syndicatebomb" + +/datum/glass_style/drinking_glass/hiveminderaser + required_drink_type = /datum/reagent/consumable/ethanol/hiveminderaser + name = "Hivemind Eraser" + desc = "For when even mindshields can't save you." + icon = 'icons/obj/drinks/mixed_drinks.dmi' + icon_state = "hiveminderaser" + +/datum/glass_style/drinking_glass/erikasurprise + required_drink_type = /datum/reagent/consumable/ethanol/erikasurprise + name = "Erika Surprise" + desc = "The surprise is, it's green!" + icon = 'icons/obj/drinks/mixed_drinks.dmi' + icon_state = "erikasurprise" + +/datum/glass_style/drinking_glass/driestmartini + required_drink_type = /datum/reagent/consumable/ethanol/driestmartini + name = "Driest Martini" + desc = "Only for the experienced. You think you see sand floating in the glass." + icon = 'icons/obj/drinks/mixed_drinks.dmi' + icon_state = "driestmartiniglass" + +/datum/glass_style/drinking_glass/bananahonk + required_drink_type = /datum/reagent/consumable/ethanol/bananahonk + name = "Banana Honk" + desc = "A drink from Clown Heaven." + icon = 'icons/obj/drinks/mixed_drinks.dmi' + icon_state = "bananahonkglass" + +/datum/glass_style/drinking_glass/silencer + required_drink_type = /datum/reagent/consumable/ethanol/silencer + name = "Silencer" + desc = "A drink from Mime Heaven." + icon = 'icons/obj/drinks/mixed_drinks.dmi' + icon_state = "silencerglass" + +/datum/glass_style/drinking_glass/drunkenblumpkin + required_drink_type = /datum/reagent/consumable/ethanol/drunkenblumpkin + name = "Drunken Blumpkin" + desc = "A drink for the drunks." + icon = 'icons/obj/drinks/mixed_drinks.dmi' + icon_state = "drunkenblumpkin" + +/datum/glass_style/drinking_glass/whiskey_sour + required_drink_type = /datum/reagent/consumable/ethanol/whiskey_sour + name = "whiskey sour" + desc = "Lemon juice mixed with whiskey and a dash of sugar. Surprisingly satisfying." + icon_state = "whiskey_sour" + +/datum/glass_style/drinking_glass/hcider + required_drink_type = /datum/reagent/consumable/ethanol/hcider + name = "hard cider" + desc = "Tastes like autumn... no wait, fall!" + icon_state = "whiskeyglass" + +/datum/glass_style/drinking_glass/fetching_fizz + required_drink_type = /datum/reagent/consumable/ethanol/fetching_fizz + name = "Fetching Fizz" + desc = "Induces magnetism in the imbiber. Started as a barroom prank but evolved to become popular with miners and scrappers. Metallic aftertaste." + icon = 'icons/obj/drinks/mixed_drinks.dmi' + icon_state = "fetching_fizz" + +/datum/glass_style/drinking_glass/hearty_punch + required_drink_type = /datum/reagent/consumable/ethanol/hearty_punch + name = "Hearty Punch" + desc = "Aromatic beverage served piping hot. According to folk tales it can almost wake the dead." + icon = 'icons/obj/drinks/mixed_drinks.dmi' + icon_state = "hearty_punch" + +/datum/glass_style/drinking_glass/bacchus_blessing + required_drink_type = /datum/reagent/consumable/ethanol/bacchus_blessing + name = "Bacchus' Blessing" + desc = "You didn't think it was possible for a liquid to be so utterly revolting. Are you sure about this...?" + icon_state = "glass_brown2" + +/datum/glass_style/drinking_glass/atomicbomb + required_drink_type = /datum/reagent/consumable/ethanol/atomicbomb + name = "Atomic Bomb" + desc = "Nanotrasen cannot take legal responsibility for your actions after imbibing." + icon = 'icons/obj/drinks/mixed_drinks.dmi' + icon_state = "atomicbombglass" + +/datum/glass_style/drinking_glass/gargle_blaster + required_drink_type = /datum/reagent/consumable/ethanol/gargle_blaster + name = "Pan-Galactic Gargle Blaster" + desc = "Like having your brain smashed out by a slice of lemon wrapped around a large gold brick." + icon = 'icons/obj/drinks/mixed_drinks.dmi' + icon_state = "gargleblasterglass" + +/datum/glass_style/drinking_glass/neurotoxin + required_drink_type = /datum/reagent/consumable/ethanol/neurotoxin + name = "Neurotoxin" + desc = "A drink that is guaranteed to knock you silly." + icon = 'icons/obj/drinks/mixed_drinks.dmi' + icon_state = "neurotoxinglass" + +/datum/glass_style/drinking_glass/hippies_delight + required_drink_type = /datum/reagent/consumable/ethanol/hippies_delight + name = "Hippie's Delight" + desc = "A drink enjoyed by people during the 1960's." + icon = 'icons/obj/drinks/mixed_drinks.dmi' + icon_state = "hippiesdelightglass" + +/datum/glass_style/has_foodtype/drinking_glass/eggnog + required_drink_type = /datum/reagent/consumable/ethanol/eggnog + name = "eggnog" + desc = "For enjoying the most wonderful time of the year." + icon_state = "glass_yellow" + drink_type = FRUIT + +/datum/glass_style/has_foodtype/juicebox/eggnog + required_drink_type = /datum/reagent/consumable/ethanol/eggnog + name = "carton of eggnog" + desc = "A big juicebox for adults." + icon_state = "nog2" + drink_type = FRUIT + +/datum/glass_style/has_foodtype/drinking_glass/dreadnog + required_drink_type = /datum/reagent/consumable/ethanol/dreadnog + name = "eggnog" + desc = "For suffering during the best time of the year." + drink_type = FRUIT | GROSS + +/datum/glass_style/drinking_glass/narsour + required_drink_type = /datum/reagent/consumable/ethanol/narsour + name = "Nar'Sour" + desc = "A new hit cocktail inspired by THE ARM Breweries will have you shouting Fuu ma'jin in no time!" + icon = 'icons/obj/drinks/mixed_drinks.dmi' + icon_state = "narsour" + +/datum/glass_style/drinking_glass/triple_sec + required_drink_type = /datum/reagent/consumable/ethanol/triple_sec + name = "Triple Sec" + desc = "A glass of straight Triple Sec." + icon_state = "glass_orange" + +/datum/glass_style/drinking_glass/creme_de_menthe + required_drink_type = /datum/reagent/consumable/ethanol/creme_de_menthe + name = "Creme de Menthe" + desc = "You can almost feel the first breath of spring just looking at it." + icon_state = "glass_green" + +/datum/glass_style/drinking_glass/creme_de_cacao + required_drink_type = /datum/reagent/consumable/ethanol/creme_de_cacao + name = "Creme de Cacao" + desc = "A million hazing lawsuits and alcohol poisonings have started with this humble ingredient." + icon_state = "glass_brown" + +/datum/glass_style/drinking_glass/creme_de_coconut + required_drink_type = /datum/reagent/consumable/ethanol/creme_de_coconut + name = "Creme de Coconut" + desc = "An unintimidating glass of coconut liqueur." + icon_state = "glass_white" + +/datum/glass_style/drinking_glass/quadruple_sec + required_drink_type = /datum/reagent/consumable/ethanol/quadruple_sec + name = "Quadruple Sec" + desc = "An intimidating and lawful beverage dares you to violate the law and make its day. Still can't drink it on duty, though." + icon = 'icons/obj/drinks/mixed_drinks.dmi' + icon_state = "quadruple_sec" + +/datum/glass_style/drinking_glass/quintuple_sec + required_drink_type = /datum/reagent/consumable/ethanol/quintuple_sec + name = "Quintuple Sec" + desc = "Now you are become law, destroyer of clowns." + icon = 'icons/obj/drinks/mixed_drinks.dmi' + icon_state = "quintuple_sec" + +/datum/glass_style/drinking_glass/grasshopper + required_drink_type = /datum/reagent/consumable/ethanol/grasshopper + name = "Grasshopper" + desc = "You weren't aware edible beverages could be that green." + icon = 'icons/obj/drinks/mixed_drinks.dmi' + icon_state = "grasshopper" + +/datum/glass_style/drinking_glass/stinger + required_drink_type = /datum/reagent/consumable/ethanol/stinger + name = "Stinger" + desc = "You wonder what would happen if you pointed this at a heat source..." + icon = 'icons/obj/drinks/mixed_drinks.dmi' + icon_state = "stinger" + +/datum/glass_style/drinking_glass/bastion_bourbon + required_drink_type = /datum/reagent/consumable/ethanol/bastion_bourbon + name = "Bastion Bourbon" + desc = "If you're feeling low, count on the buttery flavor of our own bastion bourbon." + icon = 'icons/obj/drinks/mixed_drinks.dmi' + icon_state = "bastion_bourbon" + +/datum/glass_style/drinking_glass/squirt_cider + required_drink_type = /datum/reagent/consumable/ethanol/squirt_cider + name = "Squirt Cider" + desc = "Squirt cider will toughen you right up. Too bad about the musty aftertaste." + icon = 'icons/obj/drinks/mixed_drinks.dmi' + icon_state = "squirt_cider" + +/datum/glass_style/drinking_glass/fringe_weaver + required_drink_type = /datum/reagent/consumable/ethanol/fringe_weaver + name = "Fringe Weaver" + desc = "It's a wonder it doesn't spill out of the glass." + icon = 'icons/obj/drinks/mixed_drinks.dmi' + icon_state = "fringe_weaver" + +/datum/glass_style/drinking_glass/sugar_rush + required_drink_type = /datum/reagent/consumable/ethanol/sugar_rush + name = "Sugar Rush" + desc = "If you can't mix a Sugar Rush, you can't tend bar." + icon = 'icons/obj/drinks/mixed_drinks.dmi' + icon_state = "sugar_rush" + +/datum/glass_style/drinking_glass/crevice_spike + required_drink_type = /datum/reagent/consumable/ethanol/crevice_spike + name = "Crevice Spike" + desc = "It'll either knock the drunkenness out of you or knock you out cold. Both, probably." + icon = 'icons/obj/drinks/mixed_drinks.dmi' + icon_state = "crevice_spike" + +/datum/glass_style/drinking_glass/peppermint_patty + required_drink_type = /datum/reagent/consumable/ethanol/peppermint_patty + name = "Peppermint Patty" + desc = "A boozy minty hot cocoa that warms your belly on a cold night." + icon = 'icons/obj/drinks/mixed_drinks.dmi' + icon_state = "peppermint_patty" + +/datum/glass_style/drinking_glass/alexander + required_drink_type = /datum/reagent/consumable/ethanol/alexander + name = "Alexander" + desc = "A creamy, indulgent delight that is stronger than it seems." + icon = 'icons/obj/drinks/mixed_drinks.dmi' + icon_state = "alexander" + +/datum/glass_style/drinking_glass/amaretto_alexander + required_drink_type = /datum/reagent/consumable/ethanol/amaretto_alexander + name = "Amaretto Alexander" + desc = "A creamy, indulgent delight that is in fact as gentle as it seems." + icon = 'icons/obj/drinks/mixed_drinks.dmi' + icon_state = "alexanderam" + +/datum/glass_style/drinking_glass/sidecar + required_drink_type = /datum/reagent/consumable/ethanol/sidecar + name = "Sidecar" + desc = "The one ride you'll gladly give up the wheel for." + icon = 'icons/obj/drinks/mixed_drinks.dmi' + icon_state = "sidecar" + +/datum/glass_style/drinking_glass/between_the_sheets + required_drink_type = /datum/reagent/consumable/ethanol/between_the_sheets + name = "Between the Sheets" + desc = "The only drink that comes with a label reminding you of Nanotrasen's zero-tolerance promiscuity policy." + icon = 'icons/obj/drinks/mixed_drinks.dmi' + icon_state = "between_the_sheets" + +/datum/glass_style/drinking_glass/kamikaze + required_drink_type = /datum/reagent/consumable/ethanol/kamikaze + name = "Kamikaze" + desc = "Divinely windy." + icon = 'icons/obj/drinks/mixed_drinks.dmi' + icon_state = "kamikaze" + +/datum/glass_style/drinking_glass/mojito + required_drink_type = /datum/reagent/consumable/ethanol/mojito + name = "Mojito" + desc = "A drink that looks as refreshing as it tastes." + icon = 'icons/obj/drinks/mixed_drinks.dmi' + icon_state = "mojito" + +/datum/glass_style/drinking_glass/moscow_mule + required_drink_type = /datum/reagent/consumable/ethanol/moscow_mule + name = "Moscow Mule" + desc = "A chilly drink that reminds you of the Derelict." + icon = 'icons/obj/drinks/mixed_drinks.dmi' + icon_state = "moscow_mule" + +/datum/glass_style/drinking_glass/fernet_cola + required_drink_type = /datum/reagent/consumable/ethanol/fernet_cola + name = "glass of fernet cola" + desc = "A sawed-off cola bottle filled with Fernet Cola. Nothing better after eating like a lardass." + icon = 'icons/obj/drinks/mixed_drinks.dmi' + icon_state = "godlyblend" + +/datum/glass_style/drinking_glass/fanciulli + required_drink_type = /datum/reagent/consumable/ethanol/fanciulli + name = "glass of fanciulli" + desc = "A glass of Fanciulli. It's just Manhattan with Fernet." + icon_state = "fanciulli" + +/datum/glass_style/drinking_glass/branca_menta + required_drink_type = /datum/reagent/consumable/ethanol/branca_menta + name = "glass of branca menta" + desc = "A glass of Branca Menta, perfect for those lazy and hot Sunday summer afternoons." //Get lazy literally by drinking this + icon_state = "minted_fernet" + +/datum/glass_style/drinking_glass/blank_paper + required_drink_type = /datum/reagent/consumable/ethanol/blank_paper + name = "glass of blank paper" + desc = "A fizzy cocktail for those looking to start fresh." + icon = 'icons/obj/drinks/mixed_drinks.dmi' + icon_state = "blank_paper" + +/datum/glass_style/drinking_glass/wizz_fizz + required_drink_type = /datum/reagent/consumable/ethanol/wizz_fizz + name = "Wizz Fizz" + desc = "The glass bubbles and froths with an almost magical intensity." + icon = 'icons/obj/drinks/mixed_drinks.dmi' + icon_state = "wizz_fizz" + +/datum/glass_style/drinking_glass/bug_spray + required_drink_type = /datum/reagent/consumable/ethanol/bug_spray + name = "Bug Spray" + desc = "Your eyes begin to water as the sting of alcohol reaches them." + icon = 'icons/obj/drinks/mixed_drinks.dmi' + icon_state = "bug_spray" + +/datum/glass_style/drinking_glass/applejack + required_drink_type = /datum/reagent/consumable/ethanol/applejack + name = "Applejack" + desc = "You feel like you could drink this all neight." + icon_state = "applejack_glass" + +/datum/glass_style/drinking_glass/jack_rose + required_drink_type = /datum/reagent/consumable/ethanol/jack_rose + name = "Jack Rose" + desc = "Enough of these, and you really will start to suppose your toeses are roses." + icon = 'icons/obj/drinks/mixed_drinks.dmi' + icon_state = "jack_rose" + +/datum/glass_style/drinking_glass/turbo + required_drink_type = /datum/reagent/consumable/ethanol/turbo + name = "Turbo" + desc = "A turbulent cocktail for outlaw hoverbikers." + icon = 'icons/obj/drinks/mixed_drinks.dmi' + icon_state = "turbo" + +/datum/glass_style/drinking_glass/old_timer + required_drink_type = /datum/reagent/consumable/ethanol/old_timer + name = "Old Timer" + desc = "WARNING! May cause premature aging!" + icon = 'icons/obj/drinks/mixed_drinks.dmi' + icon_state = "old_timer" + +/datum/glass_style/drinking_glass/rubberneck + required_drink_type = /datum/reagent/consumable/ethanol/rubberneck + name = "Rubberneck" + desc = "A popular drink amongst those adhering to an all synthetic diet." + icon = 'icons/obj/drinks/mixed_drinks.dmi' + icon_state = "rubberneck" + +/datum/glass_style/drinking_glass/duplex + required_drink_type = /datum/reagent/consumable/ethanol/duplex + name = "Duplex" + desc = "To imbibe one component separately from the other is consider a great faux pas." + icon = 'icons/obj/drinks/mixed_drinks.dmi' + icon_state = "duplex" + +/datum/glass_style/drinking_glass/trappist + required_drink_type = /datum/reagent/consumable/ethanol/trappist + name = "Trappist Beer" + desc = "boozy Catholicism in a glass." + icon = 'icons/obj/drinks/mixed_drinks.dmi' + icon_state = "trappistglass" + +/datum/glass_style/drinking_glass/blazaam + required_drink_type = /datum/reagent/consumable/ethanol/blazaam + name = "Blazaam" + desc = "The glass seems to be sliding between realities. Doubles as a Berenstain remover." + icon = 'icons/obj/drinks/mixed_drinks.dmi' + icon_state = "blazaamglass" + +/datum/glass_style/drinking_glass/planet_cracker + required_drink_type = /datum/reagent/consumable/ethanol/planet_cracker + name = "Planet Cracker" + desc = "Although historians believe the drink was originally created to commemorate the end of an important conflict in man's past, its origins have largely been forgotten and it is today seen more as a general symbol of human supremacy." + icon = 'icons/obj/drinks/mixed_drinks.dmi' + icon_state = "planet_cracker" + +/datum/glass_style/drinking_glass/mauna_loa + required_drink_type = /datum/reagent/consumable/ethanol/mauna_loa + name = "Mauna Loa" + desc = "Lavaland in a drink... mug... volcano... thing." + icon = 'icons/obj/drinks/mixed_drinks.dmi' + icon_state = "mauna_loa" + +/datum/glass_style/drinking_glass/painkiller + required_drink_type = /datum/reagent/consumable/ethanol/painkiller + name = "Painkiller" + desc = "A combination of tropical juices and rum. Surely this will make you feel better." + icon = 'icons/obj/drinks/mixed_drinks.dmi' + icon_state = "painkiller" + +/datum/glass_style/drinking_glass/pina_colada + required_drink_type = /datum/reagent/consumable/ethanol/pina_colada + name = "Pina Colada" + desc = "If you like pina coladas, and getting caught in the rain... well, you'll like this drink." + icon = 'icons/obj/drinks/mixed_drinks.dmi' + icon_state = "pina_colada" + +/datum/glass_style/drinking_glass/pina_olivada + required_drink_type = /datum/reagent/consumable/ethanol/pina_olivada + name = "Piña Olivada" + desc = "A balance of fruity pineapple with thick, rich olive oil. Stir well before drinking." + icon_state = "pina_olivada" + +/datum/glass_style/drinking_glass/ginger_amaretto + required_drink_type = /datum/reagent/consumable/ethanol/ginger_amaretto + name = "Ginger Amaretto" + desc = "The sprig of rosemary adds a nice aroma to the drink, and isn't just to be pretentious afterall!" + icon = 'icons/obj/drinks/mixed_drinks.dmi' + icon_state = "gingeramaretto" + +/datum/glass_style/drinking_glass/godfather + required_drink_type = /datum/reagent/consumable/ethanol/godfather + name = "Godfather" + desc = "A classic from old Italy and enjoyed by gangsters, pray the orange peel doesnt end up in your mouth." + icon = 'icons/obj/drinks/mixed_drinks.dmi' + icon_state = "godfather" + +/datum/glass_style/drinking_glass/godmother + required_drink_type = /datum/reagent/consumable/ethanol/godmother + name = "Godmother" + desc = "A lovely fresh smelling cocktail, a true Sicilian delight." + icon = 'icons/obj/drinks/mixed_drinks.dmi' + icon_state = "godmother" + +/datum/glass_style/drinking_glass/kortara + required_drink_type = /datum/reagent/consumable/ethanol/kortara + name = "glass of kortara" + desc = "The fermented nectar of the Korta nut, as enjoyed by lizards galaxywide." + icon_state = "kortara_glass" + +/datum/glass_style/drinking_glass/sea_breeze + required_drink_type = /datum/reagent/consumable/ethanol/sea_breeze + name = "Sea Breeze" + desc = "Minty, chocolatey, and creamy. It's like drinkable mint chocolate chip!" + icon = 'icons/obj/drinks/mixed_drinks.dmi' + icon_state = "sea_breeze" + +/datum/glass_style/drinking_glass/white_tiziran + required_drink_type = /datum/reagent/consumable/ethanol/white_tiziran + name = "White Tiziran" + desc = "I had a rough night and I hate the fucking humans, man." + icon = 'icons/obj/drinks/mixed_drinks.dmi' + icon_state = "white_tiziran" + +/datum/glass_style/drinking_glass/drunken_espatier + required_drink_type = /datum/reagent/consumable/ethanol/drunken_espatier + name = "Drunken Espatier" + desc = "A drink to make facing death easier." + icon = 'icons/obj/drinks/mixed_drinks.dmi' + icon_state = "drunken_espatier" + +/datum/glass_style/drinking_glass/protein_blend + required_drink_type = /datum/reagent/consumable/ethanol/protein_blend + name = "Protein Blend" + desc = "Vile, even by lizard standards." + icon = 'icons/obj/drinks/mixed_drinks.dmi' + icon_state = "protein_blend" + +/datum/glass_style/drinking_glass/mushi_kombucha + required_drink_type = /datum/reagent/consumable/ethanol/mushi_kombucha + name = "glass of mushi kombucha" + icon_state = "glass_orange" + +/datum/glass_style/drinking_glass/triumphal_arch + required_drink_type = /datum/reagent/consumable/ethanol/triumphal_arch + name = "Triumphal Arch" + desc = "A toast to the Empire, long may it stand." + icon = 'icons/obj/drinks/mixed_drinks.dmi' + icon_state = "triumphal_arch" + +/datum/glass_style/drinking_glass/the_juice + required_drink_type = /datum/reagent/consumable/ethanol/the_juice + name = "The Juice" + desc = "A concoction of not-so-edible things that apparently lets you feel like you're in two places at once" + icon = 'icons/obj/drinks/mixed_drinks.dmi' + icon_state = "thejuice" + +/datum/glass_style/drinking_glass/admiralty + required_drink_type = /datum/reagent/consumable/ethanol/admiralty + name = "Admiralty" + desc = "Hail to the Admiral, for he brings fair tidings, and rum too." + icon = 'icons/obj/drinks/mixed_drinks.dmi' + icon_state = "admiralty" + +/datum/glass_style/drinking_glass/long_haul + required_drink_type = /datum/reagent/consumable/ethanol/long_haul + name = "Long Haul" + desc = "A perfect companion for a lonely long haul flight." + icon = 'icons/obj/drinks/mixed_drinks.dmi' + icon_state = "long_haul" + +/datum/glass_style/drinking_glass/long_john_silver + required_drink_type = /datum/reagent/consumable/ethanol/long_john_silver + name = "Long John Silver" + desc = "Named for a famous pirate, who may or may not have been fictional. But hey, why let the truth get in the way of a good yarn?" //Chopper Reid says "How the fuck are ya?" + icon = 'icons/obj/drinks/mixed_drinks.dmi' + icon_state = "long_john_silver" + +/datum/glass_style/drinking_glass/tropical_storm + required_drink_type = /datum/reagent/consumable/ethanol/tropical_storm + name = "Tropical Storm" + desc = "Less destructive than the real thing." + icon = 'icons/obj/drinks/mixed_drinks.dmi' + icon_state = "tropical_storm" + +/datum/glass_style/drinking_glass/dark_and_stormy + required_drink_type = /datum/reagent/consumable/ethanol/dark_and_stormy + name = "Dark and Stormy" + desc = "Thunder and lightning, very very frightening." + icon = 'icons/obj/drinks/mixed_drinks.dmi' + icon_state = "dark_and_stormy" + +/datum/glass_style/drinking_glass/salt_and_swell + required_drink_type = /datum/reagent/consumable/ethanol/salt_and_swell + name = "Salt and Swell" + desc = "Ah, I do like to be beside the seaside." + icon = 'icons/obj/drinks/mixed_drinks.dmi' + icon_state = "salt_and_swell" + +/datum/glass_style/drinking_glass/tiltaellen + required_drink_type = /datum/reagent/consumable/ethanol/tiltaellen + name = "glass of tiltällen" + desc = "Eww... it's curdled." + icon_state = "tiltaellen" + +/datum/glass_style/drinking_glass/tich_toch + required_drink_type = /datum/reagent/consumable/ethanol/tich_toch + name = "Tich Toch" + desc = "Oh god." + icon = 'icons/obj/drinks/mixed_drinks.dmi' + icon_state = "tich_toch" + +/datum/glass_style/drinking_glass/helianthus + required_drink_type = /datum/reagent/consumable/ethanol/helianthus + name = "Helianthus" + desc = "Another reason to cut off an ear..." + icon = 'icons/obj/drinks/mixed_drinks.dmi' + icon_state = "helianthus" + +/datum/glass_style/drinking_glass/plumwine + required_drink_type = /datum/reagent/consumable/ethanol/plumwine + name = "plum wine" + desc = "Looks like an evening of writing fine poetry." + icon_state = "plumwineglass" + +/datum/glass_style/drinking_glass/the_hat + required_drink_type = /datum/reagent/consumable/ethanol/the_hat + name = "The Hat" + icon = 'icons/obj/drinks/mixed_drinks.dmi' + icon_state = "thehatglass" + +/datum/glass_style/drinking_glass/gin_garden + required_drink_type = /datum/reagent/consumable/ethanol/gin_garden + name = "gin garden" + desc = "Hey, someone forgot the herb and... the cucumber in my cocktail!" + icon = 'icons/obj/drinks/mixed_drinks.dmi' + icon_state = "gin_garden" + +/datum/glass_style/drinking_glass/wine_voltaic + required_drink_type = /datum/reagent/consumable/ethanol/wine_voltaic + name = "Voltaic Yellow Wine" + desc = "Electrically charged wine. Recharges ethereals, but also nontoxic." + icon = 'icons/obj/drinks/mixed_drinks.dmi' + icon_state = "wine_voltaic" + +/datum/glass_style/drinking_glass/telepole + required_drink_type = /datum/reagent/consumable/ethanol/telepole + name = "Telepole" + desc = "A liquid grounding rod. Recharges ethereals and grants temporary shock resistance." + icon = 'icons/obj/drinks/mixed_drinks.dmi' + icon_state = "telepole" + +/datum/glass_style/drinking_glass/pod_tesla + required_drink_type = /datum/reagent/consumable/ethanol/pod_tesla + name = "Pod Tesla" + desc = "Ride the lightning! Recharges ethereals, suppresses phobias, and grants strong temporary shock resistance." + icon = 'icons/obj/drinks/mixed_drinks.dmi' + icon_state = "pod_tesla" + +/datum/glass_style/drinking_glass/yuyakita + required_drink_type = /datum/reagent/consumable/ethanol/yuyakita + name = "Yūyakita" + desc = "And I looked, and behold a pale horse: and his name that sat on him was Death, and Hell followed with him." + icon = 'icons/obj/drinks/mixed_drinks.dmi' + icon_state = "yuyakita" + +/datum/glass_style/drinking_glass/saibasan + required_drink_type = /datum/reagent/consumable/ethanol/saibasan + name = "Saibāsan" + desc = "A drink made in honour of Cybersun Industries' 600th year of continual business. Officially, you're meant to call this a \"Hong Kong Cooler\" on Nanotrasen stations, but that name sucks." + icon = 'icons/obj/drinks/mixed_drinks.dmi' + icon_state = "saibasan" + +/datum/glass_style/drinking_glass/banzai_ti + required_drink_type = /datum/reagent/consumable/ethanol/banzai_ti + name = "Banzai-Tī" + desc = "A drink to last ten-thousand years- better sip slowly then." + icon = 'icons/obj/drinks/mixed_drinks.dmi' + icon_state = "banzai_ti" + +/datum/glass_style/drinking_glass/sanraizusoda + required_drink_type = /datum/reagent/consumable/ethanol/sanraizusoda + name = "Sanraizusōda" + desc = "A popular children's dessert from Japan, made adult with the addition of booze. Kanpai!" + icon = 'icons/obj/drinks/mixed_drinks.dmi' + icon_state = "sanraizusoda" + +/datum/glass_style/drinking_glass/kumicho + required_drink_type = /datum/reagent/consumable/ethanol/kumicho + name = "Kumichō" + desc = "Much like the American Godfather, the Kumichō is sophisticated, strong, and almost certainly tied to illicit activities." + icon = 'icons/obj/drinks/mixed_drinks.dmi' + icon_state = "kumicho" + +/datum/glass_style/drinking_glass/red_planet + required_drink_type = /datum/reagent/consumable/ethanol/red_planet + name = "Red Planet" + desc = "A patriotic drink from Mars, commonly enjoyed on September 15th: the day that peace was declared following the Martian uprising, with the Martian Concession granting Mars proper representation as part of the Terran Federation." + icon = 'icons/obj/drinks/mixed_drinks.dmi' + icon_state = "red_planet" + +/datum/glass_style/drinking_glass/amaterasu + required_drink_type = /datum/reagent/consumable/ethanol/amaterasu + name = "Amaterasu" + desc = "And so Amaterasu emerged from the Heavenly Rock Cave, and light was restored to the world." + icon = 'icons/obj/drinks/mixed_drinks.dmi' + icon_state = "amaterasu" + +/datum/glass_style/drinking_glass/nekomimosa + required_drink_type = /datum/reagent/consumable/ethanol/nekomimosa + name = "Nekomimosa" + desc = "A syrupy mess of a cocktail, dedicated to a felinid popstar that took Mars by storm a few years ago." + icon = 'icons/obj/drinks/mixed_drinks.dmi' + icon_state = "nekomimosa" + +/datum/glass_style/drinking_glass/sentai_quencha + required_drink_type = /datum/reagent/consumable/ethanol/sentai_quencha + name = "Sentai Quencha" + desc = "Tastes like ultimate ninja power. And melon. And citrus. And some other stuff." + icon = 'icons/obj/drinks/mixed_drinks.dmi' + icon_state = "sentai_quencha" + +/datum/glass_style/drinking_glass/bosozoku + required_drink_type = /datum/reagent/consumable/ethanol/bosozoku + name = "Bōsōzoku" + desc = "A refreshing summer drink enjoyed across Mars and beyond. Any resemblance to shandies or radlers is unintentional." + icon = 'icons/obj/drinks/mixed_drinks.dmi' + icon_state = "bosozoku" + +/datum/glass_style/drinking_glass/ersatzche + required_drink_type = /datum/reagent/consumable/ethanol/ersatzche + name = "Ersatzche" + desc = "An interesting drink invented in the Blue Room Bar and Grill in New Osaka. It's a tasty take on Mexican tepache, made with a beer base." + icon = 'icons/obj/drinks/mixed_drinks.dmi' + icon_state = "ersatzche" + +/datum/glass_style/drinking_glass/red_city_am + required_drink_type = /datum/reagent/consumable/ethanol/red_city_am + name = "Red City AM" + desc = "A popular breakfast drink from New Osaka's bars- for the enterprising day drinker." + icon = 'icons/obj/drinks/mixed_drinks.dmi' + icon_state = "red_city_am" + +/datum/glass_style/drinking_glass/kings_ransom + required_drink_type = /datum/reagent/consumable/ethanol/kings_ransom + name = "King's Ransom" + desc = "A weird drink that manages to marry a number of seemingly conflicting flavours into a single harmonious taste." + icon = 'icons/obj/drinks/mixed_drinks.dmi' + icon_state = "kings_ransom" + +/datum/glass_style/drinking_glass/four_bit + required_drink_type = /datum/reagent/consumable/ethanol/four_bit + name = "Four Bit" + desc = "Straight out of the pits of a Martian hacking convention." + icon = 'icons/obj/drinks/mixed_drinks.dmi' + icon_state = "four_bit" + +/datum/glass_style/drinking_glass/white_hawaiian + required_drink_type = /datum/reagent/consumable/ethanol/white_hawaiian + name = "White Hawaiian" + desc = "One of the infinite variations on the White Russian, this drink gets away from the frozen north and into the heat of the ring of fire with a host of toasty coconut flavours." + icon = 'icons/obj/drinks/mixed_drinks.dmi' + icon_state = "white_hawaiian" + +/datum/glass_style/drinking_glass/maui_sunrise + required_drink_type = /datum/reagent/consumable/ethanol/maui_sunrise + name = "Maui Sunrise" + desc = "Take a sip and be transported to the Aloha state. Metaphorically, of course." + icon = 'icons/obj/drinks/mixed_drinks.dmi' + icon_state = "maui_sunrise" + +/datum/glass_style/drinking_glass/imperial_mai_tai + required_drink_type = /datum/reagent/consumable/ethanol/imperial_mai_tai + name = "Imperial Mai Tai" + desc = "I mean, who springs for orgeat these days anyway? Korta nut's the new big thing, baby." + icon = 'icons/obj/drinks/mixed_drinks.dmi' + icon_state = "imperial_mai_tai" + +/datum/glass_style/drinking_glass/konococo_rumtini + required_drink_type = /datum/reagent/consumable/ethanol/konococo_rumtini + name = "Konococo Rumtini" + desc = "Considered an acceptable breakfast drink in Little Hawaii." + icon = 'icons/obj/drinks/mixed_drinks.dmi' + icon_state = "konococo_rumtini" + +/datum/glass_style/drinking_glass/blue_hawaiian + required_drink_type = /datum/reagent/consumable/ethanol/blue_hawaiian + name = "Blue Hawaiian" + desc = "It's a tropical vacation in a glass." + icon = 'icons/obj/drinks/mixed_drinks.dmi' + icon_state = "blue_hawaiian" + +// Shot glasses + +/datum/glass_style/shot_glass/toxins_special + required_drink_type = /datum/reagent/consumable/ethanol/toxins_special + icon = 'icons/obj/drinks/mixed_drinks.dmi' + icon_state = "toxinsspecialglass" + +/datum/glass_style/shot_glass/b52 + required_drink_type = /datum/reagent/consumable/ethanol/b52 + icon = 'icons/obj/drinks/mixed_drinks.dmi' + icon_state = "b52glass" + +/datum/glass_style/shot_glass/hcider + required_drink_type = /datum/reagent/consumable/ethanol/hcider + icon_state = "shotglassbrown" + +/datum/glass_style/shot_glass/bastion_bourbon + required_drink_type = /datum/reagent/consumable/ethanol/bastion_bourbon + icon_state = "shotglassgreen" + +/datum/glass_style/shot_glass/squirt_cider + required_drink_type = /datum/reagent/consumable/ethanol/squirt_cider + icon_state = "shotglassgreen" + +/datum/glass_style/shot_glass/jack_rose + required_drink_type = /datum/reagent/consumable/ethanol/jack_rose + icon_state = "shotglassred" diff --git a/code/modules/reagents/chemistry/reagents/drinks/glass_styles/sodas.dm b/code/modules/reagents/chemistry/reagents/drinks/glass_styles/sodas.dm new file mode 100644 index 00000000000000..467b80400fb9c3 --- /dev/null +++ b/code/modules/reagents/chemistry/reagents/drinks/glass_styles/sodas.dm @@ -0,0 +1,118 @@ +// Soft Drinks/Sodas + +/datum/glass_style/drinking_glass/space_cola + required_drink_type = /datum/reagent/consumable/space_cola + name = "glass of Space Cola" + desc = "A glass of refreshing Space Cola." + icon_state = "spacecola" + +/datum/glass_style/drinking_glass/nuka_cola + required_drink_type = /datum/reagent/consumable/nuka_cola + name = "glass of Nuka Cola" + desc = "Don't cry, Don't raise your eye, It's only nuclear wasteland." + icon = 'icons/obj/drinks/soda.dmi' + icon_state = "nuka_colaglass" + +/datum/glass_style/drinking_glass/rootbeer + required_drink_type = /datum/reagent/consumable/rootbeer + name = "glass of root beer" + desc = "A glass of highly potent, incredibly sugary root beer." + icon_state = "spacecola" + +/datum/glass_style/drinking_glass/grey_bull + required_drink_type = /datum/reagent/consumable/grey_bull + name = "glass of Grey Bull" + desc = "Surprisingly it isn't grey." + icon_state = "grey_bull_glass" + +/datum/glass_style/drinking_glass/spacemountainwind + required_drink_type = /datum/reagent/consumable/spacemountainwind + name = "glass of Space Mountain Wind" + desc = "Space Mountain Wind. As you know, there are no mountains in space, only wind." + icon_state = "Space_mountain_wind_glass" + +/datum/glass_style/drinking_glass/dr_gibb + required_drink_type = /datum/reagent/consumable/dr_gibb + name = "glass of Dr. Gibb" + desc = "Dr. Gibb. Not as dangerous as the container_name might imply." + icon_state = "dr_gibb_glass" + +/datum/glass_style/drinking_glass/space_up + required_drink_type = /datum/reagent/consumable/space_up + name = "glass of Space-Up" + desc = "Space-up. It helps you keep your cool." + icon_state = "space-up_glass" + +/datum/glass_style/drinking_glass/lemon_lime + required_drink_type = /datum/reagent/consumable/lemon_lime + name = "glass of lemon-lime" + desc = "You're pretty certain a real fruit has never actually touched this." + icon_state = "lemonlime" + +/datum/glass_style/drinking_glass/pwr_game + required_drink_type = /datum/reagent/consumable/pwr_game + name = "glass of Pwr Game" + desc = "Goes well with a Vlad's salad." + icon_state = "pwrgame" + +/datum/glass_style/drinking_glass/shamblers + required_drink_type = /datum/reagent/consumable/shamblers + name = "glass of Shambler's juice" + desc = "Mmm mm, shambly." + icon_state = "shamblerjuice" + +/datum/glass_style/drinking_glass/sodawater + required_drink_type = /datum/reagent/consumable/sodawater + name = "glass of soda water" + desc = "Soda water. Why not make a scotch and soda?" + icon_state = "glass_clearcarb" + +/datum/glass_style/drinking_glass/tonic + required_drink_type = /datum/reagent/consumable/tonic + name = "glass of tonic water" + desc = "Quinine tastes funny, but at least it'll keep that Space Malaria away." + icon_state = "glass_clearcarb" + +/datum/glass_style/drinking_glass/monkey_energy + required_drink_type = /datum/reagent/consumable/monkey_energy + name = "glass of Monkey Energy" + desc = "You can unleash the ape, but without the pop of the can?" + icon_state = "monkey_energy_glass" + +/datum/glass_style/drinking_glass/grape_soda + required_drink_type = /datum/reagent/consumable/grape_soda + name = "glass of grape juice" + +/datum/glass_style/drinking_glass/cream_soda + required_drink_type = /datum/reagent/consumable/cream_soda + name = "Cream Soda" + desc = "A classic space-American vanilla flavored soft drink." + icon = 'icons/obj/drinks/mixed_drinks.dmi' + icon_state = "cream_soda" + +/datum/glass_style/drinking_glass/sol_dry + required_drink_type = /datum/reagent/consumable/sol_dry + name = "Sol Dry" + desc = "A soothing, mellow drink made from ginger." + icon_state = "soldry" + +/datum/glass_style/drinking_glass/hakka_mate + required_drink_type = /datum/reagent/consumable/hakka_mate + name = "glass of Hakka-Mate" + desc = "The perfect drink for hacking. Just don't pour it on your computer, that'll only slow you down." + icon = 'icons/obj/drinks/drinks.dmi' + icon_state = "hakka_mate" + +/datum/glass_style/drinking_glass/melon_soda + required_drink_type = /datum/reagent/consumable/melon_soda + name = "glass of melon soda" + desc = "As enjoyed by Japanese children and 30-something Japan enthusiasts." + icon = 'icons/obj/drinks/drinks.dmi' + icon_state = "melon_soda" + +/datum/glass_style/drinking_glass/volt_energy + required_drink_type = /datum/reagent/consumable/volt_energy + name = "glass of 24-Volt Energy" + desc = "It's sharp, it's sour, it's electrifying!" + icon = 'icons/obj/drinks/drinks.dmi' + icon_state = "volt_energy" diff --git a/code/modules/reagents/reagent_containers/condiment.dm b/code/modules/reagents/reagent_containers/condiment.dm index 4a3cf864477d28..3c32d38ffe9bf5 100644 --- a/code/modules/reagents/reagent_containers/condiment.dm +++ b/code/modules/reagents/reagent_containers/condiment.dm @@ -324,6 +324,51 @@ list_reagents = list(/datum/reagent/consumable/ketchup = 50) fill_icon_thresholds = null +/obj/item/reagent_containers/condiment/worcestershire + name = "worcestershire sauce" + desc = "A fermented sauce of legend from old England. Makes almost anything better." + icon_state = "worcestershire" + list_reagents = list(/datum/reagent/consumable/worcestershire = 50) + fill_icon_thresholds = null + +/obj/item/reagent_containers/condiment/red_bay + name = "\improper Red Bay seasoning" + desc = "Mars' favourite seasoning." + icon_state = "red_bay" + list_reagents = list(/datum/reagent/consumable/red_bay = 50) + fill_icon_thresholds = null + +/obj/item/reagent_containers/condiment/curry_powder + name = "curry powder" + desc = "It's this yellow magic that makes curry taste like curry." + icon_state = "curry_powder" + list_reagents = list(/datum/reagent/consumable/curry_powder = 50) + fill_icon_thresholds = null + +/obj/item/reagent_containers/condiment/dashi_concentrate + name = "dashi concentrate" + desc = "A bottle of Amagi brand dashi concentrate. Simmer with water in a 1:8 ratio for a perfect dashi broth." + icon_state = "dashi_concentrate" + list_reagents = list(/datum/reagent/consumable/dashi_concentrate = 50) + fill_icon_thresholds = null + +/obj/item/reagent_containers/condiment/coconut_milk + name = "coconut milk" + desc = "It's coconut milk. Toasty!" + icon_state = "coconut_milk" + inhand_icon_state = "carton" + lefthand_file = 'icons/mob/inhands/items/drinks_lefthand.dmi' + righthand_file = 'icons/mob/inhands/items/drinks_righthand.dmi' + list_reagents = list(/datum/reagent/consumable/coconut_milk = 50) + fill_icon_thresholds = null + +/obj/item/reagent_containers/condiment/grounding_solution + name = "grounding solution" + desc = "A food-safe ionic solution designed to neutralise the enigmatic \"liquid electricity\" that is common to food from Sprout, forming harmless salt on contact." + icon_state = "grounding_solution" + list_reagents = list(/datum/reagent/consumable/grounding_solution = 50) + fill_icon_thresholds = null + //technically condiment packs but they are non transparent /obj/item/reagent_containers/condiment/creamer diff --git a/code/modules/reagents/reagent_containers/cups/glassbottle.dm b/code/modules/reagents/reagent_containers/cups/glassbottle.dm index 406f181d1a7650..8f3ecd4dcb8566 100644 --- a/code/modules/reagents/reagent_containers/cups/glassbottle.dm +++ b/code/modules/reagents/reagent_containers/cups/glassbottle.dm @@ -724,6 +724,30 @@ list_reagents = list(/datum/reagent/consumable/ethanol/mushi_kombucha = 30) isGlass = FALSE +/obj/item/reagent_containers/cup/glass/bottle/hakka_mate + name = "Hakka-Mate" + desc = "Hakka-Mate: it's an acquired taste." + icon_state = "hakka_mate_bottle" + list_reagents = list(/datum/reagent/consumable/hakka_mate = 30) + +/obj/item/reagent_containers/cup/glass/bottle/shochu + name = "Shu-Kouba Straight Shochu" + desc = "A boozier form of shochu designed for mixing. Comes straight from Mars' Dusty City itself, Shu-Kouba." + icon_state = "shochu_bottle" + list_reagents = list(/datum/reagent/consumable/ethanol/shochu = 100) + +/obj/item/reagent_containers/cup/glass/bottle/yuyake + name = "Moonlabor Yūyake" + desc = "The distilled essence of disco and flared pants, captured like lightning in a bottle." + icon_state = "yuyake_bottle" + list_reagents = list(/datum/reagent/consumable/ethanol/yuyake = 100) + +/obj/item/reagent_containers/cup/glass/bottle/coconut_rum + name = "Breezy Shoals Coconut Rum" + desc = "Live the breezy life with Breezy Shoals, made with only the *finest Caribbean rum." + icon_state = "coconut_rum_bottle" + list_reagents = list(/datum/reagent/consumable/ethanol/coconut_rum = 100) + ////////////////////////// MOLOTOV /////////////////////// /obj/item/reagent_containers/cup/glass/bottle/molotov name = "molotov cocktail" diff --git a/code/modules/reagents/reagent_containers/cups/soda.dm b/code/modules/reagents/reagent_containers/cups/soda.dm index 6c350e2a4d0b75..8caa4a45fac32e 100644 --- a/code/modules/reagents/reagent_containers/cups/soda.dm +++ b/code/modules/reagents/reagent_containers/cups/soda.dm @@ -282,8 +282,51 @@ list_reagents = list(/datum/reagent/consumable/monkey_energy = 50) drink_type = SUGAR | JUNKFOOD +/obj/item/reagent_containers/cup/soda_cans/volt_energy + name = "24-Volt Energy" + desc = "Recharge, with 24-Volt Energy!" + icon_state = "volt_energy" + list_reagents = list(/datum/reagent/consumable/volt_energy = 30) + drink_type = SUGAR | JUNKFOOD + +/obj/item/reagent_containers/cup/soda_cans/melon_soda + name = "Kansumi Melon Soda" + desc = "Japan's favourite melon soda, now available in can form!" + icon_state = "melon_soda" + list_reagents = list(/datum/reagent/consumable/melon_soda = 30) + drink_type = SUGAR | JUNKFOOD + /obj/item/reagent_containers/cup/soda_cans/air name = "canned air" desc = "There is no air shortage. Do not drink." icon_state = "air" list_reagents = list(/datum/reagent/nitrogen = 24, /datum/reagent/oxygen = 6) + +/obj/item/reagent_containers/cup/soda_cans/beer + name = "space beer" + desc = "Canned beer. In space." + icon_state = "beer" + volume = 40 + list_reagents = list(/datum/reagent/consumable/ethanol/beer = 40) + drink_type = GRAIN + +/obj/item/reagent_containers/cup/soda_cans/beer/rice + name = "rice beer" + desc = "A light, rice-based lagered beer popular on Mars. Considered a hate crime against Bavarians under the Reinheitsgebot Act of 1516." + icon_state = "ebisu" + list_reagents = list(/datum/reagent/consumable/ethanol/rice_beer = 40) + +/obj/item/reagent_containers/cup/soda_cans/beer/rice/Initialize(mapload) + . = ..() + var/brand = pick("Ebisu Super Dry", "Shimauma Ichiban", "Moonlabor Malt's") + name = "[brand]" + switch(brand) + if("Ebisu Super Dry") + icon_state = "ebisu" + desc = "Mars' favourite rice beer brand, 200 years running." + if("Shimauma Ichiban") + icon_state = "shimauma" + desc = "Mars' most middling rice beer brand. Not as popular as Ebisu, but it's comfortable in second place." + if("Moonlabor Malt's") + icon_state = "moonlabor" + desc = "Mars' underdog rice beer brand. Popular amongst the Yakuza, for reasons unknown." diff --git a/code/modules/vending/boozeomat.dm b/code/modules/vending/boozeomat.dm index 7f4c2b5280be7d..a5e4f551ac5cae 100644 --- a/code/modules/vending/boozeomat.dm +++ b/code/modules/vending/boozeomat.dm @@ -32,6 +32,11 @@ /obj/item/reagent_containers/cup/glass/bottle/beer = 6, /obj/item/reagent_containers/cup/glass/bottle/vodka = 5, /obj/item/reagent_containers/cup/glass/bottle/whiskey = 5, + /obj/item/reagent_containers/cup/glass/bottle/coconut_rum = 5, + /obj/item/reagent_containers/cup/glass/bottle/yuyake = 5, + /obj/item/reagent_containers/cup/glass/bottle/shochu = 5, + /obj/item/reagent_containers/cup/soda_cans/beer = 10, + /obj/item/reagent_containers/cup/soda_cans/beer/rice = 10, ), ), @@ -49,6 +54,8 @@ /obj/item/reagent_containers/cup/soda_cans/sol_dry = 8, /obj/item/reagent_containers/cup/soda_cans/cola = 8, /obj/item/reagent_containers/cup/soda_cans/tonic = 8, + /obj/item/reagent_containers/cup/glass/bottle/hakka_mate = 5, + /obj/item/reagent_containers/cup/soda_cans/melon_soda = 5, ), ), diff --git a/code/modules/vending/cola.dm b/code/modules/vending/cola.dm index 262c3b5ebfd24b..e09ed2199b7dca 100644 --- a/code/modules/vending/cola.dm +++ b/code/modules/vending/cola.dm @@ -17,6 +17,7 @@ /obj/item/reagent_containers/cup/soda_cans/sol_dry = 10, /obj/item/reagent_containers/cup/glass/waterbottle = 10, /obj/item/reagent_containers/cup/glass/bottle/mushi_kombucha = 3, + /obj/item/reagent_containers/cup/soda_cans/volt_energy = 3, ) contraband = list( /obj/item/reagent_containers/cup/soda_cans/thirteenloko = 6, diff --git a/code/modules/vending/snack.dm b/code/modules/vending/snack.dm index 22d17761bf1614..ec633084fd8360 100644 --- a/code/modules/vending/snack.dm +++ b/code/modules/vending/snack.dm @@ -24,6 +24,11 @@ /obj/item/reagent_containers/cup/glass/dry_ramen = 3, /obj/item/storage/box/gum = 3, /obj/item/food/energybar = 6, + /obj/item/food/hot_shots = 6, + /obj/item/food/sticko = 6, + /obj/item/food/sticko/random = 3, + /obj/item/food/shok_roks = 6, + /obj/item/food/shok_roks/random = 3, ) contraband = list( /obj/item/food/syndicake = 6, diff --git a/icons/obj/drinks/drinks.dmi b/icons/obj/drinks/drinks.dmi index add38550de2532..4b966cb2db2756 100644 Binary files a/icons/obj/drinks/drinks.dmi and b/icons/obj/drinks/drinks.dmi differ diff --git a/icons/obj/drinks/mixed_drinks.dmi b/icons/obj/drinks/mixed_drinks.dmi index 9d11040d0abc5f..e38df489040971 100644 Binary files a/icons/obj/drinks/mixed_drinks.dmi and b/icons/obj/drinks/mixed_drinks.dmi differ diff --git a/icons/obj/food/canned.dmi b/icons/obj/food/canned.dmi index 5f61b7e179675d..97f66f2d5b5ef9 100644 Binary files a/icons/obj/food/canned.dmi and b/icons/obj/food/canned.dmi differ diff --git a/icons/obj/food/frozen_treats.dmi b/icons/obj/food/frozen_treats.dmi index 133d6de83a03bf..b5b91520e8ca63 100644 Binary files a/icons/obj/food/frozen_treats.dmi and b/icons/obj/food/frozen_treats.dmi differ diff --git a/icons/obj/food/martian.dmi b/icons/obj/food/martian.dmi new file mode 100644 index 00000000000000..79efcd1813d58f Binary files /dev/null and b/icons/obj/food/martian.dmi differ diff --git a/icons/obj/service/janitor.dmi b/icons/obj/service/janitor.dmi new file mode 100644 index 00000000000000..05a9e0b1773ae6 Binary files /dev/null and b/icons/obj/service/janitor.dmi differ diff --git a/tgstation.dme b/tgstation.dme index 512344f7ceb860..74e1c4e2801d44 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -2129,6 +2129,7 @@ #include "code\game\objects\items\food\egg.dm" #include "code\game\objects\items\food\frozen.dm" #include "code\game\objects\items\food\lizard.dm" +#include "code\game\objects\items\food\martian.dm" #include "code\game\objects\items\food\meatdish.dm" #include "code\game\objects\items\food\meatslab.dm" #include "code\game\objects\items\food\mexican.dm" @@ -3684,6 +3685,7 @@ #include "code\modules\food_and_drinks\recipes\tablecraft\recipes_frozen.dm" #include "code\modules\food_and_drinks\recipes\tablecraft\recipes_guide.dm" #include "code\modules\food_and_drinks\recipes\tablecraft\recipes_lizard.dm" +#include "code\modules\food_and_drinks\recipes\tablecraft\recipes_martian.dm" #include "code\modules\food_and_drinks\recipes\tablecraft\recipes_meat.dm" #include "code\modules\food_and_drinks\recipes\tablecraft\recipes_mexican.dm" #include "code\modules\food_and_drinks\recipes\tablecraft\recipes_misc.dm"