-
Notifications
You must be signed in to change notification settings - Fork 47
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
Conversation
RSI Diff Bot; head commit 89c6ef7 merging into 5fd6088 Resources/Textures/ADT/Clothing/Head/Hats/beanies/bluebeanie.rsi
Resources/Textures/ADT/Clothing/Head/Hats/beanies/darkbeanie.rsi
Resources/Textures/ADT/Clothing/Head/Hats/beanies/greenbeanie.rsi
Resources/Textures/ADT/Clothing/Head/Hats/beanies/purplebeanie.rsi
Resources/Textures/ADT/Clothing/Head/Hats/beanies/redbeanie.rsi
Resources/Textures/ADT/Objects/Consumable/Drinks/sh4ziktea/cherrytea.rsi
Resources/Textures/ADT/Objects/Consumable/Drinks/sh4ziktea/orangetea.rsi
Resources/Textures/ADT/Objects/Consumable/Drinks/sh4ziktea/teapack.rsi
Resources/Textures/ADT/Objects/Consumable/Drinks/sh4ziktea/watermelontea.rsi
Resources/Textures/ADT/Objects/Consumable/Food/Baked/pizza.rsi
Resources/Textures/ADT/Objects/Weapons/Melee/Rplasma_shiv.rsi
Resources/Textures/ADT/Objects/Weapons/Melee/Rplasma_spear.rsi
Resources/Textures/ADT/Objects/Weapons/Melee/Ruranium_shiv.rsi
Resources/Textures/ADT/Objects/Weapons/Melee/Ruranium_spear.rsi
Resources/Textures/ADT/Objects/Weapons/Melee/fullshield.rsi
Resources/Textures/ADT/Objects/Weapons/Melee/fullshieldsindi.rsi
Resources/Textures/ADT/Objects/Weapons/Melee/makeshitdaggers/glassdagger.rsi
Resources/Textures/ADT/Objects/Weapons/Melee/makeshitdaggers/plasmadagger.rsi
Resources/Textures/ADT/Objects/Weapons/Melee/makeshitdaggers/reinforceddagger.rsi
Resources/Textures/ADT/Objects/Weapons/Melee/makeshitdaggers/uraniumdagger.rsi
Resources/Textures/ADT/Structures/Machines/hotplatebarmen.rsi
|
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
После проверки на локальном сервере проблем я не заметил, Без понятия почему именно YAML выдаёт ошибку, но должно быть, всё работает как нужно |
@sh4zik у тебя в FTL ошибки. Нельзя иметь заглавные буквы. У тебя |
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
Завтра постараюсь глянуть изменения по ревью |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Осталось совсем немного и все годится
Описание PR
Добавление двуручных щитов как самодельных так и синдикековских, синдикековская пицца в аплинке, новые чаи и система его готовки, шапки, и ещё пару вещей по мелочам
Почему / Баланс
Разнообразие сервера контентом, потому что, почему бы и нет?
Требования
Чейнджлог
🆑 Sh4zik