diff --git a/code/__DEFINES/is_helpers.dm b/code/__DEFINES/is_helpers.dm index 55bfcaff79..d961d6ac79 100644 --- a/code/__DEFINES/is_helpers.dm +++ b/code/__DEFINES/is_helpers.dm @@ -240,6 +240,8 @@ GLOBAL_LIST_INIT(pointed_types, typecacheof(list( #define isgun(A) (istype(A, /obj/item/gun)) +#define isfood(A) (istype(A, /obj/item/reagent_containers/food)) + //Assemblies #define isassembly(O) (istype(O, /obj/item/assembly)) diff --git a/code/datums/components/butchering.dm b/code/datums/components/butchering.dm index cb9652e0db..e5625dee6a 100644 --- a/code/datums/components/butchering.dm +++ b/code/datums/components/butchering.dm @@ -99,7 +99,7 @@ butchered_items += new sinew (T) meat.guaranteed_butcher_results.Remove(sinew) for(var/butchered_item in butchered_items) - if(istype(butchered_item, /obj/item/reagent_containers/food)) + if(isfood(butchered_item)) var/obj/item/reagent_containers/food/butchered_meat = butchered_item butchered_meat.food_quality = meat_quality if(butcher) diff --git a/code/datums/components/crafting/craft.dm b/code/datums/components/crafting/craft.dm index 64bde5da29..a5333499dd 100644 --- a/code/datums/components/crafting/craft.dm +++ b/code/datums/components/crafting/craft.dm @@ -201,7 +201,7 @@ var/atom/movable/I = new R.result (get_turf(user.loc)) I.CheckParts(parts, R) if(isitem(I)) - if(istype(I, /obj/item/reagent_containers/food)) + if(isfood(I)) var/obj/item/reagent_containers/food/food_result = I var/total_quality = 0 var/total_items = 0 diff --git a/code/modules/food_and_drinks/food/snacks.dm b/code/modules/food_and_drinks/food/snacks.dm index 889ec42185..6274a70d0e 100644 --- a/code/modules/food_and_drinks/food/snacks.dm +++ b/code/modules/food_and_drinks/food/snacks.dm @@ -303,7 +303,7 @@ All foods are distributed among various categories. Use common sense. if(cooked_type) result = new cooked_type(T) //if the result is food, set its food quality to the original food item's quality - if(istype(result, /obj/item/reagent_containers/food)) + if(isfood(result)) var/obj/item/reagent_containers/food/food_output = result food_output.adjust_food_quality(food_quality + quality_increase) if(istype(M)) diff --git a/code/modules/food_and_drinks/food/snacks_bread.dm b/code/modules/food_and_drinks/food/snacks_bread.dm index a04766be5d..777fd3875c 100644 --- a/code/modules/food_and_drinks/food/snacks_bread.dm +++ b/code/modules/food_and_drinks/food/snacks_bread.dm @@ -216,7 +216,7 @@ GLOBAL_LIST_INIT(frying_bad_chems, list( item_flags = fried.item_flags obj_flags = fried.obj_flags - if(istype(fried, /obj/item/reagent_containers/food)) + if(isfood(fried)) fried.reagents.trans_to(src, fried.reagents.total_volume) qdel(fried) else diff --git a/code/modules/food_and_drinks/kitchen_machinery/deep_fryer.dm b/code/modules/food_and_drinks/kitchen_machinery/deep_fryer.dm index 3e22070c00..e42ad07c26 100644 --- a/code/modules/food_and_drinks/kitchen_machinery/deep_fryer.dm +++ b/code/modules/food_and_drinks/kitchen_machinery/deep_fryer.dm @@ -105,7 +105,7 @@ God bless America. to_chat(user, "You put [I] into [src].") frying = new/obj/item/reagent_containers/food/snacks/deepfryholder(src, I) //setup food quality for item depending on if it's edible or not - if(istype(I, /obj/item/reagent_containers/food)) + if(isfood(I)) var/obj/item/reagent_containers/food/original_food = I frying.adjust_food_quality(original_food.food_quality) //food quality remains unchanged until degree of frying is calculated else diff --git a/code/modules/reagents/chemistry/reagents/food_reagents.dm b/code/modules/reagents/chemistry/reagents/food_reagents.dm index b94ea9601e..ba0b3ea37d 100644 --- a/code/modules/reagents/chemistry/reagents/food_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/food_reagents.dm @@ -776,7 +776,7 @@ /datum/reagent/consumable/secretsauce/reaction_obj(obj/O, reac_volume) //splashing any amount above or equal to 1u of secret sauce onto a piece of food turns its quality to 100 - if(reac_volume >= 1 && istype(O, /obj/item/reagent_containers/food)) + if(reac_volume >= 1 && isfood(O)) var/obj/item/reagent_containers/food/splashed_food = O splashed_food.adjust_food_quality(100) // if it's a customisable food, we need to edit its total quality too, to prevent its quality resetting from adding more ingredients!