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

Jump to bottom

add: mecha cage, mecha alerts #6205

Closed
wants to merge 38 commits into from
Closed

add: mecha cage, mecha alerts #6205

wants to merge 38 commits into from

Conversation

NuSanya
Copy link
Contributor

@NuSanya NuSanya commented Nov 20, 2024

Описание

почему то был мёрж конфликт, не залили. предложка баунти, добавляет новый модуль и алёрты на мех

Причина создания ПР / Почему это хорошо для игры

https://discord.com/channels/617003227182792704/755125334097133628/1284950351673430187

Тесты

https://www.youtube.com/watch?v=nMl4fU3tho4
я не проверял сейчас, видео довольно старое

@github-actions github-actions bot added Merge Conflict This doesn't seem right DMI Affects DMI files labels Nov 20, 2024
@github-actions github-actions bot removed the Merge Conflict This doesn't seem right label Nov 21, 2024
Antoonij
Antoonij requested changes Nov 26, 2024
View reviewed changes
code/_onclick/hud/alert.dm Outdated Show resolved Hide resolved
code/game/mecha/equipment/tools/other_tools.dm Outdated Show resolved Hide resolved
code/game/mecha/equipment/tools/other_tools.dm Outdated Show resolved Hide resolved
code/game/mecha/equipment/tools/other_tools.dm Outdated Show resolved Hide resolved
code/game/mecha/equipment/tools/other_tools.dm Show resolved Hide resolved
code/game/mecha/equipment/tools/other_tools.dm Outdated Show resolved Hide resolved
code/game/mecha/equipment/tools/other_tools.dm Outdated Show resolved Hide resolved
@github-actions github-actions bot added the Merge Conflict This doesn't seem right label Dec 13, 2024
@NuSanya
tweaks
1b666c0 
removes processing, fixes some bugs, adds some sprites that got deleted when this pr got copied by another person
@NuSanya NuSanya requested a review from Antoonij December 28, 2024 13:26
@github-actions github-actions bot removed the Merge Conflict This doesn't seem right label Dec 28, 2024
PlayerUnknown14
PlayerUnknown14 requested changes Dec 31, 2024
View reviewed changes
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.

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

@PlayerUnknown14 PlayerUnknown14 added Do Not Merge Либо не прошла предложка, либо кто-то не доволен. перевод Съешь же ещё этих мягких французских булок, да выпей чаю labels Dec 31, 2024
@NuSanya
Copy link
Contributor Author

NuSanya commented Dec 31, 2024

переведено

PlayerUnknown14
PlayerUnknown14 requested changes Dec 31, 2024
View reviewed changes
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/game/mecha/equipment/tools/other_tools.dm Outdated Show resolved Hide resolved
code/game/mecha/equipment/tools/other_tools.dm Outdated Show resolved Hide resolved
code/game/mecha/equipment/tools/other_tools.dm Outdated Show resolved Hide resolved
code/game/mecha/equipment/tools/other_tools.dm Outdated Show resolved Hide resolved
code/game/mecha/equipment/tools/other_tools.dm Outdated Show resolved Hide resolved
code/game/mecha/equipment/tools/other_tools.dm Outdated Show resolved Hide resolved
code/game/mecha/equipment/tools/other_tools.dm Outdated Show resolved Hide resolved
code/game/mecha/equipment/tools/other_tools.dm Outdated Show resolved Hide resolved
code/game/mecha/equipment/tools/other_tools.dm Show resolved Hide resolved
code/game/mecha/mecha.dm Outdated Show resolved Hide resolved
@github-actions github-actions bot added the Merge Conflict This doesn't seem right label Jan 4, 2025
NuSanya and others added 9 commits January 5, 2025 15:29
@NuSanya @PlayerUnknown14
blyat1
edafa1c 
Co-authored-by: PlayerUnknown14 <[email protected]>
@NuSanya @PlayerUnknown14
blyat2
6b28d10 
Co-authored-by: PlayerUnknown14 <[email protected]>
@NuSanya @PlayerUnknown14
blyat3
1821c80 
Co-authored-by: PlayerUnknown14 <[email protected]>
@NuSanya @PlayerUnknown14
blyat4
24250b9 
Co-authored-by: PlayerUnknown14 <[email protected]>
@NuSanya @PlayerUnknown14
blyatiazabylkakoi
0acafc3 
Co-authored-by: PlayerUnknown14 <[email protected]>
@NuSanya @PlayerUnknown14
blyat666
542ff20 
Co-authored-by: PlayerUnknown14 <[email protected]>
@NuSanya
blyat1337
406f385
@NuSanya
test
4537fce
@NuSanya
fix
c121828
PlayerUnknown14
PlayerUnknown14 requested changes Jan 5, 2025
View reviewed changes
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/game/mecha/equipment/tools/other_tools.dm Outdated Show resolved Hide resolved
code/game/mecha/equipment/tools/other_tools.dm Show resolved Hide resolved
code/game/mecha/mecha.dm Outdated Show resolved Hide resolved
code/modules/antagonists/changeling/powers/biodegrade.dm Outdated Show resolved Hide resolved
@NuSanya NuSanya closed this by deleting the head repository Jan 12, 2025
@NuSanya
Copy link
Contributor Author

NuSanya commented Jan 12, 2025

сделаю нормальный форк и пересоздам

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@PlayerUnknown14 PlayerUnknown14 PlayerUnknown14 requested changes

@Antoonij Antoonij Awaiting requested review from Antoonij

Assignees
No one assigned
Labels
DMI Affects DMI files Do Not Merge Либо не прошла предложка, либо кто-то не доволен. Merge Conflict This doesn't seem right перевод Съешь же ещё этих мягких французских булок, да выпей чаю
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@NuSanya @Antoonij @PlayerUnknown14 @Honker9999999