From 2db68edb2e2e6eb19c84fddfb976b3084b37aebf Mon Sep 17 00:00:00 2001
From: martcraft <47667221+martcraft@users.noreply.github.com>
Date: Mon, 23 Mar 2026 06:41:12 +0100
Subject: [PATCH] Adds emotes for multiple farm animals (#31733)

* added emotes for basic farm animals

* added new emotes to keybinds

* fixed some stuff
---
 code/datums/keybindings/emote_keybinds.dm     | 12 ++++++++++
 .../simple_animal/friendly/friendly_emote.dm  | 24 +++++++++++++++++++
 2 files changed, 36 insertions(+)

diff --git a/code/datums/keybindings/emote_keybinds.dm b/code/datums/keybindings/emote_keybinds.dm
index fa3fe858ea0..01499a9ca0f 100644
--- a/code/datums/keybindings/emote_keybinds.dm
+++ b/code/datums/keybindings/emote_keybinds.dm
@@ -711,6 +711,18 @@
 	linked_emote = /datum/emote/lizard/whicker
 	name = "Whicker (Lizard)"
 
+/datum/keybinding/emote/living/simple_animal/cow/moo
+	linked_emote = /datum/emote/living/simple_animal/cow/moo
+	name = "Moo (Cow)"
+
+/datum/keybinding/emote/living/simple_animal/cluck
+	linked_emote = /datum/emote/living/simple_animal/chicken/cluck
+	name = "Cluck (Chicken)"
+
+/datum/keybinding/emote/living/simple_animal/pig/oink
+	linked_emote = /datum/emote/living/simple_animal/pig/oink
+	name = "Oink (Pig)"
+
 /datum/keybinding/custom
 	category = KB_CATEGORY_EMOTE_CUSTOM
 	var/default_emote_text = "Insert custom me emote text."
diff --git a/code/modules/mob/living/simple_animal/friendly/friendly_emote.dm b/code/modules/mob/living/simple_animal/friendly/friendly_emote.dm
index 92a6913dd0e..f8c5f7f3401 100644
--- a/code/modules/mob/living/simple_animal/friendly/friendly_emote.dm
+++ b/code/modules/mob/living/simple_animal/friendly/friendly_emote.dm
@@ -100,3 +100,27 @@
 	var/mob/living/simple_animal/pet/cat/C = user
 	C.sit()
 	return TRUE
+
+/datum/emote/living/simple_animal/cow/moo
+	key = "moo"
+	key_third_person = "moos"
+	message = "moos!"
+	sound = "sound/creatures/cow.ogg"
+	emote_type = EMOTE_AUDIBLE
+	mob_type_allowed_typecache = list(/mob/living/basic/cow)
+
+/datum/emote/living/simple_animal/chicken/cluck
+	key = "cluck"
+	key_third_person = "clucks"
+	message = "clucks."
+	sound = "sound/creatures/clucks.ogg"
+	emote_type = EMOTE_AUDIBLE
+	mob_type_allowed_typecache = list(/mob/living/basic/chicken)
+
+/datum/emote/living/simple_animal/pig/oink
+	key = "oink"
+	key_third_person = "oinks"
+	message = "oinks."
+	sound = "sound/creatures/pig.ogg"
+	emote_type = EMOTE_AUDIBLE
+	mob_type_allowed_typecache = list(/mob/living/basic/pig)