cyberpresidentvanellope/fulpstation
1
0
Fork 0
mirror of https://github.com/fulpstation/fulpstation.git synced 2025-12-10 18:11:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

[READY] petting all dogs makes you happy, petting cats now makes you happy #freepugs (#42373)

Browse Source 
fixes #42361
closes #42363

i changed the moodlet instead of where the wuv proc is, so it should pick the initial name of the dog and say something like "pugs are so adorable! i can't stop petting them!" but for all kinds of dogs

the only thing is that this name doesn't change if you pet a pug and then a corgi because they are classified as the same buff, i could make the name of the buff the same as the mob you are petting so you could stack happiness but that would be a balance change, imagine how happy you could get locked in a room with every kind of dog in the game
This commit is contained in:
tralezab
2019-01-18 03:13:04 -08:00
committed by oranges
parent 5c6341456c
commit a89c5aee03
3 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -23,11 +23,14 @@
mood_change = 3 mood_change = 3
timeout = 3000 timeout = 3000
/datum/mood_event/pet_corgi /datum/mood_event/pet_animal
description = "<span class='nicegreen'>Corgis are adorable! I can't stop petting them!</span>\n" description = "<span class='nicegreen'>Animals are adorable! I can't stop petting them!</span>\n"
mood_change = 3 mood_change = 3
timeout = 3000 timeout = 3000
/datum/mood_event/pet_animal/add_effects(name)
description = "<span class='nicegreen'>\The [name] is adorable! I can't stop petting \him!</span>\n"
/datum/mood_event/honk /datum/mood_event/honk
description = "<span class='nicegreen'>Maybe clowns aren't so bad after all. Honk!</span>\n" description = "<span class='nicegreen'>Maybe clowns aren't so bad after all. Honk!</span>\n"
mood_change = 2 mood_change = 2

1
code/modules/mob/living/simple_animal/friendly/cat.dm
View File

@@ -238,6 +238,7 @@
if(M && stat != DEAD) if(M && stat != DEAD)
new /obj/effect/temp_visual/heart(loc) new /obj/effect/temp_visual/heart(loc)
emote("me", 1, "purrs!") emote("me", 1, "purrs!")
SEND_SIGNAL(M, COMSIG_ADD_MOOD_EVENT, name, /datum/mood_event/pet_animal, name)
else else
if(M && stat != DEAD) if(M && stat != DEAD)
emote("me", 1, "hisses!") emote("me", 1, "hisses!")

4
code/modules/mob/living/simple_animal/friendly/dog.dm
View File

@@ -267,7 +267,7 @@
return return
if(!item_to_add) if(!item_to_add)
user.visible_message("[user] pets [src].","<span class='notice'>You rest your hand on [src]'s head for a moment.</span>") user.visible_message("[user] pets [src].","<span class='notice'>You rest your hand on [src]'s head for a moment.</span>")
SEND_SIGNAL(user, COMSIG_ADD_MOOD_EVENT, "pet_corgi", /datum/mood_event/pet_corgi) SEND_SIGNAL(user, COMSIG_ADD_MOOD_EVENT, name, /datum/mood_event/pet_animal, name)
return return
if(user && !user.temporarilyRemoveItemFromInventory(item_to_add)) if(user && !user.temporarilyRemoveItemFromInventory(item_to_add))
@@ -650,7 +650,7 @@
if(M && stat != DEAD) // Added check to see if this mob (the dog) is dead to fix issue 2454 if(M && stat != DEAD) // Added check to see if this mob (the dog) is dead to fix issue 2454
new /obj/effect/temp_visual/heart(loc) new /obj/effect/temp_visual/heart(loc)
emote("me", 1, "yaps happily!") emote("me", 1, "yaps happily!")
SEND_SIGNAL(M, COMSIG_ADD_MOOD_EVENT, "pet_corgi", /datum/mood_event/pet_corgi) SEND_SIGNAL(M, COMSIG_ADD_MOOD_EVENT, name, /datum/mood_event/pet_animal, name)
else else
if(M && stat != DEAD) // Same check here, even though emote checks it as well (poor form to check it only in the help case) if(M && stat != DEAD) // Same check here, even though emote checks it as well (poor form to check it only in the help case)
emote("me", 1, "growls!") emote("me", 1, "growls!")