From: Mr. 27 <45323883+Dutch-VanDerLinde@users.noreply.github.com>
Date: Thu, 2 May 2024 12:33:51 +0000 (-0400)
Subject: emote wheel fixes (#27545)
X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=6680bd4c607a5f22aad2bf896df5c7839cfcc1ce;p=space-station-14.git

emote wheel fixes (#27545)

* cheese

* Update disease_emotes.yml
---

diff --git a/Resources/Locale/en-US/chat/emotes.ftl b/Resources/Locale/en-US/chat/emotes.ftl
index 8bbb6f033b..e95cb2795d 100644
--- a/Resources/Locale/en-US/chat/emotes.ftl
+++ b/Resources/Locale/en-US/chat/emotes.ftl
@@ -31,18 +31,18 @@ chat-emote-name-snore = Snore
 
 # Message
 chat-emote-msg-scream = screams!
-chat-emote-msg-laugh = laughs
-chat-emote-msg-honk = honks
-chat-emote-msg-sigh = sighs
-chat-emote-msg-whistle = whistle
-chat-emote-msg-crying = crying
-chat-emote-msg-squish = squishing
+chat-emote-msg-laugh = laughs.
+chat-emote-msg-honk = honks.
+chat-emote-msg-sigh = sighs.
+chat-emote-msg-whistle = whistles.
+chat-emote-msg-crying = cries.
+chat-emote-msg-squish = squishes.
 chat-emote-msg-chitter = chitters.
 chat-emote-msg-squeak = squeaks.
-chat-emote-msg-click = click.
+chat-emote-msg-click = clicks.
 chat-emote-msg-clap = claps!
-chat-emote-msg-snap = snaps fingers
-chat-emote-msg-salute = salute
+chat-emote-msg-snap = snaps {POSS-ADJ($entity)} fingers.
+chat-emote-msg-salute = salutes.
 chat-emote-msg-deathgasp = seizes up and falls limp, {POSS-ADJ($entity)} eyes dead and lifeless...
 chat-emote-msg-deathgasp-monkey = lets out a faint chimper as {SUBJECT($entity)} collapses and stops moving...
 chat-emote-msg-buzz = buzz!
@@ -51,11 +51,10 @@ chat-emote-msg-beep = beeps.
 chat-emote-msg-chime = chimes.
 chat-emote-msg-buzzestwo = buzzes twice.
 chat-emote-msg-ping = pings.
-chat-emote-msg-sneeze = sneezes
-chat-emote-msg-cough = coughs
-chat-emote-msg-catmeow = meows
-chat-emote-msg-cathisses = hisses
-chat-emote-msg-monkeyscreeches = screeches
-chat-emote-msg-robotbeep = beeps
-chat-emote-msg-yawn = yawns
-chat-emote-msg-snore = snores
+chat-emote-msg-sneeze = sneezes.
+chat-emote-msg-cough = coughs.
+chat-emote-msg-catmeow = meows.
+chat-emote-msg-cathisses = hisses!
+chat-emote-msg-monkeyscreeches = screeches!
+chat-emote-msg-yawn = yawns.
+chat-emote-msg-snore = snores.
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
index 6a2ab1f14a..0f17e7e9ec 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
@@ -433,7 +433,7 @@
   - type: Speech
     speechVerb: Moth
     speechSounds: Squeak
-    allowedEmotes: ['Chitter']
+    allowedEmotes: ['Chitter', 'Squeak']
   - type: FaxableObject
     insertingState: inserting_mothroach
   - type: MothAccent
@@ -819,7 +819,7 @@
   - type: Speech
     speechVerb: Arachnid
     speechSounds: Arachnid
-    allowedEmotes: ['Click']
+    allowedEmotes: ['Click', 'Chitter']
   - type: DamageStateVisuals
     states:
       Alive:
@@ -2238,7 +2238,7 @@
   - type: Speech
     speechVerb: Arachnid
     speechSounds: Arachnid
-    allowedEmotes: ['Click']
+    allowedEmotes: ['Click', 'Chitter']
   - type: Vocal
     sounds:
       Male: UnisexArachnid
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/space.yml b/Resources/Prototypes/Entities/Mobs/NPCs/space.yml
index 849cd83eba..7b321e80df 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/space.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/space.yml
@@ -263,7 +263,7 @@
   - type: Speech
     speechVerb: Arachnid
     speechSounds: Arachnid
-    allowedEmotes: ['Click']
+    allowedEmotes: ['Click', 'Chitter']
   - type: Vocal
     sounds:
       Male: UnisexArachnid
diff --git a/Resources/Prototypes/Entities/Mobs/Species/arachnid.yml b/Resources/Prototypes/Entities/Mobs/Species/arachnid.yml
index ec742e59b5..8b3c66d5dd 100644
--- a/Resources/Prototypes/Entities/Mobs/Species/arachnid.yml
+++ b/Resources/Prototypes/Entities/Mobs/Species/arachnid.yml
@@ -62,7 +62,7 @@
   - type: Speech
     speechVerb: Arachnid
     speechSounds: Arachnid
-    allowedEmotes: ['Click']
+    allowedEmotes: ['Click', 'Chitter']
   - type: Vocal
     sounds:
       Male: UnisexArachnid
diff --git a/Resources/Prototypes/Entities/Mobs/Species/moth.yml b/Resources/Prototypes/Entities/Mobs/Species/moth.yml
index 33bb46b172..f2a0194b7a 100644
--- a/Resources/Prototypes/Entities/Mobs/Species/moth.yml
+++ b/Resources/Prototypes/Entities/Mobs/Species/moth.yml
@@ -22,7 +22,7 @@
     accent: zombieMoth
   - type: Speech
     speechVerb: Moth
-    allowedEmotes: ['Chitter']
+    allowedEmotes: ['Chitter', 'Squeak']
   - type: TypingIndicator
     proto: moth
   - type: Butcherable
diff --git a/Resources/Prototypes/Voice/disease_emotes.yml b/Resources/Prototypes/Voice/disease_emotes.yml
index c29d6dd017..54330133d7 100644
--- a/Resources/Prototypes/Voice/disease_emotes.yml
+++ b/Resources/Prototypes/Voice/disease_emotes.yml
@@ -41,7 +41,7 @@
   id: RobotBeep
   name: chat-emote-name-robotbeep
   category: Vocal
-  chatMessages: ["chat-emote-msg-robotbeep"]
+  chatMessages: ["chat-emote-msg-beep"]
 
 - type: emote
   id: Yawn