From 7feb7341f0d2f96dca1d0cd4933fc24c22c1b29e Mon Sep 17 00:00:00 2001
From: nikothedude <59709059+nikothedude@users.noreply.github.com>
Date: Sun, 28 Nov 2021 14:17:21 -0500
Subject: [PATCH] Fixes borg emotes FOR REAL THIS TIME. (#9666)

* fix

* fixes
---
 code/modules/mob/living/emote.dm                   |  6 ++++--
 modular_skyrat/modules/emotes/code/synth_emotes.dm | 12 +++++++++++-
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/code/modules/mob/living/emote.dm b/code/modules/mob/living/emote.dm
index c44e3f9c915..7714cf19803 100644
--- a/code/modules/mob/living/emote.dm
+++ b/code/modules/mob/living/emote.dm
@@ -554,14 +554,16 @@
 /datum/emote/living/custom/replace_pronoun(mob/user, message)
 	return message
 
-/datum/emote/living/beep
+//SKYRAT EDIT REMOVAL BEGIN - SYNTH EMOTES, NOW HANDLED IN SYNTH_EMOTES.DM
+/* /datum/emote/living/beep
 	key = "beep"
 	key_third_person = "beeps"
 	message = "beeps."
 	message_param = "beeps at %t."
 	sound = 'sound/machines/twobeep.ogg'
 	mob_type_allowed_typecache = list(/mob/living/brain, /mob/living/silicon)
-	emote_type = EMOTE_AUDIBLE
+	emote_type = EMOTE_AUDIBLE */
+//SKYRAT EDIT REMOVAL END
 
 /datum/emote/living/inhale
 	key = "inhale"
diff --git a/modular_skyrat/modules/emotes/code/synth_emotes.dm b/modular_skyrat/modules/emotes/code/synth_emotes.dm
index 59fd14c95d1..8a426538119 100644
--- a/modular_skyrat/modules/emotes/code/synth_emotes.dm
+++ b/modular_skyrat/modules/emotes/code/synth_emotes.dm
@@ -48,13 +48,23 @@
 	allowed_species = list(/datum/species/robotic/ipc, /datum/species/synth, /datum/species/synth/military, /datum/species/robotic/synthliz, /datum/species/robotic/synthetic_human, /datum/species/robotic/synthetic_mammal)
 	cooldown = 2 SECONDS
 
-
 /datum/emote/living/human/beep
 	key = "beep"
 	key_third_person = "beeps"
 	message = "beeps."
 	message_param = "beeps at %t."
 	emote_type = EMOTE_AUDIBLE
+	sound = 'sound/machines/twobeep.ogg'
+	silicon_allowed = TRUE
+	allowed_species = list(/datum/species/robotic/ipc, /datum/species/synth, /datum/species/synth/military, /datum/species/robotic/synthliz, /datum/species/robotic/synthetic_human, /datum/species/robotic/synthetic_mammal)
+	cooldown = 2 SECONDS
+
+/datum/emote/living/human/beep2
+	key = "beep2"
+	key_third_person = "beeps sharply"
+	message = "beeps sharply."
+	message_param = "beeps sharply at %t."
+	emote_type = EMOTE_AUDIBLE
 	vary = TRUE
 	sound = 'modular_skyrat/modules/emotes/sound/emotes/twobeep.ogg'
 	silicon_allowed = TRUE