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

Shavuha #49

Closed
wants to merge 37 commits into from
Closed

Shavuha #49

wants to merge 37 commits into from

Conversation

jailedfish
Copy link

@jailedfish jailedfish commented Nov 13, 2024

Теперь с фиксом

Описание PR

Добавлена шаверма, готовящаяся в 2 этапа:

  • 5 секунд 2 мясо, тесто, томат
  • 15 секунд шаверма

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

Попросили здесь / готовая шаверма чуть лучше тако, так что баланс в норме

Ссылка на ветку

https://discordapp.com/channels/919301044784226385/1304645328556916818

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

  • добавлена шаверма в двух вариантах (не испечённая и готовая) (./Resources/Prototypes/Entities/Objects/Consumable/Food/shaverma-unbaked.yml и ./Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/shaverma-baked.yml)
  • добавлен её спрайт (./Resources/Textures/Objects/Consumable/Food/shavuha.rsi/) (лучше переделать)
  • добавлен рецепт (./Resources/Prototypes/Recipes/Cooking/meal_recipes.yml)

Медиа

OUTDATED:
vii

CURRENT:
image

Список изменений
🆑

  • add: Добавлена шаурма.

onlyfans12 and others added 30 commits November 11, 2024 00:16
@jailedfish
Copy link
Author

@AwareFoxy @FireNameFN

Copy link

github-actions bot commented Nov 13, 2024

RSI Diff Bot; head commit 6d2124c merging into a3f519e
This PR makes changes to 1 or more RSIs. Here is a summary of all changes:

Resources/Textures/_CorvaxNext/Objects/Consumable/Food/shavuha.rsi

State Old New Status
baked Added
unbaked Added

Edit: diff updated after 6d2124c

@jailedfish
Copy link
Author

@ksen0morph, теперь пофикшено

@Zekins3366
Copy link

Ох сколько же тут коммитов...

@CaptainSqrBeard
Copy link

Джон "Вэб" Эдит

@VulfiMoon
Copy link

Буквально насрал на то, что мы хотели ;(
Спрайт просили другой - не, мне такой нравится
Рецепт дали - оставлю такой, ну кароче, на требования забил

@foboscheshir
Copy link

думаю спрайтерам некста пора поработать над этим

@AwareFoxy AwareFoxy requested a review from Vonsant November 14, 2024 14:17
@jailedfish jailedfish closed this Nov 14, 2024
@jailedfish jailedfish deleted the shavuha_dev branch November 14, 2024 20:51
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants