From eb039f804e04f2020224144049381a90e49750ad Mon Sep 17 00:00:00 2001
From: Shadow Pandora <nick.pilant@gmail.com>
Date: Wed, 12 Nov 2014 00:32:21 -0800
Subject: [PATCH 1/4] Makes occupant scream while being gibbed.

---
 code/game/machinery/kitchen/gibber.dm | 1 +
 1 file changed, 1 insertion(+)

diff --git a/code/game/machinery/kitchen/gibber.dm b/code/game/machinery/kitchen/gibber.dm
index 8d020c5c268..265428f8af2 100644
--- a/code/game/machinery/kitchen/gibber.dm
+++ b/code/game/machinery/kitchen/gibber.dm
@@ -162,6 +162,7 @@
 	else
 		src.occupant.LAssailant = user
 
+	src.occupant.emote("scream")
 	src.occupant.death(1)
 	src.occupant.ghostize()
 	del(src.occupant)

From 7c2b8c0e64e60323282d6217cc6465fe24cf73ad Mon Sep 17 00:00:00 2001
From: Tigercat2000 <nick.pilant@gmail.com>
Date: Thu, 13 Nov 2014 16:25:13 -0800
Subject: [PATCH 2/4] Add's a gibbing sound effect to the gibber. -Tigercat2000

---
 code/game/machinery/kitchen/gibber.dm | 1 +
 1 file changed, 1 insertion(+)

diff --git a/code/game/machinery/kitchen/gibber.dm b/code/game/machinery/kitchen/gibber.dm
index 265428f8af2..d5510dbbd26 100644
--- a/code/game/machinery/kitchen/gibber.dm
+++ b/code/game/machinery/kitchen/gibber.dm
@@ -163,6 +163,7 @@
 		src.occupant.LAssailant = user
 
 	src.occupant.emote("scream")
+	playsound(src.loc, 'sound/effects/gib.ogg', 50, 1)
 	src.occupant.death(1)
 	src.occupant.ghostize()
 	del(src.occupant)

From 067d9565e311358c66cd78d750904e4479cfb9f2 Mon Sep 17 00:00:00 2001
From: Tigercat2000 <nick.pilant@gmail.com>
Date: Thu, 20 Nov 2014 20:13:31 -0800
Subject: [PATCH 3/4] Changes the button for admin OOC color to be descriptive
 of such. "OOC Text Color" to "Personal OOC Text Color"

---
 code/modules/admin/admin_verbs.dm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/modules/admin/admin_verbs.dm b/code/modules/admin/admin_verbs.dm
index 4f874619a16..f2440e5d624 100644
--- a/code/modules/admin/admin_verbs.dm
+++ b/code/modules/admin/admin_verbs.dm
@@ -304,7 +304,7 @@ var/list/admin_verbs_mod = list(
 
 /client/proc/colorooc()
 	set category = "Admin"
-	set name = "OOC Text Color"
+	set name = "Personal OOC Text Color"
 	if(!holder)	return
 	var/new_ooccolor = input(src, "Please select your OOC colour.", "OOC colour") as color|null
 	if(new_ooccolor)

From 08016a957dc2bdb4b8f6158267f5db985485cd1a Mon Sep 17 00:00:00 2001
From: Tigercat2000 <nick.pilant@gmail.com>
Date: Thu, 20 Nov 2014 21:36:10 -0800
Subject: [PATCH 4/4] Adds Machine-People specific *buzz *ping and *beep
 emotes.

---
 code/modules/mob/living/carbon/human/emote.dm | 65 +++++++++++++++++++
 1 file changed, 65 insertions(+)

diff --git a/code/modules/mob/living/carbon/human/emote.dm b/code/modules/mob/living/carbon/human/emote.dm
index 72330960a76..5f03f064ab7 100644
--- a/code/modules/mob/living/carbon/human/emote.dm
+++ b/code/modules/mob/living/carbon/human/emote.dm
@@ -19,6 +19,69 @@
 	if(src.stat == 2.0 && (act != "deathgasp"))
 		return
 	switch(act)
+		if("ping")
+			if (species.name == "Machine")
+				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 = "<B>[src]</B> pings at [param]."
+				else
+					message = "<B>[src]</B> pings."
+				playsound(src.loc, 'sound/machines/ping.ogg', 50, 0)
+				m_type = 1
+			else
+				if (!species.name == "Machine")
+					return
+
+		if("buzz")
+			if (species.name == "Machine")
+				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 = "<B>[src]</B> buzzes at [param]."
+				else
+					message = "<B>[src]</B> buzzes."
+				playsound(src.loc, 'sound/machines/buzz-sigh.ogg', 50, 0)
+				m_type = 1
+			else
+				if (!species.name == "Machine")
+					return
+
+		if("beep")
+			if(species.name == "Machine")
+				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 = "<B>[src]</B> beeps at [param]."
+				else
+					message = "<B>[src]</B> beeps."
+				playsound(src.loc, 'sound/machines/twobeep.ogg', 50, 0)
+				m_type = 1
+			else
+				if (!species.name == "Machine")
+					return
+
 		if ("airguitar")
 			if (!src.restrained())
 				message = "<B>[src]</B> is strumming the air and headbanging like a safari chimp."
@@ -567,6 +630,8 @@
 					message = "<B>[src]</B> makes a very loud noise."
 					m_type = 2
 
+
+
 		// Needed for M_TOXIC_FART
 		if("fart")
 			if(world.time-lastFart >= 600)