cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-02-09 07:49:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixes petting mood stacking

Browse Source
This commit is contained in:
ShizCalev
2019-02-02 17:16:15 -05:00
parent 8ebb72e300
commit 39c3ceff7e
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

@@ -267,7 +267,7 @@
return
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>")
SEND_SIGNAL(user, COMSIG_ADD_MOOD_EVENT, name, /datum/mood_event/pet_animal, name)
SEND_SIGNAL(user, COMSIG_ADD_MOOD_EVENT, src, /datum/mood_event/pet_animal, name)
return
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
new /obj/effect/temp_visual/heart(loc)
emote("me", 1, "yaps happily!")
SEND_SIGNAL(M, COMSIG_ADD_MOOD_EVENT, name, /datum/mood_event/pet_animal, name)
SEND_SIGNAL(M, COMSIG_ADD_MOOD_EVENT, src, /datum/mood_event/pet_animal, name)
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)
emote("me", 1, "growls!")