sorting thirst code + not-water replenishes hydration

code/modules/reagents/chemistry/reagents.dm

@@ -81,6 +81,7 @@ GLOBAL_LIST_INIT(name2reagent, build_name2reagent())
 	current_cycle++
 	if(holder)
 		holder.remove_reagent(type, metabolization_rate * M.metabolism_efficiency) //By default it slowly disappears.
+	M.thirst += hydration
 	return
 
 //called when a mob processes chems when dead.

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

@@ -3,9 +3,6 @@
 /////////////////////////////////////////////////////////////////////////////////////////////////////////
 /////////////////////// DRINKS BELOW, Beer is up there though, along with cola. Cap'n Pete's Cuban Spiced Rum////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////////////////////////////////
-/datum/reagent/water/
-	hydration = 10 * REAGENTS_METABOLISM
-
 /datum/reagent/consumable/orangejuice
 	name = "Orange Juice"
 	description = "Both delicious AND rich in Vitamin C, what more do you need?"

code/modules/reagents/chemistry/reagents/food_reagents.dm

@@ -18,7 +18,6 @@
 /datum/reagent/consumable/on_mob_life(mob/living/carbon/M)
 	current_cycle++
 	M.nutrition += nutriment_factor
-	M.thirst += hydration
 	holder.remove_reagent(type, metabolization_rate)
 
 /datum/reagent/consumable/reaction_mob(mob/living/M, method=TOUCH, reac_volume)

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

@@ -258,12 +258,7 @@
 	glass_name = "glass of water"
 	glass_desc = "The father of all refreshments."
 	shot_glass_icon_state = "shotglassclear"
-	hydration = 5 * REAGENTS_METABOLISM
-
-//hydration
-/datum/reagent/water/on_mob_life(mob/living/carbon/M)
-	M.thirst += hydration
-	..()
+	hydration = 10 * REAGENTS_METABOLISM
 
 /*
  *	Water reaction to turf