diff --git a/code/modules/mob/living/carbon/human/emote.dm b/code/modules/mob/living/carbon/human/emote.dm
index b1d7e356b39..a57764ed47a 100644
--- a/code/modules/mob/living/carbon/human/emote.dm
+++ b/code/modules/mob/living/carbon/human/emote.dm
@@ -28,8 +28,8 @@
act = lowertext(act)
switch(act)
//Cooldown-inducing emotes
- if("ping", "pings", "buzz", "buzzes", "beep", "beeps", "yes", "no")
- if (species.name == "Machine") //Only Machines can beep, ping, and buzz
+ if("ping", "pings", "buzz", "buzzes", "beep", "beeps", "yes", "no", "buzz2")
+ if (species.name == "Machine") //Only Machines can beep, ping, and buzz, yes, no, and make a silly sad trombone noise.
on_CD = handle_emote_CD() //proc located in code\modules\mob\emote.dm
else //Everyone else fails, skip the emote attempt
return
@@ -86,6 +86,11 @@
playsound(src.loc, 'sound/machines/ping.ogg', 50, 0)
m_type = 2
+ if("buzz2")
+ message = "[src] emits an irritated buzzing sound."
+ playsound(src.loc, 'sound/machines/buzz-two.ogg', 50, 0)
+ m_type = 2
+
if("buzz", "buzzes")
var/M = null
if(param)
diff --git a/code/modules/mob/living/silicon/emote.dm b/code/modules/mob/living/silicon/emote.dm
index c70979c5947..233df91eb55 100644
--- a/code/modules/mob/living/silicon/emote.dm
+++ b/code/modules/mob/living/silicon/emote.dm
@@ -13,7 +13,7 @@
//Cooldown-inducing emotes
if("scream", "screams")
on_CD = handle_emote_CD(50) //longer cooldown
- if("ping","pings","buzz","buzzs","buzzes","beep","beeps","yes","no")
+ if("ping","pings","buzz","buzzs","buzzes","beep","beeps","yes","no", "buzz2")
//halt is exempt because it's used to stop criminal scum //WHOEVER THOUGHT THAT WAS A GOOD IDEA IS GOING TO GET SHOT.
on_CD = handle_emote_CD() //proc located in code\modules\mob\emote.dm
//Everything else, including typos of the above emotes
@@ -115,7 +115,13 @@
playsound(src.loc, 'sound/goonstation/voice/robot_scream.ogg', 80, 0)
m_type = 2
+ if("buzz2")
+ message = "[src] emits an irritated buzzing sound."
+ playsound(src.loc, 'sound/machines/buzz-two.ogg', 50, 0)
+ m_type = 2
+
+
if("help")
- to_chat(src, "yes, no, beep, ping, buzz")
+ to_chat(src, "yes, no, beep, ping, buzz, scream, buzz2")
..(act, m_type, message)
\ No newline at end of file