diff --git a/code/game/objects/items/trash.dm b/code/game/objects/items/trash.dm index 11d7e23472e..eb5955e869c 100644 --- a/code/game/objects/items/trash.dm +++ b/code/game/objects/items/trash.dm @@ -483,3 +483,15 @@ name = "empty algae chips bag" desc = "It looks like someone left some strands of algae in it." icon_state = "algaechips" + +/obj/item/trash/foilwrapper + name = "foil wrapper" + //icon is located here instead of in the trash icon file because of how wrapper code works. It's either this or having duplicates of the icon show up in two different files. + icon = 'icons/obj/item/reagent_containers/food/processed.dmi' + icon_state = "foil_trash" + desc = "A foil wrapper, the kind you may find many industrially-packaged products packed in. Now it's just empty trash, though." + +/obj/item/trash/popsiclestick + name = "popsicle stick" + icon_state = "popsicle_trash" + desc = "Used by doctors to suppress tongues. Well, at least when it's clean. This one isn't, so you may as well just chuck it in the trash." diff --git a/code/game/objects/structures/machinery/vending/food.dm b/code/game/objects/structures/machinery/vending/food.dm index fdb5ffe2ee6..0256d550631 100644 --- a/code/game/objects/structures/machinery/vending/food.dm +++ b/code/game/objects/structures/machinery/vending/food.dm @@ -117,3 +117,54 @@ /obj/item/storage/box/fancy/toptarts_blueberry = 5.00, /obj/item/storage/box/unique/donkpockets = 11.00 ) + +/obj/structure/machinery/vending/idris_delights + name = "\improper idris delights vendor" + desc = "A selection of delicious cold ice creams and popsicles, brought to you by the Idris corporation. The various colors form the ice creams on offer stand out from the monochromatic Idris color scheme." + icon_state = "idrisdelight" + icon_screen = "idrisdelight-screen" + icon_vend = "idrisdelight-vend" + icon_deny = "idrisdelight-deny" + light_mask = "idrisdelight-lightmask" + + product_slogans = "It's always summer somewhere!" + idle_power_usage = 255 + temperature_setting = -1 + light_range = 2 + light_color = COLOR_BABY_BLUE + products = list( + /obj/item/storage/box/fancy/popsicle/choc_o_block_packaged = 3, + /obj/item/storage/box/fancy/popsicle/odin_pop_packaged = 3, + /obj/item/storage/box/fancy/popsicle/burrly_duo_packaged = 3, + /obj/item/storage/box/fancy/popsicle/burrly_white_packaged = 3, + /obj/item/storage/box/fancy/popsicle/swimstars_packaged = 3, + /obj/item/storage/box/fancy/popsicle/idrice_strawberry_packaged = 3, + /obj/item/storage/box/fancy/popsicle/idrice_lemon_packaged = 3, + /obj/item/storage/box/fancy/popsicle/idrice_cola_packaged = 3, + /obj/item/storage/box/fancy/popsicle/sunsicle_packaged = 3, + /obj/item/storage/box/fancy/popsicle/dreamwich_packaged = 3, + /obj/item/storage/box/fancy/popsicle/torpedo_classic_packaged = 3, + /obj/item/storage/box/fancy/popsicle/torpedo_dirtberry_packaged = 3, + /obj/item/storage/box/fancy/popsicle/torpedo_dyn_packaged = 3 + ) + premium = list( + /obj/item/storage/box/fancy/popsicle/chocolate_taco_packaged = 2 + ) + contraband = list( + /obj/item/storage/box/fancy/popsicle/traitor_pop_packaged = 5 + ) + prices = list( + /obj/item/storage/box/fancy/popsicle/choc_o_block_packaged = 1.80, + /obj/item/storage/box/fancy/popsicle/odin_pop_packaged = 2.50, + /obj/item/storage/box/fancy/popsicle/burrly_duo_packaged = 4.00, + /obj/item/storage/box/fancy/popsicle/burrly_white_packaged = 4.00, + /obj/item/storage/box/fancy/popsicle/swimstars_packaged = 3.50, + /obj/item/storage/box/fancy/popsicle/idrice_strawberry_packaged = 1.00, + /obj/item/storage/box/fancy/popsicle/idrice_lemon_packaged = 1.00, + /obj/item/storage/box/fancy/popsicle/idrice_cola_packaged = 1.00, + /obj/item/storage/box/fancy/popsicle/sunsicle_packaged = 2.00, + /obj/item/storage/box/fancy/popsicle/dreamwich_packaged = 2.00, + /obj/item/storage/box/fancy/popsicle/torpedo_classic_packaged = 4.00, + /obj/item/storage/box/fancy/popsicle/torpedo_dirtberry_packaged = 4.00, + /obj/item/storage/box/fancy/popsicle/torpedo_dyn_packaged = 4.00 + ) diff --git a/code/modules/cooking/recipes/cultural/recipes_human.dm b/code/modules/cooking/recipes/cultural/recipes_human.dm index b5290ece225..fcce0309a00 100644 --- a/code/modules/cooking/recipes/cultural/recipes_human.dm +++ b/code/modules/cooking/recipes/cultural/recipes_human.dm @@ -303,6 +303,15 @@ result = /obj/item/reagent_containers/food/snacks/bowl/eggrolls_meat reagent_mix = RECIPE_REAGENT_REPLACE //Simplify end product +/singleton/recipe/takoyaki //If Ginger ever gets added to the game please add it as an ingredient here + appliance = SKILLET | GRILL + reagents = list(/singleton/reagent/nutriment/coating/batter = 5, /singleton/reagent/nutriment/mayonnaise = 5, /singleton/reagent/spacespice = 1) + items = list( + /obj/item/reagent_containers/food/snacks/squidmeat + ) + result = /obj/item/reagent_containers/food/snacks/takoyaki + reagent_mix = RECIPE_REAGENT_REPLACE //Simplify end product + // Mictlani /singleton/recipe/pozole diff --git a/code/modules/cooking/recipes/recipes_breads.dm b/code/modules/cooking/recipes/recipes_breads.dm index 1eecb305c89..7af28f6a970 100644 --- a/code/modules/cooking/recipes/recipes_breads.dm +++ b/code/modules/cooking/recipes/recipes_breads.dm @@ -555,3 +555,13 @@ /obj/item/reagent_containers/food/snacks/schnitzel ) result = /obj/item/reagent_containers/food/snacks/pita/schnitzel + +/singleton/recipe/frenchtoast + appliance = SKILLET + reagents = list(/singleton/reagent/nutriment/honey = 5, /singleton/reagent/drink/milk = 5, /singleton/reagent/nutriment/protein/egg = 3) + items = list( + /obj/item/reagent_containers/food/snacks/breadslice, + /obj/item/reagent_containers/food/snacks/breadslice + ) + result = /obj/item/reagent_containers/food/snacks/french_toast + reagent_mix = RECIPE_REAGENT_REPLACE diff --git a/code/modules/cooking/recipes/recipes_confections.dm b/code/modules/cooking/recipes/recipes_confections.dm index a5dde76bd4c..a202adeada2 100644 --- a/code/modules/cooking/recipes/recipes_confections.dm +++ b/code/modules/cooking/recipes/recipes_confections.dm @@ -130,3 +130,17 @@ reagents = list(/singleton/reagent/drink/milk/nemiik = 5, /singleton/reagent/drink/milk/cream = 5, /singleton/reagent/sugar = 5, /singleton/reagent/nutriment/cherryjelly = 5) reagent_mix = RECIPE_REAGENT_REPLACE result = /obj/item/reagent_containers/food/snacks/nakarka_mousse/cherry + +/singleton/recipe/tiramisu + appliance = MIX + items = list( + /obj/item/reagent_containers/food/snacks/foy, + /obj/item/reagent_containers/food/snacks/foy, + /obj/item/reagent_containers/food/snacks/foy, + /obj/item/reagent_containers/food/snacks/foy, + /obj/item/reagent_containers/food/snacks/foy, + /obj/item/reagent_containers/food/snacks/foy + ) + reagents = list(/singleton/reagent/drink/coffee = 10, /singleton/reagent/nutriment/coco = 5 , /singleton/reagent/drink/milk/cream = 10, /singleton/reagent/sugar = 10) + reagent_mix = RECIPE_REAGENT_REPLACE //Simplify it + result = /obj/item/reagent_containers/food/snacks/sliceable/tiramisu_tray diff --git a/code/modules/cooking/recipes/recipes_pastries.dm b/code/modules/cooking/recipes/recipes_pastries.dm index 2b85e05c87d..e19c97acf4e 100644 --- a/code/modules/cooking/recipes/recipes_pastries.dm +++ b/code/modules/cooking/recipes/recipes_pastries.dm @@ -423,3 +423,25 @@ reagents = list(/singleton/reagent/nutriment/flour = 10, /singleton/reagent/sugar = 10) reagent_mix = RECIPE_REAGENT_REPLACE result = /obj/item/reagent_containers/food/snacks/sliceable/strawberrybars + +/singleton/recipe/lavacake + appliance = OVEN + items = list( + /obj/item/reagent_containers/food/snacks/spreads/butter, + /obj/item/reagent_containers/food/snacks/chocolatebar, + /obj/item/reagent_containers/food/snacks/chocolatebar + ) + reagents = list(/singleton/reagent/nutriment/flour = 5, /singleton/reagent/nutriment/protein/egg = 3) + result = /obj/item/reagent_containers/food/snacks/lava_cake + reagent_mix = RECIPE_REAGENT_REPLACE + +/singleton/recipe/lavacake_white + appliance = OVEN + items = list( + /obj/item/reagent_containers/food/snacks/spreads/butter, + /obj/item/reagent_containers/food/snacks/chocolatebar, + /obj/item/reagent_containers/food/snacks/whitechocolate + ) + reagents = list(/singleton/reagent/nutriment/flour = 5, /singleton/reagent/nutriment/protein/egg = 3) + result = /obj/item/reagent_containers/food/snacks/lava_cake/white + reagent_mix = RECIPE_REAGENT_REPLACE diff --git a/code/modules/reagents/reagent_containers/food/snacks/breads.dm b/code/modules/reagents/reagent_containers/food/snacks/breads.dm index bec7c844694..5ac7a1cf27a 100644 --- a/code/modules/reagents/reagent_containers/food/snacks/breads.dm +++ b/code/modules/reagents/reagent_containers/food/snacks/breads.dm @@ -714,3 +714,14 @@ icon_state = "schnitzelpita" filling_color = "#cf7105" bitesize = 2 + +/obj/item/reagent_containers/food/snacks/french_toast + name = "french toast" + desc = "Two slices of bread pan-fried in a mixture of egg yolk, honey and milk. Serve with a side of fruit or bacon, depending on if you want to maintain the illusion that this could somehow be considered a nutritious breakfast, or just double down on how much it absolutely isn't." + icon = 'icons/obj/item/reagent_containers/food/bread.dmi' + icon_state = "frenchtoast" + filling_color = "#e7b160" + center_of_mass = list("x"=15, "y"=12) + reagents_to_add = list(/singleton/reagent/nutriment = 6, /singleton/reagent/nutriment/protein/egg = 2) + reagent_data = list(/singleton/reagent/nutriment = list("milky bread" = 5, "honey" = 5)) + bitesize = 3 diff --git a/code/modules/reagents/reagent_containers/food/snacks/confections.dm b/code/modules/reagents/reagent_containers/food/snacks/confections.dm index 3516ac1ce5a..036bbd8f3dd 100644 --- a/code/modules/reagents/reagent_containers/food/snacks/confections.dm +++ b/code/modules/reagents/reagent_containers/food/snacks/confections.dm @@ -260,3 +260,26 @@ icon_state = "nakarkamousse_half" if(51 to INFINITY) icon_state = "nakarkamousse" + +/obj/item/reagent_containers/food/snacks/sliceable/tiramisu_tray + name = "tiramisu tray" + desc = "A sweet and creamy dessert, easily divisable into lovely slices of Tiramisu to share with those around you... Unless..." + icon = 'icons/obj/item/reagent_containers/food/confections.dmi' + icon_state = "tiramisu_tray" + trash = /obj/item/trash/snack_bowl + slice_path = /obj/item/reagent_containers/food/snacks/tiramisu_slice + slices_num = 4 + filling_color = "#927155" + reagents_to_add = list(/singleton/reagent/nutriment = 16, /singleton/reagent/nutriment/glucose = 8, /singleton/reagent/drink/coffee = 8) + reagent_data = list(/singleton/reagent/nutriment = list("sweet cream" = 5, "coffee cake" = 4), /singleton/reagent/nutriment/glucose = list("cocoa" = 5)) + bitesize = 2 + drop_sound = 'sound/items/drop/glass.ogg' + pickup_sound = 'sound/items/pickup/glass.ogg' + +/obj/item/reagent_containers/food/snacks/tiramisu_slice + name = "tiramisu" + desc = "A chilled dessert made of coffee-dipped biscuits, a thick helping of sweet mascarpone and cocoa powder. Traditionally it is made with ladyfingers, although in Xanu they are often substituted for cocoa biscuits. 'Tirami su' in Italian roughly translates to 'cheer me up'." + icon = 'icons/obj/item/reagent_containers/food/confections.dmi' + icon_state = "tiramisu" + trash = /obj/item/trash/plate + filling_color = "#927155" diff --git a/code/modules/reagents/reagent_containers/food/snacks/cultural/human.dm b/code/modules/reagents/reagent_containers/food/snacks/cultural/human.dm index c5fc0c48e31..fff64a8fe33 100644 --- a/code/modules/reagents/reagent_containers/food/snacks/cultural/human.dm +++ b/code/modules/reagents/reagent_containers/food/snacks/cultural/human.dm @@ -607,6 +607,17 @@ icon_state = "eggroll_meat" filling_color = "#613e16" +/obj/item/reagent_containers/food/snacks/takoyaki + name = "takoyaki" + desc = "It's notoriously impossible to get good, authentic Takoyaki in space. While batter, green onions and mayonnaise are reasonably accessible - good squid meat or pickled ginger are a bit more difficult. Not to mention, fried Bonito fish shavings, Takoyaki sauce, or the special round pans used to make Takoyaki in the firstplace are all downright impossible unless you're in an area with a very large Japanese or Konyanger population. As such - if you get Takoyaki anywhere else, be cautious and expect substitutions." + icon = 'icons/obj/item/reagent_containers/food/cultural/human.dmi' + icon_state = "takoyaki" + filling_color = "#C97F02" + trash = /obj/item/trash/chipbasket + reagents_to_add = list(/singleton/reagent/nutriment/protein/seafood = 5, /singleton/reagent/nutriment = 3) + reagent_data = list(/singleton/reagent/nutriment = list("fried batter" = 4), /singleton/reagent/nutriment/protein/seafood = list("gooey squid" = 5, "umami" = 4)) + bitesize = 2 + // Mictlani /obj/item/reagent_containers/food/snacks/soup/pozole diff --git a/code/modules/reagents/reagent_containers/food/snacks/pastries.dm b/code/modules/reagents/reagent_containers/food/snacks/pastries.dm index dab6e71107c..aa43fcd2d61 100644 --- a/code/modules/reagents/reagent_containers/food/snacks/pastries.dm +++ b/code/modules/reagents/reagent_containers/food/snacks/pastries.dm @@ -1025,3 +1025,37 @@ filling_color = "#6e0202" bitesize = 2 center_of_mass = list("x"=16, "y"=12) + +/obj/item/reagent_containers/food/snacks/lava_cake + name = "lava cake" + desc = "A dense chocolate cake, and inside... SURPRISE! More chocolate. Bet you weren't expecting that, were you?" + icon = 'icons/obj/item/reagent_containers/food/pastries.dmi' + icon_state = "lavacake" + filling_color = "#3f2204" + reagents_to_add = list(/singleton/reagent/nutriment = 6) + reagent_data = list(/singleton/reagent/nutriment = list("dense chocolate" = 5, "molten chocolate" = 5)) + +/obj/item/reagent_containers/food/snacks/lava_cake/update_icon() + var/expected_initial_reagent_volume + for(var/k in src.reagents_to_add) + expected_initial_reagent_volume += reagents_to_add[k] + var/percent_lavacake = round((reagents.total_volume / expected_initial_reagent_volume) * 100) + switch(percent_lavacake) + if(0 to 95) + icon_state = "lavacake_half" + if(96 to INFINITY) + icon_state = "lavacake" + +/obj/item/reagent_containers/food/snacks/lava_cake/white //only the taste and bitten icon are different because you can't tell which kind of lava cake it is until you bite into it. + reagent_data = list(/singleton/reagent/nutriment = list("dense chocolate" = 5, "molten white chocolate" = 5)) + +/obj/item/reagent_containers/food/snacks/lava_cake/white/update_icon() + var/expected_initial_reagent_volume + for(var/k in src.reagents_to_add) + expected_initial_reagent_volume += reagents_to_add[k] + var/percent_lavacake_white = round((reagents.total_volume / expected_initial_reagent_volume) * 100) + switch(percent_lavacake_white) + if(0 to 95) + icon_state = "lavacake_white_half" + if(96 to INFINITY) + icon_state = "lavacake" diff --git a/code/modules/reagents/reagent_containers/food/snacks/processed.dm b/code/modules/reagents/reagent_containers/food/snacks/processed.dm index 1ae746f1ac5..f0b03bc3839 100644 --- a/code/modules/reagents/reagent_containers/food/snacks/processed.dm +++ b/code/modules/reagents/reagent_containers/food/snacks/processed.dm @@ -1124,3 +1124,420 @@ drop_sound = 'sound/items/drop/wrapper.ogg' pickup_sound = 'sound/items/pickup/wrapper.ogg' icon_overlays = FALSE + +//Popsicles! + +ABSTRACT_TYPE(/obj/item/storage/box/fancy/popsicle) + name = "popsicle wrapper" + desc = "Some kind of prepackaged popsicle. If you can read this, something has gone wrong." + icon = 'icons/obj/item/reagent_containers/food/processed.dmi' + icon_state = "chocoblock_wrap" + icon_type = "popsicle" + storage_type = "wrapper" + opened_icon_state = "foil_trash" + starts_with = list(/obj/item/reagent_containers/food/snacks/choc_o_block = 1) //This is just here so it has something to default to. It can be anything. + can_hold = list(/obj/item/reagent_containers/food/snacks/choc_o_block) + make_exact_fit = TRUE + w_class = WEIGHT_CLASS_SMALL + + use_sound = 'sound/items/storage/wrapper.ogg' + drop_sound = 'sound/items/drop/wrapper.ogg' + pickup_sound = 'sound/items/pickup/wrapper.ogg' + + trash = /obj/item/trash/foilwrapper + closable = FALSE + icon_overlays = FALSE + +/obj/item/storage/box/fancy/popsicle/choc_o_block_packaged + name = "\improper choc o' block" + desc = "A pre-packaged vanilla popsicle with chocolate flavored coating. Thrilling. Whatever will they think of next?" + icon_state = "chocoblock_wrap" + +/obj/item/reagent_containers/food/snacks/choc_o_block + name = "\improper choc o' block popsicle" + desc = "Why is it called 'Choc o' Block'? I mean, yeah, there's chocolate flavored coating, but this thing is still mostly vanilla." + icon_state = "chocoblock" + icon = 'icons/obj/item/reagent_containers/food/processed.dmi' + item_state = "popsicle_brown" + contained_sprite = TRUE + filling_color = "#dbdbdb" + trash = /obj/item/trash/popsiclestick + reagents_to_add = list(/singleton/reagent/nutriment = 3, /singleton/reagent/drink/ice = 1) + reagent_data = list(/singleton/reagent/nutriment = list("vanilla" = 5, "chocolate" = 3)) + +/obj/item/reagent_containers/food/snacks/choc_o_block/update_icon() + var/expected_initial_reagent_volume + for(var/k in src.reagents_to_add) + expected_initial_reagent_volume += reagents_to_add[k] + var/percent_chocoblock = round((reagents.total_volume / expected_initial_reagent_volume) * 100) + switch(percent_chocoblock) + if(-INFINITY to 95) + icon_state = "chocoblock_bite" + if(96 to INFINITY) + icon_state = "chocoblock" + +/obj/item/storage/box/fancy/popsicle/burrly_duo_packaged + name = "\improper BURRLY duo" + desc = "A pre-packaged popsicle with a rich cream filling. This one has chocolate-vanilla filling and a milk chocolate coating. The packaging says BURRLY on it in a delightfully aggressive font." + icon_state = "burrly_duo_wrap" + starts_with = list(/obj/item/reagent_containers/food/snacks/burrly_duo = 1) + can_hold = list(/obj/item/reagent_containers/food/snacks/burrly_duo) + +/obj/item/reagent_containers/food/snacks/burrly_duo + name = "\improper BURRLY duo popsicle" + desc = "A choco-vanilla cream filled popcicle, coated in real chocolate, and made of %100 real calories." + icon = 'icons/obj/item/reagent_containers/food/processed.dmi' + icon_state = "burrly_duo" + item_state = "popsicle_brown" + contained_sprite = TRUE + filling_color = "#693d14" + trash = /obj/item/trash/popsiclestick + reagents_to_add = list(/singleton/reagent/nutriment = 3, /singleton/reagent/drink/ice = 1) + reagent_data = list(/singleton/reagent/nutriment = list("chocolate" = 5, "vanilla" = 3)) + +/obj/item/reagent_containers/food/snacks/burrly_duo/update_icon() + var/expected_initial_reagent_volume + for(var/k in src.reagents_to_add) + expected_initial_reagent_volume += reagents_to_add[k] + var/percent_burrly_duo = round((reagents.total_volume / expected_initial_reagent_volume) * 100) + switch(percent_burrly_duo) + if(-INFINITY to 95) + icon_state = "burrly_duo_bite" + if(96 to INFINITY) + icon_state = "burrly_duo" + +/obj/item/storage/box/fancy/popsicle/burrly_white_packaged + name = "\improper BURRLY white" + desc = "A pre-packaged popsicle with vanilla-caramel filling and white chocolate coating. It's about as hoity toity as you can get from a snack vending machine. The packaging says BURRLY on it in a delightfully aggressive font." + icon_state = "burrly_white_wrap" + starts_with = list(/obj/item/reagent_containers/food/snacks/burrly_white = 1) + can_hold = list(/obj/item/reagent_containers/food/snacks/burrly_white) + +/obj/item/reagent_containers/food/snacks/burrly_white + name = "\improper BURRLY white popsicle" + desc = "A popsicle with a brittle white chocolate coating and a vanilla-caramel cream filling. Luxurious!" + icon = 'icons/obj/item/reagent_containers/food/processed.dmi' + icon_state = "burrly_white" + item_state = "popsicle_light" + contained_sprite = TRUE + filling_color = "#ffefce" + trash = /obj/item/trash/popsiclestick + reagents_to_add = list(/singleton/reagent/nutriment = 3, /singleton/reagent/drink/ice = 1) + reagent_data = list(/singleton/reagent/nutriment = list("white chocolate" = 5, "vanilla" = 5, "caramel" = 3)) + +/obj/item/reagent_containers/food/snacks/burrly_white/update_icon() + var/expected_initial_reagent_volume + for(var/k in src.reagents_to_add) + expected_initial_reagent_volume += reagents_to_add[k] + var/percent_burrly_white = round((reagents.total_volume / expected_initial_reagent_volume) * 100) + switch(percent_burrly_white) + if(-INFINITY to 95) + icon_state = "burrly_white_bite" + if(96 to INFINITY) + icon_state = "burrly_white" + +/obj/item/storage/box/fancy/popsicle/swimstars_packaged + name = "\improper swimstars pop" + desc = "Who doesn't love the beloved media franchise Swimstars? Except for half of the non-psionic demographic, that is. Movies, shows, and now - a sorbet-based promotional popsicle! A cool, flavorful rendition of Qill smiles at you from the packaging with friendly gumball eyes. Skrell don't smile, of course, but it looks smile-ish enough from how they stylized it. It's Ylpha berry and Guami flavored." + icon_state = "swimstars_wrap" + starts_with = list(/obj/item/reagent_containers/food/snacks/swimstars = 1) + can_hold = list(/obj/item/reagent_containers/food/snacks/swimstars) + +/obj/item/reagent_containers/food/snacks/swimstars + name = "\improper swimstars popsicle" + desc = "Oh... Wow... It, uh... looks just like them. Yup. Definitely not going to have any nightmares about this thing later." + icon = 'icons/obj/item/reagent_containers/food/processed.dmi' + icon_state = "swimstars" + item_state = "popsicle_orange" + contained_sprite = TRUE + filling_color = "#fcb982" + trash = /obj/item/trash/popsiclestick + reagents_to_add = list(/singleton/reagent/nutriment = 2, /singleton/reagent/drink/ice = 2) + reagent_data = list(/singleton/reagent/nutriment = list("ylpha berry" = 5, "guami fruit" = 3, "soft gumballs" = 2)) + +/obj/item/reagent_containers/food/snacks/swimstars/update_icon() + var/expected_initial_reagent_volume + for(var/k in src.reagents_to_add) + expected_initial_reagent_volume += reagents_to_add[k] + var/percent_swimstars = round((reagents.total_volume / expected_initial_reagent_volume) * 100) + switch(percent_swimstars) + if(0 to 95) + icon_state = "swimstars_bite" + if(96 to INFINITY) + icon_state = "swimstars" + +/obj/item/storage/box/fancy/popsicle/idrice_strawberry_packaged + name = "\improper idrICE strawberry" + desc = "A pre-packaged strawberry flavored ice pop. Simple, cheap, sweet and refreshing!" + icon_state = "idrice_red_wrap" + starts_with = list(/obj/item/reagent_containers/food/snacks/idrice_strawberry = 1) + can_hold = list(/obj/item/reagent_containers/food/snacks/idrice_strawberry) + +/obj/item/reagent_containers/food/snacks/idrice_strawberry + name = "\improper idrICE strawberry ice pop" + desc = "A cool, shapely block of sweet, strawberry-flavored ice cleverly imposed unto a stick for your convenience. Contains no actual strawberries. Does, for some reason, contain beets, though? Weird." + icon = 'icons/obj/item/reagent_containers/food/processed.dmi' + icon_state = "idrice_red" + item_state = "popsicle_red" + contained_sprite = TRUE + filling_color = "#e00031" + trash = /obj/item/trash/popsiclestick + reagents_to_add = list(/singleton/reagent/nutriment = 1, /singleton/reagent/drink/ice = 3) + reagent_data = list(/singleton/reagent/nutriment = list("strawberry flavoring" = 5)) + +/obj/item/reagent_containers/food/snacks/idrice_strawberry/update_icon() + var/expected_initial_reagent_volume + for(var/k in src.reagents_to_add) + expected_initial_reagent_volume += reagents_to_add[k] + var/percent_idrice_strawberry = round((reagents.total_volume / expected_initial_reagent_volume) * 100) + switch(percent_idrice_strawberry) + if(0 to 70) + icon_state = "idrice_red_bite" + if(71 to INFINITY) + icon_state = "idrice_red" + +/obj/item/storage/box/fancy/popsicle/idrice_lemon_packaged + name = "\improper idrICE lemon" + desc = "A pre-packaged lemon flavored ice pop. Simple, cheap, tangy and refreshing!" + icon_state = "idrice_yellow_wrap" + starts_with = list(/obj/item/reagent_containers/food/snacks/idrice_lemon = 1) + can_hold = list(/obj/item/reagent_containers/food/snacks/idrice_lemon) + +/obj/item/reagent_containers/food/snacks/idrice_lemon + name = "\improper idrICE lemon ice pop" + desc = "A cool, shapely block of sweet, lemon-flavored ice cleverly imposed unto a stick for your convenience. The ingredients list contains no lemons and reads like a cat at a chemistry lab walked around on a keyboard." + icon = 'icons/obj/item/reagent_containers/food/processed.dmi' + icon_state = "idrice_yellow" + item_state = "popsicle_light" + contained_sprite = TRUE + filling_color = "#ffee00" + trash = /obj/item/trash/popsiclestick + reagents_to_add = list(/singleton/reagent/nutriment = 1, /singleton/reagent/drink/ice = 3) + reagent_data = list(/singleton/reagent/nutriment = list("lemon flavoring" = 5)) + +/obj/item/reagent_containers/food/snacks/idrice_lemon/update_icon() + var/expected_initial_reagent_volume + for(var/k in src.reagents_to_add) + expected_initial_reagent_volume += reagents_to_add[k] + var/percent_idrice_lemon = round((reagents.total_volume / expected_initial_reagent_volume) * 100) + switch(percent_idrice_lemon) + if(0 to 70) + icon_state = "idrice_yellow_bite" + if(71 to INFINITY) + icon_state = "idrice_yellow" + +/obj/item/storage/box/fancy/popsicle/idrice_cola_packaged + name = "\improper idrICE cola" + desc = "A pre-packaged cola flavored ice pop. Simple, cheap, lively and refreshing!" + icon_state = "idrice_cola_wrap" + starts_with = list(/obj/item/reagent_containers/food/snacks/idrice_cola = 1) + can_hold = list(/obj/item/reagent_containers/food/snacks/idrice_cola) + +/obj/item/reagent_containers/food/snacks/idrice_cola + name = "\improper idrICE cola ice pop" + desc = "A cool, shapely block of sweet, cola-flavored ice cleverly imposed unto a stick for your convenience. Some planets have Dr. Gibb flavor ones!" + icon = 'icons/obj/item/reagent_containers/food/processed.dmi' + icon_state = "idrice_cola" + item_state = "popsicle_brown" + contained_sprite = TRUE + filling_color = "#3d2218" + trash = /obj/item/trash/popsiclestick + reagents_to_add = list(/singleton/reagent/nutriment = 1, /singleton/reagent/drink/ice = 3) + reagent_data = list(/singleton/reagent/nutriment = list("cola" = 5)) + +/obj/item/reagent_containers/food/snacks/idrice_cola/update_icon() + var/expected_initial_reagent_volume + for(var/k in src.reagents_to_add) + expected_initial_reagent_volume += reagents_to_add[k] + var/percent_idrice_cola = round((reagents.total_volume / expected_initial_reagent_volume) * 100) + switch(percent_idrice_cola) + if(0 to 70) + icon_state = "idrice_cola_bite" + if(71 to INFINITY) + icon_state = "idrice_cola" + +/obj/item/storage/box/fancy/popsicle/sunsicle_packaged + name = "\improper sunsicle" + desc = "A pre-packaged popsicle with a sweet citrusy shell around a light, creamy center." + icon_state = "sunsicle_wrap" + starts_with = list(/obj/item/reagent_containers/food/snacks/sunsicle = 1) + can_hold = list(/obj/item/reagent_containers/food/snacks/sunsicle) + +/obj/item/reagent_containers/food/snacks/sunsicle + name = "\improper sunsicle ice pop" + desc = "A brightly colored popsicle with bright, sunny colors and a light, creamy center." + icon = 'icons/obj/item/reagent_containers/food/processed.dmi' + icon_state = "sunsicle" + item_state = "popsicle_orange" + contained_sprite = TRUE + filling_color = "#ff9100" + trash = /obj/item/trash/popsiclestick + reagents_to_add = list(/singleton/reagent/nutriment = 2, /singleton/reagent/drink/ice = 2) + reagent_data = list(/singleton/reagent/nutriment = list("sweet citrus" = 5, "summer vibes" = 5)) + +/obj/item/reagent_containers/food/snacks/sunsicle/update_icon() + var/expected_initial_reagent_volume + for(var/k in src.reagents_to_add) + expected_initial_reagent_volume += reagents_to_add[k] + var/percent_sunsicle = round((reagents.total_volume / expected_initial_reagent_volume) * 100) + switch(percent_sunsicle) + if(0 to 95) + icon_state = "sunsicle_bite" + if(96 to INFINITY) + icon_state = "sunsicle" + +/obj/item/storage/box/fancy/popsicle/dreamwich_packaged + name = "\improper dreamwich" + desc = "And Idris-brand ice cream sandwich in a shiny golden packaging. Very basic, but a classic for a reason." + icon_state = "dreamwich_wrap" + icon_type = "ice cream sandwich" + starts_with = list(/obj/item/reagent_containers/food/snacks/icecreamsandwich = 1) + can_hold = list(/obj/item/reagent_containers/food/snacks/icecreamsandwich) + +/obj/item/storage/box/fancy/popsicle/torpedo_classic_packaged + name = "\improper torpedo classic" + desc = "A pre-packaged ice cream cone with vanilla ice cream, strips of chocolate on top, and small chocolate flakes mixed in. The edge of the cone has a small bit of chocolate in it, too! The graphic on the packaging makes it look like you can see the ice cream inside, but it is merely an illusion brought on by the unfathomable magic that is graphic design." + icon_state = "torpedo_wrap" + icon_type = "ice cream cone" + starts_with = list(/obj/item/reagent_containers/food/snacks/torpedo_classic = 1) + can_hold = list(/obj/item/reagent_containers/food/snacks/torpedo_classic) + +/obj/item/reagent_containers/food/snacks/torpedo_classic + name = "\improper torpedo ice cream cone" + desc = "A lovely ice cream cone containing vanilla ice cream and chocolate strips as well as chocolate flakes. A real treat!" + icon = 'icons/obj/item/reagent_containers/food/processed.dmi' + icon_state = "torpedo" + item_state = "cone" + contained_sprite = TRUE + filling_color = "#ececec" + reagents_to_add = list(/singleton/reagent/nutriment = 3, /singleton/reagent/drink/ice = 1) + reagent_data = list(/singleton/reagent/nutriment = list("vanilla ice cream" = 5, "chocolate" = 5, "waffle cone" = 5)) + +/obj/item/storage/box/fancy/popsicle/torpedo_dyn_packaged + name = "\improper torpedo dyn supreme" + desc = "A pre-packaged ice cream cone with dyn flavored ice cream, strips of dark chocolate on top, small dark chocolate flakes mixed in, and a cocoa flavored cone. The edge of the cone has a small bit of dark chocolate in it, too! The graphic on the packaging makes it look like you can see the ice cream inside. This one is less popular among kids, for some reason." + icon_state = "torpedo_dyn_wrap" + icon_type = "ice cream cone" + starts_with = list(/obj/item/reagent_containers/food/snacks/torpedo_dyn = 1) + can_hold = list(/obj/item/reagent_containers/food/snacks/torpedo_dyn) + +/obj/item/reagent_containers/food/snacks/torpedo_dyn + name = "\improper torpedo dyn ice cream cone" + desc = "A lovely ice cream cone containing dyn ice cream and dark chocolate strips in a cocoa flavored waffle cone." + icon = 'icons/obj/item/reagent_containers/food/processed.dmi' + icon_state = "torpedo_dyn" + item_state = "cone" + contained_sprite = TRUE + filling_color = "#ececec" + reagents_to_add = list(/singleton/reagent/nutriment = 3, /singleton/reagent/drink/ice = 1) + reagent_data = list(/singleton/reagent/nutriment = list("mint ice cream" = 5, "dark chocolate" = 5, "waffle cone" = 5)) + +/obj/item/storage/box/fancy/popsicle/odin_pop_packaged + name = "\improper odin pop" + desc = "A pre-packaged three-colored fruity ice pop. The packaging portrays it as bravely travelling through the stars. It looks nothing like the SCC-CC Odin, though. Is that for practical reasons or legal reasons? Either way, it still looks delicious, and that's what counts." + icon_state = "odinpop_wrap" + starts_with = list(/obj/item/reagent_containers/food/snacks/odin_pop = 1) + can_hold = list(/obj/item/reagent_containers/food/snacks/odin_pop) + +/obj/item/reagent_containers/food/snacks/odin_pop + name = "\improper odin ice pop" + desc = "A fruity ice pop that looks alluring, refreshing, and for some reason, nothing like the famous ship it may or may not have been named after." + icon = 'icons/obj/item/reagent_containers/food/processed.dmi' + icon_state = "odinpop" + item_state = "popsicle_red" + contained_sprite = TRUE + filling_color = "#ff970e" + trash = /obj/item/trash/popsiclestick + reagents_to_add = list(/singleton/reagent/nutriment = 2, /singleton/reagent/drink/ice = 3) + reagent_data = list(/singleton/reagent/nutriment = list("cherry flavoring" = 5, "pineapple flavoring" = 5, "lemon flavoring" = 5)) + +/obj/item/reagent_containers/food/snacks/odin_pop/update_icon() + var/expected_initial_reagent_volume + for(var/k in src.reagents_to_add) + expected_initial_reagent_volume += reagents_to_add[k] + var/percent_odin_pop = round((reagents.total_volume / expected_initial_reagent_volume) * 100) + switch(percent_odin_pop) + if(0 to 70) + icon_state = "odinpop_bite" + if(71 to INFINITY) + icon_state = "odinpop" + +/obj/item/storage/box/fancy/popsicle/traitor_pop_packaged + name = "\improper traitor pop" + desc = "The edgiest, angstiest popsicle you've ever seen. Released ages ago to promote the 'traitorlings' video game. The package advertises an intense black cherry flavor. Hey, wait, weren't these banned in a bunch of places a while back for some reason...?" + icon_state = "traitor_pop_wrap" + starts_with = list(/obj/item/reagent_containers/food/snacks/traitor_pop = 1) + can_hold = list(/obj/item/reagent_containers/food/snacks/traitor_pop) + +/obj/item/reagent_containers/food/snacks/traitor_pop + name = "black cherry ice pop" + desc = "A definitely normal, non-suspicious, black and red popsicle. It gives off 'it's not a phase, mom' vibes." + icon = 'icons/obj/item/reagent_containers/food/processed.dmi' + icon_state = "traitor_pop" + item_state = "popsicle_red" + contained_sprite = TRUE + filling_color = "#b40000" + trash = /obj/item/trash/popsiclestick + reagents_to_add = list(/singleton/reagent/nutriment = 2, /singleton/reagent/capsaicin = 4, /singleton/reagent/drink/ice = 2) + reagent_data = list(/singleton/reagent/nutriment = list("chili" = 5, "betrayal" = 5)) + bitesize = 2 + +/obj/item/reagent_containers/food/snacks/traitor_pop/update_icon() + var/expected_initial_reagent_volume + for(var/k in src.reagents_to_add) + expected_initial_reagent_volume += reagents_to_add[k] + var/percent_traitor_pop = round((reagents.total_volume / expected_initial_reagent_volume) * 100) + switch(percent_traitor_pop) + if(0 to 95) + icon_state = "traitor_pop_bite" + if(96 to INFINITY) + icon_state = "traitor_pop" + +/obj/item/storage/box/fancy/popsicle/torpedo_dirtberry_packaged + name = "\improper torpedo dirtberry dreams" + desc = "A pre-packaged ice cream cone with dirtberry ice cream, strips of chocolate on top, and small chocolate flakes mixed in." + icon_state = "torpedo_gold_wrap" + icon_type = "ice cream cone" + starts_with = list(/obj/item/reagent_containers/food/snacks/torpedo_dirtberry = 1) + can_hold = list(/obj/item/reagent_containers/food/snacks/torpedo_dirtberry) + +/obj/item/reagent_containers/food/snacks/torpedo_dirtberry + name = "\improper torpedo dirtberry ice cream cone" + desc = "A lovely ice cream cone containing dirtberry ice cream and chocolate strips as well as chocolate flakes. Something about this combination of flavors just works extra-well, you know?" + icon = 'icons/obj/item/reagent_containers/food/processed.dmi' + icon_state = "torpedo_gold" + item_state = "cone" + contained_sprite = TRUE + filling_color = "#7c5a2e" + reagents_to_add = list(/singleton/reagent/nutriment = 3, /singleton/reagent/drink/ice = 1) + reagent_data = list(/singleton/reagent/nutriment = list("nougat ice cream" = 5, "chocolate" = 5, "waffle cone" = 5)) + +/obj/item/storage/box/fancy/popsicle/chocolate_taco_packaged + name = "chocolate taco" + desc = "A delicious, crunchy ice cream dessert disguising itself as a taco to avoid being eaten by hungry sweets-seeking predators. It's either doing a very bad job of it, or a very good job of it, because you're pretty sure you haven't seen one of these in years and thought they all went extinct! The expiration date miraculously checks out, though!" + icon_state = "chocotaco_wrap" + icon_type = "taco" + starts_with = list(/obj/item/reagent_containers/food/snacks/chocolate_taco = 1) + can_hold = list(/obj/item/reagent_containers/food/snacks/chocolate_taco) + +/obj/item/reagent_containers/food/snacks/chocolate_taco + name = "chocolate ice cream taco" + desc = "A delicious, crunchy taco made out of waffle cone, rich ice cream, chocolate, nuts, and caramel syrup." + icon = 'icons/obj/item/reagent_containers/food/processed.dmi' + icon_state = "chocotaco" + item_state = "cone" + contained_sprite = TRUE + filling_color = "#d6b994" + reagents_to_add = list(/singleton/reagent/nutriment = 4, /singleton/reagent/drink/ice = 1) + reagent_data = list(/singleton/reagent/nutriment = list("caramel ice cream" = 5, "nutty chocolate" = 5, "crunchy waffle" = 5, "cultural appropriation" = 3)) + +/obj/item/reagent_containers/food/snacks/chocolate_taco/update_icon() + var/expected_initial_reagent_volume + for(var/k in src.reagents_to_add) + expected_initial_reagent_volume += reagents_to_add[k] + var/percent_chocolate_taco = round((reagents.total_volume / expected_initial_reagent_volume) * 100) + switch(percent_chocolate_taco) + if(0 to 80) + icon_state = "chocotaco_bite" + if(81 to INFINITY) + icon_state = "chocotaco" diff --git a/html/changelogs/Tomixcomics-idrisdelights.yml b/html/changelogs/Tomixcomics-idrisdelights.yml new file mode 100644 index 00000000000..622c5c39fc4 --- /dev/null +++ b/html/changelogs/Tomixcomics-idrisdelights.yml @@ -0,0 +1,60 @@ +################################ +# Example Changelog File +# +# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. +# +# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) +# When it is, any changes listed below will disappear. +# +# Valid Prefixes: +# bugfix +# - (fixes bugs) +# wip +# - (work in progress) +# qol +# - (quality of life) +# soundadd +# - (adds a sound) +# sounddel +# - (removes a sound) +# rscadd +# - (adds a feature) +# rscdel +# - (removes a feature) +# imageadd +# - (adds an image or sprite) +# imagedel +# - (removes an image or sprite) +# spellcheck +# - (fixes spelling or grammar) +# experiment +# - (experimental change) +# balance +# - (balance changes) +# code_imp +# - (misc internal code change) +# refactor +# - (refactors code) +# config +# - (makes a change to the config files) +# admin +# - (makes changes to administrator tools) +# server +# - (miscellaneous changes to server) +################################# + +# Your name. +author: Tomixcomics + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +# Any changes you've made. See valid prefix list above. +# INDENT WITH TWO SPACES. NOT TABS. SPACES. +# SCREW THIS UP AND IT WON'T WORK. +# Also, this gets changed to [] after reading. Just remove the brackets when you add new shit. +# Please surround your changes in double quotes ("). It works without them, but if you use certain characters it screws up compiling. The quotes will not show up in the changelog. +changes: + - rscadd: "Added the 'Idris Delights' vending machine and the various treats it sells." + - rscadd: "Added two new types of trash to go along with the new treats." + - rscadd: "Added several new food dishes including Takoyaki, French toast, Lava cakes and Tiramisu." diff --git a/icons/obj/item/reagent_containers/food/bread.dmi b/icons/obj/item/reagent_containers/food/bread.dmi index b92f9ee8028..8ac6a312305 100644 Binary files a/icons/obj/item/reagent_containers/food/bread.dmi and b/icons/obj/item/reagent_containers/food/bread.dmi differ diff --git a/icons/obj/item/reagent_containers/food/confections.dmi b/icons/obj/item/reagent_containers/food/confections.dmi index beeaba5837d..59668ed5d1f 100644 Binary files a/icons/obj/item/reagent_containers/food/confections.dmi and b/icons/obj/item/reagent_containers/food/confections.dmi differ diff --git a/icons/obj/item/reagent_containers/food/cultural/human.dmi b/icons/obj/item/reagent_containers/food/cultural/human.dmi index 05c2fadf375..11cd79c5e94 100644 Binary files a/icons/obj/item/reagent_containers/food/cultural/human.dmi and b/icons/obj/item/reagent_containers/food/cultural/human.dmi differ diff --git a/icons/obj/item/reagent_containers/food/pastries.dmi b/icons/obj/item/reagent_containers/food/pastries.dmi index 2350b97fbe3..018cf4239f7 100644 Binary files a/icons/obj/item/reagent_containers/food/pastries.dmi and b/icons/obj/item/reagent_containers/food/pastries.dmi differ diff --git a/icons/obj/item/reagent_containers/food/processed.dmi b/icons/obj/item/reagent_containers/food/processed.dmi index bcfe22e5352..948c81482b4 100644 Binary files a/icons/obj/item/reagent_containers/food/processed.dmi and b/icons/obj/item/reagent_containers/food/processed.dmi differ diff --git a/icons/obj/trash.dmi b/icons/obj/trash.dmi index 7910e04dd89..86ec9f70722 100644 Binary files a/icons/obj/trash.dmi and b/icons/obj/trash.dmi differ diff --git a/icons/obj/vending.dmi b/icons/obj/vending.dmi index 4489b38921c..bce8d282788 100755 Binary files a/icons/obj/vending.dmi and b/icons/obj/vending.dmi differ