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: mecha cage, mecha alerts #6205

Open
wants to merge 18 commits into
base: master220
Choose a base branch
from
Open

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
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 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
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
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.

3 participants