cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-29 16:18:01 +01:00
Code Issues Packages Projects Releases Wiki Activity

fixes everyone being able to meow [no gbp] (#87023)

Browse Source 
## About The Pull Request
so turns out `/datum/emote/living/basic/pet/cat/meow` doesn't work the
way I thought
## Changelog
🆑 grungussuss
fix: fixed all mobs being able to meow
/🆑
# Conflicts:
#	code/modules/mob/living/basic/pets/cat/cat.dm
This commit is contained in:
grungussuss
2024-11-11 00:40:23 -08:00
committed by Majkl-J
parent 00047d6e57
commit bf6ddcc06d
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/basic/pets/cat/cat.dm
+6 -3
View File
@@ -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)