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

Самодельные щиты, шапки, чай, и просто сборник случайного контента #873

Merged
merged 56 commits into from
Dec 12, 2024

Conversation

sh4zik
Copy link
Contributor

@sh4zik sh4zik commented Dec 3, 2024

Описание PR

Добавление двуручных щитов как самодельных так и синдикековских, синдикековская пицца в аплинке, новые чаи и система его готовки, шапки, и ещё пару вещей по мелочам

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

Разнообразие сервера контентом, потому что, почему бы и нет?

Требования

  • Я прочитал(а) и следую Руководство по созданию пулл реквестов. Я понимаю, что в противном случае мой ПР может быть закрыт по усмотрению мейнтейнера.
  • Я добавил скриншоты/видео к этому пулл реквесту, демонстрирующие его изменения в игре, или этот пулл реквест не требует демонстрации в игре

Чейнджлог

🆑 Sh4zik

  • add: Были добавлены несколько самодельных рецептов копей и заточек, из армированного урана и плазмы
  • add: Была добавлена возможность скрафтить новый предмет - самодельный двуручный щит
  • add: Был добавлен штурмовой двуручный щит синдиката в аплинк ядерного оперативника
  • add: Был добавлен новый предмет - чайник для бармена, который используется для создания новых видов чая
  • add: Были добавлены зимние шапки в Зимнемат
  • add: Была добавлена пицца с омнизином в аплинк синдиката, в разделе безделушек
  • add: Было добавлено три новых видов чая - Апельсиновый, Вишнёвый, А также арбузный

@sh4zik sh4zik added Не Мерджить Не МЕРДЖИТЬ НИ В КОЕМ СЛУЧАЕ In progress В процессе выполнения labels Dec 3, 2024
@github-actions github-actions bot added Changes: Sprites Изменение спрайтов No C# Changes: Localization Изменение локализации labels Dec 3, 2024
Copy link
Contributor

github-actions bot commented Dec 3, 2024

RSI Diff Bot; head commit 89c6ef7 merging into 5fd6088
This PR makes changes to 1 or more RSIs. Here is a summary of all changes:

Resources/Textures/ADT/Clothing/Head/Hats/beanies/bluebeanie.rsi

State Old New Status
equipped-HELMET Added
icon Added

Resources/Textures/ADT/Clothing/Head/Hats/beanies/darkbeanie.rsi

State Old New Status
equipped-HELMET Added
icon Added

Resources/Textures/ADT/Clothing/Head/Hats/beanies/greenbeanie.rsi

State Old New Status
equipped-HELMET Added
icon Added

Resources/Textures/ADT/Clothing/Head/Hats/beanies/purplebeanie.rsi

State Old New Status
equipped-HELMET Added
icon Added

Resources/Textures/ADT/Clothing/Head/Hats/beanies/redbeanie.rsi

State Old New Status
equipped-HELMET Added
icon Added

Resources/Textures/ADT/Objects/Consumable/Drinks/sh4ziktea/cherrytea.rsi

State Old New Status
fill-1 Added
fill-2 Added
fill-3 Added
fill-4 Added
icon Added
icon_empty Added
teapack Added

Resources/Textures/ADT/Objects/Consumable/Drinks/sh4ziktea/orangetea.rsi

State Old New Status
fill-1 Added
fill-2 Added
fill-3 Added
fill-4 Added
icon Added
icon_empty Added
teapack Added

Resources/Textures/ADT/Objects/Consumable/Drinks/sh4ziktea/teapack.rsi

State Old New Status
icon Added
teabox Added

Resources/Textures/ADT/Objects/Consumable/Drinks/sh4ziktea/watermelontea.rsi

State Old New Status
fill-1 Added
fill-2 Added
fill-3 Added
fill-4 Added
icon Added
icon_empty Added
teapack Added

Resources/Textures/ADT/Objects/Consumable/Food/Baked/pizza.rsi

State Old New Status
box-inhand-left Added
box-inhand-right Added
boxclosed Added
boxopen Added
fullpizza Added
pizzaslice Added

Resources/Textures/ADT/Objects/Weapons/Melee/Rplasma_shiv.rsi

State Old New Status
equipped-BELT Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/ADT/Objects/Weapons/Melee/Rplasma_spear.rsi

State Old New Status
equipped-BACKPACK Added
equipped-SUITSTORAGE Added
equipped-back-fill-1 Added
equipped-suitstorage-fill-1 Added
inhand-left-fill-1 Added
inhand-left Added
inhand-right-fill-1 Added
inhand-right Added
spear Added
spear1 Added
wielded-inhand-left-fill-1 Added
wielded-inhand-left Added
wielded-inhand-right-fill-1 Added
wielded-inhand-right Added

Resources/Textures/ADT/Objects/Weapons/Melee/Ruranium_shiv.rsi

State Old New Status
equipped-BELT Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/ADT/Objects/Weapons/Melee/Ruranium_spear.rsi

State Old New Status
equipped-BACKPACK Added
equipped-SUITSTORAGE Added
equipped-back-fill-1 Added
equipped-suitstorage-fill-1 Added
inhand-left-fill-1 Added
inhand-left Added
inhand-right-fill-1 Added
inhand-right Added
spear Added
spear1 Added
wielded-inhand-left-fill-1 Added
wielded-inhand-left Added
wielded-inhand-right-fill-1 Added
wielded-inhand-right Added

Resources/Textures/ADT/Objects/Weapons/Melee/fullshield.rsi

State Old New Status
icon Added
metal-inhand Added

Resources/Textures/ADT/Objects/Weapons/Melee/fullshieldsindi.rsi

State Old New Status
icon Added
metal-inhand Added

Resources/Textures/ADT/Objects/Weapons/Melee/makeshitdaggers/glassdagger.rsi

State Old New Status
dagger-inhand-left Added
dagger-inhand-right Added
icon Added

Resources/Textures/ADT/Objects/Weapons/Melee/makeshitdaggers/plasmadagger.rsi

State Old New Status
dagger-inhand-left Added
dagger-inhand-right Added
icon Added

Resources/Textures/ADT/Objects/Weapons/Melee/makeshitdaggers/reinforceddagger.rsi

State Old New Status
dagger-inhand-left Added
dagger-inhand-right Added
icon Added

Resources/Textures/ADT/Objects/Weapons/Melee/makeshitdaggers/uraniumdagger.rsi

State Old New Status
dagger-inhand-left Added
dagger-inhand-right Added
icon Added

Resources/Textures/ADT/Structures/Machines/hotplatebarmen.rsi

State Old New Status
beaker Added
icon Added
on Added

Edit: diff updated after 89c6ef7

Copy link
Contributor

github-actions bot commented Dec 3, 2024

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@sh4zik sh4zik removed Не Мерджить Не МЕРДЖИТЬ НИ В КОЕМ СЛУЧАЕ In progress В процессе выполнения labels Dec 3, 2024
@sh4zik
Copy link
Contributor Author

sh4zik commented Dec 3, 2024

После проверки на локальном сервере проблем я не заметил, Без понятия почему именно YAML выдаёт ошибку, но должно быть, всё работает как нужно

@CrimeMoot
Copy link

@sh4zik у тебя в FTL ошибки. Нельзя иметь заглавные буквы. У тебя Tea и т.д имеют заглавные буквы.

Copy link
Contributor

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@PyotrIgn
Copy link
Contributor

Завтра постараюсь глянуть изменения по ревью

Copy link
Contributor

@PyotrIgn PyotrIgn left a comment

Choose a reason for hiding this comment

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

Осталось совсем немного и все годится

Resources/Prototypes/ADT/Recipes/Reactions/drinks.yml Outdated Show resolved Hide resolved
@github-actions github-actions bot added Status: Awaiting Changes Ожидание изменений and removed Status: Needs Review labels Dec 12, 2024
@github-actions github-actions bot removed the Status: Awaiting Changes Ожидание изменений label Dec 12, 2024
@PyotrIgn PyotrIgn merged commit 9b9f40c into master Dec 12, 2024
15 checks passed
@PyotrIgn PyotrIgn deleted the shitmadeweapon branch December 12, 2024 23:06
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Changes: Localization Изменение локализации Changes: Sprites Изменение спрайтов No C#
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants