Сезонные обновления [НЕ ДЛЯ МЕРДЖА] - #2000
Open
KashRas2 wants to merge 113 commits into
Open
Conversation
This reverts commit b6cbc11.
This reverts commit f4f20bf.
This reverts commit b955681.
This reverts commit 7bf7170.
## Описание PR Добавлено 2 новых пива под Октоберфест: Супер Скаут и Смешное Бананапиво. Ссылка на заказ, предложение или баг-репорт - [Баг-репорт/Заказ/Предложение](ссылка)-->https://discord.com/channels/901772674865455115/1420121069439811654 ## Медиа <img width="774" height="488" alt="image" src="https://github.com/user-attachments/assets/5bf095eb-a859-423a-a53a-113d2f222089" /> <img width="641" height="413" alt="image" src="https://github.com/user-attachments/assets/71716d19-583d-48ee-8f99-6aa50a42d383" /> <img width="331" height="200" alt="image" src="https://github.com/user-attachments/assets/8868e8c0-e7e4-40ac-9cc7-1245c47438dd" /> <img width="293" height="163" alt="image" src="https://github.com/user-attachments/assets/efeccbd8-1c1b-4641-9534-48ddfadaf639" /> ## Чейнджлог :cl: Username228 - add: Добавлены два новых пива под октоберфест. --------- Co-authored-by: RevengenRat <138193222+Ratyyy@users.noreply.github.com> Co-authored-by: Oleksandr <168072650+Godot04@users.noreply.github.com> Co-authored-by: godot04 <popov.oleksandr2504@gmail.com>
В общем, пробую себя в разных начинаниях, в напитках учусь разбираться. Так, по мелочи. (Кстати, Pipin и я это один человек.) ## Описание PR Теперь новакиды не будут получать урона от научного плазмо-эля. Конечно, можно сделать им от него лечение, но я от себя добавлять ничего не хочу, проект-то не мой :) ## Почему / Баланс Новакиды могут пить тёмную материю(!), а напиток из плазмы (из которой они состоят) почему-то наносит им урон. Это в рамки лора не вписывается, кажется. Кто-то просил это поправить, вот тут: https://discord.com/channels/901772674865455115/1422182383557410887 ## Техническая информация Значит, добавил я в коде научного плазмо-эля пару строчек, которые позволяют новакидам не получать от него урон. - [x] Изменения были протестированы на локальном сервере, и всё работает отлично. - [x] PR закончен и требует просмотра изменений. ## Медиа "До" у меня нет, так что вот "После": <img width="2560" height="1440" alt="Снимок экрана (34)" src="https://github.com/user-attachments/assets/b29a7cd3-4b6a-4621-bcba-3238b53682f0" /> ## Чейнджлог :cl: StasNeStasNe - add: Новакиды теперь не получают урона от научного плазмо-эля.
Contributor
|
RSI Diff Bot; head commit fe485fe merging into 13b0712 Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Hands/Gloves/gloves_red.rsi
Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Hands/Gloves/gloves_red2.rsi
Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Hands/Gloves/gloves_snow_maiden.rsi
Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Hands/Gloves/mittens_blue.rsi
Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Hands/Gloves/mittens_green.rsi
Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Hands/Gloves/mittens_red.rsi
Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Hands/Gloves/mittens_red_green.rsi
Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Head/Hats/antennas.rsi
Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Head/Hats/ded_morozhat.rsi
Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Head/Hats/deer_horns.rsi
Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Head/Hats/elf_hat.rsi
Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Head/Hats/hat_cat_holiday.rsi
Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Head/Hats/hat_christmas.rsi
|
github-actions
Bot
added
Changes: Sprites
Contributor
|
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
## Описание PR Добавление контента на 9 мая ## Почему / Баланс Заказ :cl: maksim21612 - add: Добавлена одежда советского солдата и СН-42 - add: Добавлено ППШ и пистолет Коровина --------- Co-authored-by: Red-Lis <201958950+Red-Lis@users.noreply.github.com> Co-authored-by: bananchiki <87230164+Darkiich@users.noreply.github.com>
…imeSS14/space_station_ADT into content-season-branch
Contributor
|
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
…into content-season-branch
Contributor
|
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
Contributor
|
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
Contributor
|
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
14 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
А что тут не ясно?