Revert "uh what?"

This reverts commit 0efa9eb5e5.

code/modules/reagents/chemistry/reagents/drink_reagents.dm

@@ -329,7 +329,7 @@
 	color = "#101000" // rgb: 16, 16, 0
 	nutriment_factor = 0
 	taste_description = "sweet red tea"
-	glass_icon_state = "teaglass"
+	glass_icon_state = "tea_red"
 	glass_name = "glass of red tea"
 	glass_desc = "A piping hot tea that helps with the digestion of food."
 
@@ -340,6 +340,7 @@
 	M.drowsyness = max(0,M.drowsyness-1)
 	M.jitteriness = max(0,M.jitteriness-3)
 	M.adjust_bodytemperature(23 * TEMPERATURE_DAMAGE_COEFFICIENT, 0, BODYTEMP_NORMAL)
+	..()
 	. = 1
 
 /datum/reagent/consumable/tea/green
@@ -348,7 +349,7 @@
 	color = "#101000" // rgb: 16, 16, 0
 	nutriment_factor = 0
 	taste_description = "tart green tea"
-	glass_icon_state = "teaglass"
+	glass_icon_state = "tea_green"
 	glass_name = "glass of tea"
 	glass_desc = "A calming glass of green tea to help get you through the day."
 
@@ -358,6 +359,7 @@
 	M.drowsyness = max(0,M.drowsyness-1)
 	M.jitteriness = max(0,M.jitteriness-3)
 	M.adjust_bodytemperature(15 * TEMPERATURE_DAMAGE_COEFFICIENT, 0, BODYTEMP_NORMAL)
+	..()
 	. = 1
 
 /datum/reagent/consumable/tea/forest
@@ -367,7 +369,7 @@
 	nutriment_factor = 0
 	quality = DRINK_NICE
 	taste_description = "sweet tea"
-	glass_icon_state = "teaglass"
+	glass_icon_state = "tea_forest"
 	glass_name = "glass of forest tea"
 	glass_desc = "A lovely glass of tea and honey."
 
@@ -379,6 +381,7 @@
 	M.drowsyness = max(0,M.drowsyness-1)
 	M.jitteriness = max(0,M.jitteriness-3)
 	M.adjust_bodytemperature(15 * TEMPERATURE_DAMAGE_COEFFICIENT, 0, BODYTEMP_NORMAL)
+	..()
 	. = 1
 
 /datum/reagent/consumable/tea/mush
@@ -388,7 +391,7 @@
 	nutriment_factor = 0
 	quality = DRINK_NICE
 	taste_description = "fungal infections"
-	glass_icon_state = "teaglass"
+	glass_icon_state = "tea_mush"
 	glass_name = "glass of mush tea"
 	glass_desc = "A cold merky brown tea."
 
@@ -398,6 +401,7 @@
 		M.Dizzy(10)
 	if(prob(10))
 		M.disgust = 0
+	..()
 	. = 1
 
 /datum/reagent/consumable/lemonade

code/modules/reagents/reagent_containers/spray.dm

@@ -19,6 +19,10 @@
 	var/stream_range = 1 //the range of tiles the sprayer will reach when in stream mode.
 	var/stream_amount = 10 //the amount of reagents transfered when in stream mode.
 	var/spray_delay = 3 //The amount of sleep() delay between each chempuff step.
+	/// Last world.time of spray
+	var/last_spray = 0
+	/// Spray cooldown
+	var/spray_cooldown = CLICK_CD_MELEE
 	var/can_fill_from_container = TRUE
 	amount_per_transfer_from_this = 5
 	volume = 250
@@ -27,8 +31,6 @@
 
 /obj/item/reagent_containers/spray/afterattack(atom/A, mob/user)
 	. = ..()
-	if(!user.CheckActionCooldown(CLICK_CD_MELEE))
-		return
 	if(istype(A, /obj/structure/sink) || istype(A, /obj/structure/janitorialcart) || istype(A, /obj/machinery/hydroponics))
 		return
 
@@ -49,7 +51,8 @@
 		to_chat(user, "<span class='warning'>[src] is empty!</span>")
 		return
 
-	spray(A)
+	if(!spray(A))
+		return
 
 	playsound(src.loc, 'sound/effects/spray2.ogg', 50, 1, -6)
 	user.last_action = world.time
@@ -64,10 +67,10 @@
 	if(reagents.has_reagent(/datum/reagent/lube))
 		message_admins("[ADMIN_LOOKUPFLW(user)] fired Space lube from \a [src] at [ADMIN_VERBOSEJMP(T)].")
 		log_game("[key_name(user)] fired Space lube from \a [src] at [AREACOORD(T)].")
-	return
-
 
 /obj/item/reagent_containers/spray/proc/spray(atom/A)
+	if((last_spray + spray_cooldown) > world.time)
+		return
 	var/range = clamp(get_dist(src, A), 1, current_range)
 	var/obj/effect/decal/chempuff/D = new /obj/effect/decal/chempuff(get_turf(src))
 	D.create_reagents(amount_per_transfer_from_this, NONE, NO_REAGENTS_VALUE)
@@ -79,10 +82,11 @@
 		reagents.trans_to(D, amount_per_transfer_from_this, 1/range)
 	D.color = mix_color_from_reagents(D.reagents.reagent_list)
 	var/wait_step = max(round(2+ spray_delay * INVERSE(range)), 2)
-	do_spray(A, wait_step, D, range, puff_reagent_left)
+	last_spray = world.time
+	INVOKE_ASYNC(src, .proc/do_spray, A, wait_step, D, range, puff_reagent_left)
+	return TRUE
 
 /obj/item/reagent_containers/spray/proc/do_spray(atom/A, wait_step, obj/effect/decal/chempuff/D, range, puff_reagent_left)
-	set waitfor = FALSE
 	var/range_left = range
 	for(var/i=0, i<range, i++)
 		range_left--