diff --git a/code/modules/mob/living/carbon/human/emote.dm b/code/modules/mob/living/carbon/human/emote.dm
index 896c699777..286596ba04 100644
--- a/code/modules/mob/living/carbon/human/emote.dm
+++ b/code/modules/mob/living/carbon/human/emote.dm
@@ -174,9 +174,11 @@
 		if ("clap")
 			if (!src.restrained())
 				message = "claps."
+				playsound(src.loc, 'sound/misc/clapping.ogg')
 				m_type = 2
 				if(miming)
 					m_type = 1
+
 		if ("flap")
 			if (!src.restrained())
 				message = "flaps [get_visible_gender() == MALE ? "his" : get_visible_gender() == FEMALE ? "her" : "their"] wings."
@@ -700,6 +702,20 @@
 			vomit()
 			return
 
+		if("whistle" || "whistles")
+			if(!muzzled)
+				message = "whistles a tune."
+				playsound(loc, 'sound/misc/longwhistle.ogg') //praying this doesn't get abused
+			else
+				message = "makes a light spitting noise, a poor attempt at a whistle."
+
+		if("qwhistle")
+			if(!muzzled)
+				message = "whistles quietly."
+				playsound(loc, 'sound/misc/shortwhistle.ogg')
+			else
+				message = "makes a light spitting noise, a poor attempt at a whistle."
+
 		if ("help")
 			src << "blink, blink_r, blush, bow-(none)/mob, burp, choke, chuckle, clap, collapse, cough, cry, custom, deathgasp, drool, eyebrow, fastsway/qwag, \
 					frown, gasp, giggle, glare-(none)/mob, grin, groan, grumble, handshake, hug-(none)/mob, laugh, look-(none)/mob, moan, mumble, nod, pale, point-atom, \
diff --git a/sound/misc/clapping.ogg b/sound/misc/clapping.ogg
new file mode 100644
index 0000000000..4ecdc2aa22
Binary files /dev/null and b/sound/misc/clapping.ogg differ
diff --git a/sound/misc/longwhistle.ogg b/sound/misc/longwhistle.ogg
new file mode 100644
index 0000000000..0a2e822515
Binary files /dev/null and b/sound/misc/longwhistle.ogg differ
diff --git a/sound/misc/shortwhistle.ogg b/sound/misc/shortwhistle.ogg
new file mode 100644
index 0000000000..82ef01af3d
Binary files /dev/null and b/sound/misc/shortwhistle.ogg differ