diff --git a/code/modules/cooking/machinery/cooking_machines/_cooker_output.dm b/code/modules/cooking/machinery/cooking_machines/_cooker_output.dm index 484bb611ffa..c882d9d5141 100644 --- a/code/modules/cooking/machinery/cooking_machines/_cooker_output.dm +++ b/code/modules/cooking/machinery/cooking_machines/_cooker_output.dm @@ -92,9 +92,26 @@ name = "cake" desc = "A popular band." icon_state = "cakecustom" + slices_num = 5 + slice_path = /obj/item/reagent_containers/food/snacks/variable/cakeslice size = 40 w_class = ITEMSIZE_NORMAL +/obj/item/reagent_containers/food/snacks/variable/cakeslice + name = "cake slice" + desc = "A slice of cake" + icon_state = "cakeslicecustom" + trash = /obj/item/trash/plate + w_class = ITEMSIZE_SMALL + size = 8 + +/obj/item/reagent_containers/food/snacks/variable/cakeslice/update_icon() + . = ..() + //Filling overlay + var/image/I = image(icon, "[icon_state]_filling") + I.color = filling_color + overlays += I + /obj/item/reagent_containers/food/snacks/variable/pocket name = "hot pocket" desc = "You wanna put a bangin- oh, nevermind." diff --git a/code/modules/reagents/reagent_containers/food/snacks.dm b/code/modules/reagents/reagent_containers/food/snacks.dm index b55175bfa97..2f0631e2550 100644 --- a/code/modules/reagents/reagent_containers/food/snacks.dm +++ b/code/modules/reagents/reagent_containers/food/snacks.dm @@ -252,8 +252,10 @@ var/reagents_per_slice = reagents.total_volume/slices_num for(var/i=1 to (slices_num-slices_lost)) - var/obj/slice = new slice_path (src.loc) + var/obj/item/reagent_containers/food/slice = new slice_path (src.loc) reagents.trans_to_obj(slice, reagents_per_slice) + slice.filling_color = filling_color + slice.update_icon() qdel(src) return diff --git a/html/changelogs/sliceablecustomcakes.yml b/html/changelogs/sliceablecustomcakes.yml new file mode 100644 index 00000000000..84360875aa3 --- /dev/null +++ b/html/changelogs/sliceablecustomcakes.yml @@ -0,0 +1,6 @@ +author: Sparky_hotdog + +delete-after: True + +changes: + - tweak: "Custom cakes are now sliceable." diff --git a/icons/obj/food_custom.dmi b/icons/obj/food_custom.dmi index 694536c84ca..af43a0b3b61 100644 Binary files a/icons/obj/food_custom.dmi and b/icons/obj/food_custom.dmi differ