From 60d1880f2555a50451f4533fce1e784dd25d3e00 Mon Sep 17 00:00:00 2001
From: Daniela <daniela.paladinof@gmail.com>
Date: Sun, 14 Jul 2024 00:14:13 -0300
Subject: [PATCH] Restore old IPC emotes and Include them on Harpies

---
 .../DeltaV/Voice/speech_emote_sounds.yml      |  6 ++++
 .../Prototypes/Voice/speech_emote_sounds.yml  | 12 ++++++--
 Resources/Prototypes/Voice/speech_emotes.yml  | 28 +++++++++++--------
 3 files changed, 32 insertions(+), 14 deletions(-)

diff --git a/Resources/Prototypes/DeltaV/Voice/speech_emote_sounds.yml b/Resources/Prototypes/DeltaV/Voice/speech_emote_sounds.yml
index 5dbefa1684..3378743b97 100644
--- a/Resources/Prototypes/DeltaV/Voice/speech_emote_sounds.yml
+++ b/Resources/Prototypes/DeltaV/Voice/speech_emote_sounds.yml
@@ -62,6 +62,12 @@
       collection: BikeHorn
     Weh:
       collection: Weh
+    IPCWhirr:
+      collection: IPCWhirrs
+    IPCBoop:
+      collection: IPCBoops
+    IPCBeep:
+        collection: IPCBeeps
 
 - type: emoteSounds
   id: MaleVulpkanin
diff --git a/Resources/Prototypes/Voice/speech_emote_sounds.yml b/Resources/Prototypes/Voice/speech_emote_sounds.yml
index 97ba622ab5..3735f8bfb5 100644
--- a/Resources/Prototypes/Voice/speech_emote_sounds.yml
+++ b/Resources/Prototypes/Voice/speech_emote_sounds.yml
@@ -388,11 +388,19 @@
       collection: CatHisses
     MonkeyScreeches:
       collection: MonkeyScreeches
-    RobotBeep:
-      path: /Audio/Effects/Cargo/buzz_two.ogg
     Sigh:
       path: /Audio/Voice/Talk/pai.ogg
     Crying:
       path: /Audio/EstacaoPirata/Voice/IPC/cry_robot_1.ogg
     Whistle:
       path: /Audio/Voice/Talk/pai.ogg
+    IPCWhirr:
+      collection: IPCWhirrs
+    IPCBoop:
+      collection: IPCBoops
+    IPCBeep:
+      collection: IPCBeeps
+    #Not the most organized way to reproduce this emote.
+    #But it does work because harpyBeep uses the same triggers as IPCBeep did.
+    HarpyBeep:
+      collection: IPCBeeps
diff --git a/Resources/Prototypes/Voice/speech_emotes.yml b/Resources/Prototypes/Voice/speech_emotes.yml
index c414049189..7f10a88f1b 100644
--- a/Resources/Prototypes/Voice/speech_emotes.yml
+++ b/Resources/Prototypes/Voice/speech_emotes.yml
@@ -296,17 +296,21 @@
     - whirrs.
     - whirrs!
 
-# HarpyBeep
-# - type: emote
-  # id: IPCBeep
-  # category: Vocal
-  # chatMessages: [beeps]
-  # chatTriggers:
-    # - beep
-    # - beeps
-    # - beeps.
-    # - beeps!
-    
+
+# IPCs uses this one and HarpyBeep, they are the same. but trigger differently
+# This exists mostly so Harpies can also play the same sound as IPCs, solving the "beep" trigger conflict
+- type: emote
+  id: IPCBeep
+  category: Vocal
+  chatMessages: [beeps robotically]
+  chatTriggers:
+  - rbeep
+  - rbeep.
+  - rbeeps
+  - rbeeps.
+  - beeps robotically
+  - beeps robotically.
+
 - type: emote
   id: IPCBoop
   category: Vocal
@@ -325,4 +329,4 @@
     - ping
     - pings
     - pings.
-    - pings!
\ No newline at end of file
+    - pings!