Merge pull request #6356 from Citadel-Station-13/upstream-merge-37082

[MIRROR] Disables mood traits when mood is disabled

code/datums/traits/_trait.dm

@@ -8,6 +8,7 @@
 	var/gain_text
 	var/lose_text
 	var/medical_record_text //This text will appear on medical records for the trait. Not yet implemented
+	var/mood_trait = FALSE //if true, this trait affects mood and is unavailable if moodlets are disabled
 	var/mob_trait //if applicable, apply and remove this mob trait
 	var/mob/living/trait_holder
 

code/datums/traits/good.dm

@@ -15,6 +15,7 @@
 	name = "Apathetic"
 	desc = "You just don't care as much as other people. That's nice to have in a place like this, I guess."
 	value = 1
+	mood_trait = TRUE
 
 /datum/trait/apathetic/add()
 	GET_COMPONENT_FROM(mood, /datum/component/mood, trait_holder)
@@ -43,6 +44,7 @@
 	desc = "You sometimes just feel happy, for no reason at all."
 	value = 1
 	mob_trait = TRAIT_JOLLY
+	mood_trait = TRUE
 
 
 

code/datums/traits/negative.dm

@@ -8,6 +8,7 @@
 	gain_text = "<span class='danger'>You start feeling depressed.</span>"
 	lose_text = "<span class='notice'>You no longer feel depressed.</span>" //if only it were that easy!
 	medical_record_text = "Patient has a severe mood disorder causing them to experience sudden moments of sadness."
+	mood_trait = TRUE
 
 
 
@@ -15,6 +16,7 @@
 	name = "Family Heirloom"
 	desc = "You are the current owner of an heirloom. passed down for generations. You have to keep it safe!"
 	value = -1
+	mood_trait = TRUE
 	var/obj/item/heirloom
 	var/where_text