Revert "Standardises item blending (#36617)" (#36761)

This reverts commit 39152f3.

__DEFINES/setup.dm

@@ -1960,9 +1960,6 @@ var/list/weekend_days = list("Friday", "Saturday", "Sunday")
 #define HEX_MODE_GUARD	 1
 #define HEX_MODE_ESCORT	 2
 
-#define GRIND_TRANSFER 1
-#define GRIND_NUTRIMENT_TO_REAGENT 2
-
 //Particles system defines
 #define PS_STEAM			"Steam"
 #define PS_SMOKE			"Smoke"

code/datums/gamemode/factions/bloodcult/bloodcult_items.dm

@@ -1731,8 +1731,10 @@ var/list/arcane_tomes = list()
 	update_icon()
 	for(var/datum/reagent/R in reagents.reagent_list)
 		if(R.id == BLOOD)
+			var/datum/reagent/blood/B = R
 			var/datum/disease2/disease/cultvirus = global_diseases[DISEASE_CULT]
-			R.handle_data_mix(list("virus2" = list("[cultvirus.uniqueID]-[cultvirus.subID]" = cultvirus.getcopy())))
+			if (!("[cultvirus.uniqueID]-[cultvirus.subID]" in B.data["virus2"]))
+				B.data["virus2"]["[cultvirus.uniqueID]-[cultvirus.subID]"] = cultvirus.getcopy()
 
 /obj/item/weapon/reagent_containers/food/drinks/cult/update_icon()
 	..()

code/defines/obj/weapon.dm

@@ -1152,8 +1152,7 @@ var/list/available_redphone_names3 = list("1","2","3","4","5","6","7","8","9")
 	icon = 'icons/obj/wizard.dmi'
 	icon_state = "ectoplasm"
 	w_type = RECYK_BIOLOGICAL
-	blend_reagent = ECTOPLASM
-	grind_amount = 5
+
 
 /obj/item/weapon/ectoplasm/New(turf/loc, var/alt_color)
 	..()

code/game/gamemodes/endgame/xmas/snow.dm

@@ -639,8 +639,6 @@ var/global/list/datum/stack_recipe/snow_recipes = list (
 	icon_state = "ice_crystal"
 	melt_temperature = MELTPOINT_SNOW
 	w_class = W_CLASS_TINY
-	blend_reagent = ICE
-	grind_amount = 10
 
 #undef SNOWCOVERING_FULL
 #undef SNOWCOVERING_MEDIUM

code/game/machinery/bees_apiary.dm

@@ -270,10 +270,8 @@ var/list/apiaries_list = list()
 		for(var/chem in S.chems)
 			var/list/reagent_data = list()
 			if (chem == NUTRIMENT)
-				if (S.products.len)
-					var/obj/item/I = S.products[1]
-					if(initial(I.juice_reagent))
-						reagent_data = S.chems[chem]
+				if (S.products.len && juice_items.Find(S.products[1]))
+					reagent_data = S.chems[chem]
 				else
 					continue
 			else
@@ -288,11 +286,10 @@ var/list/apiaries_list = list()
 				var/list/reagent_data = list()
 				var/chemToAdd = null
 				if (chem == NUTRIMENT)
-					if (S.products.len)
-						var/obj/item/I = S.products[1]
-						if(initial(I.juice_reagent))
-							chemToAdd = I.juice_reagent
-							reagent_data = S.chems[chem]
+					if (S.products.len && juice_items.Find(S.products[1]))
+						var/i = juice_items.Find(S.products[1])
+						chemToAdd = pick(juice_items[juice_items[i]])
+						reagent_data = S.chems[chem]
 					else
 						continue
 				else

code/game/objects/items/candle.dm

@@ -14,8 +14,6 @@
 	melt_temperature = MELTPOINT_WAX
 	starting_materials = list(MAT_WAX = CC_PER_SHEET_WAX)
 	color = COLOR_DEFAULT_CANDLE
-	blend_reagent = WAX
-	grind_amount = 1.25
 
 	var/wax = 1800 // 30 minutes
 	var/lit = 0

code/game/objects/items/devices/flashlight.dm

@@ -295,8 +295,6 @@ var/list/obj/item/device/flashlight/lamp/lamps = list()
 	heat_production = 1500
 	source_temperature = TEMPERATURE_FLAME
 	flammable = FALSE //lol
-	blend_reagent = SULFUR
-	grind_amount = 10
 	var/H_color = ""
 
 	light_color = LIGHT_COLOR_FLARE

code/game/objects/items/stacks/cable.dm

@@ -37,8 +37,6 @@ var/global/list/datum/stack_recipe/cable_recipes = list ( \
 	attack_verb = list("whips", "lashes", "disciplines", "flogs")
 	toolsounds = list('sound/weapons/cablecuff.ogg')
 	surgerysound = 'sound/items/fixovein.ogg'
-	blend_reagent = COPPER
-	grind_amount = 10
 
 // Noose suicides, now ported from hippie!
 /obj/item/stack/cable_coil/suicide_act(var/mob/living/user)

code/game/objects/items/stacks/sheets/mineral.dm

@@ -89,7 +89,6 @@ var/list/datum/stack_recipe/brick_recipes = list ( \
 	perunit = CC_PER_SHEET_DIAMOND
 	mat_type = MAT_DIAMOND
 	starting_materials = list(MAT_DIAMOND = CC_PER_SHEET_DIAMOND)
-	blend_reagent = DIAMONDDUST
 
 var/list/datum/stack_recipe/diamond_recipes = list ( \
 	new/datum/stack_recipe("diamond floor tile", /obj/item/stack/tile/mineral/diamond, 1, 4, 20), \
@@ -120,7 +119,6 @@ var/list/datum/stack_recipe/diamond_recipes = list ( \
 	perunit = CC_PER_SHEET_URANIUM
 	mat_type = MAT_URANIUM
 	starting_materials = list(MAT_URANIUM = CC_PER_SHEET_URANIUM)
-	blend_reagent = URANIUM
 
 var/list/datum/stack_recipe/uranium_recipes = list ( \
 	new/datum/stack_recipe("uranium floor tile", /obj/item/stack/tile/mineral/uranium, 1, 4, 20), \
@@ -153,7 +151,6 @@ var/list/datum/stack_recipe/uranium_recipes = list ( \
 	perunit = CC_PER_SHEET_PLASMA
 	mat_type = MAT_PLASMA
 	starting_materials = list(MAT_PLASMA = CC_PER_SHEET_PLASMA)
-	blend_reagent = PLASMA
 
 var/list/datum/stack_recipe/plasma_recipes = list ( \
 	new/datum/stack_recipe("plasma floor tile", /obj/item/stack/tile/mineral/plasma, 1, 4, 20), \
@@ -240,7 +237,6 @@ var/list/datum/stack_recipe/plastic_recipes = list ( \
 	perunit = CC_PER_SHEET_GOLD
 	mat_type = MAT_GOLD
 	starting_materials = list(MAT_GOLD = CC_PER_SHEET_GOLD)
-	blend_reagent = GOLD
 
 var/list/datum/stack_recipe/gold_recipes = list ( \
 	new/datum/stack_recipe("golden floor tile", /obj/item/stack/tile/mineral/gold, 1, 4, 20), \
@@ -285,8 +281,6 @@ var/list/datum/stack_recipe/phazon_recipes = list( \
 	perunit = CC_PER_SHEET_PHAZON
 	mat_type = MAT_PHAZON
 	starting_materials = list(MAT_PHAZON = CC_PER_SHEET_PHAZON)
-	blend_reagent = PHAZON
-	grind_amount = 1
 
 /obj/item/stack/sheet/mineral/phazon/New(var/loc, var/amount=null)
 		recipes = phazon_recipes
@@ -309,7 +303,6 @@ var/list/datum/stack_recipe/phazon_recipes = list( \
 	perunit = CC_PER_SHEET_SILVER
 	mat_type = MAT_SILVER
 	starting_materials = list(MAT_SILVER = CC_PER_SHEET_SILVER)
-	blend_reagent = SILVER
 
 var/list/datum/stack_recipe/silver_recipes = list ( \
 	new/datum/stack_recipe("silver floor tile", /obj/item/stack/tile/mineral/silver, 1, 4, 20), \
@@ -343,7 +336,6 @@ var/list/datum/stack_recipe/silver_recipes = list ( \
 	perunit = CC_PER_SHEET_CLOWN
 	mat_type = MAT_CLOWN
 	starting_materials = list(MAT_CLOWN = CC_PER_SHEET_CLOWN)
-	blend_reagent = BANANA
 
 var/list/datum/stack_recipe/clown_recipes = list ( \
 	new/datum/stack_recipe("bananium floor tile", /obj/item/stack/tile/mineral/clown, 1, 40, 20), \

code/game/objects/items/stacks/sheets/sheet_types.dm

@@ -25,7 +25,6 @@
 	melt_temperature = MELTPOINT_STEEL
 	mat_type = MAT_IRON
 	perunit = CC_PER_SHEET_METAL
-	blend_reagent = IRON
 
 /obj/item/stack/sheet/metal/ex_act(severity)
 	switch(severity)
@@ -281,8 +280,6 @@
 	mat_type = MAT_WAX
 	perunit = CC_PER_SHEET_WAX
 	color = COLOR_BEESWAX
-	blend_reagent = WAX
-	grind_amount = 5
 	var/image/glint
 
 /obj/item/stack/sheet/wax/New(loc, amount, var/param_color = null)
@@ -360,7 +357,6 @@ var/list/datum/stack_recipe/charcoal_recipes = list ()
 	origin_tech = Tc_MATERIALS + "=1"
 	w_type = RECYK_WOOD
 	flammable = TRUE
-	blend_reagent = CHARCOAL
 
 /obj/item/stack/sheet/charcoal/New(var/loc, var/amount=null)
 		recipes = charcoal_recipes
@@ -376,7 +372,6 @@ var/list/datum/stack_recipe/charcoal_recipes = list ()
 	//item_state = "bone"
 	w_type = RECYK_BIOLOGICAL
 	flammable = TRUE
-	blend_reagent = BONEMARROW
 
 /obj/item/stack/sheet/brass
 	name = "brass"

code/game/objects/items/stacks/sheets/sheets.dm

@@ -14,7 +14,6 @@
 	inhand_states = list("left_hand" = 'icons/mob/in-hand/left/sheets_n_ores.dmi', "right_hand" = 'icons/mob/in-hand/right/sheets_n_ores.dmi')
 	var/mat_type //What material this is. e.g. MAT_GLASS, MAT_DIAMOND, etc.
 	mech_flags = MECH_SCAN_FAIL
-	grind_amount = 20
 
 /obj/item/stack/sheet/New(var/newloc, var/amount = null)
 	pixel_x = (rand(0,4)-4) * PIXEL_MULTIPLIER

code/game/objects/items/trash.dm

@@ -224,8 +224,6 @@
 	icon_state = "candle4"
 	starting_materials = list(MAT_WAX = (4*CC_PER_SHEET_WAX/5))
 	w_type=RECYK_WAX
-	blend_reagent = WAX
-	grind_amount = 1
 	var/image/wick
 
 /obj/item/trash/candle/New(turf/loc, var/obj/item/candle/source)
@@ -302,8 +300,6 @@ var/list/crushed_cans_cache = list()
 	throwforce = 2
 	throw_range = 8
 	throw_speed = 3
-	blend_reagent = ALUMINUM
-	grind_amount = 10
 
 /obj/item/trash/soda_cans/New(var/loc, var/age, var/icon_state, var/color, var/dir, var/pixel_x, var/pixel_y)
 	name = color
@@ -375,8 +371,6 @@ var/list/crushed_cans_cache = list()
 	icon_state	= "egg"
 	desc = "Pieces of calcium carbonate."
 	inhand_states = list("left_hand" = 'icons/mob/in-hand/left/food.dmi', "right_hand" = 'icons/mob/in-hand/right/food.dmi')
-	blend_reagent = CALCIUMCARBONATE
-	grind_amount = 1
 
 /obj/item/trash/egg/borer
 	icon_state	= "borer egg-growing"

code/game/objects/items/weapons/cigs_lighters.dm

@@ -33,8 +33,6 @@ MATCHBOXES ARE ALSO IN FANCY.DM
 	w_type = RECYK_WOOD
 	flammable = FALSE //matches are LIT and should not catch on fire
 	origin_tech = Tc_MATERIALS + "=1"
-	blend_reagent = PHOSPHORUS
-	grind_amount = 2
 	var/list/unlit_attack_verb = list("prods", "pokes")
 	var/list/lit_attack_verb = list("burns", "singes")
 	attack_verb = list("prods", "pokes")

code/game/objects/items/weapons/power_cells.dm

@@ -16,8 +16,6 @@
 	starting_materials = list(MAT_IRON = 700, MAT_GLASS = 50)
 	w_type = RECYK_ELECTRONIC
 	melt_temperature = MELTPOINT_STEEL // Rugged
-	blend_reagent = LITHIUM
-	grind_amount = 10
 	var/rigged = 0		// true if rigged to explode
 	var/minor_fault = 0 //If not 100% reliable, it will build up faults.
 	var/brute_damage = 0 //Used by cyborgs

code/modules/clothing/head/misc_special.dm

@@ -273,8 +273,7 @@
 	throwforce = 2
 	throw_speed = 3
 	throw_range = 5
-	blend_reagent = MERCURY
-	grind_amount = 10
+
 	wizard_garb = 1
 
 	var/s_tone = 0.0

code/modules/hydroponics/grown_inedible.dm

@@ -5,7 +5,6 @@
 /obj/item/weapon/grown // Grown weapons
 	name = "grown_weapon"
 	icon = 'icons/obj/hydroponics/nettle.dmi'
-	grind_flags = GRIND_TRANSFER|GRIND_NUTRIMENT_TO_REAGENT
 	var/plantname
 	var/potency = 1
 	var/fragrance = null
@@ -139,8 +138,6 @@
 	throw_range = 3
 	attack_verb = list("sears", "heats", "whacks", "steams")
 	fragrance = INCENSE_NOVAFLOWERS
-	blend_reagent = NOVAFLOUR
-	grind_amount = 0
 
 /obj/item/weapon/grown/novaflower/New(atom/loc, custom_plantname)
 	..()
@@ -180,8 +177,6 @@
 	throw_speed = 1
 	throw_range = 3
 	origin_tech = Tc_COMBAT + "=1"
-	blend_reagent = FORMIC_ACID
-	grind_amount = 0
 
 /obj/item/weapon/grown/nettle/pickup(mob/living/carbon/human/user as mob) //todo this
 	if(istype(user))
@@ -229,8 +224,6 @@
 	throw_range = 3
 	origin_tech = Tc_COMBAT + "=3"
 	attack_verb = list("stings", "pricks")
-	blend_reagent = PHENOL
-	grind_amount = 0
 
 /obj/item/weapon/grown/deathnettle/suicide_act(var/mob/living/user)
 	to_chat(viewers(user), "<span class='danger'>[user] is eating some of the [src.name]! It looks like \he's trying to commit suicide.</span>")

code/modules/hydroponics/seeds.dm

@@ -5,8 +5,6 @@
 	icon_state = "seed"
 	flags = FPRINT
 	w_class = W_CLASS_SMALL
-	blend_reagent = BLACKPEPPER
-	grind_amount = 5
 
 	var/seed_type
 	var/datum/seed/seed