Merge pull request #493 from nicky89107/master

Gibbing sound effects and screams + clarifying admin OOC color verb's name.+ Machine people *buzz *ping and *beep emotes -Tigercat2000

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)

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)