diff --git a/code/modules/food_and_drinks/food/foods/desserts.dm b/code/modules/food_and_drinks/food/foods/desserts.dm index a0a458e2b61..efb685f45f1 100644 --- a/code/modules/food_and_drinks/food/foods/desserts.dm +++ b/code/modules/food_and_drinks/food/foods/desserts.dm @@ -19,7 +19,9 @@ /obj/item/reagent_containers/food/snacks/icecream/update_overlays() . = ..() var/mutable_appearance/filling = mutable_appearance('icons/obj/kitchen.dmi', "icecream_color") - filling.color = mix_color_from_reagents(reagents.reagent_list) + var/list/reagent_colors = rgb2num(mix_color_from_reagents(reagents.reagent_list), COLORSPACE_HSV) //switching to HSV colorspace lets us easily manipulate the saturation and brightness independently + //Clamping the brightness keeps us from having greyish ice cream while still alowing for a range of colours + filling.color = rgb(reagent_colors[1], ((1.5 * reagent_colors[2]) - 10), (clamp(reagent_colors[3], 85, 100) - 10), space = COLORSPACE_HSV) . += filling /obj/item/reagent_containers/food/snacks/icecream/icecreamcone @@ -30,12 +32,20 @@ bitesize = 3 list_reagents = list("nutriment" = 3, "sugar" = 7, "ice" = 2) +/obj/item/reagent_containers/food/snacks/icecream/wafflecone + name = "ice cream in a waffle cone" + desc = "Delicious ice cream." + icon_state = "icecream_cone_waffle" + volume = 50 + bitesize = 3 + list_reagents = list("nutriment" = 3, "sugar" = 7, "ice" = 2) + /obj/item/reagent_containers/food/snacks/icecream/icecreamcup name = "chocolate ice cream cone" desc = "Delicious ice cream." - icon_state = "icecream_cup" + icon_state = "icecream_cone_chocolate" volume = 50 - bitesize = 6 + bitesize = 3 list_reagents = list("nutriment" = 5, "chocolate" = 8, "ice" = 2) /obj/item/reagent_containers/food/snacks/icecreamsandwich diff --git a/code/modules/food_and_drinks/kitchen_machinery/icecream_vat.dm b/code/modules/food_and_drinks/kitchen_machinery/icecream_vat.dm index 18bc71bde37..e514ed60658 100644 --- a/code/modules/food_and_drinks/kitchen_machinery/icecream_vat.dm +++ b/code/modules/food_and_drinks/kitchen_machinery/icecream_vat.dm @@ -2,7 +2,7 @@ //Code made by Sawu at Sawu-Station. /obj/machinery/icemachine - name = "cream-master deluxe" + name = "\improper Cream-Master Deluxe" density = TRUE anchored = TRUE icon = 'icons/obj/kitchen.dmi' @@ -15,8 +15,8 @@ /obj/machinery/icemachine/proc/generate_name(reagent_name) - var/name_prefix = pick("Mr.","Mrs.","Super","Happy","Whippy") - var/name_suffix = pick(" Whippy "," Slappy "," Creamy "," Dippy "," Swirly "," Swirl ") + var/name_prefix = pick("Mr.","Mrs.","Mx.","Dr.","Super","Happy","Whippy", "Sugary", "Sweet", "Lawful", "Chaotic", "Neutral", "Drippy","Sicknasty","Tubular","Radical") + var/name_suffix = pick(" Whippy "," Slappy "," Creamy "," Dippy "," Swirly "," Swirl ", " Rootin'Tootin "," Frosty ", " Chilly "," Neutral ", " Good ", " Evil ", " Smooth ", " Chunky ", " Flaming ") var/cone_name = null //Heart failure prevention. cone_name += name_prefix cone_name += name_suffix @@ -55,13 +55,13 @@ /obj/machinery/icemachine/proc/validexchange(reag) - if(reag == "sprinkles" | reag == "cola" | reag == "kahlua" | reag == "dr_gibb" | reag == "vodka" | reag == "space_up" | reag == "rum" | reag == "spacemountainwind" | reag == "gin" | reag == "cream" | reag == "water") - return 1 - else - if(reagents.total_volume < 500) - to_chat(usr, "[src] vibrates for a moment, apparently accepting the unknown liquid.") - playsound(loc, 'sound/machines/twobeep.ogg', 10, 1) - return 1 + var/list/static/invalid_reagents = list("sprinkles", "cola", "kahlua", "dr_gibb", "vodka", "space-up", "rum", "spacemountainwind", "gin", "cream", "vanilla") + if(reag in invalid_reagents) + return + if(reagents.total_volume < 500) + to_chat(usr, "[src] vibrates for a moment, apparently accepting the unknown liquid.") + playsound(loc, 'sound/machines/twobeep.ogg', 10, 1) + return TRUE /obj/machinery/icemachine/Topic(href, href_list) @@ -141,25 +141,18 @@ else reagents.add_reagent("gin",5) else if(ID == 4) - if(reagents.total_volume <= 500 & reagents.total_volume >= 15) - reagents.add_reagent("cream",(30 - reagents.total_volume)) - else if(reagents.total_volume <= 15) - reagents.add_reagent("cream",(15 - reagents.total_volume)) + reagents.add_reagent("cream", 5) else if(ID == 5) - if(reagents.total_volume <= 500 & reagents.total_volume >= 15) - reagents.add_reagent("water",(30 - reagents.total_volume)) - else if(reagents.total_volume <= 15) - reagents.add_reagent("water",(15 - reagents.total_volume)) + reagents.add_reagent("vanilla", 5) - else if(href_list["createcup"]) + else if(href_list["createchoco"]) var/name = generate_name(reagents.get_master_reagent_name()) name += " Chocolate Cone" - var/obj/item/reagent_containers/food/snacks/icecream/icecreamcup/C - C = new/obj/item/reagent_containers/food/snacks/icecream/icecreamcup(loc) + var/obj/item/reagent_containers/food/snacks/icecream/icecreamcup/C = new(loc) C.name = "[name]" C.pixel_x = rand(-8, 8) C.pixel_y = -16 - reagents.trans_to(C,30) + reagents.trans_to(C, 50) if(reagents) reagents.clear_reagents() C.update_icon() @@ -167,12 +160,23 @@ else if(href_list["createcone"]) var/name = generate_name(reagents.get_master_reagent_name()) name += " Cone" - var/obj/item/reagent_containers/food/snacks/icecream/icecreamcone/C - C = new/obj/item/reagent_containers/food/snacks/icecream/icecreamcone(loc) + var/obj/item/reagent_containers/food/snacks/icecream/icecreamcone/C = new(loc) C.name = "[name]" C.pixel_x = rand(-8, 8) C.pixel_y = -16 - reagents.trans_to(C,15) + reagents.trans_to(C, 30) + if(reagents) + reagents.clear_reagents() + C.update_icon() + + else if(href_list["createwaffle"]) + var/name = generate_name(reagents.get_master_reagent_name()) + name += " Waffle Cone" + var/obj/item/reagent_containers/food/snacks/icecream/wafflecone/C = new(loc) + C.name = "[name]" + C.pixel_x = rand(-8, 8) + C.pixel_y = -16 + reagents.trans_to(C, 20) if(reagents) reagents.clear_reagents() C.update_icon() @@ -192,10 +196,11 @@ dat += "Alcohol
" dat += "Finish With:
" dat += "Cream
" - dat += "Water
" + dat += "Vanilla
" dat += "Dispense in:
" - dat += "Chocolate Cone
" + dat += "Chocolate Cone
" dat += "Cone
" + dat += "Waffle Cone
" dat += "" return dat diff --git a/code/modules/hydroponics/grown/cocoa_vanilla.dm b/code/modules/hydroponics/grown/cocoa_vanilla.dm index 136b4c7dbf4..b00c4b1aded 100644 --- a/code/modules/hydroponics/grown/cocoa_vanilla.dm +++ b/code/modules/hydroponics/grown/cocoa_vanilla.dm @@ -23,7 +23,7 @@ name = "cocoa pod" desc = "Fattening... Mmmmm... chucklate." icon_state = "cocoapod" - filling_color = "#FFD700" + filling_color = "#5F3A13" bitesize_mod = 2 tastes = list("cocoa" = 1) @@ -44,6 +44,6 @@ name = "vanilla pod" desc = "Fattening... Mmmmm... vanilla." icon_state = "vanillapod" - filling_color = "#FFD700" + filling_color = "#FEFEFE" tastes = list("vanilla" = 1) distill_reagent = "vanilla" //Takes longer, but you can get even more vanilla from it. diff --git a/code/modules/reagents/chemistry/reagents/drinks.dm b/code/modules/reagents/chemistry/reagents/drinks.dm index 1f5ee19b29d..2c86287296a 100644 --- a/code/modules/reagents/chemistry/reagents/drinks.dm +++ b/code/modules/reagents/chemistry/reagents/drinks.dm @@ -18,7 +18,7 @@ name = "Tomato Juice" id = "tomatojuice" description = "Tomatoes made into juice. What a waste of big, juicy tomatoes, huh?" - color = "#731008" // rgb: 115, 16, 8 + color = "#C00609" drink_icon = "glass_red" drink_name = "Glass of Tomato juice" drink_desc = "Are you sure this is tomato juice?" @@ -44,7 +44,7 @@ name = "Lime Juice" id = "limejuice" description = "The sweet-sour juice of limes." - color = "#365E30" // rgb: 54, 94, 48 + color = "#68E735" drink_icon = "glass_green" drink_name = "Glass of Lime juice" drink_desc = "A glass of sweet-sour lime juice." @@ -60,7 +60,7 @@ name = "Carrot juice" id = "carrotjuice" description = "Just like a carrot, but without the crunching." - color = "#973800" // rgb: 151, 56, 0 + color = "#FFA500" drink_icon = "carrotjuice" drink_name = "Glass of carrot juice" drink_desc = "Just like a carrot, but without the crunching." @@ -100,7 +100,7 @@ id = "triple_citrus" description = "A refreshing mixed drink of orange, lemon and lime juice." reagent_state = LIQUID - color = "#23A046" + color = "#B5FF00" drink_icon = "triplecitrus" drink_name = "Glass of Triplecitrus Juice" drink_desc = "As colorful and healthy as it is delicious." @@ -114,7 +114,7 @@ name = "Berry Juice" id = "berryjuice" description = "A delicious blend of several different kinds of berries." - color = "#863333" // rgb: 134, 51, 51 + color = "#B23A4E" drink_icon = "berryjuice" drink_name = "Glass of berry juice" drink_desc = "Berry juice. Or maybe it's jam. Who cares?" @@ -124,7 +124,7 @@ name = "Poison Berry Juice" id = "poisonberryjuice" description = "A tasty juice blended from various kinds of very deadly and toxic berries." - color = "#863353" // rgb: 134, 51, 83 + color = "#B23A4E" drink_icon = "poisonberryjuice" drink_name = "Glass of poison berry juice" drink_desc = "A glass of deadly juice." @@ -139,7 +139,7 @@ name = "Apple Juice" id = "applejuice" description = "The sweet juice of an apple, fit for all ages." - color = "#ECFF56" // rgb: 236, 255, 86 + color = "#FBF969" drink_name = "Apple Juice" drink_desc = "Apple juice. Maybe it would have been better in a pie..." taste_description = "apple juice" @@ -157,7 +157,7 @@ name = "Lemon Juice" id = "lemonjuice" description = "This juice is VERY sour." - color = "#863333" // rgb: 175, 175, 0 + color = "#E5F249" drink_icon = "lemonglass" drink_name = "Glass of lemonjuice" drink_desc = "Sour..." @@ -176,7 +176,7 @@ name = "Banana Juice" id = "banana" description = "The raw essence of a banana." - color = "#863333" // rgb: 175, 175, 0 + color = "#F6F834" drink_icon = "banana" drink_name = "Glass of banana juice" drink_desc = "The raw essence of a banana. HONK" @@ -220,7 +220,7 @@ name = "Milk" id = "milk" description = "An opaque white liquid produced by the mammary glands of mammals." - color = "#DFDFDF" // rgb: 223, 223, 223 + color = "#F1F1F1" drink_icon = "glass_white" drink_name = "Glass of milk" drink_desc = "White and nutritious goodness!" @@ -238,7 +238,7 @@ name = "Soy Milk" id = "soymilk" description = "An opaque white liquid made from soybeans." - color = "#DFDFC7" // rgb: 223, 223, 199 + color = "#DCD3AF" drink_name = "Glass of soy milk" drink_desc = "White and nutritious soy goodness!" taste_description = "fake milk" @@ -246,8 +246,8 @@ /datum/reagent/consumable/drink/milk/cream name = "Cream" id = "cream" - description = "The fatty, still liquid part of milk. Why don't you mix this with sum scotch, eh?" - color = "#DFD7AF" // rgb: 223, 215, 175 + description = "The fatty, still liquid part of milk. Why don't you mix this with some scotch, eh?" + color = "#F1F1F1" drink_name = "Glass of cream" drink_desc = "Ewwww..." taste_description = "cream" @@ -256,7 +256,7 @@ name = "Chocolate milk" id ="chocolate_milk" description = "Chocolate-flavored milk, tastes like being a kid again." - color = "#85432C" + color = "#652109" drink_name = "Chocolate milk" drink_desc = "Smells like childhood. What would they need to add to make it taste like childhood too?" taste_description = "chocolate milk" @@ -266,7 +266,7 @@ id = "hot_coco" description = "Made with love! And coco beans." nutriment_factor = 3 * REAGENTS_METABOLISM - color = "#403010" // rgb: 64, 48, 16 + color = "#401101" drink_icon = "hot_coco" drink_name = "Glass of hot coco" drink_desc = "Delicious and cozy." @@ -307,7 +307,7 @@ name = "Iced Coffee" id = "icecoffee" description = "Coffee and ice, refreshing and cool." - color = "#102838" // rgb: 16, 40, 56 + color = "#33250A" drink_icon = "icedcoffeeglass" drink_name = "Iced Coffee" drink_desc = "A drink to perk you up and refresh you!" @@ -317,12 +317,12 @@ name = "Soy Latte" id = "soy_latte" description = "A nice and tasty beverage while you are reading your hippie books." - color = "#664300" // rgb: 102, 67, 0 + color = "#8A6723" adj_sleepy = 0 drink_icon = "soy_latte" drink_name = "Soy Latte" drink_desc = "A nice and refrshing beverage while you are reading." - taste_description = "fake milky coffee" + taste_description = "milkish coffee" /datum/reagent/consumable/drink/coffee/soy_latte/on_mob_life(mob/living/M) var/update_flags = STATUS_UPDATE_NONE @@ -335,7 +335,7 @@ name = "Cafe Latte" id = "cafe_latte" description = "A nice, strong and tasty beverage while you are reading." - color = "#664300" // rgb: 102, 67, 0 + color = "#7A5C21" adj_sleepy = 0 drink_icon = "cafe_latte" drink_name = "Cafe Latte" @@ -353,7 +353,7 @@ name = "Cafe Mocha" id = "cafe_mocha" description = "The perfect blend of coffee, milk, and chocolate." - color = "#673629" + color = "#3E2603" drink_name = "Cafe Mocha" drink_desc = "The perfect blend of coffee, milk, and chocolate." taste_description = "chocolatey coffee" @@ -633,7 +633,7 @@ name = "Space-Up" id = "space_up" description = "Tastes like a hull breach in your mouth." - color = "#202800" // rgb: 32, 40, 0 + color = "#C7DF67" drink_icon = "space-up_glass" drink_name = "Glass of Space-up" drink_desc = "Space-up. It helps keep your cool." @@ -643,7 +643,7 @@ name = "Lemon Lime" description = "A tangy substance made of 0.5% natural citrus!" id = "lemon_lime" - color = "#878F00" // rgb: 135, 40, 0 + color = "#BEC80F" taste_description = "citrus soda" /datum/reagent/consumable/drink/lemonade @@ -731,7 +731,7 @@ return ..() // imitate alcohol effects using current cycle M.AdjustDrunk(alcohol_perc STATUS_EFFECT_CONSTANT) - M.AdjustDizzy(dizzy_adj, bound_upper = 1.5 MINUTES) + M.AdjustDizzy(dizzy_adj, bound_upper = 1.5 MINUTES) return ..() /datum/reagent/consumable/drink/fyrsskar_tears/on_mob_delete(mob/living/M) diff --git a/code/modules/reagents/chemistry/reagents/food.dm b/code/modules/reagents/chemistry/reagents/food.dm index a63cfb089b0..702f385c837 100644 --- a/code/modules/reagents/chemistry/reagents/food.dm +++ b/code/modules/reagents/chemistry/reagents/food.dm @@ -312,16 +312,16 @@ description = "A fatty, bitter paste made from cocoa beans." reagent_state = SOLID nutriment_factor = 5 * REAGENTS_METABOLISM - color = "#302000" // rgb: 48, 32, 0 + color = "#5F3A13" taste_description = "bitter cocoa" /datum/reagent/consumable/vanilla - name = "Vanilla Powder" + name = "Vanilla" id = "vanilla" description = "A fatty, bitter paste made from vanilla pods." reagent_state = SOLID nutriment_factor = 5 * REAGENTS_METABOLISM - color = "#FFFACD" + color = "#FEFEFE" taste_description = "bitter vanilla" /datum/reagent/consumable/hot_coco diff --git a/icons/obj/kitchen.dmi b/icons/obj/kitchen.dmi index 4578f5dc589..b8424e583f5 100644 Binary files a/icons/obj/kitchen.dmi and b/icons/obj/kitchen.dmi differ