From 4b835f6c1ec4c8cbf4906167b6e23d79325fa969 Mon Sep 17 00:00:00 2001
From: HugoLuman <qaggeler@uci.edu>
Date: Fri, 6 May 2016 16:42:50 -0700
Subject: [PATCH] Adds an emote for Drask talk sounds, gives them the ability
 to eat soap

---
 .../game/objects/items/weapons/clown_items.dm |  7 ++++++
 code/modules/mob/living/carbon/human/emote.dm | 22 +++++++++++++++++++
 2 files changed, 29 insertions(+)

diff --git a/code/game/objects/items/weapons/clown_items.dm b/code/game/objects/items/weapons/clown_items.dm
index 2038c4851aa..2abc8f5858c 100644
--- a/code/game/objects/items/weapons/clown_items.dm
+++ b/code/game/objects/items/weapons/clown_items.dm
@@ -39,6 +39,13 @@
 	//So this is a workaround. This also makes more sense from an IC standpoint. ~Carn
 	if(user.client && (target in user.client.screen))
 		to_chat(user, "<span class='notice'>You need to take that [target.name] off before cleaning it.</span>")
+	else if(target == user && user.a_intent == "grab")
+		var/mob/living/carbon/human/muncher = user
+		var/species = muncher.get_species()
+		if(species == "Drask")
+			to_chat(user, "You take a bite of the [src.name]. Delicious!")
+			playsound(user.loc, 'sound/items/eatfood.ogg', 50, 0)
+			user.nutrition += 5
 	else if(istype(target,/obj/effect/decal/cleanable))
 		user.visible_message("<span class='warning'>[user] begins to scrub \the [target.name] out with [src].</span>")
 		if(do_after(user, src.cleanspeed, target = target) && target)
diff --git a/code/modules/mob/living/carbon/human/emote.dm b/code/modules/mob/living/carbon/human/emote.dm
index 9f1b41b3ac5..5e058003ceb 100644
--- a/code/modules/mob/living/carbon/human/emote.dm
+++ b/code/modules/mob/living/carbon/human/emote.dm
@@ -32,6 +32,11 @@
 				on_CD = handle_emote_CD()			//proc located in code\modules\mob\emote.dm
 			else								//Everyone else fails, skip the emote attempt
 				return
+		if("drone","drones","hum","hums","rumble","rumbles")
+			if (species.name == "Drask")		//Only Drask can make whale noises
+				on_CD = handle_emote_CD()			//proc located in code\modules\mob\emote.dm
+			else
+				return
 		if("squish", "squishes")
 			var/found_slime_bodypart = 0
 
@@ -114,6 +119,23 @@
 			playsound(src.loc, 'sound/machines/twobeep.ogg', 50, 0)
 			m_type = 2
 
+		if("drone", "drones", "hum", "hums", "rumble", "rumbles")
+			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> drones at [param]."
+			else
+				message = "<B>[src]</B> rumbles."
+			playsound(src.loc, 'sound/voice/DraskTalk.ogg', 50, 0)
+			m_type = 2
+
 		if("squish", "squishes")
 			var/M = null
 			if(param)