cyberpresidentvanellope/GS13
1
0
Fork 0
mirror of https://github.com/KabKebab/GS13.git synced 2026-02-09 15:17:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #808 from DragonTrance/catnip-mood-boost

Browse Source 
Gives Catnip a Mood Boost to felinids
This commit is contained in:
QuoteFox
2021-01-03 05:41:24 +00:00
committed by GitHub
parent 86e0d7fb1b b51b969ee2
commit ff20e5077b
3 changed files with 28 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
code/datums/mood_events/generic_positive_events.dm
View File

@@ -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,10 @@
mood_change = 2
timeout = 15 MINUTES
/datum/mood_event/catnip //Used by datum/reagent/catnip
description = "<span class='nicegreen'>Whatever I ate was a-<i>nya</i>-zing!</span>\n"
mood_change = 8 //Felinids become pacified from catnip, so give a bigger mood boost
//Bloodsucker stuff below.
/datum/mood_event/drankblood
description = "<span class='nicegreen'>I have fed greedly from that which nourishes me.</span>\n"
@@ -158,5 +162,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

4
code/modules/hydroponics/grown/tea_coffee.dm
View File

@@ -55,7 +55,7 @@
icon_grow = "catnip-grow"
growthstages = 3
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
@@ -63,7 +63,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

26
code/modules/reagents/chemistry/reagents/other_reagents.dm
View File

@@ -2196,18 +2196,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")
if(prob(80))
M.adjustArousalLoss(3)
..()
// Adding new mutation toxin stuff from /code/modules/reagent/chemistry/recipes/slime_extracts.dm