Merge pull request #1180 from LonoferaRS/master

divide mrrp into mrrp and mrrp2
SPLURT-Station · Jul 16, 2024 · b41b2b6 · b41b2b6
2 parents ade01df + e252a00
commit b41b2b6
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/modular_splurt/code/modules/mob/living/emotes.dm b/modular_splurt/code/modules/mob/living/emotes.dm
@@ -1486,9 +1486,13 @@
 	emote_cooldown = 0.8 SECONDS // mrrp mrrp meow
 	emote_pitch_variance = FALSE
 
-/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/mrrp2
+	key = "mrrp2"
+	key_third_person = "mrrps"
+	message = "trills like a cat!"
+	emote_sound = 'modular_splurt/sound/voice/catpeople/cat_mrrp2.ogg'
+	emote_cooldown = 0.8 SECONDS
+	emote_pitch_variance = FALSE
 
 /datum/emote/living/audio/gay
 	key = "gay"