diff --git a/code/datums/components/mood.dm b/code/datums/components/mood.dm
index 21a3c37c..dbce0072 100644
--- a/code/datums/components/mood.dm
+++ b/code/datums/components/mood.dm
@@ -307,7 +307,9 @@
 
 /datum/component/mood/proc/HandleThirst(mob/living/L)
 	switch(L.thirst)
-		if(NUTRITION_LEVEL_HUNGRY to INFINITY)
+		if(NUTRITION_LEVEL_WELL_FED to INFINITY)
+			add_event(null, "thirst", /datum/mood_event/quenched)
+		if(NUTRITION_LEVEL_HUNGRY to NUTRITION_LEVEL_WELL_FED)
 			clear_event(null, "thirst")
 		if(NUTRITION_LEVEL_STARVING to NUTRITION_LEVEL_HUNGRY)
 			add_event(null, "thirst", /datum/mood_event/thirsty)
diff --git a/code/datums/mood_events/needs_events.dm b/code/datums/mood_events/needs_events.dm
index d9564d73..a19b9541 100644
--- a/code/datums/mood_events/needs_events.dm
+++ b/code/datums/mood_events/needs_events.dm
@@ -7,25 +7,29 @@
 	description = "<span class='nicegreen'>I'm stuffed!</span>\n"
 	mood_change = 6
 
+/datum/mood_event/quenched
+	description = "<span class='nicegreen'>I'm quenched!</span>\n"
+	mood_change = 6
+
 /datum/mood_event/fed
 	description = "<span class='nicegreen'>I have recently had some food.</span>\n"
 	mood_change = 3
 
 /datum/mood_event/hungry
 	description = "<span class='warning'>I'm getting a bit hungry.</span>\n"
-	mood_change = -8
+	mood_change = -5
 
 /datum/mood_event/starving
 	description = "<span class='boldwarning'>I'm starving!</span>\n"
-	mood_change = -15
+	mood_change = -10
 
 /datum/mood_event/thirsty
 	description = "<span class='warning'>I'm getting a bit thirsty.</span>\n"
-	mood_change = -8
+	mood_change = -5
 
 /datum/mood_event/dehydrated
 	description = "<span class='boldwarning'>I'm dehydrated!</span>\n"
-	mood_change = -15
+	mood_change = -10
 
 //Disgust
 /datum/mood_event/gross
diff --git a/code/modules/mob/mob_defines.dm b/code/modules/mob/mob_defines.dm
index 9c07bffc..7bd7e76f 100644
--- a/code/modules/mob/mob_defines.dm
+++ b/code/modules/mob/mob_defines.dm
@@ -57,7 +57,7 @@
 	var/dizziness = 0//Carbon
 	var/jitteriness = 0//Carbon
 	var/nutrition = NUTRITION_LEVEL_START_MIN // randomised in Initialize
-	var/thirst = NUTRITION_LEVEL_START_MIN // randomised in Initialize
+	var/thirst = 300
 	var/satiety = 0//Carbon
 
 	var/overeatduration = 0		// How long this guy is overeating //Carbon