From 3ad7cd8e8e7f58afb54ca4740d3532e6b43a31b5 Mon Sep 17 00:00:00 2001
From: Atermonera <atermonera@gmail.com>
Date: Mon, 13 Mar 2023 23:50:02 -0800
Subject: [PATCH] *bing

---
 code/modules/emotes/definitions/synthetics.dm  | 5 +++++
 code/modules/mob/living/silicon/emote.dm       | 5 +++++
 code/modules/mob/living/silicon/robot/emote.dm | 5 +++++
 3 files changed, 15 insertions(+)

diff --git a/code/modules/emotes/definitions/synthetics.dm b/code/modules/emotes/definitions/synthetics.dm
index 4d5fea40ef7..d3e8fe355f3 100644
--- a/code/modules/emotes/definitions/synthetics.dm
+++ b/code/modules/emotes/definitions/synthetics.dm
@@ -14,6 +14,11 @@
 	emote_sound = 'sound/machines/twobeep.ogg'
 	sound_vary = FALSE
 
+/decl/emote/audible/synth/bing
+	key = "bing"
+	emote_message_3p = "bings."
+	emote_sound = 'sound/machines/ping.ogg'
+
 /decl/emote/audible/synth/buzz
 	key = "buzz"
 	emote_message_3p = "buzzes."
diff --git a/code/modules/mob/living/silicon/emote.dm b/code/modules/mob/living/silicon/emote.dm
index 728b4d9f846..9f567ac4e65 100644
--- a/code/modules/mob/living/silicon/emote.dm
+++ b/code/modules/mob/living/silicon/emote.dm
@@ -1,6 +1,11 @@
 var/list/_silicon_default_emotes = list(
 	/decl/emote/audible/synth,
+<<<<<<< HEAD
 	/decl/emote/audible/synth/beep,
+=======
+	/decl/emote/audible/synth/ping,
+	/decl/emote/audible/synth/bing,
+>>>>>>> ca0065ea05e... Merge pull request #9033 from Varlaisvea/goodbing
 	/decl/emote/audible/synth/buzz,
 	/decl/emote/audible/synth/confirm,
 	/decl/emote/audible/synth/deny,
diff --git a/code/modules/mob/living/silicon/robot/emote.dm b/code/modules/mob/living/silicon/robot/emote.dm
index 79df20a324a..7674205e06b 100644
--- a/code/modules/mob/living/silicon/robot/emote.dm
+++ b/code/modules/mob/living/silicon/robot/emote.dm
@@ -16,7 +16,12 @@ var/list/_robot_default_emotes = list(
 	/decl/emote/visible/spin,
 	/decl/emote/visible/sidestep,
 	/decl/emote/audible/synth,
+<<<<<<< HEAD
 	/decl/emote/audible/synth/beep,
+=======
+	/decl/emote/audible/synth/ping,
+	/decl/emote/audible/synth/bing,
+>>>>>>> ca0065ea05e... Merge pull request #9033 from Varlaisvea/goodbing
 	/decl/emote/audible/synth/buzz,
 	/decl/emote/audible/synth/confirm,
 	/decl/emote/audible/synth/deny,