Merge pull request #4377 from QuinnAggeler/drask-fluff

Drask fluff additions

code/game/objects/items/flag.dm

@@ -161,6 +161,11 @@
 	desc = "A flag proudly proclaiming the superior heritage of Vulpkanin."
 	icon_state = "vulpflag"
 
+/obj/item/flag/species/drask
+	name = "Drask flag"
+	desc = "A flag proudly proclaiming the superior heritage of Drask."
+	icon_state = "draskflag"
+
 //Department Flags
 
 /obj/item/flag/cargo

code/game/objects/items/weapons/clown_items.dm

@@ -39,6 +39,12 @@
 	//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 == I_GRAB && ishuman(target))
+		var/mob/living/carbon/human/muncher = user
+		if(muncher && muncher.get_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 += 2
 	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)

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)

code/modules/store/items.dm

@@ -171,6 +171,12 @@
 	typepath = /obj/item/flag/species/vulp
 	cost = 1000
 
+/datum/storeitem/flag_drask
+	name = "Drask flag"
+	desc = "A flag proudly proclaiming the superior heritage of Drask."
+	typepath = /obj/item/flag/species/drask
+	cost = 1000
+
 /datum/storeitem/flag_ian
 	name = "Ian flag"
 	desc = "The banner of Ian, because SQUEEEEE."