diff --git a/code/game/objects/items/trash.dm b/code/game/objects/items/trash.dm index cd788141935..e3e6b5d0b43 100644 --- a/code/game/objects/items/trash.dm +++ b/code/game/objects/items/trash.dm @@ -128,5 +128,10 @@ desc = "Not sticky anymore." throw_range = 1 +/obj/item/trash/popsicle_stick + name = "used popsicle stick" + icon_state = "popsicle_stick_s" + desc = "Still tastes sweet." + /obj/item/trash/attack(mob/M as mob, mob/living/user as mob) return diff --git a/code/game/objects/items/weapons/misc_items.dm b/code/game/objects/items/weapons/misc_items.dm index 4a8642bc8c8..e90c14664d0 100644 --- a/code/game/objects/items/weapons/misc_items.dm +++ b/code/game/objects/items/weapons/misc_items.dm @@ -14,6 +14,7 @@ Newton Cradle PAI cable Red Phone + Popsicle Sticks */ /obj/item/balltoy @@ -216,3 +217,9 @@ if(cooldown < world.time - 20) playsound(user.loc, 'sound/weapons/ring.ogg', 50, 1) cooldown = world.time + +/obj/item/popsicle_stick + name = "popsicle stick" + desc = "A small wooden stick, usually topped by popsicles or other frozen treats." + icon = 'icons/obj/food/frozen_treats.dmi' + icon_state = "popsicle_stick" diff --git a/code/modules/food_and_drinks/drinks/bottler/bottler_recipes.dm b/code/modules/food_and_drinks/drinks/bottler/bottler_recipes.dm index 2717379ec4d..5f13f593892 100644 --- a/code/modules/food_and_drinks/drinks/bottler/bottler_recipes.dm +++ b/code/modules/food_and_drinks/drinks/bottler/bottler_recipes.dm @@ -56,7 +56,7 @@ There is no excuse to do this wrong now that there is an example for you. --Fals description = "Creamy, smooth flavor, just like the bald heads of the masses. Supposedly aged for 30 years." ingredients = list(/obj/item/reagent_containers/food/drinks/cans/cola, /obj/item/reagent_containers/food/snacks/grown/sugarcane, - /obj/item/reagent_containers/food/snacks/icecream) + /obj/item/reagent_containers/food/snacks/frozen/icecream) result = "blackeye_brew" /datum/bottler_recipe/Grape_Granade diff --git a/code/modules/food_and_drinks/food/foods/desserts.dm b/code/modules/food_and_drinks/food/foods/desserts.dm index efb685f45f1..692c8c06208 100644 --- a/code/modules/food_and_drinks/food/foods/desserts.dm +++ b/code/modules/food_and_drinks/food/foods/desserts.dm @@ -1,60 +1,3 @@ - -////////////////////// -// Ice Cream // -////////////////////// - -/obj/item/reagent_containers/food/snacks/icecream - name = "ice cream" - desc = "Delicious ice cream." - icon = 'icons/obj/kitchen.dmi' - icon_state = "icecream_cone" - bitesize = 3 - list_reagents = list("nutriment" = 1, "sugar" = 1) - tastes = list("ice cream" = 1) - -/obj/item/reagent_containers/food/snacks/icecream/Initialize(mapload) - . = ..() - update_icon(UPDATE_OVERLAYS) - -/obj/item/reagent_containers/food/snacks/icecream/update_overlays() - . = ..() - var/mutable_appearance/filling = mutable_appearance('icons/obj/kitchen.dmi', "icecream_color") - 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 - name = "ice cream cone" - desc = "Delicious ice cream." - icon_state = "icecream_cone" - volume = 50 - 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_cone_chocolate" - volume = 50 - bitesize = 3 - list_reagents = list("nutriment" = 5, "chocolate" = 8, "ice" = 2) - -/obj/item/reagent_containers/food/snacks/icecreamsandwich - name = "icecream sandwich" - desc = "Portable ice cream in its own packaging." - icon_state = "icecreamsandwich" - list_reagents = list("nutriment" = 2, "ice" = 2) - - ////////////////////// // Misc // ////////////////////// diff --git a/code/modules/food_and_drinks/food/foods/frozen.dm b/code/modules/food_and_drinks/food/foods/frozen.dm new file mode 100644 index 00000000000..d9c790827b7 --- /dev/null +++ b/code/modules/food_and_drinks/food/foods/frozen.dm @@ -0,0 +1,335 @@ + +////////////////////////////// +// Frozen Treats // +////////////////////////////// + +//Abstract item for inheritence. + +/obj/item/reagent_containers/food/snacks/frozen + name = "frozen treat" + desc = "If you got this, something broke! Contact a coder if this somehow spawns." + icon = 'icons/obj/food/frozen_treats.dmi' + icon_state = "flavorless_sc" + +/obj/item/reagent_containers/food/snacks/sliceable/clowncake + name = "clown cake" + desc = "A funny cake with a clown face on it." + icon = 'icons/obj/food/frozen_treats.dmi' + icon_state = "clowncake" + slice_path = /obj/item/reagent_containers/food/snacks/frozen/clowncakeslice + list_reagents = list("nutriment" = 20, "sugar" = 5, "vitamin" = 5, "banana" = 15) + tastes = list("cake" = 5, "sweetness" = 2, "carrot" = 1) + +/obj/item/reagent_containers/food/snacks/frozen/clowncakeslice + name = "clown cake slice" + desc = "A slice of bad jokes, and silly props." + icon_state = "clowncake_slice" + trash = /obj/item/trash/plate + filling_color = "#FFD675" + list_reagents = list("nutriment" = 4, "sugar" = 1, "vitamin" = 1, "banana" = 3) + tastes = list("cake" = 5, "sweetness" = 2, "sad clowns" = 1, "ice-cream" = 1) + +/obj/item/reagent_containers/food/snacks/frozen/sundae + name = "sundae" + desc = "Portable ice cream in its own packaging." + icon_state = "sundae" + list_reagents = list("nutriment" = 2, "ice" = 2) + tastes = list("ice cream" = 1, "banana" = 1) + +/////////////////// +// Ice Cream // +////////////////// + +/obj/item/reagent_containers/food/snacks/frozen/icecream + name = "ice cream" + desc = "Delicious ice cream." + icon_state = "icecream_cone" + bitesize = 3 + list_reagents = list("nutriment" = 1, "sugar" = 1) + tastes = list("ice cream" = 1) + +/obj/item/reagent_containers/food/snacks/frozen/icecream/Initialize(mapload) + . = ..() + update_icon(UPDATE_OVERLAYS) + +/obj/item/reagent_containers/food/snacks/frozen/icecream/update_overlays() + . = ..() + var/mutable_appearance/filling = mutable_appearance('icons/obj/food/frozen_treats.dmi', "icecream_color") + 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/frozen/icecream/icecreamcone + name = "ice cream cone" + desc = "Delicious ice cream." + icon_state = "icecream_cone" + volume = 50 + bitesize = 3 + list_reagents = list("nutriment" = 3, "sugar" = 7, "ice" = 2) + +/obj/item/reagent_containers/food/snacks/frozen/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/frozen/icecream/icecreamcup + name = "chocolate ice cream cone" + desc = "Delicious ice cream." + icon_state = "icecream_cone_chocolate" + volume = 50 + bitesize = 3 + list_reagents = list("nutriment" = 5, "chocolate" = 8, "ice" = 2) + +/obj/item/reagent_containers/food/snacks/wafflecone + name = "waffle cone" + desc = "Delicious waffle cone, but no ice cream." + icon = 'icons/obj/food/frozen_treats.dmi' + icon_state = "icecream_cone_waffle" + list_reagents = list("nutriment" = 5) + tastes = list("cream" = 2, "waffle" = 1) + +/obj/item/reagent_containers/food/snacks/frozen/icecreamsandwich + name = "icecream sandwich" + desc = "Portable ice cream in its own packaging." + icon_state = "icecreamsandwich" + list_reagents = list("nutriment" = 2, "ice" = 2) + tastes = list("ice cream" = 1) + +/obj/item/reagent_containers/food/snacks/frozen/berryicecreamsandwich + name = "strawberry icecream sandwich" + desc = "Portable ice cream in its own packaging." + icon_state = "strawberryicecreamsandwich" + list_reagents = list("nutriment" = 2, "ice" = 2) + tastes = list("ice cream" = 1, "strawberry" = 1) + +/obj/item/reagent_containers/food/snacks/frozen/sundae + name = "sundae" + desc = "A classic dessert." + icon_state = "sundae" + list_reagents = list("nutriment" = 6, "banana" = 5, "vitamin" = 2) + tastes = list("ice cream" = 1, "banana" = 1) + +/obj/item/reagent_containers/food/snacks/frozen/honkdae + name = "honkdae" + desc = "The clown's favorite dessert." + icon_state = "honkdae" + list_reagents = list("nutriment" = 6, "banana" = 10, "vitamin" = 4) + tastes = list("ice cream" = 1, "banana" = 1, "a bad joke" = 1) + +/obj/item/reagent_containers/food/snacks/frozen/cornuto + name = "cornuto" + desc = "A neapolitan vanilla and chocolate ice cream cone. It menaces with a sprinkling of caramelized nuts." + icon_state = "cornuto" + list_reagents = list("nutriment" = 6, "hot_coco" = 4, "cream" = 2, "vanilla" = 4, "sugar" = 2) + tastes = list("chopped hazelnuts" = 3, "waffle" = 5) + +/obj/item/reagent_containers/food/snacks/frozen/peanutbuttermochi + name = "peanut butter ice cream mochi" + desc = "A classic dessert at the Arabia Street Night Market in Prospect, peanut butter ice cream mochi is made with a peanut-butter flavoured ice cream as the main filling, and coated in crushed peanuts in the Taiwanese tradition." + icon_state = "pb_ice_cream_mochi" + list_reagents = list("nutriment" = 4, "sugar" = 6, "peanutbutter" = 4, "milk" = 2) + tastes = list("peanut butter" = 1, "mochi" = 1) + +/obj/item/reagent_containers/food/snacks/frozen/spacefreezy + name = "spacefreezy" + desc = "The best ice cream in space." + icon_state = "spacefreezy" + list_reagents = list("nutriment" = 8, "vitamin" = 5, "bluecherryjelly" = 5) + tastes = list("blue cherries" = 2, "ice cream" = 2) + +/////////////////// +// Snow Cones // +////////////////// + +/obj/item/reagent_containers/food/snacks/frozen/snowcone + name = "flavorless snowcone" + desc = "It's just shaved ice. Still fun to chew on." + icon_state = "flavorless_sc" + trash = /obj/item/reagent_containers/food/drinks/sillycup + list_reagents = list("water" = 10, "ice" = 5) + tastes = list("cold water" = 1) + +/obj/item/reagent_containers/food/snacks/frozen/snowcone/apple + name = "apple snowcone" + desc = "Apple syrup drizzled over a snowball in a paper cup." + icon_state = "amber_sc" + list_reagents = list("water" = 10, "ice" = 5, "nutriment" = 1, "applejuice" = 5) + tastes = list("ice" = 1, "water" = 1, "apples" = 5) + +/obj/item/reagent_containers/food/snacks/frozen/snowcone/berry + name = "berry snowcone" + desc = "Berry syrup drizzled over a snowball in a paper cup." + icon_state = "berry_sc" + list_reagents = list("water" = 10, "ice" = 5, "nutriment" = 1, "berryjuice" = 5) + tastes = list("ice" = 1, "water" = 1, "berries" = 5) + +/obj/item/reagent_containers/food/snacks/frozen/snowcone/bluecherry + name = "bluecherry snowcone" + desc = "Bluecherry syrup drizzled over a snowball in a paper cup, how rare!" + icon_state = "blue_sc" + list_reagents = list("water" = 10, "ice" = 5, "nutriment" = 1, "bluecherryjelly" = 5) + tastes = list("ice" = 1, "water" = 1, "bluecherries" = 5) + +/obj/item/reagent_containers/food/snacks/frozen/snowcone/cherry + name = "cherry snowcone" + desc = "Cherry syrup drizzled over a snowball in a paper cup." + icon_state = "red_sc" + list_reagents = list("water" = 10, "ice" = 5, "nutriment" = 1, "cherryjelly" = 5) + tastes = list("ice" = 1, "water" = 1, "cherries" = 5) + +/obj/item/reagent_containers/food/snacks/frozen/snowcone/fruitsalad + name = "fruit salad snowcone" + desc = "A delightful mix of citrus syrups drizzled over a snowball in a paper cup." + icon_state = "fruitsalad_sc" + list_reagents = list("water" = 10, "ice" = 5, "nutriment" = 1, "limejuice" = 5, "lemonjuice" = 5, "orangejuice" = 5) + tastes = list("ice" = 1, "water" = 1, "oranges" = 5, "lemons" = 5, "limes" = 5) + +/obj/item/reagent_containers/food/snacks/frozen/snowcone/grape + name = "grape snowcone" + desc = "Grape syrup drizzled over a snowball in a paper cup." + icon_state = "grape_sc" + list_reagents = list("water" = 10, "ice" = 5, "nutriment" = 1, "grapejuice" = 5) + tastes = list("ice" = 1, "water" = 1, "grapes" = 5) + +/obj/item/reagent_containers/food/snacks/frozen/snowcone/honey + name = "honey snowcone" + desc = "Honey drizzled over a snowball in a paper cup." + icon_state = "amber_sc" + list_reagents = list("water" = 10, "ice" = 5, "nutriment" = 1, "honey" = 5) + tastes = list("ice" = 1, "water" = 1, "honey" = 5) + +/obj/item/reagent_containers/food/snacks/frozen/snowcone/lemon + name = "lemon snowcone" + desc = "Lemon syrup drizzled over a snowball in a paper cup." + icon_state = "lemon_sc" + list_reagents = list("water" = 10, "ice" = 5, "nutriment" = 1, "lemonjuice" = 5) + tastes = list("ice" = 1, "water" = 1, "lemons" = 5) + +/obj/item/reagent_containers/food/snacks/frozen/snowcone/lime + name = "lime snowcone" + desc = "Lime syrup drizzled over a snowball in a paper cup." + icon_state = "lime_sc" + list_reagents = list("water" = 10, "ice" = 5, "nutriment" = 1, "limejuice" = 5) + tastes = list("ice" = 1, "water" = 1, "limes" = 5) + +/obj/item/reagent_containers/food/snacks/frozen/snowcone/mime + name = "mime snowcone" + desc = "..." + icon_state = "mime_sc" + list_reagents = list("water" = 10, "ice" = 5, "nutriment" = 1, "nothing" = 5) + tastes = list("ice" = 1, "water" = 1, "silence" = 5) + +/obj/item/reagent_containers/food/snacks/frozen/snowcone/orange + name = "orange snowcone" + desc = "Orange syrup drizzled over a snowball in a paper cup." + icon_state = "orange_sc" + list_reagents = list("water" = 10, "ice" = 5, "nutriment" = 1, "orangejuice" = 5) + tastes = list("ice" = 1, "water" = 1, "oranges" = 5) + +/obj/item/reagent_containers/food/snacks/frozen/snowcone/pineapple + name = "pineapple snowcone" + desc = "Pineapple syrup drizzled over a snowball in a paper cup." + icon_state = "pineapple_sc" + list_reagents = list("water" = 10, "ice" = 5, "nutriment" = 1, "pineapplejuice" = 5) + tastes = list("ice" = 1, "water" = 1, "pineapple" = 5) + +/obj/item/reagent_containers/food/snacks/frozen/snowcone/rainbow + name = "rainbow snowcone" + desc = "A very colorful snowball in a paper cup." + icon_state = "rainbow_sc" + list_reagents = list("water" = 10, "ice" = 5, "colorful_reagent" = 5) + tastes = list("ice" = 1, "water" = 1, "rainbows" = 5) + +/obj/item/reagent_containers/food/snacks/frozen/snowcone/cola + name = "space cola snowcone" + desc = "Space Cola drizzled over a snowball in a paper cup." + icon_state = "soda_sc" + list_reagents = list("water" = 10, "ice" = 5, "nutriment" = 1, "cola" = 5) + tastes = list("ice" = 1, "water" = 1, "soda" = 5) + +/obj/item/reagent_containers/food/snacks/frozen/snowcone/spacemountain + name = "space mountain wind snowcone" + desc = "Space Mountain Wind drizzled over a snowball in a paper cup." + icon_state = "mountainwind_sc" + list_reagents = list("water" = 10, "ice" = 5, "nutriment" = 1, "spacemountainwind" = 5) + tastes = list("ice" = 1, "water" = 1, "mountain wind" = 5) + +/////////////////// +// Popsicles // +///////////////// + +/obj/item/reagent_containers/food/snacks/frozen/popsicle + name = "jumbo icecream" + desc = "A luxurious ice cream covered in rich chocolate. It seems smaller than you remember it being." + icon_state = "jumbo" + trash = /obj/item/trash/popsicle_stick + list_reagents = list("nutriment" = 4, "sugar" = 4, "chocolate" = 3) + tastes = list("ice cream" = 1, "chocolate" = 1, "vanilla" = 1) + +/obj/item/reagent_containers/food/snacks/frozen/popsicle/bananatop + name = "banana topsicle" + desc = "A frozen treat made from tofu and banana juice blended smooth, then frozen. Popular in rural Japan in the summer." + icon_state = "topsicle_banana" + list_reagents = list("vitamin" = 4, "sugar" = 6, "banana" = 4) + tastes = list("bananas" = 1, "tofu" = 1) + +/obj/item/reagent_containers/food/snacks/frozen/popsicle/berrytop + name = "berry topsicle" + desc = "A frozen treat made from tofu and berry juice blended smooth, then frozen. Supposedly a favourite of bears, but that makes no sense..." + icon_state = "topsicle_berry" + list_reagents = list("vitamin" = 4, "sugar" = 6, "berryjuice" = 4) + tastes = list("berries" = 1, "tofu" = 1) + +/obj/item/reagent_containers/food/snacks/frozen/popsicle/pineappletop + name = "pineapple topsicle" + desc = "A frozen treat made from tofu and pineapple juice blended smooth, then frozen. As seen on TV." + icon_state = "topsicle_pineapple" + list_reagents = list("vitamin" = 4, "sugar" = 6, "pineapplejuice" = 4) + tastes = list("pineapples" = 1, "tofu" = 1) + +/obj/item/reagent_containers/food/snacks/frozen/popsicle/licoricecream + name = "licorice creamsicle" + desc = "A salty licorice ice cream. A salty frozen treat." + icon_state = "licorice_creamsicle" + list_reagents = list("nutriment" = 4, "cream" = 2, "vanilla" = 1, "sugar" = 4, "salt" = 1) + tastes = list("salty licorice" = 1) + +/obj/item/reagent_containers/food/snacks/frozen/popsicle/orangecream + name = "orange creamsicle" + desc = "A classic orange creamsicle. A sunny frozen treat." + icon_state = "creamsicle_o" + list_reagents = list("orangejuice" = 4, "cream" = 2, "vanilla" = 2, "sugar" = 4) + tastes = list("ice cream" = 1, "oranges" = 1, "vanilla" = 1) + +/obj/item/reagent_containers/food/snacks/frozen/popsicle/berrycream + name = "berry creamsicle" + desc = "A vibrant berry creamsicle. A berry good frozen treat." + icon_state = "creamsicle_m" + list_reagents = list("berryjuice" = 4, "cream" = 2, "vanilla" = 2, "sugar" = 4) + tastes = list("ice cream" = 1, "berries" = 1, "vanilla" = 1) + +/obj/item/reagent_containers/food/snacks/frozen/popsicle/frozenpineapple + name = "frozen pineapple pop" + desc = "Few cultures love pineapple as much as the Martians, and this dessert proves that- frozen pineapple, on a stick, with just a little dunk of dark chocolate." + icon_state = "pineapple_pop" + list_reagents = list("pineapplejuice" = 4, "sugar" = 4, "nutriment" = 2, "vitamin" = 2) + tastes = list("cold pineapple" = 1, "chocolate" = 1) + +/obj/item/reagent_containers/food/snacks/frozen/popsicle/sea_salt + name = "sea salt ice-cream bar" + desc = "This sky-blue ice-cream bar is flavoured with only the finest imported sea salt. Salty... no, sweet!" + icon_state = "sea_salt_pop" + list_reagents = list("salt" = 1, "nutriment" = 2, "cream" = 2, "vanilla" = 2, "sugar"= 4,) + tastes = list("salt" = 1, "sweet" = 1) + +/obj/item/reagent_containers/food/snacks/frozen/popsicle/ant + name = "ant popsicle" + desc = "A colony of ants suspended in hardened sugar. Those things are dead, right?" + icon_state = "ant_pop" + trash = /obj/item/stack/rods + list_reagents = list("nutriment" = 1, "vitamin" = 1, "sugar" = 5, "ants" = 3,) + tastes = list("candy" = 1, "ants" = 2) 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 d66fcbac0f2..f28d4f13e50 100644 --- a/code/modules/food_and_drinks/kitchen_machinery/icecream_vat.dm +++ b/code/modules/food_and_drinks/kitchen_machinery/icecream_vat.dm @@ -40,7 +40,7 @@ to_chat(user, "You add [I] to [src]") updateUsrDialog() return - if(istype(I, /obj/item/reagent_containers/food/snacks/icecream)) + if(istype(I, /obj/item/reagent_containers/food/snacks/frozen/icecream)) if(!I.reagents.has_reagent("sprinkles")) if(I.reagents.total_volume > 29) I.reagents.remove_any(1) @@ -147,7 +147,7 @@ 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 = new(loc) + var/obj/item/reagent_containers/food/snacks/frozen/icecream/icecreamcup/C = new(loc) C.name = "[name]" C.pixel_x = rand(-8, 8) C.pixel_y = -16 @@ -159,7 +159,7 @@ 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 = new(loc) + var/obj/item/reagent_containers/food/snacks/frozen/icecream/icecreamcone/C = new(loc) C.name = "[name]" C.pixel_x = rand(-8, 8) C.pixel_y = -16 @@ -171,7 +171,7 @@ 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) + var/obj/item/reagent_containers/food/snacks/frozen/icecream/wafflecone/C = new(loc) C.name = "[name]" C.pixel_x = rand(-8, 8) C.pixel_y = -16 diff --git a/code/modules/food_and_drinks/kitchen_machinery/processor.dm b/code/modules/food_and_drinks/kitchen_machinery/processor.dm index f268d02f21e..6c6224bf572 100644 --- a/code/modules/food_and_drinks/kitchen_machinery/processor.dm +++ b/code/modules/food_and_drinks/kitchen_machinery/processor.dm @@ -119,6 +119,10 @@ input = /obj/item/reagent_containers/food/snacks/grown/carrot output = /obj/item/reagent_containers/food/snacks/grown/carrot/wedges +/datum/food_processor_process/towercap + input = /obj/item/grown/log + output = /obj/item/popsicle_stick + ///////////////////////// ///END OBJECT RECIPIES/// ///////////////////////// diff --git a/code/modules/food_and_drinks/recipes/recipes_candy.dm b/code/modules/food_and_drinks/recipes/recipes_candy.dm index 0c6f3c67007..2339acd3ffa 100644 --- a/code/modules/food_and_drinks/recipes/recipes_candy.dm +++ b/code/modules/food_and_drinks/recipes/recipes_candy.dm @@ -83,6 +83,10 @@ being_cooked.reagents.del_reagent("egg") return being_cooked +/datum/recipe/candy/wafflecone + reagents = list("milk" = 1, "sugar" = 1) + result = /obj/item/reagent_containers/food/snacks/wafflecone + // *********************************************************** // Base Candy Recipes (unflavored / plain) // *********************************************************** diff --git a/code/modules/food_and_drinks/recipes/recipes_microwave.dm b/code/modules/food_and_drinks/recipes/recipes_microwave.dm index 48ff01389ba..112dcc6ca87 100644 --- a/code/modules/food_and_drinks/recipes/recipes_microwave.dm +++ b/code/modules/food_and_drinks/recipes/recipes_microwave.dm @@ -1045,9 +1045,246 @@ /datum/recipe/microwave/icecreamsandwich reagents = list("ice" = 5, "cream" = 5) items = list( - /obj/item/reagent_containers/food/snacks/icecream, + /obj/item/reagent_containers/food/snacks/frozen/icecream, ) - result = /obj/item/reagent_containers/food/snacks/icecreamsandwich + result = /obj/item/reagent_containers/food/snacks/frozen/icecreamsandwich + +/datum/recipe/microwave/berryicecreamsandwich + reagents = list("ice" = 5, "cream" = 5) + items = list( + /obj/item/reagent_containers/food/snacks/grown/cherries, + /obj/item/reagent_containers/food/snacks/grown/cherries, + /obj/item/reagent_containers/food/snacks/wafflecone + ) + result = /obj/item/reagent_containers/food/snacks/frozen/berryicecreamsandwich + +/datum/recipe/microwave/sundae + reagents = list("cream" = 5) + items = list( + /obj/item/reagent_containers/food/snacks/wafflecone, + /obj/item/reagent_containers/food/snacks/grown/cherries, + /obj/item/reagent_containers/food/snacks/grown/banana + ) + result = /obj/item/reagent_containers/food/snacks/frozen/sundae + +/datum/recipe/microwave/bananatopsicle + reagents = list("sugar" = 5, "banana" = 5) + items = list( + /obj/item/popsicle_stick, + /obj/item/reagent_containers/food/snacks/tofu + ) + result = /obj/item/reagent_containers/food/snacks/frozen/popsicle/bananatop + +/datum/recipe/microwave/berrytopsicle + reagents = list("sugar" = 5, "berryjuice" = 5) + items = list( + /obj/item/popsicle_stick, + /obj/item/reagent_containers/food/snacks/tofu + ) + result = /obj/item/reagent_containers/food/snacks/frozen/popsicle/berrytop + +/datum/recipe/microwave/pineappletopsicle + reagents = list("sugar" = 5, "pineapplejuice" = 5) + items = list( + /obj/item/popsicle_stick, + /obj/item/reagent_containers/food/snacks/tofu + ) + result = /obj/item/reagent_containers/food/snacks/frozen/popsicle/pineappletop + +/datum/recipe/microwave/licoricecreamsicle + reagents = list("sugar" = 2, "blumpkinjuice" = 4, "ice" = 2, "vanilla" = 2, "cream" = 2) + items = list( + /obj/item/popsicle_stick + ) + result = /obj/item/reagent_containers/food/snacks/frozen/popsicle/licoricecream + +/datum/recipe/microwave/orangecreamsicle + reagents = list("sugar" = 2, "orangejuice" = 4, "ice" = 2, "vanilla" = 2, "cream" = 2) + items = list( + /obj/item/popsicle_stick + ) + result = /obj/item/reagent_containers/food/snacks/frozen/popsicle/orangecream + +/datum/recipe/microwave/berrycreamsicle + reagents = list("sugar" = 2, "berryjuice" = 4, "ice" = 2, "vanilla" = 2, "cream" = 2) + items = list( + /obj/item/popsicle_stick + ) + result = /obj/item/reagent_containers/food/snacks/frozen/popsicle/berrycream + +/datum/recipe/microwave/frozenpineapplepop + items = list( + /obj/item/popsicle_stick, + /obj/item/reagent_containers/food/snacks/pineappleslice, + /obj/item/reagent_containers/food/snacks/chocolatebar + ) + result = /obj/item/reagent_containers/food/snacks/frozen/popsicle/frozenpineapple + +/datum/recipe/microwave/jumboicecream + reagents = list("sugar" = 2, "ice" = 2, "vanilla" = 3, "cream" = 2) + items = list( + /obj/item/popsicle_stick, + /obj/item/reagent_containers/food/snacks/chocolatebar + ) + result = /obj/item/reagent_containers/food/snacks/frozen/popsicle + +/datum/recipe/microwave/seasalticecream + reagents = list("sugar" = 5, "sodiumchloride" = 3, "cream" = 5) + items = list( + /obj/item/popsicle_stick + ) + result = /obj/item/reagent_containers/food/snacks/frozen/popsicle/sea_salt + +/datum/recipe/microwave/cornuto + reagents = list("ice" = 2, "sugar" = 4, "cream" = 4) + items = list( + /obj/item/reagent_containers/food/snacks/sliceable/flatdough, + /obj/item/reagent_containers/food/snacks/chocolatebar + ) + result = /obj/item/reagent_containers/food/snacks/frozen/cornuto + +/datum/recipe/microwave/honkdae + reagents = list("cream" = 5, "ice" = 5) + items = list( + /obj/item/reagent_containers/food/snacks/wafflecone, + /obj/item/reagent_containers/food/snacks/grown/cherries, + /obj/item/reagent_containers/food/snacks/grown/banana, + /obj/item/reagent_containers/food/snacks/grown/banana, + /obj/item/clothing/mask/gas/clown_hat + ) + result = /obj/item/reagent_containers/food/snacks/frozen/honkdae + +/datum/recipe/microwave/peanutbuttermochi + reagents = list("cream" = 5, "rice" = 5, "sugar" = 5, "peanutbutter" = 2) + items = list( + /obj/item/reagent_containers/food/snacks/wafflecone + ) + result = /obj/item/reagent_containers/food/snacks/frozen/peanutbuttermochi + +/datum/recipe/microwave/spacefreezy + reagents = list("bluecherryjelly" = 5,"spacemountainwind" = 15) + items = list( + /obj/item/reagent_containers/food/snacks/frozen/icecream + ) + result = /obj/item/reagent_containers/food/snacks/frozen/spacefreezy + +/datum/recipe/microwave/snowcone/apple + reagents = list("ice" = 15, "applejuice" = 5) + items = list( + /obj/item/reagent_containers/food/drinks/sillycup + ) + result = /obj/item/reagent_containers/food/snacks/frozen/snowcone/apple + +/datum/recipe/microwave/snowcone/berry + reagents = list("ice" = 15, "berryjuice" = 5) + items = list( + /obj/item/reagent_containers/food/drinks/sillycup + ) + result = /obj/item/reagent_containers/food/snacks/frozen/snowcone/berry + +/datum/recipe/microwave/snowcone/bluecherry + reagents = list("ice" = 15, "bluecherryjelly" = 5) + items = list( + /obj/item/reagent_containers/food/drinks/sillycup + ) + result = /obj/item/reagent_containers/food/snacks/frozen/snowcone/bluecherry +/datum/recipe/microwave/snowcone/cherry + reagents = list("ice" = 15, "cherryjelly" = 5) + items = list( + /obj/item/reagent_containers/food/drinks/sillycup + ) + result = /obj/item/reagent_containers/food/snacks/frozen/snowcone/cherry + +/datum/recipe/microwave/snowcone/flavorless + reagents = list("ice" = 15) + items = list( + /obj/item/reagent_containers/food/drinks/sillycup + ) + result = /obj/item/reagent_containers/food/snacks/frozen/snowcone + +/datum/recipe/microwave/snowcone/fruitsalad + reagents = list("ice" = 15, "orangejuice" = 5, "limejuice" = 5, "lemonjuice" = 5) + items = list( + /obj/item/reagent_containers/food/drinks/sillycup + ) + result = /obj/item/reagent_containers/food/snacks/frozen/snowcone/fruitsalad + +/datum/recipe/microwave/snowcone/grape + reagents = list("ice" = 15, "grapejuice" = 5) + items = list( + /obj/item/reagent_containers/food/drinks/sillycup + ) + result = /obj/item/reagent_containers/food/snacks/frozen/snowcone/grape + +/datum/recipe/microwave/snowcone/honey + reagents = list("ice" = 15, "honey" = 5) + items = list( + /obj/item/reagent_containers/food/drinks/sillycup + ) + result = /obj/item/reagent_containers/food/snacks/frozen/snowcone/honey + +/datum/recipe/microwave/snowcone/lemon + reagents = list("ice" = 15, "lemonjuice" = 5) + items = list( + /obj/item/reagent_containers/food/drinks/sillycup + ) + result = /obj/item/reagent_containers/food/snacks/frozen/snowcone/lemon + +/datum/recipe/microwave/snowcone/lime + reagents = list("ice" = 15, "limejuice" = 5) + items = list( + /obj/item/reagent_containers/food/drinks/sillycup + ) + result = /obj/item/reagent_containers/food/snacks/frozen/snowcone/lime + +/datum/recipe/microwave/snowcone/mime + reagents = list("ice" = 15, "nothing" = 5) + items = list( + /obj/item/reagent_containers/food/drinks/sillycup + ) + result = /obj/item/reagent_containers/food/snacks/frozen/snowcone/mime + +/datum/recipe/microwave/snowcone/orange + reagents = list("ice" = 15, "orangejuice" = 5) + items = list( + /obj/item/reagent_containers/food/drinks/sillycup + ) + result = /obj/item/reagent_containers/food/snacks/frozen/snowcone/orange + +/datum/recipe/microwave/snowcone/pineapple + reagents = list("ice" = 15, "pineapplejuice" = 5) + items = list( + /obj/item/reagent_containers/food/drinks/sillycup + ) + result = /obj/item/reagent_containers/food/snacks/frozen/snowcone/pineapple + +/datum/recipe/microwave/snowcone/rainbow + reagents = list("ice" = 15, "colorful_reagent" = 5) + items = list( + /obj/item/reagent_containers/food/drinks/sillycup + ) + result = /obj/item/reagent_containers/food/snacks/frozen/snowcone/rainbow + +/datum/recipe/microwave/snowcone/cola + reagents = list("ice" = 15, "cola" = 5) + items = list( + /obj/item/reagent_containers/food/drinks/sillycup + ) + result = /obj/item/reagent_containers/food/snacks/frozen/snowcone/cola + +/datum/recipe/microwave/snowcone/spacemountainwind + reagents = list("ice" = 15, "spacemountainwind" = 5) + items = list( + /obj/item/reagent_containers/food/drinks/sillycup + ) + result = /obj/item/reagent_containers/food/snacks/frozen/snowcone/spacemountain + +/datum/recipe/microwave/antpopsicle + reagents = list("sugar" = 5, "water" = 5, "ants" = 10) + items = list( + /obj/item/popsicle_stick + ) + result = /obj/item/reagent_containers/food/snacks/frozen/popsicle/ant /datum/recipe/microwave/notasandwich items = list( diff --git a/code/modules/food_and_drinks/recipes/recipes_oven.dm b/code/modules/food_and_drinks/recipes/recipes_oven.dm index a95a6071b22..a06b87d8883 100644 --- a/code/modules/food_and_drinks/recipes/recipes_oven.dm +++ b/code/modules/food_and_drinks/recipes/recipes_oven.dm @@ -109,6 +109,22 @@ ) result = /obj/item/reagent_containers/food/snacks/sliceable/plaincake +/datum/recipe/oven/clowncake + reagents = list("milk" = 5, "sugar" = 15) + items = list( + /obj/item/reagent_containers/food/snacks/dough, + /obj/item/reagent_containers/food/snacks/dough, + /obj/item/reagent_containers/food/snacks/dough, + /obj/item/reagent_containers/food/snacks/frozen/sundae, + /obj/item/reagent_containers/food/snacks/frozen/sundae, + /obj/item/reagent_containers/food/snacks/grown/banana, + /obj/item/reagent_containers/food/snacks/grown/banana, + /obj/item/reagent_containers/food/snacks/grown/banana, + /obj/item/reagent_containers/food/snacks/grown/banana, + /obj/item/reagent_containers/food/snacks/grown/banana + ) + result = /obj/item/reagent_containers/food/snacks/sliceable/clowncake + /datum/recipe/oven/meatpie items = list( /obj/item/reagent_containers/food/snacks/sliceable/flatdough, diff --git a/icons/obj/food/food.dmi b/icons/obj/food/food.dmi index 10287972d09..545769dc774 100644 Binary files a/icons/obj/food/food.dmi and b/icons/obj/food/food.dmi differ diff --git a/icons/obj/food/frozen_treats.dmi b/icons/obj/food/frozen_treats.dmi new file mode 100644 index 00000000000..8bc389272a5 Binary files /dev/null and b/icons/obj/food/frozen_treats.dmi differ diff --git a/icons/obj/trash.dmi b/icons/obj/trash.dmi index 95af0f67b58..f9b8b5bb7f3 100644 Binary files a/icons/obj/trash.dmi and b/icons/obj/trash.dmi differ diff --git a/paradise.dme b/paradise.dme index 45b6629d032..e6ee25bfafc 100644 --- a/paradise.dme +++ b/paradise.dme @@ -1747,6 +1747,7 @@ #include "code\modules\food_and_drinks\food\foods\candy.dm" #include "code\modules\food_and_drinks\food\foods\desserts.dm" #include "code\modules\food_and_drinks\food\foods\ethnic.dm" +#include "code\modules\food_and_drinks\food\foods\frozen.dm" #include "code\modules\food_and_drinks\food\foods\ingredients.dm" #include "code\modules\food_and_drinks\food\foods\junkfood.dm" #include "code\modules\food_and_drinks\food\foods\meat.dm"