implements isfood helper

This commit is contained in:
timothyteakettle
2020-04-17 01:45:15 +01:00
parent aa6d6883e3
commit a4cc54781f
7 changed files with 8 additions and 6 deletions
+2
View File
@@ -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))
+1 -1
View File
@@ -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)
+1 -1
View File
@@ -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
+1 -1
View File
@@ -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))
@@ -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
@@ -105,7 +105,7 @@ God bless America.
to_chat(user, "<span class='notice'>You put [I] into [src].</span>")
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
@@ -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!