Merge branch 'master' of https://github.com/SPLURT-Station/S.P.L.U.R.…

…T-Station-13
Kush1Push1 · Jun 21, 2024 · fa74a28 · fa74a28
2 parents 72b95e2 + 0461d1b
commit fa74a28
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 0 deletions.
diff --git a/html/changelogs/archive/2024-06.yml b/html/changelogs/archive/2024-06.yml
@@ -21,3 +21,6 @@
 2024-06-12:
   LonoferaRS:
   - rscadd: new Leopard tail
+2024-06-20:
+  AloraineOkapi:
+  - rscadd: Added the gay emote
diff --git a/modular_splurt/code/modules/mob/living/emotes.dm b/modular_splurt/code/modules/mob/living/emotes.dm
@@ -1519,3 +1519,12 @@
 /datum/emote/living/audio/mrrp/run_emote(mob/user, params)
 	emote_sound = pick('modular_splurt/sound/voice/catpeople/cat_mrrp1.ogg', 'modular_splurt/sound/voice/catpeople/cat_mrrp2.ogg')
 	. = ..()
+
+/datum/emote/living/audio/gay
+	key = "gay"
+	key_third_person = "points at a player"
+	message = "saw something gay."
+	emote_sound = 'modular_splurt/sound/voice/gay-echo.ogg'
+	emote_cooldown = 0.95 SECONDS
+	emote_pitch_variance = FALSE
+
diff --git a/modular_splurt/sound/voice/gay-echo.ogg b/modular_splurt/sound/voice/gay-echo.ogg