Merge branch 'master' into upstream-merge-31737

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

@@ -285,7 +285,9 @@
 	updateUsrDialog()
 
 /obj/machinery/reagentgrinder/proc/get_allowed_by_obj(obj/item/O)
-	return blend_items[O.type]
+	for (var/i in blend_items)
+		if (istype(O, i))
+			return blend_items[i]
 
 /obj/machinery/reagentgrinder/proc/get_allowed_juice_by_obj(obj/item/reagent_containers/food/snacks/O)
 	for(var/i in juice_items)
@@ -433,7 +435,7 @@
 			if (O.Uses > 0)
 				beaker.reagents.add_reagent("slimejelly",min(20, space))
 			remove_object(O)
-		else if(istype(I, /obj/item/reagent_containers))
+		if(istype(I, /obj/item/reagent_containers))
 			var/obj/item/reagent_containers/O = I
 			var/amount = O.reagents.total_volume
 			O.reagents.trans_to(beaker, amount)

code/modules/reagents/chemistry/reagents/medicine_reagents.dm

@@ -466,7 +466,7 @@
 	metabolization_rate = 0.5 * REAGENTS_METABOLISM
 
 /datum/reagent/medicine/pen_acid/on_mob_life(mob/living/M)
-	M.radiation -= min(M.radiation-RAD_MOB_SAFE, 0)/100
+	M.radiation -= max(M.radiation-RAD_MOB_SAFE, 0)/100
 	M.adjustToxLoss(-2*REM, 0)
 	for(var/datum/reagent/R in M.reagents.reagent_list)
 		if(R != src)

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

@@ -1159,6 +1159,34 @@
 		M.confused = min(M.confused + 2, 5)
 	..()
 
+/datum/reagent/stimulum
+	name = "Stimulum"
+	id = "stimulum"
+	description = "An unstable experimental gas that greatly increases the energy of those that inhale it"
+	reagent_state = GAS
+	metabolization_rate = 1.5 * REAGENTS_METABOLISM
+	color = "E1A116"
+	taste_description = "sourness"
+
+/datum/reagent/stimulum/on_mob_life(mob/living/M) // Has a speedup, and the anti-stun effects of nicotine.
+	M.status_flags |= GOTTAGOFAST
+	M.AdjustStun(-20, 0)
+	M.AdjustKnockdown(-20, 0)
+	M.AdjustUnconscious(-20, 0)
+	M.adjustStaminaLoss(-0.5*REM, 0)
+
+/datum/reagent/browngas
+	name = "Brown gas"
+	id = "brown_gas"
+	description = "A strange brown gas that makes you feel faster"
+	reagent_state = GAS
+	metabolization_rate = REAGENTS_METABOLISM
+	color = "90560B"
+	taste_description = "burning"
+
+/datum/reagent/browngas/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/chemistry/recipes/slime_extracts.dm

@@ -243,7 +243,7 @@
 	if(holder && holder.my_atom)
 		var/turf/open/T = get_turf(holder.my_atom)
 		if(istype(T))
-			T.atmos_spawn_air("freon=50;TEMP=120")
+			T.atmos_spawn_air("nitrogen=50;TEMP=2.7")
 
 /datum/chemical_reaction/slime/slimefireproof
 	name = "Slime Fireproof"