Merge branch 'master' into upstream-merge-32183

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

@@ -344,11 +344,16 @@
 		return null
 	else
 		var/md5 = md5(AM.name)
-#if DM_VERSION > 511
-#warn Refactor the loop in /obj/machinery/chem_master/adjust_item_drop_location() to make use of 512's list-like access to characters in a string
-#endif
 		for (var/i in 1 to 32)
+			#if DM_VERSION >= 513
+			#warning 512 is definitely stable now, remove the old code
+			#endif
+			
+			#if DM_VERSION >= 512
+			. += hex2num(md5[i])
+			#else
 			. += hex2num(copytext(md5,i,i+1))
+			#endif
 		. = . % 9
 		AM.pixel_x = ((.%3)*6)
 		AM.pixel_y = -8 + (round( . / 3)*8)

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

@@ -1174,6 +1174,8 @@
 	M.AdjustKnockdown(-20, 0)
 	M.AdjustUnconscious(-20, 0)
 	M.adjustStaminaLoss(-0.5*REM, 0)
+	..()
+	. = TRUE //Update status effects.
 
 /datum/reagent/nitryl
 	name = "Nitryl"
@@ -1184,8 +1186,9 @@
 	color = "90560B"
 	taste_description = "burning"
 
-/datum/reagent/browngas/on_mob_life(mob/living/M) //Has just a speedup
+/datum/reagent/nitryl/on_mob_life(mob/living/M) //Has just a speedup
 	M.status_flags |= GOTTAGOFAST
+	..()
 
 /////////////////////////Coloured Crayon Powder////////////////////////////
 //For colouring in /proc/mix_color_from_reagents

code/modules/reagents/reagent_containers/syringes.dm

@@ -1,6 +1,3 @@
-#define SYRINGE_DRAW 0
-#define SYRINGE_INJECT 1
-
 /obj/item/reagent_containers/syringe
 	name = "syringe"
 	desc = "A syringe that can hold up to 15 units."