Merge remote-tracking branch 'refs/remotes/ParadiseSS13/master' into TooSpoopy

code/modules/reagents/Chemistry-Readme.dm

@@ -98,6 +98,9 @@ About the Holder:
 			Returns the amount of the matching reagent inside the
 			holder. Returns 0 if the reagent is missing.
 
+		overdose_list()
+			Returns a list of all the chemical IDs in the reagent holder that are overdosing
+
 		Important variables:
 
 			total_volume

code/modules/reagents/newchem/newchem_procs.dm

@@ -82,6 +82,14 @@ datum/reagents/proc/metabolize(var/mob/M)
 	addiction_tick++
 	update_total()
 
+/datum/reagents/proc/overdose_list()
+	var/od_chems[0]
+	for(var/datum/reagent/R in reagent_list)
+		if(R.overdosed)
+			od_chems.Add(R.id)
+	return od_chems
+
+
 datum/reagents/proc/reagent_on_tick()
 	for(var/datum/reagent/R in reagent_list)
 		R.on_tick()

code/modules/reagents/reagent_containers/food/snacks.dm

@@ -1989,6 +1989,7 @@
 	New()
 		..()
 		reagents.add_reagent("nutriment", 8)
+		reagents.add_reagent("synaptizine", 5)
 		bitesize = 2
 
 /obj/item/weapon/reagent_containers/food/snacks/spesslaw
@@ -2000,6 +2001,7 @@
 	New()
 		..()
 		reagents.add_reagent("nutriment", 8)
+		reagents.add_reagent("synaptizine", 10)
 		bitesize = 2
 
 /obj/item/weapon/reagent_containers/food/snacks/poppypretzel

code/modules/reagents/reagent_containers/glass/bottle.dm

@@ -275,6 +275,21 @@
 		..()
 		reagents.add_reagent("insulin", 50)
 
+
+/obj/item/weapon/reagent_containers/glass/bottle/reagent/hairgrownium
+	name = "Hair Grow Gel"
+	desc = "A bottle full of a stimulative hair growth formula"
+	New()
+		..()
+		reagents.add_reagent("hairgrownium", 50)
+
+/obj/item/weapon/reagent_containers/glass/bottle/reagent/hair_dye
+	name = "Quantum Hair Dye Bottle"
+	desc = "A bottle of the ever-changing quantum hair dye."
+	New()
+		..()
+		reagents.add_reagent("hair_dye", 50)
+
 ////////////////////Traitor Poison Bottle//////////////////////////////
 
 /obj/item/weapon/reagent_containers/glass/bottle/traitor