Fixed emotes, chat bubble fonts

gluesniffler · Sep 1, 2024 · 2747975 · 2747975
1 parent 6a44b88
commit 2747975
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 44 deletions.
diff --git a/Resources/Locale/en-US/chat/managers/chat-manager.ftl b/Resources/Locale/en-US/chat/managers/chat-manager.ftl
@@ -21,11 +21,11 @@ chat-manager-whisper-headset-on-message = You can't whisper on the radio!
 chat-manager-server-wrap-message = [bold]{$message}[/bold]
 chat-manager-sender-announcement-wrap-message = [font size=14][bold]{$sender} Announcement:[/font][font size=12]
                                                 {$message}[/bold][/font]
-chat-manager-entity-say-wrap-message = [BubbleHeader][Name]{$entityName}[/Name][/BubbleHeader] {$verb}, [font="{$fontType}" size={$fontSize}]"[color={$color}][BubbleContent]{$message}[/BubbleContent][/color]"[/font]
-chat-manager-entity-say-bold-wrap-message = [BubbleHeader][Name]{$entityName}[/Name][/BubbleHeader] {$verb}, [font="{$fontType}" size={$fontSize}]"[color={$color}][BubbleContent][bold]{$message}[/bold][/BubbleContent][/color]"[/font]
+chat-manager-entity-say-wrap-message = [BubbleHeader][Name]{$entityName}[/Name][/BubbleHeader] {$verb}, "[BubbleContent][font="{$fontType}" size={$fontSize}][color={$color}]{$message}[/color][/font][/BubbleContent]"
+chat-manager-entity-say-bold-wrap-message = [BubbleHeader][Name]{$entityName}[/Name][/BubbleHeader] {$verb}, "[BubbleContent][font="{$fontType}" size={$fontSize}][color={$color}][bold]{$message}[/bold][/color][/font][/BubbleContent]"
 
-chat-manager-entity-whisper-wrap-message = [font size=11][italic][BubbleHeader][Name]{$entityName}[/Name][/BubbleHeader] whispers,"[color={$color}][BubbleContent]{$message}[/BubbleContent][/color]"[/italic][/font]
-chat-manager-entity-whisper-unknown-wrap-message = [font size=11][italic][BubbleHeader]Someone[/BubbleHeader] whispers, "[color={$color}][BubbleContent]{$message}[/BubbleContent][/color]"[/italic][/font]
+chat-manager-entity-whisper-wrap-message = [font size=11][italic][BubbleHeader][Name]{$entityName}[/Name][/BubbleHeader] whispers, "[BubbleContent][font="{$fontType}"][color={$color}]{$message}[/color][/font][/BubbleContent]"[/italic][/font]
+chat-manager-entity-whisper-unknown-wrap-message = [font size=11][italic][BubbleHeader]Someone[/BubbleHeader] whispers, "[BubbleContent][font="{$fontType}"][color={$color}]{$message}[/color][/font][/BubbleContent]"[/italic][/font]
 
 # THE() is not used here because the entity and its name can technically be disconnected if a nameOverride is passed...
 chat-manager-entity-me-wrap-message = [italic]{ PROPER($entity) ->

diff --git a/Resources/Prototypes/Voice/speech_emote_sounds.yml b/Resources/Prototypes/Voice/speech_emote_sounds.yml
@@ -434,10 +434,6 @@
       path: /Audio/Voice/IPC/syndieborg_laugh.ogg
       params:
         variation: 0.125
-    Honk:
-      collection: BikeHorn
-      params:
-        variation: 0.125
     Chitter:
       path: /Audio/Voice/Talk/pai.ogg
       params:

diff --git a/Resources/Prototypes/Voice/speech_emotes.yml b/Resources/Prototypes/Voice/speech_emotes.yml
@@ -144,42 +144,6 @@
   chatTriggers:
     - chirps
 
-# Machine Emotes
-- type: emote
-  id: Beep
-  category: Vocal
-  chatMessages: [ beeps ]
-  chatTriggers:
-    - beeps
-
-- type: emote
-  id: Boop
-  category: Vocal
-  chatMessages: [ boops ]
-  chatTriggers:
-    - boops
-
-- type: emote
-  id: Chime
-  category: Vocal
-  chatMessages: [ chimes ]
-  chatTriggers:
-    - chimes
-
-- type: emote
-  id: Buzz-Two
-  category: Vocal
-  chatMessages: [ "buzzes twice" ]
-  chatTriggers:
-    - buzzes twice
-
-- type: emote
-  id: Ping
-  category: Vocal
-  chatMessages: [ pings ]
-  chatTriggers:
-    - pings
-
     # Machine Emotes
 - type: emote
   id: Beep