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: Spech bubble #6043

Merged
merged 15 commits into from
Oct 26, 2024
Merged

add: Spech bubble #6043

merged 15 commits into from
Oct 26, 2024

Conversation

lolybomb
Copy link
Contributor

Описание

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

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

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

Демонстрация изменений

image

image

image

image

@github-actions github-actions bot added the DMI Affects DMI files label Oct 17, 2024
@Etrnlmelancholy
Copy link
Contributor

Хуйня, переделывай

@lolybomb
Copy link
Contributor Author

Хуйня, переделывай

Хуйня, не переделаю

@Vladisvell
Copy link
Collaborator

Merge branch 'ss220-space:master220' into master220

@Etrnlmelancholy
Copy link
Contributor

SS220-speech:master220 branch 'merge' into bubble-master

@SAADf603
Copy link
Contributor

SS220-speech:master220 branch 'merge' into bubble-master

SS1884-> SS220-speech:master220 branch 'merge' into lollipop-falsebibki master branch

@Etrnlmelancholy
Copy link
Contributor

SS220-speech:master220 branch 'merge' into bubble-master

SS1884-> SS220-speech:master220 branch 'merge' into lollipop-falsebibki master branch

Могу я замерджить свою ветку в твой репозиторий? :catrose:

Copy link
Contributor

@Samirakis Samirakis 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/clothing/under/accessories/accessory.dm Outdated Show resolved Hide resolved
code/modules/clothing/under/accessories/accessory.dm Outdated Show resolved Hide resolved
code/modules/clothing/under/accessories/accessory.dm Outdated Show resolved Hide resolved
@lolybomb
Copy link
Contributor Author

Немного описания подправить было бы хорошо

Подправили

@Bizzonium Bizzonium merged commit 5a92fa0 into ss220-space:master220 Oct 26, 2024
12 checks passed
@lolybomb lolybomb deleted the Speech-buble branch November 4, 2024 11:09
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.

7 participants