diff --git a/code/modules/mob/living/carbon/human/emote.dm b/code/modules/mob/living/carbon/human/emote.dm
index 06d49959b60..4a44b867f53 100644
--- a/code/modules/mob/living/carbon/human/emote.dm
+++ b/code/modules/mob/living/carbon/human/emote.dm
@@ -53,6 +53,19 @@
if(!found_slime_bodypart) //Everyone else fails, skip the emote attempt
return
+
+ if("clack", "clacks")
+ if(species.name == "Kidan") //Only Kidan can clack and rightfully so.
+ on_CD = handle_emote_CD() //proc located in code\modules\mob\emote.dm'
+ else //Everyone else fails, skip the emote attempt
+ return
+
+ if("click", "clicks")
+ if(species.name == "Kidan") //Only Kidan can click and rightfully so.
+ on_CD = handle_emote_CD() //proc located in code\modules\mob\emote.dm'
+ else //Everyone else fails, skip the emote attempt
+ return
+
if("scream", "screams")
on_CD = handle_emote_CD(50) //longer cooldown
if("fart", "farts", "flip", "flips", "snap", "snaps")
@@ -163,6 +176,40 @@
playsound(loc, 'sound/effects/slime_squish.ogg', 50, 0) //Credit to DrMinky (freesound.org) for the sound.
m_type = 2
+ if("clack", "clacks")
+ 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] clacks their mandibles at [param]."
+ else
+ message = "[src] clacks their mandibles."
+ playsound(loc, 'sound/effects/Kidanclack.ogg', 50, 0) //Credit to DrMinky (freesound.org) for the sound.
+ m_type = 2
+
+ if("click", "clicks")
+ 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] clicks their mandibles at [param]."
+ else
+ message = "[src] clicks their mandibles."
+ playsound(loc, 'sound/effects/Kidanclack2.ogg', 50, 0) //Credit to DrMinky (freesound.org) for the sound.
+ m_type = 2
+
if("yes")
var/M = null
if(param)
@@ -225,12 +272,12 @@
if(!restrained())
message = "[src] is strumming the air and headbanging like a safari chimp."
m_type = 1
-
+
if("dance")
if(!restrained())
message = "[src] dances around happily."
m_type = 1
-
+
if("jump")
if(!restrained())
message = "[src] jumps!"
@@ -836,11 +883,11 @@
// playsound(loc, 'sound/effects/fart.ogg', 50, 1, -3) //Admins still vote no to fun
if(locate(/obj/item/weapon/storage/bible) in get_turf(src))
to_chat(viewers(src), "[src] farts on the Bible!")
- var/image/cross = image('icons/obj/storage.dmi',"bible")
- var/adminbfmessage = "\blue [bicon(cross)] Bible Fart: [key_name(src, 1)] (?) (PP) (VV) (SM) ([admin_jump_link(src)]) (CA) (SMITE):"
- for(var/client/X in admins)
- if(check_rights(R_EVENT,0,X.mob))
- to_chat(X, adminbfmessage)
+ var/image/cross = image('icons/obj/storage.dmi',"bible")
+ var/adminbfmessage = "\blue [bicon(cross)] Bible Fart: [key_name(src, 1)] (?) (PP) (VV) (SM) ([admin_jump_link(src)]) (CA) (SMITE):"
+ for(var/client/X in admins)
+ if(check_rights(R_EVENT,0,X.mob))
+ to_chat(X, adminbfmessage)
else if(TOXIC_FARTS in mutations)
message = "[src] unleashes a [pick("horrible","terrible","foul","disgusting","awful")] fart."
else if(SUPER_FART in mutations)
diff --git a/sound/effects/Kidanclack.ogg b/sound/effects/Kidanclack.ogg
new file mode 100644
index 00000000000..a25cf3efab7
Binary files /dev/null and b/sound/effects/Kidanclack.ogg differ
diff --git a/sound/effects/kidanclack2.ogg b/sound/effects/kidanclack2.ogg
new file mode 100644
index 00000000000..de2d625bc13
Binary files /dev/null and b/sound/effects/kidanclack2.ogg differ