From bf6ddcc06d87c27ee37c3f8c1b5ccbaa0fe3ed33 Mon Sep 17 00:00:00 2001 From: grungussuss <96586172+Sadboysuss@users.noreply.github.com> Date: Thu, 3 Oct 2024 22:16:39 +0300 Subject: [PATCH] fixes everyone being able to meow [no gbp] (#87023) ## About The Pull Request so turns out `/datum/emote/living/basic/pet/cat/meow` doesn't work the way I thought ## Changelog :cl: grungussuss fix: fixed all mobs being able to meow /:cl: # Conflicts: # code/modules/mob/living/basic/pets/cat/cat.dm --- code/modules/mob/living/basic/pets/cat/cat.dm | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/code/modules/mob/living/basic/pets/cat/cat.dm b/code/modules/mob/living/basic/pets/cat/cat.dm index 154032bbd47..9743c9edbaa 100644 --- a/code/modules/mob/living/basic/pets/cat/cat.dm +++ b/code/modules/mob/living/basic/pets/cat/cat.dm @@ -52,7 +52,11 @@ ///icon state of our cult icon var/cult_icon_state = "cat_cult" -/datum/emote/living/basic/pet/cat/meow +/datum/emote/cat + mob_type_allowed_typecache = /mob/living/basic/pet/cat + mob_type_blacklist_typecache = list() + +/datum/emote/cat/meow key = "petmeow" // BUBBER EDIT CHANGE - 'meow' used by /datum/emote/living/meow key_third_person = null // BUBBER EDIT CHANGE - 'purr' used by /datum/emote/living/purr message = "meows!" @@ -60,7 +64,7 @@ vary = TRUE sound = SFX_CAT_MEOW -/datum/emote/living/basic/pet/cat/purr +/datum/emote/cat/purr key = "petpurr" // BUBBER EDIT CHANGE - 'purr' used by /datum/emote/living/purr key_third_person = null // BUBBER EDIT CHANGE - 'purr' used by /datum/emote/living/purr message = "purrs." @@ -68,7 +72,6 @@ vary = TRUE sound = SFX_CAT_PURR - /mob/living/basic/pet/cat/Initialize(mapload) . = ..() AddElement(/datum/element/cultist_pet, pet_cult_icon_state = cult_icon_state)