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.

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

Translate areas #913

Merged
merged 15 commits into from
Feb 7, 2024
Merged

Translate areas #913

merged 15 commits into from
Feb 7, 2024

Conversation

Kar4es
Copy link

@Kar4es Kar4es commented Jan 17, 2024

Что этот PR делает

Переведены зоны отделов.
Переведены зоны у контрактника.

Почему это хорошо для игры

Будет чуть проще новичкам

Изображения изменений

Тестирование

Зоны показываются нормально, странных подписей и подобного нет.

Changelog

🆑
tweak: Переведены зоны отделов.
/:cl:

@github-actions github-actions bot added the :finnadie: НЕ МОДУЛЬНО Ну это ваще пиздец. Либо засовывай в модуль, либо заливай на апстрим. label Jan 17, 2024
Copy link

@RuslanM RuslanM left a comment

Choose a reason for hiding this comment

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

Привет. Большая часть комментариев - вкусовщина, просто предложения.

code/game/area/ss13_areas/command_areas.dm Outdated Show resolved Hide resolved
code/game/area/ss13_areas/engineering_areas.dm Outdated Show resolved Hide resolved
code/game/area/ss13_areas/engineering_areas.dm Outdated Show resolved Hide resolved
code/game/area/ss13_areas/legal_areas.dm Outdated Show resolved Hide resolved
code/game/area/ss13_areas/medical_areas.dm Outdated Show resolved Hide resolved
code/game/area/ss13_areas/public_areas.dm Outdated Show resolved Hide resolved
code/game/area/ss13_areas/public_areas.dm Outdated Show resolved Hide resolved
code/game/area/ss13_areas/public_areas.dm Outdated Show resolved Hide resolved
code/game/area/ss13_areas/service_areas.dm Outdated Show resolved Hide resolved
code/game/area/ss13_areas/supply_areas.dm Outdated Show resolved Hide resolved
code/game/area/ss13_areas/ai_areas.dm Outdated Show resolved Hide resolved
code/game/area/ss13_areas/command_areas.dm Outdated Show resolved Hide resolved
code/game/area/ss13_areas/command_areas.dm Outdated Show resolved Hide resolved
code/game/area/ss13_areas/maintenance_areas.dm Outdated Show resolved Hide resolved
code/game/area/ss13_areas/maintenance_areas.dm Outdated Show resolved Hide resolved
code/game/area/ss13_areas/science_areas.dm Outdated Show resolved Hide resolved
code/game/area/ss13_areas/science_areas.dm Outdated Show resolved Hide resolved
code/game/area/ss13_areas/science_areas.dm Outdated Show resolved Hide resolved
code/game/area/ss13_areas/security_areas.dm Outdated Show resolved Hide resolved
code/game/area/ss13_areas/supply_areas.dm Outdated Show resolved Hide resolved
@Kar4es Kar4es requested a review from dj-34 January 18, 2024 07:57
@github-actions github-actions bot removed the :finnadie: НЕ МОДУЛЬНО Ну это ваще пиздец. Либо засовывай в модуль, либо заливай на апстрим. label Jan 18, 2024
@Kar4es Kar4es marked this pull request as ready for review January 18, 2024 09:06
Copy link
Collaborator

@dj-34 dj-34 left a comment

Choose a reason for hiding this comment

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

  1. Почему-то ты не всё перевел. Оправдание такой зоны нет на Дельте - такое себе, потому что появление новых зон не редкое явление, и у нас играют не только на Дельте (на Кибериаде будет разнобой английского и русского), лучше доперевести всё, тем более что тут немного.
  2. Попробуй везде убрать \improper и \proper. Оно должно хендлить автоматически зависимо от того, написано ли название с большой или маленькой буквы. Если написано с большой, то The по идеи не должно быть.
    Перепроверь чтобы не было "the Бассейн" и тому подобное.
  3. Резолв конверсейшена без резолва проблемс
  4. Нужны тесты

code/game/area/ss13_areas/ai_areas.dm Outdated Show resolved Hide resolved
code/game/area/ss13_areas/maintenance_areas.dm Outdated Show resolved Hide resolved
code/game/area/ss13_areas/maintenance_areas.dm Outdated Show resolved Hide resolved
code/game/area/ss13_areas/maintenance_areas.dm Outdated Show resolved Hide resolved
code/game/area/ss13_areas/maintenance_areas.dm Outdated Show resolved Hide resolved
code/game/area/ss13_areas/medical_areas.dm Outdated Show resolved Hide resolved
code/game/area/ss13_areas/medical_areas.dm Outdated Show resolved Hide resolved
code/game/area/ss13_areas/medical_areas.dm Outdated Show resolved Hide resolved
code/game/area/ss13_areas/science_areas.dm Outdated Show resolved Hide resolved
code/game/area/ss13_areas/science_areas.dm Outdated Show resolved Hide resolved
@dj-34 dj-34 added the 📝 Перевод Приятно когда всё на родном языке. label Jan 19, 2024
@Kar4es
Copy link
Author

Kar4es commented Jan 19, 2024

@dj-34 У тебя Гит как то странно показывает изменения. Почти все что ты указал - изменено

Copy link
Collaborator

@AyIong AyIong left a comment

Choose a reason for hiding this comment

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

Почему не перевёл?
image

code/game/area/ss13_areas/maintenance_areas.dm Outdated Show resolved Hide resolved
code/game/area/ss13_areas/maintenance_areas.dm Outdated Show resolved Hide resolved
code/game/area/ss13_areas/maintenance_areas.dm Outdated Show resolved Hide resolved
code/game/area/ss13_areas/maintenance_areas.dm Outdated Show resolved Hide resolved
code/game/area/ss13_areas/maintenance_areas.dm Outdated Show resolved Hide resolved
code/game/area/ss13_areas/maintenance_areas.dm Outdated Show resolved Hide resolved
code/game/area/ss13_areas/maintenance_areas.dm Outdated Show resolved Hide resolved
code/game/area/ss13_areas/medical_areas.dm Outdated Show resolved Hide resolved
code/game/area/ss13_areas/medical_areas.dm Outdated Show resolved Hide resolved
code/game/area/ss13_areas/public_areas.dm Outdated Show resolved Hide resolved
@Kar4es Kar4es requested review from dj-34 and AyIong January 19, 2024 08:16
code/game/area/ss13_areas/command_areas.dm Outdated Show resolved Hide resolved
code/game/area/ss13_areas/command_areas.dm Show resolved Hide resolved
code/game/area/ss13_areas/engineering_areas.dm Outdated Show resolved Hide resolved
code/game/area/ss13_areas/engineering_areas.dm Outdated Show resolved Hide resolved
icon_state = "toxstorage"

/area/station/science/toxins/test
name = "\improper Toxins Test Area"
name = "Тестовая Комната Токиснов РНД"
Copy link
Collaborator

Choose a reason for hiding this comment

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

Suggested change
name = "Тестовая Комната Токиснов РНД"
name = "Тестовая Комната Плазмы РНД"

Вроде уже как-то токсины и из кода выводят

Copy link
Author

Choose a reason for hiding this comment

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

Не уверен что стоит менять, ибо у нас все таки токсины изучают

code/game/area/ss13_areas/security_areas.dm Show resolved Hide resolved
modular_ss220/maps220/code/Areas/station.dm Show resolved Hide resolved
modular_ss220/maps220/code/Areas/station.dm Outdated Show resolved Hide resolved
modular_ss220/maps220/code/Areas/station.dm Show resolved Hide resolved
code/game/area/ss13_areas/ai_areas.dm Show resolved Hide resolved
code/game/area/ss13_areas/command_areas.dm Outdated Show resolved Hide resolved
code/game/area/ss13_areas/command_areas.dm Outdated Show resolved Hide resolved
code/game/area/ss13_areas/maintenance_areas.dm Outdated Show resolved Hide resolved
@Kar4es Kar4es requested a review from dj-34 January 27, 2024 13:02
Copy link
Collaborator

@dj-34 dj-34 left a comment

Choose a reason for hiding this comment

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

Надеюсь теперь точно пойдет

modular_ss220/maps220/code/Areas/station.dm Show resolved Hide resolved
modular_ss220/maps220/code/Areas/station.dm Outdated Show resolved Hide resolved
@ss220bot
Copy link
Collaborator

Test Merge Deployed

Details
Server Instance

Paradise-main-I

Revision

Origin: f0196ef
Pull Request: a474663
Server: 4c2e1cfabf73019fb478c2fe131e1c8f7d26fb0b

Comment

@AyIong AyIong requested a review from PhantornRU January 30, 2024 13:14
"Alternate Construction Area",
"Barber Shop",
"Альтернативная Зона Строительства",
"Парикмахерская",
"Escape Shuttle Hallway Podbay",
Copy link
Collaborator

Choose a reason for hiding this comment

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

Чё это не перевёл кстати?

Comment on lines 80 to 81
"Experimentation Lab",
"Holodeck Alpha",
Copy link
Collaborator

Choose a reason for hiding this comment

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

И это

@github-actions github-actions bot added the Merge Conflict Ну блять... label Feb 7, 2024
@github-actions github-actions bot removed the Merge Conflict Ну блять... label Feb 7, 2024
Copy link
Collaborator

@PhantornRU PhantornRU left a comment

Choose a reason for hiding this comment

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

Устраивает.

@Legendaxe Legendaxe merged commit 9123acc into ss220club:translate Feb 7, 2024
6 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
📝 Перевод Приятно когда всё на родном языке.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants