Merge branch 'master' into reageaaaannntttttts

Conflicts:
	code/modules/reagents/Chemistry-Reagents.dm

+ apply cleaner patch manually

code/modules/reagents/newchem/medicine.dm

@@ -825,6 +825,35 @@ datum/reagent/stimulants/reagent_deleted(var/mob/living/M as mob)
 	..()
 	return
 
+/datum/reagent/medicine/stimulative_agent
+	name = "Stimulative Agent"
+	id = "stimulative_agent"
+	description = "An illegal compound that dramatically enhances the body's performance and healing capabilities."
+	color = "#C8A5DC"
+	metabolization_rate = 0.5 * REAGENTS_METABOLISM
+	overdose_threshold = 60
+
+/datum/reagent/medicine/stimulative_agent/on_mob_life(mob/living/M)
+	M.status_flags |= GOTTAGOFAST
+	if(M.health < 50 && M.health > 0)
+		M.adjustOxyLoss(-1*REM)
+		M.adjustToxLoss(-1*REM)
+		M.adjustBruteLoss(-1*REM)
+		M.adjustFireLoss(-1*REM)
+	M.AdjustParalysis(-3)
+	M.AdjustStunned(-3)
+	M.AdjustWeakened(-3)
+	M.adjustStaminaLoss(-5*REM)
+	..()
+
+/datum/reagent/medicine/stimulative_agent/overdose_process(mob/living/M)
+	if(prob(33))
+		M.adjustStaminaLoss(2.5*REM)
+		M.adjustToxLoss(1*REM)
+		M.losebreath++
+	..()
+	return
+
 datum/reagent/insulin
 	name = "Insulin"
 	id = "insulin"

code/modules/reagents/newchem/newchem_procs.dm

@@ -96,7 +96,7 @@ datum/reagents/proc/check_ignoreslow(var/mob/M)
 
 datum/reagents/proc/check_gofast(var/mob/M)
 	if(istype(M, /mob))
-		if(M.reagents.has_reagent("unholywater")||M.reagents.has_reagent("nuka_cola"))
+		if(M.reagents.has_reagent("unholywater")||M.reagents.has_reagent("nuka_cola")||M.reagents.has_reagent("stimulative_agent"))
 			return 1
 		else
 			M.status_flags &= ~GOTTAGOFAST

code/modules/reagents/oldchem/reagents/reagents_water.dm

@@ -110,6 +110,8 @@
 	color = "#61C2C2"
 
 /datum/reagent/space_cleaner/reaction_obj(var/obj/O, var/volume)
+	if(O)
+		O.color = initial(O.color)
 	if(istype(O,/obj/effect/decal/cleanable))
 		qdel(O)
 	else
@@ -118,6 +120,8 @@
 
 /datum/reagent/space_cleaner/reaction_turf(var/turf/T, var/volume)
 	if(volume >= 1)
+		if(T)
+			T.color = initial(T.color)
 		T.overlays.Cut()
 		T.clean_blood()
 		for(var/obj/effect/decal/cleanable/C in src)
@@ -125,10 +129,9 @@
 
 		for(var/mob/living/carbon/slime/M in T)
 			M.adjustToxLoss(rand(5,10))
-
-/datum/reagent/space_cleaner/reaction_turf(var/turf/simulated/S, var/volume)
-	if(volume >= 1)
-		S.dirt = 0
+		if(istype(T,/turf/simulated))
+			var/turf/simulated/S = T
+			S.dirt = 0
 
 /datum/reagent/space_cleaner/reaction_mob(var/mob/M, var/method=TOUCH, var/volume)
 	if(iscarbon(M))