Merge branch 'master' into plant-adding

code/datums/components/mood.dm

@@ -161,6 +161,7 @@
 	holdmyinsanityeffect = insanity_effect
 
 	HandleNutrition(owner)
+	HandleThirst(owner)
 
 /datum/component/mood/proc/setSanity(amount, minimum=SANITY_INSANE, maximum=SANITY_NEUTRAL)//I'm sure bunging this in here will have no negative repercussions.
 	var/mob/living/master = parent
@@ -289,7 +290,6 @@
 /datum/component/mood/proc/hud_click(datum/source, location, control, params, mob/user)
 	print_mood(user)
 
-
 /datum/component/mood/proc/HandleNutrition(mob/living/L)
 	switch(L.nutrition)
 		if(NUTRITION_LEVEL_FULL to INFINITY)
@@ -305,5 +305,14 @@
 		if(0 to NUTRITION_LEVEL_STARVING)
 			add_event(null, "nutrition", /datum/mood_event/starving)
 
+/datum/component/mood/proc/HandleThirst(mob/living/L)
+	switch(L.thirst)
+		if(NUTRITION_LEVEL_HUNGRY to INFINITY)
+			clear_event(null, "thirst")
+		if(NUTRITION_LEVEL_STARVING to NUTRITION_LEVEL_HUNGRY)
+			add_event(null, "thirst", /datum/mood_event/thirsty)
+		if(0 to NUTRITION_LEVEL_STARVING)
+			add_event(null, "thirst", /datum/mood_event/dehydrated)
+
 #undef MINOR_INSANITY_PEN
 #undef MAJOR_INSANITY_PEN

code/datums/mood_events/needs_events.dm

@@ -19,6 +19,14 @@
 	description = "<span class='boldwarning'>I'm starving!</span>\n"
 	mood_change = -15
 
+/datum/mood_event/thirsty
+	description = "<span class='warning'>I'm getting a bit thirsty.</span>\n"
+	mood_change = -8
+
+/datum/mood_event/dehydrated
+	description = "<span class='boldwarning'>I'm dehydrated!</span>\n"
+	mood_change = -15
+
 //Disgust
 /datum/mood_event/gross
 	description = "<span class='warning'>I saw something gross.</span>\n"

code/datums/traits/good.dm

@@ -295,3 +295,33 @@
 /datum/quirk/slimespeaker/remove()
 	var/mob/living/M = quirk_holder
 	M.remove_language(/datum/language/slime)
+
+/datum/quirk/tajaspeaker
+	name = "Siik-Tajr speaker"
+	desc = "Due to your time spent around Tajaran, you can speak their native tongue!"
+	value = 1
+	gain_text = "<span class='notice'>You feel sensitive to mrowls and your tongue curls comfortably.</span>"
+	lose_text = "<span class='notice'>You forget how to speak Siik'Tajr!</span>"
+
+/datum/quirk/tajaspeaker/add()
+	var/mob/living/M = quirk_holder
+	M.grant_language(/datum/language/tajara)
+
+/datum/quirk/tajaspeaker/remove()
+	var/mob/living/M = quirk_holder
+	M.remove_language(/datum/language/tajara)
+
+/datum/quirk/russianspeaker
+	name = "Neo-Russkiya speaker"
+	desc = "Due to your time spent around space russians, you can speak Neo-Russkiya!"
+	value = 1
+	gain_text = "<span class='notice'>You feel sensitive to the motherland, blyat!</span>"
+	lose_text = "<span class='notice'>You forget how to speak Neo-Russkiya!</span>"
+
+/datum/quirk/russianspeaker/add()
+	var/mob/living/M = quirk_holder
+	M.grant_language(/datum/language/spacerussian)
+
+/datum/quirk/russianspeaker/remove()
+	var/mob/living/M = quirk_holder
+	M.remove_language(/datum/language/spacerussian)

code/datums/traits/neutral.dm

@@ -134,4 +134,11 @@
 	desc = "You like headpats, alot, maybe even a little bit too much. Headpats give you a bigger mood boost and cause arousal"
 	mob_trait = TRAIT_HEADPAT_SLUT
 	value = 0
-	medical_record_text = "Patient seems overly affectionate"
+	medical_record_text = "Patient seems overly affectionate."
+
+/datum/quirk/headpat_hater
+	name = "Distant"
+	desc = "You don't seem to show much care for being touched. Whether it's because you're reserved or due to self control, you won't wag your tail outside of your own control should you possess one."
+	mob_trait = TRAIT_DISTANT
+	value = 0
+	medical_record_text = "Patient cares little with or dislikes being touched."