diff --git a/code/modules/food_and_drinks/drinks/drinks.dm b/code/modules/food_and_drinks/drinks/drinks.dm index 270e8cff6c..6e34c0f2ce 100644 --- a/code/modules/food_and_drinks/drinks/drinks.dm +++ b/code/modules/food_and_drinks/drinks/drinks.dm @@ -375,6 +375,11 @@ name = "grape juice box" desc = "Tasty grape juice in a fun little container. Non-alcoholic!" foodtype = FRUIT | BREAKFAST + if(/datum/reagent/consumable/pineapplejuice) + icon_state = "pineapplebox" + name = "pineapple juice box" + desc = "Why would you even want this?" + foodtype = FRUIT | PINEAPPLE if("chocolate_milk") icon_state = "chocolatebox" name = "carton of chocolate milk" diff --git a/code/modules/food_and_drinks/drinks/drinks/bottle.dm b/code/modules/food_and_drinks/drinks/drinks/bottle.dm index b38250e39d..d62c4d606b 100644 --- a/code/modules/food_and_drinks/drinks/drinks/bottle.dm +++ b/code/modules/food_and_drinks/drinks/drinks/bottle.dm @@ -429,6 +429,17 @@ list_reagents = list(/datum/reagent/consumable/limejuice = 100) foodtype = FRUIT +/obj/item/reagent_containers/food/drinks/bottle/pineapplejuice + name = "pineapple juice" + desc = "Extremely tart, yellow juice." + icon_state = "pineapplejuice" + item_state = "carton" + lefthand_file = 'icons/mob/inhands/equipment/kitchen_lefthand.dmi' + righthand_file = 'icons/mob/inhands/equipment/kitchen_righthand.dmi' + isGlass = FALSE + list_reagents = list(/datum/reagent/consumable/pineapplejuice = 100) + foodtype = FRUIT | PINEAPPLE + /obj/item/reagent_containers/food/drinks/bottle/menthol name = "menthol" desc = "Tastes naturally minty, and imparts a very mild numbing sensation." diff --git a/code/modules/food_and_drinks/food/snacks_frozen.dm b/code/modules/food_and_drinks/food/snacks_frozen.dm index 0bcfe340aa..b699477245 100644 --- a/code/modules/food_and_drinks/food/snacks_frozen.dm +++ b/code/modules/food_and_drinks/food/snacks_frozen.dm @@ -197,7 +197,7 @@ name = "pineapple snowcone" desc = "Pineapple syrup drizzled over a snowball in a paper cup." icon_state = "pineapple_sc" - list_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/water = 10) + list_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/pineapplejuice = 5) tastes = list("ice" = 1, "water" = 1, "pineapples" = 5) foodtype = PINEAPPLE //Pineapple to allow all that like pineapple to enjoy diff --git a/code/modules/food_and_drinks/food/snacks_meat.dm b/code/modules/food_and_drinks/food/snacks_meat.dm index 83a03ed2d9..6a175e6f39 100644 --- a/code/modules/food_and_drinks/food/snacks_meat.dm +++ b/code/modules/food_and_drinks/food/snacks_meat.dm @@ -149,6 +149,8 @@ bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/vitamin = 1) list_reagents = list(/datum/reagent/consumable/nutriment = 6, /datum/reagent/consumable/nutriment/vitamin = 1) tastes = list("meat" = 1) + slices_num = 6 + slice_path = /obj/item/reagent_containers/food/snacks/salami foodtype = MEAT | BREAKFAST var/roasted = FALSE @@ -156,6 +158,15 @@ . = ..() eatverb = pick("bite","chew","nibble","deep throat","gobble","chomp") +/obj/item/reagent_containers/food/snacks/salami + name = "salami" + filling_color = "#CD4122" + desc = "A slice of cured salami." + icon_state = "salami" + list_reagents = list(/datum/reagent/consumable/nutriment = 1) + tastes = list("meat" = 1, "smoke" = 1) + foodtype = MEAT + /obj/item/reagent_containers/food/snacks/kebab trash = /obj/item/stack/rods icon_state = "kebab" diff --git a/code/modules/food_and_drinks/food/snacks_other.dm b/code/modules/food_and_drinks/food/snacks_other.dm index 6c71318807..6feb2df524 100644 --- a/code/modules/food_and_drinks/food/snacks_other.dm +++ b/code/modules/food_and_drinks/food/snacks_other.dm @@ -173,7 +173,7 @@ list_reagents = list(/datum/reagent/consumable/nutriment = 5) filling_color = "#F0E68C" tastes = list("egg" = 1) - foodtype = MEAT | GRAIN + foodtype = MEAT /obj/item/reagent_containers/food/snacks/beans name = "tin of beans" @@ -542,6 +542,7 @@ desc = "A sliced piece of juicy pineapple." icon_state = "pineapple_slice" filling_color = "#F6CB0B" + juice_results = list(/datum/reagent/consumable/pineapplejuice = 3) tastes = list("pineapple" = 1) foodtype = FRUIT | PINEAPPLE diff --git a/code/modules/food_and_drinks/recipes/drinks_recipes.dm b/code/modules/food_and_drinks/recipes/drinks_recipes.dm index 2cb0141728..720c44b6e3 100644 --- a/code/modules/food_and_drinks/recipes/drinks_recipes.dm +++ b/code/modules/food_and_drinks/recipes/drinks_recipes.dm @@ -259,10 +259,10 @@ required_reagents = list(/datum/reagent/consumable/ethanol/gin = 2, /datum/reagent/consumable/sodawater = 1, /datum/reagent/consumable/limejuice = 1) /datum/chemical_reaction/bahama_mama - name = "Bahama mama" + name = "Bahama Mama" id = /datum/reagent/consumable/ethanol/bahama_mama - results = list(/datum/reagent/consumable/ethanol/bahama_mama = 6) - required_reagents = list(/datum/reagent/consumable/ethanol/rum = 2, /datum/reagent/consumable/orangejuice = 2, /datum/reagent/consumable/limejuice = 1, /datum/reagent/consumable/ice = 1) + results = list(/datum/reagent/consumable/ethanol/bahama_mama = 5) + required_reagents = list(/datum/reagent/consumable/ethanol/creme_de_coconut = 1, /datum/reagent/consumable/ethanol/kahlua = 1, /datum/reagent/consumable/ethanol/rum = 2, /datum/reagent/consumable/pineapplejuice = 1) /datum/chemical_reaction/singulo name = "Singulo" @@ -300,6 +300,17 @@ results = list(/datum/reagent/consumable/ethanol/barefoot = 3) required_reagents = list(/datum/reagent/consumable/berryjuice = 1, /datum/reagent/consumable/cream = 1, /datum/reagent/consumable/ethanol/vermouth = 1) +/datum/chemical_reaction/painkiller + name = "Painkiller" + id = /datum/reagent/consumable/ethanol/painkiller + results = list(/datum/reagent/consumable/ethanol/painkiller = 10) + required_reagents = list(/datum/reagent/consumable/ethanol/creme_de_coconut = 5, /datum/reagent/consumable/pineapplejuice = 4, /datum/reagent/consumable/orangejuice = 1) + +/datum/chemical_reaction/pina_colada + name = "Pina Colada" + id = /datum/reagent/consumable/ethanol/pina_colada + results = list(/datum/reagent/consumable/ethanol/pina_colada = 5) + required_reagents = list(/datum/reagent/consumable/ethanol/creme_de_coconut = 1, /datum/reagent/consumable/pineapplejuice = 3, /datum/reagent/consumable/ethanol/rum = 1, /datum/reagent/consumable/limejuice = 1) ////DRINKS THAT REQUIRED IMPROVED SPRITES BELOW:: -Agouri///// @@ -729,14 +740,14 @@ /datum/chemical_reaction/pinkmilk name = "Strawberry Milk" id = /datum/reagent/consumable/pinkmilk - results = list(/datum/reagent/consumable/pinkmilk = 5) - required_reagents = list(/datum/reagent/drug/aphrodisiacplus = 1, /datum/reagent/consumable/milk = 1) + results = list(/datum/reagent/consumable/pinkmilk = 2) + required_reagents = list(/datum/reagent/consumable/strawberryjuice = 1, /datum/reagent/consumable/milk = 1) /datum/chemical_reaction/pinktea name = "Strawberry Tea" id = /datum/reagent/consumable/pinktea results = list(/datum/reagent/consumable/pinktea = 5) - required_reagents = list(/datum/reagent/drug/aphrodisiac = 1, /datum/reagent/consumable/tea/arnold_palmer = 1, /datum/reagent/consumable/sugar = 1) + required_reagents = list(/datum/reagent/consumable/strawberryjuice = 1, /datum/reagent/consumable/tea/arnold_palmer = 1, /datum/reagent/consumable/sugar = 1) /datum/chemical_reaction/blank_paper name = "Blank Paper" diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_frozen.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_frozen.dm index 6d443c99f0..3e47904e6e 100644 --- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_frozen.dm +++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_frozen.dm @@ -211,7 +211,7 @@ reqs = list( /obj/item/reagent_containers/food/drinks/sillycup = 1, /datum/reagent/consumable/ice = 15, - /obj/item/reagent_containers/food/snacks/pineappleslice = 2 + /datum/reagent/consumable/pineapplejuice = 5 ) result = /obj/item/reagent_containers/food/snacks/snowcones/pineapple subcategory = CAT_ICE diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_mexican.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_mexican.dm index e155a1bd23..2256e7c633 100644 --- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_mexican.dm +++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_mexican.dm @@ -100,12 +100,3 @@ ) result = /obj/item/reagent_containers/food/snacks/cubannachos subcategory = CAT_MEXICAN - -/datum/crafting_recipe/food/wrap - name = "Wrap" - reqs = list(/datum/reagent/consumable/soysauce = 10, - /obj/item/reagent_containers/food/snacks/friedegg = 1, - /obj/item/reagent_containers/food/snacks/grown/cabbage = 1, - ) - result = /obj/item/reagent_containers/food/snacks/eggwrap - subcategory = CAT_MEXICAN \ No newline at end of file diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_misc.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_misc.dm index 479e116801..528fc61156 100644 --- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_misc.dm +++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_misc.dm @@ -14,6 +14,15 @@ result = /obj/item/reagent_containers/food/snacks/chawanmushi subcategory = CAT_MISCFOOD +/datum/crafting_recipe/food/wrap + name = "Egg Wrap" + reqs = list(/datum/reagent/consumable/soysauce = 10, + /obj/item/reagent_containers/food/snacks/friedegg = 1, + /obj/item/reagent_containers/food/snacks/grown/cabbage = 1, + ) + result = /obj/item/reagent_containers/food/snacks/eggwrap + subcategory = CAT_MISCFOOD + /datum/crafting_recipe/food/khachapuri name = "Khachapuri" reqs = list( diff --git a/code/modules/hydroponics/grown/berries.dm b/code/modules/hydroponics/grown/berries.dm index 0646ae1a8c..80792538d6 100644 --- a/code/modules/hydroponics/grown/berries.dm +++ b/code/modules/hydroponics/grown/berries.dm @@ -261,6 +261,7 @@ seed = /obj/item/seeds/strawberry name = "strawberry" icon_state = "strawberry" - filling_color = "#7FFF00" + filling_color = "#E50D31" + juice_results = list(/datum/reagent/consumable/strawberryjuice = 0) tastes = list("strawberries" = 1) wine_power = 20 diff --git a/code/modules/hydroponics/grown/pineapple.dm b/code/modules/hydroponics/grown/pineapple.dm index 40b3a67573..79df8aa75e 100644 --- a/code/modules/hydroponics/grown/pineapple.dm +++ b/code/modules/hydroponics/grown/pineapple.dm @@ -30,5 +30,6 @@ filling_color = "#F6CB0B" w_class = WEIGHT_CLASS_NORMAL foodtype = FRUIT | PINEAPPLE + juice_results = list(/datum/reagent/consumable/pineapplejuice = 0) tastes = list("pineapple" = 1) wine_power = 40 diff --git a/code/modules/reagents/chemistry/machinery/chem_dispenser.dm b/code/modules/reagents/chemistry/machinery/chem_dispenser.dm index 2974df29a6..eb2a6ad162 100644 --- a/code/modules/reagents/chemistry/machinery/chem_dispenser.dm +++ b/code/modules/reagents/chemistry/machinery/chem_dispenser.dm @@ -486,6 +486,7 @@ /datum/reagent/consumable/pwr_game, /datum/reagent/consumable/shamblers, /datum/reagent/consumable/sugar, + /datum/reagent/consumable/pineapplejuice, /datum/reagent/consumable/orangejuice, /datum/reagent/consumable/grenadine, /datum/reagent/consumable/limejuice, @@ -494,15 +495,22 @@ /datum/reagent/consumable/menthol ) upgrade_reagents = list( - /datum/reagent/drug/mushroomhallucinogen, - /datum/reagent/consumable/nothing, - /datum/reagent/medicine/cryoxadone + /datum/reagent/consumable/banana, + /datum/reagent/consumable/berryjuice, + /datum/reagent/consumable/strawberryjuice ) upgrade_reagents2 = list( - /datum/reagent/consumable/banana, - /datum/reagent/consumable/berryjuice + /datum/reagent/consumable/applejuice, + /datum/reagent/consumable/carrotjuice, + /datum/reagent/consumable/pumpkinjuice, + /datum/reagent/consumable/watermelonjuice + ) + upgrade_reagents3 = list( + /datum/reagent/drug/mushroomhallucinogen, + /datum/reagent/consumable/nothing, + /datum/reagent/medicine/cryoxadone, + /datum/reagent/consumable/peachjuice ) - upgrade_reagents3 = null emagged_reagents = list( /datum/reagent/consumable/ethanol/thirteenloko, /datum/reagent/consumable/ethanol/changelingsting, @@ -551,6 +559,7 @@ /datum/reagent/consumable/ethanol/hcider, /datum/reagent/consumable/ethanol/creme_de_menthe, /datum/reagent/consumable/ethanol/creme_de_cacao, + /datum/reagent/consumable/ethanol/creme_de_coconut, /datum/reagent/consumable/ethanol/triple_sec, /datum/reagent/consumable/ethanol/sake, /datum/reagent/consumable/ethanol/applejack diff --git a/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm b/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm index e22f8caf89..37e89b23a1 100644 --- a/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm @@ -958,14 +958,14 @@ All effects don't start immediately, but rather get worse over time; the rate is /datum/reagent/consumable/ethanol/bahama_mama name = "Bahama Mama" - description = "Tropical cocktail." + description = "A tropical cocktail with a complex blend of flavors." color = "#FF7F3B" // rgb: 255, 127, 59 boozepwr = 35 quality = DRINK_GOOD - taste_description = "lime and orange" + taste_description = "pineapple, coconut, and a hint of coffee" glass_icon_state = "bahama_mama" glass_name = "Bahama Mama" - glass_desc = "Tropical cocktail." + glass_desc = "A tropical cocktail with a complex blend of flavors." value = 2 /datum/reagent/consumable/ethanol/singulo @@ -1563,6 +1563,16 @@ All effects don't start immediately, but rather get worse over time; the rate is glass_desc = "A million hazing lawsuits and alcohol poisonings have started with this humble ingredient." value = 1 +/datum/reagent/consumable/ethanol/creme_de_coconut + name = "Creme de Coconut" + description = "A coconut liqueur for smooth, creamy, tropical drinks." + color = "#F7F0D0" + boozepwr = 20 + taste_description = "a sweet milky flavor with notes of toasted sugar" + glass_icon_state = "glass_white" + glass_name = "Creme de Coconut" + glass_desc = "An unintimidating glass of coconut liqueur." + /datum/reagent/consumable/ethanol/quadruple_sec name = "Quadruple Sec" description = "Kicks just as hard as licking the powercell on a baton, but tastier." @@ -1604,6 +1614,28 @@ All effects don't start immediately, but rather get worse over time; the rate is . = 1 return ..() +/datum/reagent/consumable/ethanol/painkiller + name = "Painkiller" + description = "Dulls your pain. Your emotional pain, that is." + boozepwr = 20 + color = "#EAD677" + quality = DRINK_NICE + taste_description = "sugary tartness" + glass_icon_state = "painkiller" + glass_name = "Painkiller" + glass_desc = "A combination of tropical juices and rum. Surely this will make you feel better." + +/datum/reagent/consumable/ethanol/pina_colada + name = "Pina Colada" + description = "A fresh pineapple drink with coconut rum. Yum." + boozepwr = 40 + color = "#FFF1B2" + quality = DRINK_FANTASTIC + taste_description = "pineapple, coconut, and a hint of the ocean" + glass_icon_state = "pina_colada" + glass_name = "Pina Colada" + glass_desc = "If you like pina coladas, and getting caught in the rain... well, you'll like this drink." + /datum/reagent/consumable/ethanol/grasshopper name = "Grasshopper" description = "A fresh and sweet dessert shooter. Difficult to look manly while drinking this." diff --git a/code/modules/reagents/chemistry/reagents/drink_reagents.dm b/code/modules/reagents/chemistry/reagents/drink_reagents.dm index 6a191bd2ab..26988e7026 100644 --- a/code/modules/reagents/chemistry/reagents/drink_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/drink_reagents.dm @@ -136,6 +136,12 @@ . = 1 ..() +/datum/reagent/consumable/strawberryjuice + name = "Strawberry Juice" + description = "No, you're not getting dosed." + color = "#E50D31" + taste_description = "strawberry" + /datum/reagent/consumable/nothing name = "Nothing" description = "Absolutely nothing." @@ -812,6 +818,14 @@ taste_description = "peaches" glass_name = "glass of peach juice" +/datum/reagent/consumable/pineapplejuice + name = "Pineapple Juice" + description = "Tart, tropical, and hotly debated." + color = "#F7D435" + taste_description = "pineapple" + glass_name = "glass of pineapple juice" + glass_desc = "Tart, tropical, and hotly debated." + /datum/reagent/consumable/cream_soda name = "Cream Soda" description = "A classic space-American vanilla flavored soft drink." diff --git a/icons/obj/drinks.dmi b/icons/obj/drinks.dmi index 17d6024586..27af94f5c2 100644 Binary files a/icons/obj/drinks.dmi and b/icons/obj/drinks.dmi differ diff --git a/icons/obj/food/food.dmi b/icons/obj/food/food.dmi index 9518640416..37173beadb 100644 Binary files a/icons/obj/food/food.dmi and b/icons/obj/food/food.dmi differ