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

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

@@ -92,8 +92,15 @@
 
 /obj/machinery/chem_dispenser/Initialize()
 	. = ..()
-	for(var/list/L in list(dispensable_reagents, emagged_reagents, upgrade_reagents, upgrade_reagents2, upgrade_reagents3))
-		L = sortList(L, /proc/cmp_reagents_asc)
+	if(emagged_reagents)
+		emagged_reagents = sortList(emagged_reagents, /proc/cmp_reagents_asc)
+	if(upgrade_reagents)
+		upgrade_reagents = sortList(upgrade_reagents, /proc/cmp_reagents_asc)
+	if(upgrade_reagents2)
+		upgrade_reagents2 = sortList(upgrade_reagents2, /proc/cmp_reagents_asc)
+	if(upgrade_reagents3)
+		upgrade_reagents3 = sortList(upgrade_reagents3, /proc/cmp_reagents_asc)
+	dispensable_reagents = sortList(dispensable_reagents, /proc/cmp_reagents_asc)
 	update_icon()
 
 /obj/machinery/chem_dispenser/Destroy()

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

@@ -434,11 +434,11 @@
 					state = "Gas"
 				var/const/P = 3 //The number of seconds between life ticks
 				var/T = initial(R.metabolization_rate) * (60 / P)
-				var/datum/chemical_reaction/Rcr = get_chemical_reaction(R.type)
+				var/datum/chemical_reaction/Rcr = get_chemical_reaction(R)
 				if(Rcr && Rcr.FermiChem)
 					fermianalyze = TRUE
 					var/pHpeakCache = (Rcr.OptimalpHMin + Rcr.OptimalpHMax)/2
-					var/datum/reagent/targetReagent = beaker.reagents.has_reagent(R.type)
+					var/datum/reagent/targetReagent = beaker.reagents.has_reagent(R)
 
 					if(!targetReagent)
 						CRASH("Tried to find a reagent that doesn't exist in the chem_master!")
@@ -463,9 +463,9 @@
 				var/T = initial(R.metabolization_rate) * (60 / P)
 				if(istype(R, /datum/reagent/fermi))
 					fermianalyze = TRUE
-					var/datum/chemical_reaction/Rcr = get_chemical_reaction(R.type)
+					var/datum/chemical_reaction/Rcr = get_chemical_reaction(R)
 					var/pHpeakCache = (Rcr.OptimalpHMin + Rcr.OptimalpHMax)/2
-					var/datum/reagent/targetReagent = reagents.has_reagent(R.type)
+					var/datum/reagent/targetReagent = reagents.has_reagent(R)
 
 					if(!targetReagent)
 						CRASH("Tried to find a reagent that doesn't exist in the chem_master!")
@@ -483,7 +483,7 @@
 
 
 /obj/machinery/chem_master/proc/end_fermi_reaction()//Ends any reactions upon moving.
-	if(beaker.reagents.fermiIsReacting)
+	if(beaker && beaker.reagents.fermiIsReacting)
 		beaker.reagents.fermiEnd()
 
 /obj/machinery/chem_master/proc/isgoodnumber(num)

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

@@ -60,7 +60,7 @@
 		B = new(T)
 	if(data["blood_DNA"])
 		B.blood_DNA[data["blood_DNA"]] = data["blood_type"]
-	if(!B.reagents)
+	if(B.reagents)
 		B.reagents.add_reagent(type, reac_volume)
 	B.update_icon()
 

code/modules/reagents/chemistry/recipes/others.dm

@@ -709,3 +709,41 @@
 	id = /datum/reagent/carpet/royalblue
 	results = list(/datum/reagent/carpet/royalblue = 2)
 	required_reagents = list(/datum/reagent/carpet = 1, /datum/reagent/medicine/clonexadone = 1)
+
+//////////////////////////////////// Glitter ///////////////////////////////////////////
+
+/datum/chemical_reaction/white_glitter/blue
+	name = "white glitter from blue"
+	id = "white_glitter_blue"
+	results = list(/datum/reagent/glitter/white = 2)
+	required_reagents = list(/datum/reagent/glitter/blue = 1, /datum/reagent/colorful_reagent/crayonpowder/white = 1)
+
+/datum/chemical_reaction/white_glitter/pink
+	name = "white glitter from pink"
+	id = "white_glitter_pink"
+	results = list(/datum/reagent/glitter/white = 2)
+	required_reagents = list(/datum/reagent/glitter/pink = 1, /datum/reagent/colorful_reagent/crayonpowder/white = 1)
+
+/datum/chemical_reaction/pink_glitter/blue
+	name = "pink glitter from blue"
+	id = "pink_glitter_blue"
+	results = list(/datum/reagent/glitter/pink = 2)
+	required_reagents = list(/datum/reagent/glitter/blue = 1, /datum/reagent/colorful_reagent/crayonpowder/red = 1)
+
+/datum/chemical_reaction/pink_glitter/white
+	name = "pink glitter from white"
+	id = "pink_glitter_white"
+	results = list(/datum/reagent/glitter/pink = 2)
+	required_reagents = list(/datum/reagent/glitter/white = 1, /datum/reagent/colorful_reagent/crayonpowder/red = 1)
+
+/datum/chemical_reaction/blue_glitter/pink
+	name = "blue glitter from pink"
+	id = "blue_glitter_pink"
+	results = list(/datum/reagent/glitter/blue = 2)
+	required_reagents = list(/datum/reagent/glitter/pink = 1, /datum/reagent/colorful_reagent/crayonpowder/blue = 1)
+
+/datum/chemical_reaction/blue_glitter/white
+	name = "blue glitter from white"
+	id = "blue_glitter_white"
+	results = list(/datum/reagent/glitter/blue  = 2)
+	required_reagents = list(/datum/reagent/glitter/white = 1, /datum/reagent/colorful_reagent/crayonpowder/blue = 1)