diff --git a/modular_ss220/emotes/audio/unathi/whip_short_unathi.ogg b/modular_ss220/emotes/audio/unathi/whip_short_unathi.ogg
new file mode 100644
index 000000000000..1f0cf906d7f9
Binary files /dev/null and b/modular_ss220/emotes/audio/unathi/whip_short_unathi.ogg differ
diff --git a/modular_ss220/emotes/audio/unathi/whip_unathi.ogg b/modular_ss220/emotes/audio/unathi/whip_unathi.ogg
new file mode 100644
index 000000000000..27041906ba02
Binary files /dev/null and b/modular_ss220/emotes/audio/unathi/whip_unathi.ogg differ
diff --git a/modular_ss220/emotes/code/emote.dm b/modular_ss220/emotes/code/emote.dm
index 5c99efc90494..efbd01cdaa61 100644
--- a/modular_ss220/emotes/code/emote.dm
+++ b/modular_ss220/emotes/code/emote.dm
@@ -328,3 +328,32 @@
 		'modular_ss220/emotes/audio/kidan/wiggles_kidan_2.ogg',
 		'modular_ss220/emotes/audio/kidan/wiggles_kidan_3.ogg')
 
+/datum/emote/living/carbon/human/whip
+	key = "whip"
+	key_third_person = "whip"
+	message = "ударяет хвостом."
+	message_mime = "взмахивает хвостом и бесшумно опускает его на пол."
+	message_postfix = ", грозно смотря на %t."
+	message_param = EMOTE_PARAM_USE_POSTFIX
+	species_type_whitelist_typecache = list(/datum/species/unathi)
+	emote_type = EMOTE_VISIBLE | EMOTE_AUDIBLE
+	volume = 75
+	audio_cooldown = 3 SECONDS
+	sound = 'modular_ss220/emotes/audio/unathi/whip_short_unathi.ogg'
+
+/datum/emote/living/carbon/human/whip/whip_l
+	key = "whips"
+	key_third_person = "whips"
+	message = "хлестает хвостом."
+	species_type_whitelist_typecache = list(/datum/species/unathi)
+	audio_cooldown = 6 SECONDS
+	sound = 'modular_ss220/emotes/audio/unathi/whip_unathi.ogg'
+
+/datum/emote/living/carbon/human/whip/can_run_emote(mob/user, status_check = TRUE, intentional)
+	if(!..())
+		return FALSE
+
+	if(!can_wag(user))
+		return FALSE
+
+	return TRUE
diff --git a/modular_ss220/emotes/code/emote_keybindings.dm b/modular_ss220/emotes/code/emote_keybindings.dm
index f62395dc7dd5..5ac14960614c 100644
--- a/modular_ss220/emotes/code/emote_keybindings.dm
+++ b/modular_ss220/emotes/code/emote_keybindings.dm
@@ -41,3 +41,11 @@
 /datum/keybinding/emote/carbon/human/wiggles
 	linked_emote = /datum/emote/living/carbon/human/wiggles
 	name = "Шевелить усиками"
+
+/datum/keybinding/emote/carbon/human/whip_l
+	linked_emote = /datum/emote/living/carbon/human/whip/whip_l
+	name = "Хлестать хвостом"
+
+/datum/keybinding/emote/carbon/human/whip
+	linked_emote = /datum/emote/living/carbon/human/whip
+	name = "Ударять хвостом"
diff --git a/modular_ss220/emotes/code/emote_panel_names.dm b/modular_ss220/emotes/code/emote_panel_names.dm
index b9758a85c1d1..ebdaba785525 100644
--- a/modular_ss220/emotes/code/emote_panel_names.dm
+++ b/modular_ss220/emotes/code/emote_panel_names.dm
@@ -423,3 +423,9 @@
 
 /datum/emote/living/carbon/human/wiggles
 	name = "Шевелить усики"
+
+/datum/emote/living/carbon/human/whip
+	name = "Ударять хвостом"
+
+/datum/emote/living/carbon/human/whip/whip_l
+	name = "Хлестать хвостом"