diff --git a/code/game/objects/items/flag.dm b/code/game/objects/items/flag.dm index 12594ff0310..97b2dfd6cfc 100644 --- a/code/game/objects/items/flag.dm +++ b/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 diff --git a/code/game/objects/items/weapons/clown_items.dm b/code/game/objects/items/weapons/clown_items.dm index 2038c4851aa..b3d8a7a19e2 100644 --- a/code/game/objects/items/weapons/clown_items.dm +++ b/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, "You need to take that [target.name] off before cleaning it.") + 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("[user] begins to scrub \the [target.name] out with [src].") 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 = "[src] drones at [param]." + else + message = "[src] rumbles." + playsound(src.loc, 'sound/voice/DraskTalk.ogg', 50, 0) + m_type = 2 + if("squish", "squishes") var/M = null if(param) diff --git a/code/modules/store/items.dm b/code/modules/store/items.dm index 489caa96a91..c67ed43fd92 100644 --- a/code/modules/store/items.dm +++ b/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." diff --git a/icons/mob/species/drask/helmet.dmi b/icons/mob/species/drask/helmet.dmi index 3759f81fc41..0fdd257f0d9 100644 Binary files a/icons/mob/species/drask/helmet.dmi and b/icons/mob/species/drask/helmet.dmi differ diff --git a/icons/obj/flag.dmi b/icons/obj/flag.dmi index b85010f3727..d1e0f08fa49 100644 Binary files a/icons/obj/flag.dmi and b/icons/obj/flag.dmi differ