Merge branch 'Bubberstation:master' into master

SPLURT-Station · Jul 30, 2024 · 9373457 · 9373457
2 parents 4438c7d + bd7a837
commit 9373457
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 1 deletion.
diff --git a/html/changelogs/AutoChangeLog-pr-1855.yml 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!"
diff --git a/html/changelogs/AutoChangeLog-pr-1857.yml b/html/changelogs/AutoChangeLog-pr-1857.yml
@@ -0,0 +1,4 @@
+author: "snailomi"
+delete-after: True
+changes:
+  - code_imp: "updated donator_personal.dm"
diff --git 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
@@ -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
diff --git a/modular_zubbers/sound/emotes/mrowl.ogg b/modular_zubbers/sound/emotes/mrowl.ogg