catnip gives felinids a mood boost

TODO: after catnip icon gets merged

code/datums/mood_events/generic_positive_events.dm

@@ -116,7 +116,7 @@
 
 /datum/mood_event/happy_empath/add_effects(var/mob/happytarget)
 	description = "<span class='nicegreen'>[happytarget.name]'s happiness is infectious!</span>\n"
-	
+
 /datum/mood_event/lewd_headpat
 	description = "<span class='nicegreen'>I love headpats so much!</span>\n"
 	mood_change = 3
@@ -127,6 +127,11 @@
 	mood_change = 2
 	timeout = 15 MINUTES
 
+/datum/mood_event/catnip
+	description = "<span class='nicegreen'>Whatever I ate was a-<i>nya</i>-zing!</span>\n"	//hate
+	mood_change = 4
+	//No timeout, handled by reagent
+
 //Bloodsucker stuff below.
 /datum/mood_event/drankblood
 	description = "<span class='nicegreen'>I have fed greedly from that which nourishes me.</span>\n"
@@ -158,5 +163,5 @@
 	mood_change = 5
 
 /datum/mood_event/radiant
-	description = "<span class='nicegreen'>I have seen the light of The Phoenix; I cannot be stopped.</span>\n" 
+	description = "<span class='nicegreen'>I have seen the light of The Phoenix; I cannot be stopped.</span>\n"
 	mood_change = 12

code/modules/hydroponics/grown/tea_coffee.dm

@@ -53,7 +53,7 @@
 	species = "catnip"
 	plantname = "Catnip Plant"
 	product = /obj/item/reagent_containers/food/snacks/grown/tea/catnip
-	reagents_add = list(/datum/reagent/pax/catnip = 0.1, /datum/reagent/consumable/nutriment/vitamin = 0.06, /datum/reagent/toxin/teapowder = 0.3)
+	reagents_add = list(/datum/reagent/catnip = 0.1, /datum/reagent/consumable/nutriment/vitamin = 0.06, /datum/reagent/toxin/teapowder = 0.3)
 	rarity = 50
 
 /obj/item/reagent_containers/food/snacks/grown/tea/catnip
@@ -61,7 +61,7 @@
 	name = "Catnip buds"
 	icon_state = "catnip"
 	filling_color = "#4582B4"
-	grind_results = list(/datum/reagent/pax/catnip = 2, /datum/reagent/water = 1)
+	grind_results = list(/datum/reagent/catnip = 2, /datum/reagent/water = 1)
 
 // Coffee
 /obj/item/seeds/coffee

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

@@ -380,7 +380,7 @@
 					M.IgniteMob()
 				else
 					M.adjustToxLoss(1, 0)
-					M.adjustFireLoss(1, 0)	
+					M.adjustFireLoss(1, 0)
 	if(data >= 60)	// 30 units, 135 seconds
 		if(iscultist(M, FALSE, TRUE) || is_servant_of_ratvar(M, FALSE, TRUE))
 			if(iscultist(M))
@@ -2193,18 +2193,32 @@
 	color = "#BCC740" //RGB: 188, 199, 64
 	taste_description = "plant dust"
 
-/datum/reagent/pax/catnip
+/datum/reagent/catnip
 	name = "catnip"
 	taste_description = "grass"
 	description = "A colorless liquid that makes people more peaceful and felines more happy."
 	metabolization_rate = 1.75 * REAGENTS_METABOLISM
 
-/datum/reagent/pax/catnip/on_mob_life(mob/living/carbon/M)
-	if(prob(20))
-		M.emote("nya")
+/datum/reagent/catnip/on_mob_metabolize(mob/living/carbon/L)
+	..()
+	if(iscatperson(L))
+		SEND_SIGNAL(L, COMSIG_ADD_MOOD_EVENT, "catnip", /datum/mood_event/catnip)
+		ADD_TRAIT(L, TRAIT_PACIFISM, type)	//Just like pax, except it only works for felinids
+	else
+		SEND_SIGNAL(L, COMSIG_ADD_MOOD_EVENT, "catnip", /datum/mood_event/gross_food)
+
+/datum/reagent/catnip/on_mob_end_metabolize(mob/living/carbon/L)
+	..()
+	if(iscatperson(L))
+		SEND_SIGNAL(L, COMSIG_CLEAR_MOOD_EVENT, "catnip")
+		REMOVE_TRAIT(L, TRAIT_PACIFISM, type)
+
+/datum/reagent/catnip/on_mob_life(mob/living/carbon/M)
 	if(prob(20))
 		to_chat(M, "<span class = 'notice'>[pick("Headpats feel nice.", "The feeling of a hairball...", "Backrubs would be nice.", "Whats behind those doors?")]</span>")
-	M.adjustArousalLoss(2)
+		if(iscatperson(M))
+			M.emote("nya")
+			M.adjustArousalLoss(-2)
 	..()
 
 // Adding new mutation toxin stuff from /code/modules/reagent/chemistry/recipes/slime_extracts.dm
@@ -2243,7 +2257,7 @@
 	color = "#5EFF3B" //RGB: 94, 255, 59
 	race = /datum/species/insect
 	mutationtext = "<span class='danger'>The pain subsides. You feel... oddly attracted to light.</span>"
-	
+
 /datum/reagent/mutationtoxin/ipc
 	name = "IPC Mutation Toxin"
 	description = "A robotic toxin." //NANOMACHINES SON.