diff --git a/modular_ss220/_defines220/code/emote.dm b/modular_ss220/_defines220/code/emote.dm
index 57a98f59285a..98a182f8fd75 100644
--- a/modular_ss220/_defines220/code/emote.dm
+++ b/modular_ss220/_defines220/code/emote.dm
@@ -44,6 +44,9 @@
 #define EMOTE_TWITCHS 				"Дёргаться"
 #define EMOTE_WHIMPER 				"Хныкать"
 #define EMOTE_WSMILE 				"Сдержанно улыбнуться"
+#define EMOTE_EXERCISE 				"Упражнения"
+#define EMOTE_SQUAT 				"Приседания"
+#define EMOTE_PUSHUP 				"Отжимания"
 
 /// Human Emotes
 #define EMOTE_HUMAN_AIRGUITAR 		"Воображаемая гитара"
@@ -83,7 +86,9 @@
 #define EMOTE_HUMAN_AFLAP 			"Махать крыльями агрессивно"
 #define EMOTE_HUMAN_FLUTTER 		"Трепетать крыльями"
 #define EMOTE_HUMAN_QUILL 			"Шуршать перьями"
-#define EMOTE_HUMAN_WARBLE 			"Трель"
+#define EMOTE_HUMAN_WARBLE 			"Трелить"
+#define EMOTE_HUMAN_CROAK 			"Квакать"
+#define EMOTE_HUMAN_CROAK_ANGER 	"Гневно квакать"
 #define EMOTE_HUMAN_CLACK 			"Трещать"
 #define EMOTE_HUMAN_CLICK 			"Щёлкать"
 #define EMOTE_HUMAN_DRONE 			"Гудеть"
diff --git a/modular_ss220/emotes/_emotes.dme b/modular_ss220/emotes/_emotes.dme
index 01e9bf3a2a68..8337a6c7c64a 100644
--- a/modular_ss220/emotes/_emotes.dme
+++ b/modular_ss220/emotes/_emotes.dme
@@ -6,8 +6,7 @@
 #include "code/exercise/exercise_animation.dm"
 #include "code/exercise/exercise_datum.dm"
 #include "code/exercise/exercise_emotes.dm"
-#include "code/emote_keybindings.dm"
-#include "code/emote_panel_names.dm"
+#include "code/emote_names.dm"
 #include "code/emote_panel.dm"
 #include "code/emote.dm"
 #include "code/emote_verbs.dm"
diff --git a/modular_ss220/emotes/audio/skrell/anger_1.ogg b/modular_ss220/emotes/audio/skrell/anger_1.ogg
new file mode 100644
index 000000000000..41f436d3540a
Binary files /dev/null and b/modular_ss220/emotes/audio/skrell/anger_1.ogg differ
diff --git a/modular_ss220/emotes/audio/skrell/anger_2.ogg b/modular_ss220/emotes/audio/skrell/anger_2.ogg
new file mode 100644
index 000000000000..59b7d71d05c0
Binary files /dev/null and b/modular_ss220/emotes/audio/skrell/anger_2.ogg differ
diff --git a/modular_ss220/emotes/audio/skrell/credit.txt b/modular_ss220/emotes/audio/skrell/credit.txt
new file mode 100644
index 000000000000..b99f5b367010
--- /dev/null
+++ b/modular_ss220/emotes/audio/skrell/credit.txt
@@ -0,0 +1,14 @@
+anger_1.ogg
+CC4-BY-NC https://freesound.org/people/BiancaBothaPure/sounds/365671/
+
+anger_2.ogg
+CC0 https://freesound.org/people/BaDoink/sounds/522731/
+
+warble_1.ogg
+CC4-BY https://freesound.org/people/JPBILLINGSLEYJR/sounds/469364/
+
+warble_2.ogg
+CC0 https://freesound.org/people/D.jones/sounds/527846/
+
+croak_1.ogg, croak_2.ogg, croak_3.ogg
+CC4-BY https://freesound.org/people/juskiddink/sounds/99644/
diff --git a/modular_ss220/emotes/audio/skrell/croak_1.ogg b/modular_ss220/emotes/audio/skrell/croak_1.ogg
new file mode 100644
index 000000000000..a680fc29dbc8
Binary files /dev/null and b/modular_ss220/emotes/audio/skrell/croak_1.ogg differ
diff --git a/modular_ss220/emotes/audio/skrell/croak_2.ogg b/modular_ss220/emotes/audio/skrell/croak_2.ogg
new file mode 100644
index 000000000000..2fbeb76a090f
Binary files /dev/null and b/modular_ss220/emotes/audio/skrell/croak_2.ogg differ
diff --git a/modular_ss220/emotes/audio/skrell/croak_3.ogg b/modular_ss220/emotes/audio/skrell/croak_3.ogg
new file mode 100644
index 000000000000..f4a5966382d9
Binary files /dev/null and b/modular_ss220/emotes/audio/skrell/croak_3.ogg differ
diff --git a/modular_ss220/emotes/audio/skrell/warble_1.ogg b/modular_ss220/emotes/audio/skrell/warble_1.ogg
new file mode 100644
index 000000000000..120353048579
Binary files /dev/null and b/modular_ss220/emotes/audio/skrell/warble_1.ogg differ
diff --git a/modular_ss220/emotes/audio/skrell/warble_2.ogg b/modular_ss220/emotes/audio/skrell/warble_2.ogg
new file mode 100644
index 000000000000..3dc79ab0c454
Binary files /dev/null and b/modular_ss220/emotes/audio/skrell/warble_2.ogg differ
diff --git a/modular_ss220/emotes/code/emote.dm b/modular_ss220/emotes/code/emote.dm
index a25cadcefecd..244d048f0145 100644
--- a/modular_ss220/emotes/code/emote.dm
+++ b/modular_ss220/emotes/code/emote.dm
@@ -357,3 +357,38 @@
 		return FALSE
 
 	return TRUE
+
+/datum/emote/living/carbon/human/warble/get_sound(mob/living/user)
+	return pick(
+		'modular_ss220/emotes/audio/skrell/warble_1.ogg',
+		'modular_ss220/emotes/audio/skrell/warble_2.ogg')
+
+/datum/emote/living/carbon/human/croak
+	key = "croak"
+	key_third_person = "croak"
+	message = "квакает."
+	message_param = "квакает на %t."
+	emote_type = EMOTE_AUDIBLE
+	age_based = TRUE
+	species_type_whitelist_typecache = list(/datum/species/skrell)
+
+/datum/emote/living/carbon/human/croak/get_sound(mob/living/user)
+	return pick(
+		'modular_ss220/emotes/audio/skrell/croak_1.ogg',
+		'modular_ss220/emotes/audio/skrell/croak_2.ogg',
+		'modular_ss220/emotes/audio/skrell/croak_3.ogg')
+
+/datum/emote/living/carbon/human/croak/anger
+	key = "croak_anger"
+	key_third_person = "croak_anger"
+	message = "гневно квакает!"
+	message_param = "гневно квакает на %t."
+	emote_type = EMOTE_AUDIBLE
+	age_based = TRUE
+	volume = 80
+	species_type_whitelist_typecache = list(/datum/species/skrell)
+
+/datum/emote/living/carbon/human/croak/anger/get_sound(mob/living/user)
+	return pick(
+		'modular_ss220/emotes/audio/skrell/anger_1.ogg',
+		'modular_ss220/emotes/audio/skrell/anger_2.ogg')
diff --git a/modular_ss220/emotes/code/emote_keybindings.dm b/modular_ss220/emotes/code/emote_keybindings.dm
deleted file mode 100644
index ff7ae69aa466..000000000000
--- a/modular_ss220/emotes/code/emote_keybindings.dm
+++ /dev/null
@@ -1,63 +0,0 @@
-/datum/keybinding/emote/carbon/human/hem
-	linked_emote = /datum/emote/living/carbon/human/hem
-	name = EMOTE_HUMAN_HEM
-
-/datum/keybinding/emote/carbon/human/scratch
-	linked_emote = /datum/emote/living/carbon/human/scratch
-	name = EMOTE_HUMAN_SCRATCH
-
-/datum/keybinding/emote/carbon/human/whistle
-	linked_emote = /datum/emote/living/carbon/human/whistle
-	name = EMOTE_HUMAN_WHISTLE
-
-/datum/keybinding/emote/carbon/human/snuffle
-	linked_emote = /datum/emote/living/carbon/human/snuffle
-	name = EMOTE_HUMAN_SNUFFLE
-
-/datum/keybinding/emote/carbon/human/roar
-	linked_emote = /datum/emote/living/carbon/human/roar
-	name = EMOTE_HUMAN_ROAR
-
-/datum/keybinding/emote/carbon/human/rumble
-	linked_emote = /datum/emote/living/carbon/human/rumble
-	name = EMOTE_HUMAN_RUMBLE
-
-/datum/keybinding/emote/carbon/human/threat
-	linked_emote = /datum/emote/living/carbon/human/threat
-	name = EMOTE_HUMAN_THREAT
-
-/datum/keybinding/emote/carbon/human/purr
-	linked_emote = /datum/emote/living/carbon/human/purr
-	name = EMOTE_HUMAN_PURR
-
-/datum/keybinding/emote/carbon/human/purrl
-	linked_emote = /datum/emote/living/carbon/human/purrl
-	name = EMOTE_HUMAN_PURRL
-
-/datum/keybinding/emote/carbon/human/waves
-	linked_emote = /datum/emote/living/carbon/human/waves_k
-	name = EMOTE_HUMAN_WAVES_K
-
-/datum/keybinding/emote/carbon/human/wiggles
-	linked_emote = /datum/emote/living/carbon/human/wiggles
-	name = EMOTE_HUMAN_WIGGLES
-
-/datum/keybinding/emote/carbon/human/whips
-	linked_emote = /datum/emote/living/carbon/human/whip/whips
-	name = EMOTE_HUMAN_WHIPS
-
-/datum/keybinding/emote/carbon/human/whip
-	linked_emote = /datum/emote/living/carbon/human/whip
-	name = EMOTE_HUMAN_WHIP
-
-/datum/keybinding/emote/exercise
-	linked_emote = /datum/emote/exercise
-	name = "Упражнения"
-
-/datum/keybinding/emote/exercise/squat
-	linked_emote = /datum/emote/exercise/squat
-	name = "Приседания"
-
-/datum/keybinding/emote/exercise/pushup
-	linked_emote = /datum/emote/exercise/pushup
-	name = "Отжимания"
diff --git a/modular_ss220/emotes/code/emote_panel_names.dm b/modular_ss220/emotes/code/emote_names.dm
similarity index 79%
rename from modular_ss220/emotes/code/emote_panel_names.dm
rename to modular_ss220/emotes/code/emote_names.dm
index a16fc4ac0354..1350cda26f5a 100644
--- a/modular_ss220/emotes/code/emote_panel_names.dm
+++ b/modular_ss220/emotes/code/emote_names.dm
@@ -148,25 +148,25 @@
 
 /// Emote Brain
 
-/datum/emote/living/carbon/brain/alarm
+/datum/emote/living/brain/alarm
 	name = EMOTE_BRAIN_ALARM
 
-/datum/emote/living/carbon/brain/alert
+/datum/emote/living/brain/alert
 	name = EMOTE_BRAIN_ALERT
 
-/datum/emote/living/carbon/brain/flash
+/datum/emote/living/brain/flash
 	name = EMOTE_BRAIN_FLASH
 
-/datum/emote/living/carbon/brain/notice
+/datum/emote/living/brain/notice
 	name = EMOTE_BRAIN_NOTICE
 
-/datum/emote/living/carbon/brain/whistle
+/datum/emote/living/brain/whistle
 	name = EMOTE_BRAIN_WHISTLE
 
-/datum/emote/living/carbon/brain/beep
+/datum/emote/living/brain/beep
 	name = EMOTE_BRAIN_BEEP
 
-/datum/emote/living/carbon/brain/boop
+/datum/emote/living/brain/boop
 	name = EMOTE_BRAIN_BOOP
 
 // Emote Carbon
@@ -268,18 +268,12 @@
 /datum/emote/living/carbon/sign/signal
 	name = EMOTE_HUMAN_SIGNAL
 
-/datum/emote/living/carbon/human/flap
-	name = EMOTE_HUMAN_FLAP
-
-/datum/emote/living/carbon/human/flutter
-	name = EMOTE_HUMAN_FLUTTER
-
-/datum/emote/living/carbon/human/flap/aflap
-	name = EMOTE_HUMAN_AFLAP
-
 /datum/emote/living/carbon/human/gasp
 	name = EMOTE_HUMAN_GASP
 
+/datum/emote/living/carbon/human/shake
+	name = EMOTE_HUMAN_SHAKE
+
 /datum/emote/living/carbon/human/grumble
 	name = EMOTE_HUMAN_GRUMBLE
 
@@ -340,9 +334,21 @@
 /datum/emote/living/carbon/human/shrug
 	name = EMOTE_HUMAN_SHRUG
 
+/datum/emote/living/carbon/human/sniff
+	name = EMOTE_HUMAN_SNIFF
+
 /datum/emote/living/carbon/human/nod
 	name = EMOTE_HUMAN_NOD
 
+/datum/emote/living/carbon/human/drask_talk/drone
+	name = EMOTE_HUMAN_DRONE
+
+/datum/emote/living/carbon/human/drask_talk/hum
+	name = EMOTE_HUMAN_HUM
+
+/datum/emote/living/carbon/human/drask_talk/rumble
+	name = EMOTE_HUMAN_RUMBLE
+
 /datum/emote/living/carbon/human/monkey/gnarl
 	name = EMOTE_HUMAN_GNARL
 
@@ -352,6 +358,9 @@
 /datum/emote/living/carbon/human/monkey/tail
 	name = EMOTE_HUMAN_TAIL
 
+/datum/emote/living/carbon/human/monkey/scratch
+	name = EMOTE_HUMAN_SCRATCH
+
 /// Emote Silicon
 
 /datum/emote/living/silicon/scream
@@ -386,12 +395,48 @@
 
 /// Species specific
 
+/datum/emote/living/carbon/human/hiss
+	name = EMOTE_HUMAN_HISS
+
+/datum/emote/living/carbon/human/creak
+	name = EMOTE_HUMAN_CREAK
+
+/datum/emote/living/carbon/human/quill
+	name = EMOTE_HUMAN_QUILL
+
+/datum/emote/living/carbon/human/warble
+	name = EMOTE_HUMAN_WARBLE
+
+/datum/emote/living/carbon/human/croak
+	name = EMOTE_HUMAN_CROAK
+
+/datum/emote/living/carbon/human/croak/anger
+	name = EMOTE_HUMAN_CROAK_ANGER
+
+/datum/emote/living/carbon/human/clack
+	name = EMOTE_HUMAN_CLACK
+
+/datum/emote/living/carbon/human/clack/click
+	name = EMOTE_HUMAN_CLICK
+
+/datum/emote/living/carbon/human/flap
+	name = EMOTE_HUMAN_FLAP
+
+/datum/emote/living/carbon/human/flutter
+	name = EMOTE_HUMAN_FLUTTER
+
+/datum/emote/living/carbon/human/flap/aflap
+	name = EMOTE_HUMAN_AFLAP
+
 /datum/emote/living/carbon/human/howl
 	name = EMOTE_HUMAN_HOWL
 
 /datum/emote/living/carbon/human/growl
 	name = EMOTE_HUMAN_GROWL
 
+/datum/emote/living/carbon/human/rattle
+	name = EMOTE_HUMAN_RATTLE
+
 /datum/emote/living/carbon/human/slime/squish
 	name = EMOTE_HUMAN_SQUISH
 
@@ -401,6 +446,41 @@
 /datum/emote/living/carbon/human/slime/pop
 	name = EMOTE_HUMAN_POP
 
+/// Emote Animal
+
+/datum/emote/living/simple_animal/gorilla/ooga
+	name = EMOTE_ANIMAL_OOGA
+
+/datum/emote/living/simple_animal/diona_chirp
+	name = EMOTE_ANIMAL_CHIRP
+
+/datum/emote/living/simple_animal/gorilla_ooga
+	name = EMOTE_ANIMAL_OOGA
+
+/datum/emote/living/simple_animal/pet/dog/bark
+	name = EMOTE_ANIMAL_BARK
+
+/datum/emote/living/simple_animal/pet/dog/yelp
+	name = EMOTE_ANIMAL_YELP
+
+/datum/emote/living/simple_animal/pet/dog/growl
+	name = EMOTE_ANIMAL_GROWL
+
+/datum/emote/living/simple_animal/mouse/squeak
+	name = EMOTE_ANIMAL_SQUEAK
+
+/datum/emote/living/simple_animal/pet/cat/meow
+	name = EMOTE_ANIMAL_MEOW
+
+/datum/emote/living/simple_animal/pet/cat/hiss
+	name = EMOTE_ANIMAL_HISS
+
+/datum/emote/living/simple_animal/pet/cat/purr
+	name = EMOTE_ANIMAL_PURR
+
+/datum/emote/living/simple_animal/pet/cat/sit
+	name = EMOTE_ANIMAL_SIT
+
 /// New Emotes
 
 /datum/emote/living/carbon/human/whistle
diff --git a/modular_ss220/emotes/code/emote_verbs.dm b/modular_ss220/emotes/code/emote_verbs.dm
index 01b191d5435a..6ee5fbda8377 100644
--- a/modular_ss220/emotes/code/emote_verbs.dm
+++ b/modular_ss220/emotes/code/emote_verbs.dm
@@ -122,17 +122,17 @@
 
 /// Exercise Emotes ///
 /mob/living/carbon/human/verb/emote_exercise()
-	set name = "⚝ Упражнения"
+	set name = "⚝ " + EMOTE_EXERCISE
 	set category = "Эмоции"
 	emote("exercise", intentional = TRUE)
 
 /mob/living/carbon/human/verb/emote_pushup()
-	set name = "⚝ Отжимания"
+	set name = "⚝ " + EMOTE_PUSHUP
 	set category = "Эмоции"
 	emote("pushup", intentional = TRUE)
 
 /mob/living/carbon/human/verb/emote_squat()
-	set name = "⚝ Приседания"
+	set name = "⚝ " + EMOTE_SQUAT
 	set category = "Эмоции"
 	emote("squat", intentional = TRUE)
 
@@ -287,16 +287,21 @@
 	set category = "Эмоции"
 	emote("bshake", intentional = TRUE)
 
-/mob/living/carbon/human/proc/emote_flutter()
-	set name = "◦ " + EMOTE_HUMAN_FLUTTER + " "
+/mob/living/carbon/human/proc/emote_flap()
+	set name = "◦ " + EMOTE_HUMAN_FLAP + " "
 	set category = "Эмоции"
-	emote("flutter", intentional = TRUE)
+	emote("flap", intentional = TRUE)
 
 /mob/living/carbon/human/proc/emote_aflap()
 	set name = "◦ " + EMOTE_HUMAN_AFLAP + " "
 	set category = "Эмоции"
 	emote("aflap", intentional = TRUE)
 
+/mob/living/carbon/human/proc/emote_flutter()
+	set name = "◦ " + EMOTE_HUMAN_FLUTTER + " "
+	set category = "Эмоции"
+	emote("flutter", intentional = TRUE)
+
 /// Racial Emotes ///
 /mob/living/carbon/human/proc/emote_wag()
 	set name = "< " + EMOTE_HUMAN_WAG + " >"
@@ -353,6 +358,11 @@
 	set category = "Эмоции"
 	emote("whips", intentional = TRUE)
 
+/mob/living/carbon/human/proc/emote_hum()
+	set name = "< " + EMOTE_HUMAN_HUM + " >"
+	set category = "Эмоции"
+	emote("hum", intentional = TRUE)
+
 /mob/living/carbon/human/proc/emote_rumble()
 	set name = "< " + EMOTE_HUMAN_RUMBLE + " >"
 	set category = "Эмоции"
@@ -378,6 +388,16 @@
 	set category = "Эмоции"
 	emote("warble", intentional = TRUE)
 
+/mob/living/carbon/human/proc/emote_croak()
+	set name = "< " + EMOTE_HUMAN_CROAK + " >"
+	set category = "Эмоции"
+	emote("croak", intentional = TRUE)
+
+/mob/living/carbon/human/proc/emote_croak_anger()
+	set name = "< " + EMOTE_HUMAN_CROAK_ANGER + " >"
+	set category = "Эмоции"
+	emote("croak_anger", intentional = TRUE)
+
 /mob/living/carbon/human/proc/emote_click()
 	set name = "< " + EMOTE_HUMAN_CLICK + " >"
 	set category = "Эмоции"
@@ -388,16 +408,26 @@
 	set category = "Эмоции"
 	emote("clack", intentional = TRUE)
 
-/mob/living/carbon/human/proc/emote_hum()
-	set name = "< " + EMOTE_HUMAN_HUM + " >"
+/mob/living/carbon/human/proc/emote_rattle()
+	set name = "< " + EMOTE_HUMAN_RATTLE + " >"
 	set category = "Эмоции"
-	emote("hum", intentional = TRUE)
+	emote("rattle", intentional = TRUE)
 
 /mob/living/carbon/human/proc/emote_squish()
 	set name = "< " + EMOTE_HUMAN_SQUISH + " >"
 	set category = "Эмоции"
 	emote("squish", intentional = TRUE)
 
+/mob/living/carbon/human/proc/emote_bubble()
+	set name = "< " + EMOTE_HUMAN_BUBBLE + " >"
+	set category = "Эмоции"
+	emote("bubble", intentional = TRUE)
+
+/mob/living/carbon/human/proc/emote_pop()
+	set name = "< " + EMOTE_HUMAN_POP + " >"
+	set category = "Эмоции"
+	emote("pop", intentional = TRUE)
+
 /mob/living/carbon/human/proc/emote_ping()
 	set name = "< " + EMOTE_SILICON_PING + " >"
 	set category = "Эмоции"
diff --git a/modular_ss220/emotes/code/exercise/exercise_emotes.dm b/modular_ss220/emotes/code/exercise/exercise_emotes.dm
index a6175f0ab3ea..eea7ab215f2e 100644
--- a/modular_ss220/emotes/code/exercise/exercise_emotes.dm
+++ b/modular_ss220/emotes/code/exercise/exercise_emotes.dm
@@ -1,6 +1,7 @@
 /datum/emote/exercise
 	key = "exercise"
 	key_third_person = "exercises"
+	name = EMOTE_EXERCISE
 	// message = "упражняется!"
 	hands_use_check = TRUE
 	emote_type = EMOTE_VISIBLE | EMOTE_FORCE_NO_RUNECHAT // Don't need an emote to see that
diff --git a/modular_ss220/emotes/code/exercise/exercises/pushup.dm b/modular_ss220/emotes/code/exercise/exercises/pushup.dm
index 3ded9bc3ef09..bf793b9014f0 100644
--- a/modular_ss220/emotes/code/exercise/exercises/pushup.dm
+++ b/modular_ss220/emotes/code/exercise/exercises/pushup.dm
@@ -5,6 +5,7 @@
 /datum/emote/exercise/pushup
 	key = "pushup"
 	key_third_person = "pushups"
+	name = EMOTE_PUSHUP
 	subtypes_types = /datum/exercise/pushup
 
 	message_prepare = "начал отжиматься."
diff --git a/modular_ss220/emotes/code/exercise/exercises/squat.dm b/modular_ss220/emotes/code/exercise/exercises/squat.dm
index 0abc90b7b503..5c89a6b3d498 100644
--- a/modular_ss220/emotes/code/exercise/exercises/squat.dm
+++ b/modular_ss220/emotes/code/exercise/exercises/squat.dm
@@ -5,6 +5,7 @@
 /datum/emote/exercise/squat
 	key = "squat"
 	key_third_person = "squats"
+	name = EMOTE_SQUAT
 	subtypes_types = /datum/exercise/squat
 
 	message_prepare = "начал приседать."
diff --git a/modular_ss220/emotes/code/racial_emotes.dm b/modular_ss220/emotes/code/racial_emotes.dm
index 37993737aa3a..5417ac7b3738 100644
--- a/modular_ss220/emotes/code/racial_emotes.dm
+++ b/modular_ss220/emotes/code/racial_emotes.dm
@@ -62,27 +62,39 @@
 
 /datum/species/moth/on_species_gain(mob/living/carbon/human/H)
 	..()
+	H.verbs |= /mob/living/carbon/human/proc/emote_flap
+	H.verbs |= /mob/living/carbon/human/proc/emote_aflap
 	H.verbs |= /mob/living/carbon/human/proc/emote_flutter
 
 /datum/species/moth/on_species_loss(mob/living/carbon/human/H)
 	..()
+	H.verbs -= /mob/living/carbon/human/proc/emote_flap
+	H.verbs -= /mob/living/carbon/human/proc/emote_aflap
 	H.verbs -= /mob/living/carbon/human/proc/emote_flutter
 
 /datum/species/skrell/on_species_gain(mob/living/carbon/human/H)
 	..()
 	H.verbs |= /mob/living/carbon/human/proc/emote_warble
+	H.verbs |= /mob/living/carbon/human/proc/emote_croak
+	H.verbs |= /mob/living/carbon/human/proc/emote_croak_anger
 
 /datum/species/skrell/on_species_loss(mob/living/carbon/human/H)
 	..()
 	H.verbs -= /mob/living/carbon/human/proc/emote_warble
+	H.verbs -= /mob/living/carbon/human/proc/emote_croak
+	H.verbs -= /mob/living/carbon/human/proc/emote_croak_anger
 
 /datum/species/slime/on_species_gain(mob/living/carbon/human/H)
 	..()
 	H.verbs |= /mob/living/carbon/human/proc/emote_squish
+	H.verbs |= /mob/living/carbon/human/proc/emote_bubble
+	H.verbs |= /mob/living/carbon/human/proc/emote_pop
 
 /datum/species/slime/on_species_loss(mob/living/carbon/human/H)
 	..()
 	H.verbs -= /mob/living/carbon/human/proc/emote_squish
+	H.verbs -= /mob/living/carbon/human/proc/emote_bubble
+	H.verbs -= /mob/living/carbon/human/proc/emote_pop
 
 /datum/species/tajaran/on_species_gain(mob/living/carbon/human/H)
 	..()
@@ -133,3 +145,11 @@
 	H.verbs -= /mob/living/carbon/human/proc/emote_wag
 	H.verbs -= /mob/living/carbon/human/proc/emote_swag
 	H.verbs -= /mob/living/carbon/human/proc/emote_quill
+
+/datum/species/skeleton/on_species_gain(mob/living/carbon/human/H)
+	..()
+	H.verbs |= /mob/living/carbon/human/proc/emote_rattle
+
+/datum/species/skeleton/on_species_loss(mob/living/carbon/human/H)
+	..()
+	H.verbs -= /mob/living/carbon/human/proc/emote_rattle
diff --git a/modular_ss220/keybindings/code/emote_keybinds.dm b/modular_ss220/keybindings/code/emote_keybinds.dm
index fb5a7d8144db..c68d43062852 100644
--- a/modular_ss220/keybindings/code/emote_keybinds.dm
+++ b/modular_ss220/keybindings/code/emote_keybinds.dm
@@ -1,461 +1,113 @@
-/datum/keybinding/emote/flip
-	name = EMOTE_FLIP
+/datum/keybinding/emote/New()
+	name = initial(linked_emote.name)
 
-/datum/keybinding/emote/spin
-	name = EMOTE_SPIN
+/datum/keybinding/emote/carbon/human/hem
+	linked_emote = /datum/emote/living/carbon/human/hem
+	name = EMOTE_HUMAN_HEM
 
-/datum/keybinding/emote/blush
-	name = EMOTE_BLUSH
+/datum/keybinding/emote/carbon/human/scratch
+	linked_emote = /datum/emote/living/carbon/human/scratch
+	name = EMOTE_HUMAN_SCRATCH
 
-/datum/keybinding/emote/bow
-	name = EMOTE_BOW
+/datum/keybinding/emote/carbon/human/whistle
+	linked_emote = /datum/emote/living/carbon/human/whistle
+	name = EMOTE_HUMAN_WHISTLE
 
-/datum/keybinding/emote/burp
-	name = EMOTE_BURP
+/datum/keybinding/emote/carbon/human/snuffle
+	linked_emote = /datum/emote/living/carbon/human/snuffle
+	name = EMOTE_HUMAN_SNUFFLE
 
-/datum/keybinding/emote/choke
-	name = EMOTE_CHOKE
+/datum/keybinding/emote/carbon/human/roar
+	linked_emote = /datum/emote/living/carbon/human/roar
+	name = EMOTE_HUMAN_ROAR
 
-/datum/keybinding/emote/collapse
-	name = EMOTE_COLLAPSE
+/datum/keybinding/emote/carbon/human/rumble
+	linked_emote = /datum/emote/living/carbon/human/rumble
+	name = EMOTE_HUMAN_RUMBLE
 
-/datum/keybinding/emote/dance
-	name = EMOTE_DANCE
+/datum/keybinding/emote/carbon/human/threat
+	linked_emote = /datum/emote/living/carbon/human/threat
+	name = EMOTE_HUMAN_THREAT
 
-/datum/keybinding/emote/jump
-	name = EMOTE_JUMP
+/datum/keybinding/emote/carbon/human/purr
+	linked_emote = /datum/emote/living/carbon/human/purr
+	name = EMOTE_HUMAN_PURR
 
-/datum/keybinding/emote/deathgasp
-	name = EMOTE_DEATHGASP
+/datum/keybinding/emote/carbon/human/purrl
+	linked_emote = /datum/emote/living/carbon/human/purrl
+	name = EMOTE_HUMAN_PURRL
 
-/datum/keybinding/emote/drool
-	name = EMOTE_DROOL
+/datum/keybinding/emote/carbon/human/waves
+	linked_emote = /datum/emote/living/carbon/human/waves_k
+	name = EMOTE_HUMAN_WAVES_K
 
-/datum/keybinding/emote/quiver
-	name = EMOTE_QUIVER
+/datum/keybinding/emote/carbon/human/wiggles
+	linked_emote = /datum/emote/living/carbon/human/wiggles
+	name = EMOTE_HUMAN_WIGGLES
 
-/datum/keybinding/emote/frown
-	name = EMOTE_FROWN
+/datum/keybinding/emote/carbon/human/whips
+	linked_emote = /datum/emote/living/carbon/human/whip/whips
+	name = EMOTE_HUMAN_WHIPS
 
-/datum/keybinding/emote/glare
-	name = EMOTE_GLARE
+/datum/keybinding/emote/carbon/human/whip
+	linked_emote = /datum/emote/living/carbon/human/whip
+	name = EMOTE_HUMAN_WHIP
 
-/datum/keybinding/emote/gag
-	name = EMOTE_GAG
+/datum/keybinding/emote/carbon/human/croak
+	linked_emote = /datum/emote/living/carbon/human/croak
+	name = EMOTE_HUMAN_CROAK
 
-/datum/keybinding/emote/grin
-	name = EMOTE_GRIN
+/datum/keybinding/emote/carbon/human/croak/anger
+	linked_emote = /datum/emote/living/carbon/human/croak/anger
+	name = EMOTE_HUMAN_CROAK_ANGER
 
-/datum/keybinding/emote/grimace
-	name = EMOTE_GRIMACE
+/datum/keybinding/emote/exercise
+	linked_emote = /datum/emote/exercise
+	name = EMOTE_EXERCISE
 
-/datum/keybinding/emote/groan
-	name = EMOTE_GROAN
+/datum/keybinding/emote/exercise/squat
+	linked_emote = /datum/emote/exercise/squat
+	name = EMOTE_SQUAT
 
-/datum/keybinding/emote/look
-	name = EMOTE_LOOK
+/datum/keybinding/emote/exercise/pushup
+	linked_emote = /datum/emote/exercise/pushup
+	name = EMOTE_PUSHUP
 
-/datum/keybinding/emote/bshake
-	name = EMOTE_BSHAKE
+/datum/keybinding/emote/carbon/human/drask_talk/New()
+	..()
+	name += " (драск)"
 
-/datum/keybinding/emote/shudder
-	name = EMOTE_SHUDDER
+/datum/keybinding/emote/carbon/human/hiss/New()
+	..()
+	name += " (унатх)"
 
-/datum/keybinding/emote/point
-	name = EMOTE_POINT
+/datum/keybinding/emote/carbon/human/hiss/tajaran/New()
+	..()
+	name = replacetext(name, regex(@"\(.*\)"), "(таяр)")
 
-/datum/keybinding/emote/pout
-	name = EMOTE_POUT
+/datum/keybinding/emote/carbon/human/monkey/New()
+	..()
+	name += " (мартышка)"
 
-/datum/keybinding/emote/scream
-	name = EMOTE_SCREAM
+/datum/keybinding/emote/simple_animal/diona_chirp/New()
+	..()
+	name += " (нимфа)"
 
-/datum/keybinding/emote/shake
-	name = EMOTE_SHAKE
+/datum/keybinding/emote/simple_animal/gorilla_ooga/New()
+	..()
+	name += " (горилла)"
 
-/datum/keybinding/emote/shiver
-	name = EMOTE_SHIVER
+/datum/keybinding/emote/simple_animal/pet/dog/New()
+	..()
+	name += " (пёс)"
 
-/datum/keybinding/emote/sigh
-	name = EMOTE_SIGH
+/datum/keybinding/emote/simple_animal/mouse/New()
+	..()
+	name += " (мышь)"
 
-/datum/keybinding/emote/happy
-	name = EMOTE_SIGH_HAPPY
-
-/datum/keybinding/emote/sit
-	name = EMOTE_SIT
-
-/datum/keybinding/emote/smile
-	name = EMOTE_SMILE
-
-/datum/keybinding/emote/smug
-	name = EMOTE_SMUG
-
-/datum/keybinding/emote/sniff
-	name = EMOTE_SNIFF
-
-/datum/keybinding/emote/snore
-	name = EMOTE_SNORE
-
-/datum/keybinding/emote/nightmare
-	name = EMOTE_NIGHTMARE
-
-/datum/keybinding/emote/stare
-	name = EMOTE_STARE
-
-/datum/keybinding/emote/stretch
-	name = EMOTE_STRECH
-
-/datum/keybinding/emote/sulk
-	name = EMOTE_SULK
-
-/datum/keybinding/emote/sway
-	name = EMOTE_SWAY
-
-/datum/keybinding/emote/swear
-	name = EMOTE_SWEAR
-
-/datum/keybinding/emote/tilt
-	name = EMOTE_TILT
-
-/datum/keybinding/emote/tremble
-	name = EMOTE_TREMBLE
-
-/datum/keybinding/emote/twitch
-	name = EMOTE_TWITCH
-
-/datum/keybinding/emote/twitch_s
-	name = EMOTE_TWITCHS
-
-/datum/keybinding/emote/whimper
-	name = EMOTE_WHIMPER
-
-/datum/keybinding/emote/wsmile
-	name = EMOTE_WSMILE
-
-/datum/keybinding/emote/carbon/blink
-	name = EMOTE_CARBON_BLINK
-
-/datum/keybinding/emote/carbon/blink_r
-	name = EMOTE_CARBON_BLINKR
-
-/datum/keybinding/emote/carbon/clap
-	name = EMOTE_CARBON_CLAP
-
-/datum/keybinding/emote/carbon/cross
-	name = EMOTE_CARBON_CROSS
-
-/datum/keybinding/emote/carbon/chuckle
-	name = EMOTE_CARBON_CHUCKLE
-
-/datum/keybinding/emote/carbon/cough
-	name = EMOTE_CARBON_COUGH
-
-/datum/keybinding/emote/carbon/moan
-	name = EMOTE_CARBON_MOAN
-
-/datum/keybinding/emote/carbon/giggle
-	name = EMOTE_CARBON_GIGGLE
-
-/datum/keybinding/emote/carbon/gurgle
-	name = EMOTE_CARBON_GURGLE
-
-/datum/keybinding/emote/carbon/inhale
-	name = EMOTE_CARBON_INHALE
-
-/datum/keybinding/emote/carbon/inhale/sharp
-	name = EMOTE_CARBON_INHALE_SHARP
-
-/datum/keybinding/emote/carbon/kiss
-	name = EMOTE_CARBON_KISS
-
-/datum/keybinding/emote/carbon/wave
-	name = EMOTE_CARBON_WAVE
-
-/datum/keybinding/emote/carbon/yawn
-	name = EMOTE_CARBON_YAWN
-
-/datum/keybinding/emote/carbon/exhale
-	name = EMOTE_CARBON_EXHALE
-
-/datum/keybinding/emote/carbon/laugh
-	name = EMOTE_CARBON_LAUGH
-
-/datum/keybinding/emote/carbon/scowl
-	name = EMOTE_CARBON_SCOWL
-
-/datum/keybinding/emote/carbon/faint
-	name = EMOTE_CARBON_FAINT
-
-/datum/keybinding/emote/carbon/sign
-	name = EMOTE_CARBON_SIGN
-
-/datum/keybinding/emote/carbon/twirl
-	name = EMOTE_CARBON_TWIRL
-
-/datum/keybinding/emote/carbon/alien/humanoid/roar
-	name = EMOTE_ALIEN_ROAR
-
-/datum/keybinding/emote/carbon/alien/humanoid/hiss
-	name = EMOTE_ALIEN_HISS
-
-/datum/keybinding/emote/carbon/alien/humanoid/gnarl
-	name = EMOTE_ALIEN_GNARL
-
-/datum/keybinding/emote/carbon/brain/alarm
-	name = EMOTE_BRAIN_ALARM
-
-/datum/keybinding/emote/carbon/brain/alert
-	name = EMOTE_BRAIN_ALERT
-
-/datum/keybinding/emote/carbon/brain/notice
-	name = EMOTE_BRAIN_NOTICE
-
-/datum/keybinding/emote/carbon/brain/flash
-	name = EMOTE_BRAIN_FLASH
-
-/datum/keybinding/emote/carbon/brain/whistle
-	name = EMOTE_BRAIN_WHISTLE
-
-/datum/keybinding/emote/carbon/brain/beep
-	name = EMOTE_BRAIN_BEEP
-
-/datum/keybinding/emote/carbon/brain/boop
-	name = EMOTE_BRAIN_BOOP
-
-/datum/keybinding/emote/carbon/human/airguitar
-	name = EMOTE_HUMAN_AIRGUITAR
-
-/datum/keybinding/emote/carbon/human/cry
-	name = EMOTE_HUMAN_CRY
-
-/datum/keybinding/emote/carbon/human/dap
-	name = EMOTE_HUMAN_DAP
-
-/datum/keybinding/emote/carbon/human/eyebrow
-	name = EMOTE_HUMAN_EYEBROW
-
-/datum/keybinding/emote/carbon/human/grumble
-	name = EMOTE_HUMAN_GRUMBLE
-
-/datum/keybinding/emote/carbon/human/hug
-	name = EMOTE_HUMAN_HUG
-
-/datum/keybinding/emote/carbon/human/facepalm
-	name = EMOTE_HUMAN_FACEPALM
-
-/datum/keybinding/emote/carbon/human/palm
-	name = EMOTE_HUMAN_PALM
-
-/datum/keybinding/emote/carbon/human/wince
-	name = EMOTE_HUMAN_WINCE
-
-/datum/keybinding/emote/carbon/human/mumble
-	name = EMOTE_HUMAN_MUMBLE
-
-/datum/keybinding/emote/carbon/human/nod
-	name = EMOTE_HUMAN_NOD
-
-/datum/keybinding/emote/carbon/human/scream
-	name = EMOTE_HUMAN_SCREAM
-
-/datum/keybinding/emote/carbon/human/gasp
-	name = EMOTE_HUMAN_GASP
-
-/datum/keybinding/emote/carbon/human/shake
-	name = EMOTE_HUMAN_SHAKE
-
-/datum/keybinding/emote/carbon/human/pale
-	name = EMOTE_HUMAN_PALE
-
-/datum/keybinding/emote/carbon/human/raise
-	name = EMOTE_HUMAN_RAISE
-
-/datum/keybinding/emote/carbon/human/salute
-	name = EMOTE_HUMAN_SALUTE
-
-/datum/keybinding/emote/carbon/human/sign/signal
-	name = EMOTE_HUMAN_SIGNAL
-
-/datum/keybinding/emote/carbon/human/shrug
-	name = EMOTE_HUMAN_SHRUG
-
-/datum/keybinding/emote/carbon/human/sniff
-	name = EMOTE_HUMAN_SNIFF
-
-/datum/keybinding/emote/carbon/human/johnny
-	name = EMOTE_HUMAN_JOHNNY
-
-/datum/keybinding/emote/carbon/human/sneeze
-	name = EMOTE_HUMAN_SNEEZE
-
-/datum/keybinding/emote/carbon/human/slap
-	name = EMOTE_HUMAN_SLAP
-
-/datum/keybinding/emote/carbon/human/wink
-	name = EMOTE_HUMAN_WINK
-
-/datum/keybinding/emote/carbon/human/clap
-	name = EMOTE_HUMAN_CLAP
-
-/datum/keybinding/emote/carbon/human/highfive
-	name = EMOTE_HUMAN_HIGHFIVE
-
-/datum/keybinding/emote/carbon/human/handshake
-	name = EMOTE_HUMAN_HANDSHAKE
-
-/datum/keybinding/emote/carbon/human/snap
-	name = EMOTE_HUMAN_SNAP
-
-/datum/keybinding/emote/carbon/human/crack
-	name = EMOTE_HUMAN_CRACK
-
-/datum/keybinding/emote/carbon/human/fart
-	name = EMOTE_HUMAN_FART
-
-/datum/keybinding/emote/carbon/human/wag
-	name = EMOTE_HUMAN_WAG
-
-/datum/keybinding/emote/carbon/human/wag/stop
-	name = EMOTE_HUMAN_WAG_STOP
-
-/datum/keybinding/emote/carbon/human/flap
-	name = EMOTE_HUMAN_FLAP
-
-/datum/keybinding/emote/carbon/human/flutter
-	name = EMOTE_HUMAN_FLUTTER
-
-/datum/keybinding/emote/carbon/human/flap/angry
-	name = EMOTE_HUMAN_AFLAP
-
-/datum/keybinding/emote/carbon/human/quill
-	name = EMOTE_HUMAN_QUILL
-
-/datum/keybinding/emote/carbon/human/warble
-	name = EMOTE_HUMAN_WARBLE
-
-/datum/keybinding/emote/carbon/human/clack
-	name = EMOTE_HUMAN_CLACK
-
-/datum/keybinding/emote/carbon/human/clack/click
-	name = EMOTE_HUMAN_CLICK
-
-/datum/keybinding/emote/carbon/human/drask_talk/drone
-	name = EMOTE_HUMAN_DRONE + " (драск)"
-
-/datum/keybinding/emote/carbon/human/drask_talk/hum
-	name = EMOTE_HUMAN_HUM + " (драск)"
-
-/datum/keybinding/emote/carbon/human/drask_talk/rumble
-	name = EMOTE_HUMAN_RUMBLE + " (драск)"
-
-/datum/keybinding/emote/carbon/human/hiss
-	name = EMOTE_HUMAN_HISS
-
-/datum/keybinding/emote/carbon/human/hiss/tajaran
-	name = EMOTE_HUMAN_HISS + " (таяр)"
-
-/datum/keybinding/emote/carbon/human/creak
-	name = EMOTE_HUMAN_CREAK
-
-/datum/keybinding/emote/carbon/human/slime/squish
-	name = EMOTE_HUMAN_SQUISH
-
-/datum/keybinding/emote/carbon/human/squint
-	name = EMOTE_HUMAN_SQUINT
-
-/datum/keybinding/emote/carbon/human/bubble
-	name = EMOTE_HUMAN_BUBBLE
-
-/datum/keybinding/emote/carbon/human/pop
-	name = EMOTE_HUMAN_POP
-
-/datum/keybinding/emote/carbon/human/howl
-	name = EMOTE_HUMAN_HOWL
-
-/datum/keybinding/emote/carbon/human/growl
-	name = EMOTE_HUMAN_GROWL
-
-/datum/keybinding/emote/carbon/human/rattle
-	name = EMOTE_HUMAN_RATTLE
-
-/datum/keybinding/emote/carbon/human/monkey/gnarl
-	name = EMOTE_HUMAN_GNARL + " (мартышка)"
-
-/datum/keybinding/emote/carbon/human/monkey/roll
-	name = EMOTE_HUMAN_ROLL + " (мартышка)"
-
-/datum/keybinding/emote/carbon/human/monkey/scratch
-	name = EMOTE_HUMAN_SCRATCH + " (мартышка)"
-
-/datum/keybinding/emote/carbon/human/monkey/tail
-	name = EMOTE_HUMAN_TAIL + " (мартышка)"
-
-/datum/keybinding/emote/carbon/human/monkey/scream/screech
-	name = EMOTE_HUMAN_SCREECH + " (мартышка)"
-
-/datum/keybinding/emote/carbon/human/monkey/scream/screech/roar
-	name = EMOTE_HUMAN_ROAR + " (мартышка)"
-
-/datum/keybinding/emote/silicon/scream
-	name = EMOTE_SILICON_SCREAM
-
-/datum/keybinding/emote/silicon/ping
-	name = EMOTE_SILICON_PING
-
-/datum/keybinding/emote/silicon/buzz
-	name = EMOTE_SILICON_BUZZ
-
-/datum/keybinding/emote/silicon/buzz2
-	name = EMOTE_SILICON_BUZZ2
-
-/datum/keybinding/emote/silicon/beep
-	name = EMOTE_SILICON_BEEP
-
-/datum/keybinding/emote/silicon/boop
-	name = EMOTE_SILICON_BOOP
-
-/datum/keybinding/emote/silicon/yes
-	name = EMOTE_SILICON_YES
-
-/datum/keybinding/emote/silicon/no
-	name = EMOTE_SILICON_NO
-
-/datum/keybinding/emote/silicon/law
-	name = EMOTE_SILICON_LAW
-
-/datum/keybinding/emote/silicon/halt
-	name = EMOTE_SILICON_HALT
-
-/datum/keybinding/emote/simple_animal/diona_chirp
-	name = EMOTE_ANIMAL_CHIRP + " (нимфа)"
-
-/datum/keybinding/emote/simple_animal/gorilla_ooga
-	name = EMOTE_ANIMAL_OOGA + " (горилла)"
-
-/datum/keybinding/emote/simple_animal/pet/dog/bark
-	name = EMOTE_ANIMAL_BARK + " (пёс)"
-
-/datum/keybinding/emote/simple_animal/pet/dog/yelp
-	name = EMOTE_ANIMAL_YELP + " (пёс)"
-
-/datum/keybinding/emote/simple_animal/pet/dog/growl
-	name = EMOTE_ANIMAL_GROWL + " (пёс)"
-
-/datum/keybinding/emote/simple_animal/mouse/squeak
-	name = EMOTE_ANIMAL_SQUEAK + " (мышь)"
-
-/datum/keybinding/emote/simple_animal/pet/cat/meow
-	name = EMOTE_ANIMAL_MEOW + " (кот)"
-
-/datum/keybinding/emote/simple_animal/pet/cat/hiss
-	name = EMOTE_ANIMAL_HISS + " (кот)"
-
-/datum/keybinding/emote/simple_animal/pet/cat/purr
-	name = EMOTE_ANIMAL_PURR + " (кот)"
-
-/datum/keybinding/emote/simple_animal/pet/cat/sit
-	name = EMOTE_ANIMAL_SIT + " (кот)"
+/datum/keybinding/emote/simple_animal/pet/cat/New()
+	..()
+	name += " (кот)"
 
 /datum/keybinding/custom
 	default_emote_text = "Введите текст вашей эмоции"
@@ -473,7 +125,7 @@
 	name = "Своя эмоция 4"
 
 /datum/keybinding/custom/five
-	name = "Своя эмоцияe 5"
+	name = "Своя эмоция 5"
 
 /datum/keybinding/custom/six
 	name = "Своя эмоция 6"