All-In-One grinder results are now defined by type, not by huge lists

code/game/objects/items.dm

@@ -117,7 +117,13 @@ GLOBAL_VAR_INIT(rpg_loot_items, FALSE)
 
 	var/trigger_guard = TRIGGER_GUARD_NONE
 
+<<<<<<< HEAD
 	var/icon_override = null
+=======
+	//Grinder vars
+	var/list/grind_results //A reagent list containing the reagents this item produces when ground up in a grinder - this can be an empty list to allow for reagent transferring only
+	var/list/juice_results //A reagent list containing blah blah... but when JUICED in a grinder!
+>>>>>>> d447acd... All-In-One grinder results are now defined by type, not by huge lists (#33181)
 
 /obj/item/Initialize()
 	if (!materials)
@@ -678,6 +684,15 @@ GLOBAL_VAR_INIT(rpg_loot_items, FALSE)
 
 /obj/item/proc/on_mob_death(mob/living/L, gibbed)
 
+/obj/item/proc/grind_requirements(obj/machinery/reagentgrinder/R) //Used to check for extra requirements for grinding an object
+	return TRUE
+
+ //Called BEFORE the object is ground up - use this to change grind results based on conditions
+ //Use "return -1" to prevent the grinding from occurring
+/obj/item/proc/on_grind()
+
+/obj/item/proc/on_juice()
+
 /obj/item/proc/set_force_string()
 	switch(force)
 		if(0 to 4)