diff --git a/code/modules/mob/living/carbon/human/emote.dm b/code/modules/mob/living/carbon/human/emote.dm
index e98022acfdb..885d3e0866b 100644
--- a/code/modules/mob/living/carbon/human/emote.dm
+++ b/code/modules/mob/living/carbon/human/emote.dm
@@ -25,7 +25,7 @@
 				message = "is strumming the air and headbanging like a safari chimp."
 				m_type = 1
 
-		if("ping", "beep", "buzz")
+		if("ping", "beep", "buzz", "yes", "no")
 
 			if(!isSynthetic())
 				src << "<span class='warning'>You are not a synthetic.</span>"
@@ -48,6 +48,12 @@
 			else if(act == "ping")
 				display_msg = "pings"
 				use_sound = 'sound/machines/ping.ogg'
+			else if(act == "yes")
+				display_msg = "emits an affirmative blip"
+				use_sound = 'sound/machines/synth_yes.ogg'
+			else if(act == "no")
+				display_msg = "emits a negative blip"
+				use_sound = 'sound/machines/synth_no.ogg'
 
 			if (param)
 				message = "[display_msg] at [param]."
diff --git a/code/modules/mob/living/silicon/robot/emote.dm b/code/modules/mob/living/silicon/robot/emote.dm
index dca60f597c6..23b6cc0d67b 100644
--- a/code/modules/mob/living/silicon/robot/emote.dm
+++ b/code/modules/mob/living/silicon/robot/emote.dm
@@ -187,6 +187,40 @@
 			playsound(src.loc, 'sound/machines/buzz-sigh.ogg', 50, 0)
 			m_type = 1
 
+		if("yes")
+			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 = "emits an affirmative blip at [param]."
+			else
+				message = "emits an affirmative blip."
+			playsound(src.loc, 'sound/machines/synth_yes.ogg', 50, 0)
+			m_type = 1
+
+		if("no")
+			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 = "emits a negative blip at [param]."
+			else
+				message = "emits a negative blip."
+			playsound(src.loc, 'sound/machines/synth_no.ogg', 50, 0)
+			m_type = 1
+
 		if("law")
 			if (istype(module,/obj/item/weapon/robot_module/security))
 				message = "shows its legal authorization barcode."
@@ -206,7 +240,7 @@
 				src << "You are not security."
 
 		if ("help")
-			src << "salute, bow-(none)/mob, clap, flap, aflap, twitch, twitch_s, nod, deathgasp, glare-(none)/mob, stare-(none)/mob, look, beep, ping, \nbuzz, law, halt"
+			src << "salute, bow-(none)/mob, clap, flap, aflap, twitch, twitch_s, nod, deathgasp, glare-(none)/mob, stare-(none)/mob, look, beep, ping, \nbuzz, law, halt, yes, no"
 		else
 			src << "\blue Unusable emote '[act]'. Say *help for a list."
 
diff --git a/sound/machines/synth_no.ogg b/sound/machines/synth_no.ogg
new file mode 100644
index 00000000000..f0d2c3bfb0c
Binary files /dev/null and b/sound/machines/synth_no.ogg differ
diff --git a/sound/machines/synth_yes.ogg b/sound/machines/synth_yes.ogg
new file mode 100644
index 00000000000..300cad132ed
Binary files /dev/null and b/sound/machines/synth_yes.ogg differ