diff --git a/html/changelogs/AutoChangeLog-pr-1855.yml b/html/changelogs/AutoChangeLog-pr-1855.yml new file mode 100644 index 0000000000000..3f0a29b6c7740 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-1855.yml @@ -0,0 +1,5 @@ +author: "KathrinBailey" +delete-after: True +changes: + - sound: "Adds meow1 emote!" + - sound: "Adds mrowl emote!" \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-1857.yml b/html/changelogs/AutoChangeLog-pr-1857.yml new file mode 100644 index 0000000000000..f2762627bf5ce --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-1857.yml @@ -0,0 +1,4 @@ +author: "snailomi" +delete-after: True +changes: + - code_imp: "updated donator_personal.dm" \ No newline at end of file diff --git a/modular_zubbers/code/modules/emotes/emotes.dm b/modular_zubbers/code/modules/emotes/emotes.dm index d75ecd7a987d1..e8a878f855088 100644 --- a/modular_zubbers/code/modules/emotes/emotes.dm +++ b/modular_zubbers/code/modules/emotes/emotes.dm @@ -72,3 +72,19 @@ message_param = "snaps their fingers at %t." emote_type = EMOTE_AUDIBLE | EMOTE_VISIBLE sound = 'sound/misc/fingersnap1.ogg' + +/datum/emote/living/meow_alt + key = "meow1" + key_third_person = "meows" + message = "meows!" + emote_type = EMOTE_AUDIBLE + vary = TRUE + sound = 'modular_zubbers/sound/emotes/meow1.ogg' + +/datum/emote/living/mrowl + key = "mrowl" + key_third_person = "mrowls" + message = "mrowls!" + emote_type = EMOTE_AUDIBLE + vary = TRUE + sound = 'modular_zubbers/sound/emotes/mrowl.ogg' diff --git a/modular_zubbers/code/modules/loadout/categories/~donator/donator_personal.dm b/modular_zubbers/code/modules/loadout/categories/~donator/donator_personal.dm index d1ed013482a94..abe1b8b2f27d1 100644 --- a/modular_zubbers/code/modules/loadout/categories/~donator/donator_personal.dm +++ b/modular_zubbers/code/modules/loadout/categories/~donator/donator_personal.dm @@ -102,7 +102,7 @@ /datum/loadout_item/suit/holographic name = "Holographic Suit V4000" item_path = /obj/item/clothing/suit/misc/holographic - ckeywhitelist = list("blovy") + ckeywhitelist = list("blovy", "snailomi") /datum/loadout_item/suit/skyymed_jacket // donator item for LT3 name = "Expedition Medical Jacket" diff --git a/modular_zubbers/sound/emotes/meow1.ogg b/modular_zubbers/sound/emotes/meow1.ogg new file mode 100644 index 0000000000000..97fa1dc4b936d Binary files /dev/null and b/modular_zubbers/sound/emotes/meow1.ogg differ diff --git a/modular_zubbers/sound/emotes/mrowl.ogg b/modular_zubbers/sound/emotes/mrowl.ogg new file mode 100644 index 0000000000000..d77cd3c101e7b Binary files /dev/null and b/modular_zubbers/sound/emotes/mrowl.ogg differ