Фикс эмоутов

ss220club · Oct 16, 2024 · 8b0ad7b · 8b0ad7b
1 parent cebf819
commit 8b0ad7b
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 14 deletions.
diff --git a/modular_ss220/species/serpentids/code/mob/emotes.dm b/modular_ss220/species/serpentids/code/mob/emotes.dm
@@ -1,19 +1,32 @@
-/mob/living/carbon/human/verb/emote_gbsroar()
+#define EMOTE_HUMAN_GBSROAR 			"Рычать"
+#define EMOTE_HUMAN_GBSHISS 			"Шипеть"
+#define EMOTE_HUMAN_GBSWIGGLE 			"Шевелить усиками"
+
+/mob/living/carbon/human/proc/emote_gbsroar()
 	set name = "< " + EMOTE_HUMAN_ROAR + " >"
 	set category = "Эмоции"
 	emote("gbsroar", intentional = TRUE)
 
-/mob/living/carbon/human/verb/emote_gbshiss()
+/mob/living/carbon/human/proc/emote_gbshiss()
 	set name = "< " + EMOTE_HUMAN_HISS + " >"
 	set category = "Эмоции"
 	emote("gbshiss", intentional = TRUE)
 
-/mob/living/carbon/human/verb/emote_gbswiggles()
+/mob/living/carbon/human/proc/emote_gbswiggles()
 	set name = "< " + EMOTE_HUMAN_WIGGLES + " >"
 	set category = "Эмоции"
 	emote("gbswiggles", intentional = TRUE)
 
-/datum/emote/living/carbon/human/roar/gbs
+/datum/emote/living/carbon/human/gbsroar
+	name = EMOTE_HUMAN_GBSROAR
+
+/datum/emote/living/carbon/human/gbshiss
+	name = EMOTE_HUMAN_GBSHISS
+
+/datum/emote/living/carbon/human/gbswiggles
+	name = EMOTE_HUMAN_GBSWIGGLE
+
+/datum/emote/living/carbon/human/gbsroar
 	key = "gbsroar"
 	key_third_person = "gbsroar"
 	message = "утробно рычит."
@@ -25,11 +38,11 @@
 	emote_type = EMOTE_VISIBLE | EMOTE_MOUTH | EMOTE_AUDIBLE
 	age_based = TRUE
 
-/datum/emote/living/carbon/human/roar/gbs/get_sound(mob/living/user)
+/datum/emote/living/carbon/human/gbsroar/get_sound(mob/living/user)
 	return pick(
 		'modular_ss220/species/serpentids/sounds/serpentid_roar.ogg')
 
-/datum/emote/living/carbon/human/hiss/gbs
+/datum/emote/living/carbon/human/gbshiss
 	key = "gbshiss"
 	key_third_person = "gbshisses"
 	message = "шипит."
@@ -41,7 +54,7 @@
 	sound = "modular_ss220/species/serpentids/sounds/serpentid_hiss.ogg"
 	muzzled_noises = list("weak hissing")
 
-/datum/emote/living/carbon/human/wiggles/gbs
+/datum/emote/living/carbon/human/gbswiggles
 	key = "gbswiggles"
 	key_third_person = "gbswiggles"
 	message = "шевелит усиками."

diff --git a/modular_ss220/species/serpentids/code/mob/serpentids.dm b/modular_ss220/species/serpentids/code/mob/serpentids.dm
@@ -157,9 +157,9 @@
 	H.AddComponent(/datum/component/mob_overlay_shift, shift_y_hand = 3, shift_xs_belt = 5, shift_y_belt = 7, shift_y_back = 7, shift_y_head = 10, shift_xs_head = 3) //shift_xs_hand = 12
 	H.AddComponent(/datum/component/gadom_living)
 	H.AddComponent(/datum/component/gadom_cargo)
-	H.verbs |= /mob/living/carbon/human/verb/emote_gbsroar
-	H.verbs |= /mob/living/carbon/human/verb/emote_gbshiss
-	H.verbs |= /mob/living/carbon/human/verb/emote_gbswiggles
+	H.verbs |= /mob/living/carbon/human/proc/emote_gbsroar
+	H.verbs |= /mob/living/carbon/human/proc/emote_gbshiss
+	H.verbs |= /mob/living/carbon/human/proc/emote_gbswiggles
 	H.verbs -= /mob/living/carbon/human/verb/emote_cough
 	H.verbs -= /mob/living/carbon/human/verb/emote_sneeze
 	H.verbs -= /mob/living/carbon/human/verb/emote_sniff
@@ -169,11 +169,11 @@
 	H.chat_message_y_offset = 11
 	SEND_SIGNAL(H, COMSIG_MOB_OVERLAY_SHIFT_UPDATE)
 
-/datum/species/moth/on_species_loss(mob/living/carbon/human/H)
+/datum/species/serpentid/on_species_loss(mob/living/carbon/human/H)
 	..()
-	H.verbs -= /mob/living/carbon/human/verb/emote_gbsroar
-	H.verbs -= /mob/living/carbon/human/verb/emote_gbshiss
-	H.verbs -= /mob/living/carbon/human/verb/emote_gbswiggles
+	H.verbs -= /mob/living/carbon/human/proc/emote_gbsroar
+	H.verbs -= /mob/living/carbon/human/proc/emote_gbshiss
+	H.verbs -= /mob/living/carbon/human/proc/emote_gbswiggles
 	H.verbs |= /mob/living/carbon/human/verb/emote_cough
 	H.verbs |= /mob/living/carbon/human/verb/emote_sneeze
 	H.verbs |= /mob/living/carbon/human/verb/emote_sniff