From d43bc54e458a8ea5482ec6b63828c660f617f495 Mon Sep 17 00:00:00 2001 From: DragonTrance Date: Fri, 1 Jan 2021 14:08:02 -0700 Subject: [PATCH 1/2] catnip gives felinids a mood boost TODO: after catnip icon gets merged --- .../mood_events/generic_positive_events.dm | 9 ++++-- code/modules/hydroponics/grown/tea_coffee.dm | 4 +-- .../chemistry/reagents/other_reagents.dm | 28 ++++++++++++++----- 3 files changed, 30 insertions(+), 11 deletions(-) diff --git a/code/datums/mood_events/generic_positive_events.dm b/code/datums/mood_events/generic_positive_events.dm index 85fe2810..e6aab30c 100644 --- a/code/datums/mood_events/generic_positive_events.dm +++ b/code/datums/mood_events/generic_positive_events.dm @@ -116,7 +116,7 @@ /datum/mood_event/happy_empath/add_effects(var/mob/happytarget) description = "[happytarget.name]'s happiness is infectious!\n" - + /datum/mood_event/lewd_headpat description = "I love headpats so much!\n" mood_change = 3 @@ -127,6 +127,11 @@ 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 + //Bloodsucker stuff below. /datum/mood_event/drankblood description = "I have fed greedly from that which nourishes me.\n" @@ -158,5 +163,5 @@ mood_change = 5 /datum/mood_event/radiant - description = "I have seen the light of The Phoenix; I cannot be stopped.\n" + description = "I have seen the light of The Phoenix; I cannot be stopped.\n" mood_change = 12 diff --git a/code/modules/hydroponics/grown/tea_coffee.dm b/code/modules/hydroponics/grown/tea_coffee.dm index 2c518770..de534271 100644 --- a/code/modules/hydroponics/grown/tea_coffee.dm +++ b/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 diff --git a/code/modules/reagents/chemistry/reagents/other_reagents.dm b/code/modules/reagents/chemistry/reagents/other_reagents.dm index 58edb11e..942158c3 100644 --- a/code/modules/reagents/chemistry/reagents/other_reagents.dm +++ b/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, "[pick("Headpats feel nice.", "The feeling of a hairball...", "Backrubs would be nice.", "Whats behind those doors?")]") - 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 = "The pain subsides. You feel... oddly attracted to light." - + /datum/reagent/mutationtoxin/ipc name = "IPC Mutation Toxin" description = "A robotic toxin." //NANOMACHINES SON. From b51b969ee242d0e99896c9dce29093705c3bef4e Mon Sep 17 00:00:00 2001 From: DragonTrance Date: Fri, 1 Jan 2021 14:16:15 -0700 Subject: [PATCH 2/2] slower metabolism --- code/datums/mood_events/generic_positive_events.dm | 7 +++---- code/modules/reagents/chemistry/reagents/other_reagents.dm | 4 ++-- 2 files changed, 5 insertions(+), 6 deletions(-) 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