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

add: grey rework #6108

Merged
merged 38 commits into from
Jan 6, 2025
Merged

Conversation

Samirakis
Copy link
Contributor

Описание

Небольшой реворк греев, сделанный на основе двух предложек
Если постараться кратко, то: добавлен "ретранслятор псионического голоса" греев, который заменяет старый дешифратор вингдингс, а так же голосовые связки греев. Добавлены чипы с языками для установки в него же. Прописан весь код для лёгкого добавления имплантов-переводчиков в игру, изменены некоторые цифры у греев, теперь греи получают стаминаурон от перетаскивания существ/объектов, лучше принимают импланты

Весь список изменений есть в предложках ниже

Автор всех спрайтов(discord): vitalya_kramsatel

Ссылка на предложение/Причина создания ПР

https://discord.com/channels/617003227182792704/755125334097133628/1291932121291817030
https://discord.com/channels/617003227182792704/755125334097133628/1291932183333830748

Тесты

Много дней, проведённых на локалке в отлавливании багов. Тыкался долго, все найденные проблемы были устранены

@github-actions github-actions bot added the DMI Affects DMI files label Oct 31, 2024
code/datums/action.dm Outdated Show resolved Hide resolved
code/datums/action.dm Outdated Show resolved Hide resolved
code/game/objects/structures/watercloset.dm Outdated Show resolved Hide resolved
code/modules/client/preference/loadout/loadout_racial.dm Outdated Show resolved Hide resolved
code/modules/mob/living/carbon/human/human_movement.dm Outdated Show resolved Hide resolved
code/modules/surgery/organs/voice_translator.dm Outdated Show resolved Hide resolved
code/modules/surgery/organs/augments_internal.dm Outdated Show resolved Hide resolved
code/modules/surgery/organs/augments_internal.dm Outdated Show resolved Hide resolved
code/modules/surgery/organs/voice_translator.dm Outdated Show resolved Hide resolved
code/modules/surgery/organs/voice_translator.dm Outdated Show resolved Hide resolved
@Samirakis Samirakis requested a review from Antoonij November 1, 2024 19:44
Antoonij
Antoonij previously approved these changes Nov 2, 2024
Copy link
Contributor

@Antoonij Antoonij left a comment

Choose a reason for hiding this comment

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

Now it's looks more better

@github-actions github-actions bot added the Merge Conflict This doesn't seem right label Nov 3, 2024
@github-actions github-actions bot removed the Merge Conflict This doesn't seem right label Nov 3, 2024
@github-actions github-actions bot added Merge Conflict This doesn't seem right and removed Merge Conflict This doesn't seem right labels Nov 4, 2024
@github-actions github-actions bot added Merge Conflict This doesn't seem right and removed Merge Conflict This doesn't seem right labels Nov 5, 2024
@github-actions github-actions bot added Merge Conflict This doesn't seem right and removed Merge Conflict This doesn't seem right labels Nov 6, 2024
@Den109G Den109G added the перевод Съешь же ещё этих мягких французских булок, да выпей чаю label Nov 12, 2024
@github-actions github-actions bot removed the Merge Conflict This doesn't seem right label Dec 24, 2024
@github-actions github-actions bot added the Merge Conflict This doesn't seem right label Dec 30, 2024
Copy link
Member

@PlayerUnknown14 PlayerUnknown14 left a comment

Choose a reason for hiding this comment

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

Доработать перевод.

code/modules/mob/living/carbon/human/species/grey.dm Outdated Show resolved Hide resolved
code/modules/research/designs/medical_designs.dm Outdated Show resolved Hide resolved
code/modules/surgery/organs/autoimplanter.dm Outdated Show resolved Hide resolved
code/modules/surgery/organs/autoimplanter.dm Outdated Show resolved Hide resolved
code/modules/surgery/organs/voice_translator.dm Outdated Show resolved Hide resolved
code/modules/surgery/organs/voice_translator.dm Outdated Show resolved Hide resolved
code/modules/surgery/organs/voice_translator.dm Outdated Show resolved Hide resolved
code/modules/surgery/organs_internal.dm Outdated Show resolved Hide resolved
@github-actions github-actions bot removed the Merge Conflict This doesn't seem right label Jan 1, 2025
@github-actions github-actions bot added the Merge Conflict This doesn't seem right label Jan 2, 2025
@github-actions github-actions bot removed the Merge Conflict This doesn't seem right label Jan 2, 2025
Copy link
Member

@PlayerUnknown14 PlayerUnknown14 left a comment

Choose a reason for hiding this comment

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

Последние штрихи перевода.

code/modules/mob/living/carbon/human/species/grey.dm Outdated Show resolved Hide resolved
code/modules/surgery/organs/voice_translator.dm Outdated Show resolved Hide resolved
PlayerUnknown14
PlayerUnknown14 previously approved these changes Jan 2, 2025
Copy link
Member

@PlayerUnknown14 PlayerUnknown14 left a comment

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 This doesn't seem right label Jan 4, 2025
@github-actions github-actions bot removed the Merge Conflict This doesn't seem right label Jan 5, 2025
@BeebBeebBoob BeebBeebBoob merged commit b192529 into ss220-space:master220 Jan 6, 2025
12 checks passed
Ssheya pushed a commit to Ssheya/Paradise that referenced this pull request Jan 25, 2025
* grey rework

* review fixes

* fixes2

* end

* Update code/modules/surgery/organs/voice_translator.dm

Co-authored-by: Antoonij <[email protected]>

* Dae review

* HAS_TRAIT

* toxins.dm conflict

* again and again and again

* var rename(i love 2 line commits)

* code optimization, I guess

* again and again

* Smol code clean

* Den review

* Update code/modules/mob/living/carbon/human/species/grey.dm

Co-authored-by: PlayerUnknown14 <[email protected]>

* Update code/modules/research/designs/medical_designs.dm

Co-authored-by: PlayerUnknown14 <[email protected]>

* Update code/modules/surgery/organs/autoimplanter.dm

Co-authored-by: PlayerUnknown14 <[email protected]>

* Update code/modules/surgery/organs/autoimplanter.dm

Co-authored-by: PlayerUnknown14 <[email protected]>

* translation fix

* Update voice_translator.dm

* ru_names under desc

* end?

* Update code/modules/mob/living/carbon/human/species/grey.dm

Co-authored-by: PlayerUnknown14 <[email protected]>

* Update code/modules/surgery/organs/voice_translator.dm

Co-authored-by: PlayerUnknown14 <[email protected]>

* Compile error fix

---------

Co-authored-by: Antoonij <[email protected]>
Co-authored-by: PlayerUnknown14 <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
DMI Affects DMI files перевод Съешь же ещё этих мягких французских булок, да выпей чаю
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants