From 1b5d81d3ea8c2b45f769039237f63a73bde4fb05 Mon Sep 17 00:00:00 2001
From: Lohikar <lohikar@protonmail.com>
Date: Wed, 4 Jan 2017 15:45:45 -0600
Subject: [PATCH] More emotes for IPCs (#1391)

Adds *ping, *beep, and *buzz emotes to IPCs.
Emotes are copied from silicon/robot/emote.dm.
---
 code/modules/mob/living/carbon/human/emote.dm | 64 ++++++++++++++++++-
 html/changelogs/Lohikar-ipcbeep.yml           |  4 ++
 2 files changed, 66 insertions(+), 2 deletions(-)
 create mode 100644 html/changelogs/Lohikar-ipcbeep.yml

diff --git a/code/modules/mob/living/carbon/human/emote.dm b/code/modules/mob/living/carbon/human/emote.dm
index de55265b649..dd148291283 100644
--- a/code/modules/mob/living/carbon/human/emote.dm
+++ b/code/modules/mob/living/carbon/human/emote.dm
@@ -551,15 +551,75 @@
 		if("swag", "stopsway")
 			src.animate_tail_stop()
 
+		if("beep")
+			if (!isipc(src))
+				src << span("notice", "You're not a machine!")
+			else 
+				var/M = null
+				if(param)
+					for (var/mob/A in view(null, null))
+						if (param == A.name)
+							M = A
+							break
+				if(!M)
+					param = null
+
+				if (param)
+					message = "beeps at [param]."
+				else
+					message = "beeps."
+				playsound(src.loc, 'sound/machines/twobeep.ogg', 50, 0)
+				m_type = 1
+
+		if("ping")
+			if (!isipc(src))
+				src << span("notice", "You're not a machine!")
+			else 
+				var/M = null
+				if(param)
+					for (var/mob/A in view(null, null))
+						if (param == A.name)
+							M = A
+							break
+				if(!M)
+					param = null
+
+				if (param)
+					message = "pings at [param]."
+				else
+					message = "pings."
+				playsound(src.loc, 'sound/machines/ping.ogg', 50, 0)
+				m_type = 1
+
+		if("buzz")
+			if (!isipc(src))
+				src << span("notice", "You're not a machine!")
+			else
+				var/M = null
+				if(param)
+					for (var/mob/A in view(null, null))
+						if (param == A.name)
+							M = A
+							break
+				if(!M)
+					param = null
+
+				if (param)
+					message = "buzzes at [param]."
+				else
+					message = "buzzes."
+				playsound(src.loc, 'sound/machines/buzz-sigh.ogg', 50, 0)
+				m_type = 1
+
 		if ("help")
 			src << {"blink, blink_r, blush, bow-(none)/mob, burp, choke, chuckle, clap, collapse, cough,
 cry, custom, deathgasp, drool, eyebrow, frown, gasp, giggle, groan, grumble, handshake, hug-(none)/mob, glare-(none)/mob,
 grin, laugh, look-(none)/mob, moan, mumble, nod, pale, point-atom, raise, salute, shake, shiver, shrug,
 sigh, signal-#1-10, smile, sneeze, sniff, snore, stare-(none)/mob, tremble, twitch, twitch_s, whimper,
-wink, yawn, swish, sway/wag, fastsway/qwag, stopsway/swag"}
+wink, yawn, swish, sway/wag, fastsway/qwag, stopsway/swag, beep, ping, buzz"}
 
 		else
-			src << "\blue Unusable emote '[act]'. Say *help for a list."
+			src << span("notice", "Unusable emote '[act]'. Say *help for a list.")
 
 
 
diff --git a/html/changelogs/Lohikar-ipcbeep.yml b/html/changelogs/Lohikar-ipcbeep.yml
new file mode 100644
index 00000000000..6f0802378c9
--- /dev/null
+++ b/html/changelogs/Lohikar-ipcbeep.yml
@@ -0,0 +1,4 @@
+author: Lohikar
+delete-after: True
+changes: 
+  - rscadd: "IPCs can now use *beep, *ping and *buzz."