diff --git a/code/modules/mob/living/carbon/human/emote.dm b/code/modules/mob/living/carbon/human/emote.dm
index 3e1bf0d9e26..9f70a098391 100644
--- a/code/modules/mob/living/carbon/human/emote.dm
+++ b/code/modules/mob/living/carbon/human/emote.dm
@@ -111,9 +111,19 @@
 		if ("clap")
 			if (!src.restrained())
 				message = "claps."
+				playsound(loc, 'sound/effects/clap.ogg', 50, 1)
 				m_type = 2
 				if(miming)
 					m_type = 1
+
+		if ("golfclap")
+			if (!src.restrained())
+				message = "claps, clearly unimpressed."
+				playsound(loc, 'sound/effects/golfclap.ogg', 50, 1)
+				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."
@@ -330,7 +340,6 @@
 			message = "snaps [get_visible_gender() == MALE ? "his" : get_visible_gender() == FEMALE ? "her" : "their"] fingers."
 			playsound(loc, 'sound/effects/fingersnap.ogg', 50, 1, -3)
 
-
 		if ("laugh")
 			if(miming)
 				message = "acts out a laugh."
@@ -659,7 +668,7 @@
 
 
 		if ("help")
-			src << {"blink, blink_r, blush, bow-(none)/mob, burp, choke, chuckle, clap, collapse, cough,
+			src << {"blink, blink_r, blush, bow-(none)/mob, burp, choke, chuckle, clap, golfclap, collapse, cough,
 cry, custom, deathgasp, drool, eyebrow, frown, gasp, giggle, groan, grumble, handshake, hug-(none)/mob, glare-(none)/mob,
 grin, laugh, look-(none)/mob, moan, mumble, nod, pale, point-atom, raise, salute, shake, shiver, shrug,
 sigh, signal-#1-10, smile, sneeze, sniff, snore, stare-(none)/mob, tremble, twitch, twitch_s, whimper,
diff --git a/html/changelogs/mattatlas-clapclapidiot.yml b/html/changelogs/mattatlas-clapclapidiot.yml
new file mode 100644
index 00000000000..0b32df4cc02
--- /dev/null
+++ b/html/changelogs/mattatlas-clapclapidiot.yml
@@ -0,0 +1,5 @@
+author: MattAtlas
+delete-after: True
+changes: 
+  - rscadd: "Added a sound to the *clap emote."
+  - rscadd: "Added a *golfclap emote, a clap but more disappointed. Has its own sound effect."
diff --git a/sound/effects/clap.ogg b/sound/effects/clap.ogg
new file mode 100644
index 00000000000..c67c353c07d
Binary files /dev/null and b/sound/effects/clap.ogg differ
diff --git a/sound/effects/golfclap.ogg b/sound/effects/golfclap.ogg
new file mode 100644
index 00000000000..96e01335ef6
Binary files /dev/null and b/sound/effects/golfclap.ogg differ