diff --git a/code/datums/mood_events/generic_positive_events.dm b/code/datums/mood_events/generic_positive_events.dm index e6aab30c..0de5cd26 100644 --- a/code/datums/mood_events/generic_positive_events.dm +++ b/code/datums/mood_events/generic_positive_events.dm @@ -127,10 +127,9 @@ mood_change = 2 timeout = 15 MINUTES -/datum/mood_event/catnip - description = "Whatever I ate was a-nya-zing!\n" //hate - mood_change = 4 - //No timeout, handled by reagent +/datum/mood_event/catnip //Used by datum/reagent/catnip + description = "Whatever I ate was a-nya-zing!\n" + mood_change = 8 //Felinids become pacified from catnip, so give a bigger mood boost //Bloodsucker stuff below. /datum/mood_event/drankblood diff --git a/code/modules/reagents/chemistry/reagents/other_reagents.dm b/code/modules/reagents/chemistry/reagents/other_reagents.dm index 942158c3..a87cd490 100644 --- a/code/modules/reagents/chemistry/reagents/other_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/other_reagents.dm @@ -2197,7 +2197,6 @@ 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/catnip/on_mob_metabolize(mob/living/carbon/L) ..() @@ -2218,7 +2217,8 @@ to_chat(M, "[pick("Headpats feel nice.", "The feeling of a hairball...", "Backrubs would be nice.", "Whats behind those doors?")]") if(iscatperson(M)) M.emote("nya") - M.adjustArousalLoss(-2) + if(prob(80)) + M.adjustArousalLoss(3) ..() // Adding new mutation toxin stuff from /code/modules/reagent/chemistry/recipes/slime_extracts.dm