cyberpresidentvanellope/Hyper-Station-13
1
0
Fork 0
mirror of https://github.com/quotefox/Hyper-Station-13.git synced 2026-07-12 16:22:42 +01: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
code/modules/reagents/chemistry/reagents/other_reagents.dm
+20 -6
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