From 91e4498792fb8728e2d8edafdbd2a07da4744c56 Mon Sep 17 00:00:00 2001 From: Tigercat2000 Date: Sun, 30 Nov 2014 16:20:14 -0800 Subject: [PATCH] Revert "Allow's slime people to make a squishing sound with *squish" This reverts commit 2d67449c6fc8101465169adbf7e8c5a5f31e5b83. --- code/modules/mob/living/carbon/human/emote.dm | 22 ------------------- 1 file changed, 22 deletions(-) diff --git a/code/modules/mob/living/carbon/human/emote.dm b/code/modules/mob/living/carbon/human/emote.dm index 7dc7db0966b..5f03f064ab7 100644 --- a/code/modules/mob/living/carbon/human/emote.dm +++ b/code/modules/mob/living/carbon/human/emote.dm @@ -82,28 +82,6 @@ if (!species.name == "Machine") return - if("squish") - if(species.name == "Slime People") - 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] squishes at [param]." - else - message = "[src] squishes." - playsound(src.loc, 'sound/effects/squelch1.ogg', 50, 0) - m_type = 1 - else - if(!species.name == "Slime People") - return - - if ("airguitar") if (!src.restrained()) message = "[src] is strumming the air and headbanging like a safari chimp."