conflicts!!!

code/modules/reagents/chemistry/machinery/chem_master.dm

@@ -32,7 +32,7 @@
 	for (var/x in 1 to PILL_STYLE_COUNT)
 		var/list/SL = list()
 		SL["id"] = x
-		SL["htmltag"] = assets.icon_class_name("pill[x]")
+		SL["className"] = assets.icon_class_name("pill[x]")
 		pillStyles += list(SL)
 
 	. = ..()

code/modules/reagents/chemistry/reagents/other_reagents.dm

@@ -71,7 +71,9 @@
 	if(data["blood_DNA"])
 		B.blood_DNA[data["blood_DNA"]] = data["blood_type"]
 		if(!B.blood_DNA["color"])
-			B.blood_DNA["color"] = list(data["bloodcolor"])
+			B.blood_DNA["color"] = data["bloodcolor"]
+		else
+			B.blood_DNA["color"] = BlendRGB(B.blood_DNA["color"], data["bloodcolor"])
 	if(B.reagents)
 		B.reagents.add_reagent(type, reac_volume)
 	B.update_icon()