Revert "отрыжка (#317)" (#343)

This reverts commit 98a3360.
space-sunrise · Aug 30, 2024 · fd0311a · fd0311a
1 parent e591ba3
commit fd0311a
Show file tree

Hide file tree

Showing 9 changed files with 0 additions and 63 deletions.
diff --git a/Resources/Audio/_Sunrise/Voice/Misc/Otryjka/otryjka1.ogg b/Resources/Audio/_Sunrise/Voice/Misc/Otryjka/otryjka1.ogg
diff --git a/Resources/Audio/_Sunrise/Voice/Misc/Otryjka/otryjka2.ogg b/Resources/Audio/_Sunrise/Voice/Misc/Otryjka/otryjka2.ogg
diff --git a/Resources/Audio/_Sunrise/Voice/Misc/Otryjka/otryjka3.ogg b/Resources/Audio/_Sunrise/Voice/Misc/Otryjka/otryjka3.ogg
diff --git a/Resources/Audio/_Sunrise/Voice/Misc/Otryjka/otryjka4.ogg b/Resources/Audio/_Sunrise/Voice/Misc/Otryjka/otryjka4.ogg
diff --git a/Resources/Audio/_Sunrise/Voice/Misc/Otryjka/otryjka5.ogg b/Resources/Audio/_Sunrise/Voice/Misc/Otryjka/otryjka5.ogg
diff --git a/Resources/Prototypes/Voice/speech_emote_sounds.yml b/Resources/Prototypes/Voice/speech_emote_sounds.yml
@@ -38,12 +38,6 @@
       collection: MaleGasp
     DefaultDeathgasp:
       collection: MaleDeathGasp
-    # Sunrise-start
-    Otryjka:
-      collection: Otryjka
-      params:
-        volume: -12
-    # Sunrise-end
 
 - type: emoteSounds
   id: FemaleHuman
@@ -106,12 +100,6 @@
       collection: MaleGasp
     DefaultDeathgasp:
       collection: DeathGasp
-    # Sunrise-start
-    Otryjka:
-      collection: Otryjka
-      params:
-        volume: -12
-    # Sunrise-end
 
 - type: emoteSounds
   id: FemaleReptilian
@@ -305,12 +293,6 @@
       collection: MaleGasp
     DefaultDeathgasp:
       collection: MaleDeathGasp
-    # Sunrise-start
-    Otryjka:
-      collection: Otryjka
-      params:
-        volume: -12
-    # Sunrise-end
   params:
     variation: 0.125
     pitch: 0.75

diff --git a/Resources/Prototypes/_Sunrise/SoundCollections/otryjka.yml b/Resources/Prototypes/_Sunrise/SoundCollections/otryjka.yml
diff --git a/Resources/Prototypes/_Sunrise/Voice/speech_emote_sounds.yml b/Resources/Prototypes/_Sunrise/Voice/speech_emote_sounds.yml
@@ -25,12 +25,6 @@
       collection: FelinidPurrs
     Growl:
       collection: FelinidGrowls
-    # Sunrise-start
-    Otryjka:
-      collection: Otryjka
-      params:
-        volume: -12
-    # Sunrise-end
 
 - type: emoteSounds
   id: FemaleFelinid
@@ -85,12 +79,6 @@
       collection: VulpkaninHowls
     Bark:
       collection: VulpkaninBarks
-    # Sunrise-start
-    Otryjka:
-      collection: Otryjka
-      params:
-        volume: -12
-    # Sunrise-end
 
 - type: emoteSounds
   id: FemaleVulpkanin
@@ -145,12 +133,6 @@
       collection: MaleCry
     Whistle:
       collection: Whistles
-    # Sunrise-start
-    Otryjka:
-      collection: Otryjka
-      params:
-        volume: -12
-    # Sunrise-end
   params:
     variation: 0.125
 

diff --git a/Resources/Prototypes/_Sunrise/Voice/speech_emotes.yml b/Resources/Prototypes/_Sunrise/Voice/speech_emotes.yml
@@ -207,22 +207,3 @@
   name: Инсульт
   category: Vocal
   chatMessages: [инсультыы]
-
-- type: emote
-  id: Otryjka
-  name: Отрыжка
-  category: Vocal
-  chatMessages: ["рыгает"]
-  whitelist:
-    components:
-    - Vocal
-  blacklist:
-    components:
-    - BorgChassis
-  chatTriggers:
-  - рыгает.
-  - рыг.
-  - рыгает!
-  - рыг!
-  - рыгает
-  - рыг