Croaks, more emotes in emote tab, refactoring

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 			"Гудеть"

modular_ss220/emotes/_emotes.dme

@@ -6,7 +6,6 @@
 #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_names.dm"
 #include "code/emote_panel.dm"
 #include "code/emote.dm"

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/

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')

modular_ss220/emotes/code/emote_names.dm

@@ -407,6 +407,12 @@
 /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
 
@@ -442,6 +448,9 @@
 
 /// Emote Animal
 
+/datum/emote/living/simple_animal/gorilla/ooga
+	name = EMOTE_ANIMAL_OOGA
+
 /datum/emote/living/simple_animal/diona_chirp
 	name = EMOTE_ANIMAL_CHIRP
 

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 = "Эмоции"

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,7 @@
 	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_loss(mob/living/carbon/human/H)
+	..()
+	H.verbs -= /mob/living/carbon/human/proc/emote_rattle