fix merge issue in speech_emote_sounds.yml

AdventureTimeSS14 · Aug 5, 2024 · d845207 · d845207
1 parent 44bbd18
commit d845207
Showing 1 changed file with 0 additions and 211 deletions.
diff --git a/Resources/Prototypes/ADT/Voice/speech_emote_sounds.yml b/Resources/Prototypes/ADT/Voice/speech_emote_sounds.yml
@@ -47,214 +47,3 @@
       collection: DraskCough
     CatMeow:
       collection: CatMeows
-    CatHisses:
-      collection: CatHisses
-    MonkeyScreeches:
-      collection: MonkeyScreeches
-    RobotBeep:
-      collection: RobotBeeps
-    Yawn:
-      collection: FemaleYawn
-    Snore:
-      collection: Snores
-    Honk:
-      collection: CluwneHorn
-    Sigh:
-      collection: FemaleSigh
-    Crying:
-      collection: FemaleCry
-    Whistle:
-      collection: Whistles
-
-- type: emoteSounds
-  id: UnisexIPC
-  sounds:
-    RobotBeep:
-      collection: RobotBeeps
-    SynthYes:
-      collection: SynthYes
-    SynthNo:
-      collection: SynthNo
-    Ping:
-      collection: Ping
-    Buzz:
-      collection: Buzz
-    SighBuzz:
-      collection: SighBuzz
-    Sigh:
-      collection: SighIPC
-    Scream:
-      collection: ScreamIPC
-  params:
-    variation: 0.125
-
-- type: emoteSounds
-  id: MaleMoth
-  params:
-    variation: 0.125
-  sounds:
-    Buzz:
-      collection: MothBuzz
-    Scream:
-      collection: MothScream
-    Laugh:
-      collection: MothLaugh
-    Chitter:
-      collection: MothChitter
-    Squeak:
-      collection: MothSqueak
-    Weh:
-      collection: Weh
-    Sneeze:
-      collection: MaleSneezes
-    Cough:
-      collection: MaleCoughs
-    MonkeyScreeches:
-      collection: MonkeyScreeches
-    Yawn:
-      collection: MaleYawn
-    Snore:
-      collection: Snores
-    Honk:
-      collection: BikeHorn
-    Sigh:
-      collection: MaleSigh
-    Crying:
-      collection: MaleCry
-    Whistle:
-      collection: Whistles
-
-- type: emoteSounds
-  id: FemaleMoth
-  params:
-    variation: 0.125
-  sounds:
-    Buzz:
-      collection: MothBuzz
-    Scream:
-      collection: MothScream
-    Laugh:
-      collection: MothLaugh
-    Chitter:
-      collection: MothChitter
-    Squeak:
-      collection: MothSqueak
-    Weh:
-      collection: Weh
-    Sneeze:
-      collection: MaleSneezes
-    Cough:
-      collection: MaleCoughs
-    MonkeyScreeches:
-      collection: MonkeyScreeches
-    Yawn:
-      collection: MaleYawn
-    Snore:
-      collection: Snores
-    Honk:
-      collection: BikeHorn
-    Sigh:
-      collection: MaleSigh
-    Crying:
-      collection: MaleCry
-    Whistle:
-      collection: Whistles
-
-- type: emoteSounds
-  id: ADTMaleTajaran
-  params:
-    variation: 0.125
-  sounds:
-    Scream:
-      collection: TajaranMaleScreams
-    Laugh:
-      collection: MaleLaugh
-    Hiss:
-      collection: TajaranHisses
-    Meow:
-      collection: TajaranMeows
-    Mew:
-      collection: TajaranMews
-    Growl:
-      collection: TajaranGrowls
-    Purr:
-      collection: TajaranPurrs
-    Sneeze:
-      collection: MaleSneezes
-    Cough:
-      collection: MaleCoughs
-    MonkeyScreeches:
-      collection: MonkeyScreeches
-    RobotBeep:
-      collection: RobotBeeps
-    Yawn:
-      collection: MaleYawn
-    Snore:
-      collection: Snores
-    Honk:
-      collection: BikeHorn
-    Sigh:
-      collection: MaleSigh
-    Crying:
-      collection: MaleCry
-    Whistle:
-      collection: Whistles
-    # ADT-Apathy Sounds.
-    Scream-apathy:
-      collection: TajaranMaleScreams
-    Laugh-apathy:
-      collection: MaleLaugh
-    Sigh-apathy:
-      collection: MaleSigh
-    Crying-apathy:
-      collection: MaleCry
-
-- type: emoteSounds
-  id: ADTFemaleTajaran
-  params:
-    variation: 0.125
-  sounds:
-    Scream:
-      collection: TajaranFemaleScreams
-    Laugh:
-      collection: FemaleLaugh
-    Sneeze:
-      collection: FemaleSneezes
-    Cough:
-      collection: FemaleCoughs
-    Hiss:
-      collection: TajaranHisses
-    Meow:
-      collection: TajaranMeows
-    Mew:
-      collection: TajaranMews
-    Growl:
-      collection: TajaranGrowls
-    Purr:
-      collection: TajaranPurrs
-    MonkeyScreeches:
-      collection: MonkeyScreeches
-    RobotBeep:
-      collection: RobotBeeps
-    Yawn:
-      collection: FemaleYawn
-    Snore:
-      collection: Snores
-    Honk:
-      collection: CluwneHorn
-    Sigh:
-      collection: FemaleSigh
-    Crying:
-      collection: FemaleCry
-    Whistle:
-      collection: Whistles
-    # ADT-Apathy Sounds.
-    Scream-apathy:
-      collection: TajaranFemaleScreams
-    Laugh-apathy:
-      collection: FemaleLaugh
-    Sigh-apathy:
-      collection: FemaleSigh
-    Crying-apathy:
-      collection: FemaleCry
-      collection: FemaleCry