From 089a795fbebe280654eaf2cfbd160d2a58c74a48 Mon Sep 17 00:00:00 2001 From: Lonkuk Date: Wed, 21 Aug 2024 18:27:34 +0300 Subject: [PATCH 1/2] fix moth emote/locale --- .../en-US/ss14-ru/prototypes/entities/mobs/player/moth.ftl | 4 ++-- .../ru-RU/ss14-ru/prototypes/entities/mobs/player/moth.ftl | 4 ++-- Resources/Prototypes/ADT/Entities/Mobs/Species/moth.yml | 1 + Resources/Prototypes/ADT/SoundCollections/emotes.yml | 2 +- Resources/Prototypes/Voice/speech_emotes.yml | 2 +- 5 files changed, 7 insertions(+), 6 deletions(-) diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/mobs/player/moth.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/mobs/player/moth.ftl index ecff67f7422..21ab09dd517 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/mobs/player/moth.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/mobs/player/moth.ftl @@ -1,2 +1,2 @@ -#ent-MobMoth = Urist McFluff -# .desc = { ent-BaseMobMoth.desc } +ent-MobMoth = Urist McFluff + .desc = { ent-BaseMobMoth.desc } diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/mobs/player/moth.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/mobs/player/moth.ftl index 1d03f099943..c01dd8a1de0 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/mobs/player/moth.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/mobs/player/moth.ftl @@ -1,2 +1,2 @@ -#ent-MobMoth = Урист МакФлафф -# .desc = { ent-BaseMobMoth.desc } +ent-MobMoth = Урист МакФлафф + .desc = { ent-BaseMobMoth.desc } diff --git a/Resources/Prototypes/ADT/Entities/Mobs/Species/moth.yml b/Resources/Prototypes/ADT/Entities/Mobs/Species/moth.yml index 8f91d7d6574..6dab4f8aa3d 100644 --- a/Resources/Prototypes/ADT/Entities/Mobs/Species/moth.yml +++ b/Resources/Prototypes/ADT/Entities/Mobs/Species/moth.yml @@ -26,6 +26,7 @@ accent: zombieMoth - type: Speech speechVerb: Moth + allowedEmotes: ['Chitter', 'Squeak', 'Buzz'] - type: TypingIndicator proto: moth - type: Butcherable diff --git a/Resources/Prototypes/ADT/SoundCollections/emotes.yml b/Resources/Prototypes/ADT/SoundCollections/emotes.yml index c5bde96c9ef..9dbd88f64f9 100644 --- a/Resources/Prototypes/ADT/SoundCollections/emotes.yml +++ b/Resources/Prototypes/ADT/SoundCollections/emotes.yml @@ -92,7 +92,7 @@ - type: soundCollection id: MothBuzz files: - - /Audio/ADT/Moth/moth_squeak.ogg + - /Audio/ADT/Moth/moth_screm.ogg - type: soundCollection id: MothScream diff --git a/Resources/Prototypes/Voice/speech_emotes.yml b/Resources/Prototypes/Voice/speech_emotes.yml index 87adc4015a2..b6431884c45 100644 --- a/Resources/Prototypes/Voice/speech_emotes.yml +++ b/Resources/Prototypes/Voice/speech_emotes.yml @@ -510,7 +510,7 @@ category: Vocal icon: Interface/Emotes/buzz.png whitelist: - requireAll: true + requireAll: false #ADT Tweak components: - BorgChassis - Vocal From d6b30945188bb1b6ed1eb0c7288ea29f89f684e2 Mon Sep 17 00:00:00 2001 From: Lonkuk Date: Wed, 21 Aug 2024 19:16:43 +0300 Subject: [PATCH 2/2] fix locale moth --- .../en-US/ss14-ru/prototypes/entities/mobs/player/moth.ftl | 4 ++-- .../ru-RU/ADT/prototypes/Entities/Mobs/Species/moth.ftl | 3 +++ .../ru-RU/ss14-ru/prototypes/entities/mobs/player/moth.ftl | 4 ++-- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/mobs/player/moth.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/mobs/player/moth.ftl index 21ab09dd517..ecff67f7422 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/mobs/player/moth.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/mobs/player/moth.ftl @@ -1,2 +1,2 @@ -ent-MobMoth = Urist McFluff - .desc = { ent-BaseMobMoth.desc } +#ent-MobMoth = Urist McFluff +# .desc = { ent-BaseMobMoth.desc } diff --git a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Mobs/Species/moth.ftl b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Mobs/Species/moth.ftl index 8287a7c9fa3..ca0ed6a456e 100644 --- a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Mobs/Species/moth.ftl +++ b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Mobs/Species/moth.ftl @@ -3,3 +3,6 @@ ent-BaseMobMoth = Урист МакНиан .suffix = Ниан ent-MobMothDummy = { ent-BaseMobMoth } .desc = { ent-BaseMobMoth.desc } +ent-MobMoth = { ent-BaseMobMoth } + .desc = { ent-BaseMobMoth.desc } + .suffix = { ent-BaseMobMoth.suffix } \ No newline at end of file diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/mobs/player/moth.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/mobs/player/moth.ftl index c01dd8a1de0..1d03f099943 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/mobs/player/moth.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/mobs/player/moth.ftl @@ -1,2 +1,2 @@ -ent-MobMoth = Урист МакФлафф - .desc = { ent-BaseMobMoth.desc } +#ent-MobMoth = Урист МакФлафф +# .desc = { ent-BaseMobMoth.desc }