From 08016a957dc2bdb4b8f6158267f5db985485cd1a Mon Sep 17 00:00:00 2001 From: Tigercat2000 Date: Thu, 20 Nov 2014 21:36:10 -0800 Subject: [PATCH] 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 = "[src] pings at [param]." + else + message = "[src] 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 = "[src] buzzes at [param]." + else + message = "[src] 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 = "[src] beeps at [param]." + else + message = "[src] 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 = "[src] is strumming the air and headbanging like a safari chimp." @@ -567,6 +630,8 @@ message = "[src] makes a very loud noise." m_type = 2 + + // Needed for M_TOXIC_FART if("fart") if(world.time-lastFart >= 600)