Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit229

code/modules/reagents/reagent_containers/dropper.dm

@@ -64,12 +64,7 @@
 
 			reagents.reaction(target, TOUCH, fraction)
 			var/mob/M = target
-			var/R
-			if(reagents)
-				for(var/datum/reagent/A in src.reagents.reagent_list)
-					R += A.type + " ("
-					R += num2text(A.volume) + "),"
-			log_combat(user, M, "squirted", R)
+			log_combat(user, M, "squirted", reagents.log_list())
 
 		trans = src.reagents.trans_to(target, amount_per_transfer_from_this)
 		to_chat(user, "<span class='notice'>You transfer [trans] unit\s of the solution.</span>")

code/modules/reagents/reagent_containers/glass.dm

@@ -181,7 +181,7 @@
 /obj/item/reagent_containers/glass/beaker/flask/spouty
 	name = "flask with spout"
 	desc = "A flask with a spout! It can hold up to 120 units. Unable to withstand reagents of an extreme pH."
-	custom_materials = list(MAT_GLASS = 2500)
+	custom_materials = list(/datum/material/glass = 2500)
 	icon_state = "flaskspouty"
 	possible_transfer_amounts = list(1,2,3,4,5,10,15,20,25,30,50,100,120)
 	volume = 120