diff --git a/modular/Neu_Food/code/NeuFood.dm b/modular/Neu_Food/code/NeuFood.dm index 899449578..9cad1f5d5 100644 --- a/modular/Neu_Food/code/NeuFood.dm +++ b/modular/Neu_Food/code/NeuFood.dm @@ -455,13 +455,17 @@ /* .................. Food platter ................... */ /obj/item/cooking/platter/attackby(obj/item/I, mob/user, params) var/found_table = locate(/obj/structure/table) in (loc) + if(findtext("[I.type]", "/plated")) //All plated food items have /plated at end of path + to_chat(user, span_warning("[I] in your hand appears to already be plated.")) + return if(istype(I, /obj/item/reagent_containers/food/snacks/rogue/meat/poultry/baked)) if(isturf(loc)&& (found_table)) playsound(get_turf(user), 'sound/foley/dropsound/food_drop.ogg', 40, TRUE, -1) if(do_after(user,2 SECONDS, target = src)) - new /obj/item/reagent_containers/food/snacks/rogue/meat/poultry/baked/plated(loc) - qdel(I) - qdel(src) + if(istype(I, /obj/item/reagent_containers/food/snacks/rogue/meat/poultry/baked/spiced)) + new /obj/item/reagent_containers/food/snacks/rogue/meat/poultry/baked/spiced/plated(loc) + else + new /obj/item/reagent_containers/food/snacks/rogue/meat/poultry/baked/plated(loc) else to_chat(user, span_warning("You need to put [src] on a table to work on it.")) if(istype(I, /obj/item/reagent_containers/food/snacks/rogue/peppersteak)) diff --git a/modular/Neu_Food/code/cooked/NeuFood_meals.dm b/modular/Neu_Food/code/cooked/NeuFood_meals.dm index da1db26e1..be61e56eb 100644 --- a/modular/Neu_Food/code/cooked/NeuFood_meals.dm +++ b/modular/Neu_Food/code/cooked/NeuFood_meals.dm @@ -261,6 +261,7 @@ desc = "Abyssor's bounty, make sure to eat the eyes!" icon_state = "carpcooked_plated" item_state = "plate_food" + icon = 'modular/Neu_Food/icons/food.dmi' lefthand_file = 'modular/Neu_Food/icons/food_lefthand.dmi' righthand_file = 'modular/Neu_Food/icons/food_righthand.dmi' experimental_inhand = FALSE @@ -273,6 +274,7 @@ desc = "Abyssor's bounty, make sure to eat the eyes!" icon_state = "clownfishcooked_plated" item_state = "plate_food" + icon = 'modular/Neu_Food/icons/food.dmi' lefthand_file = 'modular/Neu_Food/icons/food_lefthand.dmi' righthand_file = 'modular/Neu_Food/icons/food_righthand.dmi' experimental_inhand = FALSE @@ -285,6 +287,7 @@ desc = "Abyssor's bounty, make sure to eat the eyes!" icon_state = "anglercooked_plated" item_state = "plate_food" + icon = 'modular/Neu_Food/icons/food.dmi' lefthand_file = 'modular/Neu_Food/icons/food_lefthand.dmi' righthand_file = 'modular/Neu_Food/icons/food_righthand.dmi' experimental_inhand = FALSE @@ -297,6 +300,7 @@ desc = "Abyssor's bounty, make sure to eat the eyes!" icon_state = "eelcooked_plated" item_state = "plate_food" + icon = 'modular/Neu_Food/icons/food.dmi' lefthand_file = 'modular/Neu_Food/icons/food_lefthand.dmi' righthand_file = 'modular/Neu_Food/icons/food_righthand.dmi' experimental_inhand = FALSE @@ -342,7 +346,10 @@ return FALSE mill.reagents.remove_reagent(/datum/reagent/consumable/blackpepper, 1) - new /obj/item/reagent_containers/food/snacks/rogue/meat/poultry/baked/spiced(loc) + if(istype(src, /obj/item/reagent_containers/food/snacks/rogue/meat/poultry/baked/plated)) + new /obj/item/reagent_containers/food/snacks/rogue/meat/poultry/baked/spiced/plated(loc) + else + new /obj/item/reagent_containers/food/snacks/rogue/meat/poultry/baked/spiced(loc) qdel(src) else mill.icon_state = "peppermill" @@ -367,6 +374,17 @@ trash = /obj/item/cooking/platter rotprocess = SHELFLIFE_LONG +/obj/item/reagent_containers/food/snacks/rogue/meat/poultry/baked/spiced/plated + icon_state = "roastchicken_plated" + item_state = "plate_food" + lefthand_file = 'modular/Neu_Food/icons/food_lefthand.dmi' + righthand_file = 'modular/Neu_Food/icons/food_righthand.dmi' + color = "#ffc0c0" + experimental_inhand = FALSE + w_class = WEIGHT_CLASS_BULKY + bonus_reagents = list(/datum/reagent/consumable/nutriment = 2) + trash = /obj/item/cooking/platter + rotprocess = SHELFLIFE_LONG /* ................. Cooked rat ................... */ /obj/item/reagent_containers/food/snacks/rogue/friedrat/plated diff --git a/modular/Neu_Food/code/raw/NeuFood_dough.dm b/modular/Neu_Food/code/raw/NeuFood_dough.dm index ceb868894..dc7da01eb 100644 --- a/modular/Neu_Food/code/raw/NeuFood_dough.dm +++ b/modular/Neu_Food/code/raw/NeuFood_dough.dm @@ -757,7 +757,7 @@ rotprocess = SHELFLIFE_LONG /obj/item/reagent_containers/food/snacks/rogue/ccakeslice/plated - icon_state = "cheesecakeslice_plated" + icon_state = "cheesecake_slice_plated" rotprocess = SHELFLIFE_EXTREME bonus_reagents = list(/datum/reagent/consumable/nutriment = 1) trash = /obj/item/cooking/platter diff --git a/modular/Neu_Food/code/raw/NeuFood_veggies.dm b/modular/Neu_Food/code/raw/NeuFood_veggies.dm index ec8d03291..1a1dc738a 100644 --- a/modular/Neu_Food/code/raw/NeuFood_veggies.dm +++ b/modular/Neu_Food/code/raw/NeuFood_veggies.dm @@ -51,3 +51,14 @@ fried_type = /obj/item/reagent_containers/food/snacks/rogue/preserved/potato_fried cooked_type = /obj/item/reagent_containers/food/snacks/rogue/preserved/potato_fried +/obj/item/reagent_containers/food/snacks/grown/apple + slice_path = /obj/item/reagent_containers/food/snacks/rogue/fruit/apple_sliced + slices_num = 3 + chopping_sound = TRUE + +/obj/item/reagent_containers/food/snacks/rogue/fruit/apple_sliced + name = "apple slice" + icon_state = "apple_sliced" + desc = "A neatly sliced bit of apple. Nicer to eat. Refined, even." + tastes = list("airy apple" = 1) + list_reagents = list(/datum/reagent/consumable/nutriment = 1) diff --git a/modular/Neu_Food/icons/food.dmi b/modular/Neu_Food/icons/food.dmi index 51568e518..a73388662 100644 Binary files a/modular/Neu_Food/icons/food.dmi and b/modular/Neu_Food/icons/food.dmi differ