Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Фикс звуков эмоции молей (Ниан) #326

Merged
merged 4 commits into from
Aug 21, 2024
Merged

Фикс звуков эмоции молей (Ниан) #326

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
089a795
fix moth emote/locale
Lonkuk Aug 21, 2024
ff7c9df
Merge branch 'master' into moth
Lonkuk Aug 21, 2024
d6b3094
fix locale moth
Lonkuk Aug 21, 2024
8ce173b
Merge branch 'moth' of https://github.com/Lonkuk/space_station_ADT in…
Lonkuk Aug 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Resources/Locale/en-US/ss14-ru/prototypes/entities/mobs/player/moth.ftl
View file
Open in desktop
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Это зачем трогали

Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
#ent-MobMoth = Urist McFluff
# .desc = { ent-BaseMobMoth.desc }
ent-MobMoth = Urist McFluff
.desc = { ent-BaseMobMoth.desc }
4 changes: 2 additions & 2 deletions Resources/Locale/ru-RU/ss14-ru/prototypes/entities/mobs/player/moth.ftl
View file
Open in desktop
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

И это тоже зачем трогали

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Чтобы локализация была русская, ее попросту нету

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Она есть в файлах адт, как я помню

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Она есть в файлах адт, как я помню

Повторюсь, в игре она не используется

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Локализация была сломана
было
Screenshot_1292
стало
Screenshot_1293

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Так. Ладно
У нас есть такая локализация, которую я вижу
Screenshot_2024-08-21-19-03-14-595_com.github.android.png

Тогда было бы не плохо заменить это на МакНиан

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Согласны? Нет?
Мне апрув то дать не тяжело, если лень изменить.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Щяс...

Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
#ent-MobMoth = Урист МакФлафф
# .desc = { ent-BaseMobMoth.desc }
ent-MobMoth = Урист МакФлафф
.desc = { ent-BaseMobMoth.desc }
1 change: 1 addition & 0 deletions Resources/Prototypes/ADT/Entities/Mobs/Species/moth.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
accent: zombieMoth
- type: Speech
speechVerb: Moth
allowedEmotes: ['Chitter', 'Squeak', 'Buzz']
- type: TypingIndicator
proto: moth
- type: Butcherable
Expand Down
2 changes: 1 addition & 1 deletion Resources/Prototypes/ADT/SoundCollections/emotes.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion Resources/Prototypes/Voice/speech_emotes.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -510,7 +510,7 @@
category: Vocal
icon: Interface/Emotes/buzz.png
whitelist:
requireAll: true
requireAll: false #ADT Tweak
components:
- BorgChassis
- Vocal
Expand Down
Loading