From 5da386c2ad14b6d733590994e4aa8853a1975fbe Mon Sep 17 00:00:00 2001
From: GunHog <gunhog24@yahoo.com>
Date: Tue, 27 Jan 2015 12:51:18 -0600
Subject: [PATCH 1/2] New Silicon Emotes!

Adds the following emotes, all audible:
- buzz2
- chime (MULEbot delivery chime)
- honk, with the pitch variation of the standard bike horn!
- sad, the sad trombone sound from HONK mechs!
- warn, the warning buzzer from newscasters and disposal shutes

I also set the other audible emotes to audio message type.
---
 .../modules/mob/living/silicon/robot/emote.dm | 31 +++++++++++++++++--
 1 file changed, 28 insertions(+), 3 deletions(-)

diff --git a/code/modules/mob/living/silicon/robot/emote.dm b/code/modules/mob/living/silicon/robot/emote.dm
index 9c4913dd830..2d71165cad8 100644
--- a/code/modules/mob/living/silicon/robot/emote.dm
+++ b/code/modules/mob/living/silicon/robot/emote.dm
@@ -30,7 +30,7 @@
 			else
 				message = "<B>[src]</B> beeps."
 			playsound(src.loc, 'sound/machines/twobeep.ogg', 50, 0)
-			m_type = 1
+			m_type = 2
 
 		if ("bow")
 			if (!src.buckled)
@@ -63,7 +63,17 @@
 			else
 				message = "<B>[src]</B> buzzes."
 			playsound(src.loc, 'sound/machines/buzz-sigh.ogg', 50, 0)
-			m_type = 1
+			m_type = 2
+
+		if ("buzz2")
+			message = "<B>[src]</B> buzzes twice."
+			playsound(loc, 'sound/machines/buzz-two.ogg', 50, 0)
+			m_type = 2
+
+		if ("chime") //You have mail!
+			message = "<B>[src]</B> chimes."
+			playsound(loc, 'sound/machines/chime.ogg', 50, 0)
+			m_type = 2
 
 		if ("clap")
 			if (!src.restrained())
@@ -107,6 +117,11 @@
 			else
 				message = "<B>[src]</B> glares."
 
+		if ("honk") //Honk!
+			message = "<B>[src]</B> honks!"
+			playsound(loc, 'sound/items/bikehorn.ogg', 50, 1)
+			m_type = 2
+
 		if ("look")
 			var/M = null
 			if (param)
@@ -153,7 +168,12 @@
 			else
 				message = "<B>[src]</B> pings."
 			playsound(src.loc, 'sound/machines/ping.ogg', 50, 0)
-			m_type = 1
+			m_type = 2
+
+		if ("sad") //When words cannot express...
+			message = "<B>[src]</B> plays a sad trombone."
+			playsound(loc, 'sound/misc/sadtrombone.ogg', 50, 0)
+			m_type = 2
 
 		if ("salute")
 			if (!src.buckled)
@@ -194,6 +214,11 @@
 			message = "<B>[src]</B> twitches."
 			m_type = 1
 
+		if ("warn") //HUMAN HARM DETECTED. PLEASE DIE IN AN ORDERLY FASHION.
+			message = "<B>[src]</B> blares an alarm!"
+			playsound(loc, 'sound/machines/warning-buzzer.ogg', 50, 0)
+			m_type = 2
+
 		if ("help")
 			src << "Help for cyborg emotes. You can use these emotes with say \"*emote\":\n\naflap, beep-(none)/mob, bow-(none)/mob, buzz-(none)/mob, clap, custom, deathgasp, flap, glare-(none)/mob, look-(none)/mob, me, nod, ping-(none)/mob, \nsalute-(none)/mob, twitch, twitch_s,"
 

From 2920aa3aa95ecb6dec7fd8bbc0b4580e85c3efa5 Mon Sep 17 00:00:00 2001
From: GunHog <gunhog24@yahoo.com>
Date: Wed, 28 Jan 2015 16:39:25 -0600
Subject: [PATCH 2/2] Adds the new emotes to the help emote display.

---
 code/modules/mob/living/silicon/robot/emote.dm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/modules/mob/living/silicon/robot/emote.dm b/code/modules/mob/living/silicon/robot/emote.dm
index 2d71165cad8..3e12bfe9639 100644
--- a/code/modules/mob/living/silicon/robot/emote.dm
+++ b/code/modules/mob/living/silicon/robot/emote.dm
@@ -220,7 +220,7 @@
 			m_type = 2
 
 		if ("help")
-			src << "Help for cyborg emotes. You can use these emotes with say \"*emote\":\n\naflap, beep-(none)/mob, bow-(none)/mob, buzz-(none)/mob, clap, custom, deathgasp, flap, glare-(none)/mob, look-(none)/mob, me, nod, ping-(none)/mob, \nsalute-(none)/mob, twitch, twitch_s,"
+			src << "Help for cyborg emotes. You can use these emotes with say \"*emote\":\n\naflap, beep-(none)/mob, bow-(none)/mob, buzz-(none)/mob,buzz2,chime, clap, custom, deathgasp, flap, glare-(none)/mob, honk, look-(none)/mob, me, nod, ping-(none)/mob, sad, \nsalute-(none)/mob, twitch, twitch_s, warn,"
 
 		else
 			src << "<span class='notice'>Unusable emote '[act]'. Say *help for a list.</span>"