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

Исправленная резиновая свинья WIP #2607

Open
wants to merge 16 commits into
base: master
Choose a base branch
from

Conversation

Moryachok136
Copy link

Описание PR

Вторая попытка добавить резиновую свинью с исправлением конфликтов

Почему / Баланс

Станет еще веселее

Технические детали

Сделано по образцу space-wizards/space-station-14#29637, но всеми любимая резиновая свинья

Медиа

image
image

rubber.pig.mp4

Требования

Критические изменения

Отсутствуют
Список изменений

🆑

  • add: добавлена всеми любимая резиновая свинья!

@github-actions github-actions bot added No C# Code has not been changed Changes: Sprites Should be reviewed or fixed by people who are knowledgeable with spriting or visual design Status: Needs Review This PR requires new reviews before it can be merged labels Sep 20, 2024
Copy link
Contributor

github-actions bot commented Sep 20, 2024

RSI Diff Bot; head commit 9caa5a3 merging into 646f432
This PR makes changes to 1 or more RSIs. Here is a summary of all changes:

Resources/Textures/Corvax/Objects/Fun/toys.rsi

State Old New Status
rubber_pig Added

Edit: diff updated after 9caa5a3

@lzk228
Copy link
Collaborator

lzk228 commented Sep 20, 2024

webedit ops + не смог пофиксить легчайшие конфлиеты

@Moryachok136
Copy link
Author

Moryachok136 commented Sep 20, 2024

webedit ops + не смог пофиксить легчайшие конфлиеты

Да кто этот ваш webedit ops
Я абсолютно не в курсе как нормально конфликты фиксить. Сделал как смог

@Moryachok136
Copy link
Author

webedit ops + не смог пофиксить легчайшие конфлиеты

По-русски будь добр сказать что не так.

@Moryachok136 Moryachok136 changed the title Исправленная резиновая свинья Исправленная резиновая свинья WIP Sep 20, 2024
@lzk228 lzk228 added Status: Awaiting Changes This PR needs its reviews addressed or changes to be made in order to be merged and removed Status: Needs Review This PR requires new reviews before it can be merged labels Nov 3, 2024
@github-actions github-actions bot added Status: Needs Review This PR requires new reviews before it can be merged and removed Status: Awaiting Changes This PR needs its reviews addressed or changes to be made in order to be merged labels Nov 4, 2024
Copy link
Collaborator

@lzk228 lzk228 left a comment

Choose a reason for hiding this comment

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

Пример взят с принятой у оффов резиновой курицы. Раз приняли, не думаю что это проблема.

не досмотрели space-wizards/space-station-14#33152
фикси

@lzk228 lzk228 added Status: Awaiting Changes This PR needs its reviews addressed or changes to be made in order to be merged and removed Status: Needs Review This PR requires new reviews before it can be merged labels Nov 13, 2024
@Moryachok136
Copy link
Author

bruh

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Changes: Sprites Should be reviewed or fixed by people who are knowledgeable with spriting or visual design No C# Code has not been changed Status: Awaiting Changes This PR needs its reviews addressed or changes to be made in order to be merged
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants