From b2a57366184335240b7361cee8d6319fe0e8f2dd Mon Sep 17 00:00:00 2001 From: Fordoxia <143041327+Fordoxia@users.noreply.github.com> Date: Sun, 14 Sep 2025 05:55:20 +0100 Subject: [PATCH] yummy --- _maps/map_files/test_tiny/test_tiny.dmm | 41 ++++++++++++++++--- code/modules/cooking/cooking_container.dm | 15 +++++++ .../cooking/recipes/cutting_board_recipes.dm | 10 +++++ .../food_and_drinks/food/foods/sandwiches.dm | 10 ++++- 4 files changed, 70 insertions(+), 6 deletions(-) diff --git a/_maps/map_files/test_tiny/test_tiny.dmm b/_maps/map_files/test_tiny/test_tiny.dmm index cf23687ddfb..8a72436ee84 100644 --- a/_maps/map_files/test_tiny/test_tiny.dmm +++ b/_maps/map_files/test_tiny/test_tiny.dmm @@ -11,18 +11,35 @@ /obj/effect/landmark/spawner/late/crew, /turf/simulated/floor/mineral/titanium/blue, /area/shuttle/arrival/station) +"f" = ( +/obj/structure/table/reinforced, +/turf/simulated/floor/mineral/titanium/blue, +/area/shuttle/arrival/station) "p" = ( /obj/machinery/light{ dir = 1 }, /turf/simulated/floor/mineral/titanium/blue, /area/shuttle/arrival/station) +"t" = ( +/obj/item/nuke_core/supermatter_sliver, +/obj/structure/table/reinforced, +/obj/item/nuke_core/supermatter_sliver, +/obj/item/nuke_core/supermatter_sliver, +/obj/item/nuke_core/supermatter_sliver, +/turf/simulated/floor/mineral/titanium/blue, +/area/shuttle/arrival/station) "u" = ( /turf/simulated/wall/mineral/titanium, /area/shuttle/arrival/station) "x" = ( /turf/simulated/floor/mineral/titanium/blue, /area/shuttle/arrival/station) +"B" = ( +/obj/structure/table/reinforced, +/obj/item/reagent_containers/cooking/board, +/turf/simulated/floor/mineral/titanium/blue, +/area/shuttle/arrival/station) "F" = ( /obj/machinery/light, /turf/simulated/floor/mineral/titanium/blue, @@ -33,6 +50,20 @@ }, /turf/simulated/floor/mineral/titanium/blue, /area/shuttle/arrival/station) +"S" = ( +/obj/item/food/sliced/bread, +/obj/structure/table/reinforced, +/obj/item/food/sliced/bread{ + pixel_x = -5; + pixel_y = 7 + }, +/turf/simulated/floor/mineral/titanium/blue, +/area/shuttle/arrival/station) +"T" = ( +/obj/item/retractor/supermatter, +/obj/structure/table/reinforced, +/turf/simulated/floor/mineral/titanium/blue, +/area/shuttle/arrival/station) "U" = ( /obj/machinery/light{ dir = 4 @@ -32293,9 +32324,9 @@ x x x x -x -x -x +t +B +f x x x @@ -32550,9 +32581,9 @@ x x x x -x +T b -x +S x x x diff --git a/code/modules/cooking/cooking_container.dm b/code/modules/cooking/cooking_container.dm index 8ace9dc6004..20bfc615af6 100644 --- a/code/modules/cooking/cooking_container.dm +++ b/code/modules/cooking/cooking_container.dm @@ -315,6 +315,21 @@ preposition = "On" materials = list(MAT_WOOD = 5) +// For very carefully making the most powerful sandwich in the universe. +/obj/item/reagent_containers/cooking/board/item_interaction(mob/living/user, obj/item/used, list/modifiers) + if(istype(used, /obj/item/retractor/supermatter)) + var/obj/item/retractor/supermatter/tongs = used + if(tongs.sliver) + tongs.sliver.melee_attack_chain(user, src) + if(tongs.sliver.loc != tongs) + tongs.sliver = null + // TODO: refactor the tongs so they actually check if(sliver) in `update_icon()` instead of manually setting the icons everywhere. + tongs.icon_state = "supermatter_tongs" + tongs.item_state = "supermatter_tongs" + used.update_appearance(UPDATE_ICON) + return ITEM_INTERACT_COMPLETE + ..() + /obj/item/reagent_containers/cooking/sushimat name = "Sushi Mat" desc = "A wooden mat used for efficient sushi crafting." diff --git a/code/modules/cooking/recipes/cutting_board_recipes.dm b/code/modules/cooking/recipes/cutting_board_recipes.dm index 55f48f7ffae..33f30dfe642 100644 --- a/code/modules/cooking/recipes/cutting_board_recipes.dm +++ b/code/modules/cooking/recipes/cutting_board_recipes.dm @@ -444,6 +444,16 @@ PCWJ_ADD_ITEM(/obj/item/food/sliced/bread), ) +/datum/cooking/recipe/supermatter_sandwich + container_type = /obj/item/reagent_containers/cooking/board + product_type = /obj/item/food/supermatter_sandwich + catalog_category = COOKBOOK_CATEGORY_BURGS + steps = list( + PCWJ_ADD_ITEM(/obj/item/food/sliced/bread), + PCWJ_ADD_ITEM(/obj/item/nuke_core/supermatter_sliver), + PCWJ_ADD_ITEM(/obj/item/food/sliced/bread), + ) + /datum/cooking/recipe/philly_cheesesteak container_type = /obj/item/reagent_containers/cooking/board product_type = /obj/item/food/philly_cheesesteak diff --git a/code/modules/food_and_drinks/food/foods/sandwiches.dm b/code/modules/food_and_drinks/food/foods/sandwiches.dm index d5dc7b8e02d..e145d5ed029 100644 --- a/code/modules/food_and_drinks/food/foods/sandwiches.dm +++ b/code/modules/food_and_drinks/food/foods/sandwiches.dm @@ -485,7 +485,7 @@ /obj/item/food/supermatter_sandwich name = "supermatter sandwich" - desc = "You have been told many times to not lick the forbidden nacho... But surely one taste can't be that bad?" + desc = "A supermatter sliver, somehow safely contained between two slices of bread. You have been told many times to not lick the forbidden nacho... But surely one taste can't be that bad?" icon = 'icons/obj/food/burgerbread.dmi' icon_state = "supermatter_sandwich" tastes = list("indescribable power" = 3, "bread" = 2) @@ -505,3 +505,11 @@ M.dust() message_admins("[src] has consumed [key_name_admin(M)] [ADMIN_JMP(src)].") investigate_log("has consumed [key_name(M)].", INVESTIGATE_SUPERMATTER) + +/obj/item/food/supermatter_sandwich/process() + . = ..() + var/new_filter = isnull(get_filter("ray")) + ray_filter_helper(1, 40,"#ffd04f", 6, 20) + if(new_filter) + animate(get_filter("ray"), offset = 10, time = 10 SECONDS, loop = -1) + animate(offset = 0, time = 10 SECONDS)