more fixes

ss220club · Oct 18, 2023 · 9fc4cc5 · 9fc4cc5
1 parent ed91594
commit 9fc4cc5
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 5 deletions.
diff --git a/modular_ss220/emotes/code/emote_panel_names.dm b/modular_ss220/emotes/code/emote_panel_names.dm
@@ -92,6 +92,9 @@
 /datum/emote/living/sigh
 	name = "вздохнуть"
 
+/datum/emote/living/sigh/happy
+	name = "удовлетворённо вздохнуть"
+
 /datum/emote/living/sit
 	name = "сесть"
 
@@ -205,10 +208,10 @@
 	name = "побулькать"
 
 /datum/emote/living/carbon/inhale
-	name = "вздохнуть"
+	name = "вдохнуть"
 
-/datum/emote/living/carbon/inhale
-	name = "удовлетвореноо вздохнуть"
+/datum/emote/living/carbon/inhale/sharp
+	name = "глубоко вдохнуть"
 
 /datum/emote/living/carbon/kiss
 	name = "поцеловать"

diff --git a/tgui/packages/tgui/interfaces/EmotePanel.js b/tgui/packages/tgui/interfaces/EmotePanel.js
@@ -143,8 +143,7 @@ export const EmotePanelContent = (props, context) => {
           <Flex.Item>
           {emotes
           .filter(emote => emote.key &&
-            ((searchText.length > 0 ? emote.key.toLowerCase().includes(searchText.toLowerCase()) : true) ||
-            (searchText.length > 0 ? emote.name.toLowerCase().includes(searchText.toLowerCase()) : true)) &&
+            (searchText.length > 0 ? (emote.key.toLowerCase().includes(searchText.toLowerCase()) || emote.name.toLowerCase().includes(searchText.toLowerCase())) : true) &&
             (filterVisible ? emote.visible : true) &&
             (filterAudible ? emote.audible : true) &&
             (filterSound ? emote.sound : true) &&

diff --git a/tgui/packages/tgui/public/tgui.bundle.js b/tgui/packages/tgui/public/tgui.bundle.js