forked from tgstation/tgstation
-
Notifications
You must be signed in to change notification settings - Fork 51
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
Adds hookas #1124
Open
mcbalaam
wants to merge
13
commits into
ss220club:master
Choose a base branch
from
mcbalaam:bar-stuff
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Adds hookas #1124
Conversation
This file contains 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
This comment was marked as spam.
This comment was marked as spam.
larentoun
reviewed
Feb 3, 2025
#define COUGH_STAMINA_LOSS 5 | ||
|
||
/obj/machinery/hookah | ||
name = "кальян" |
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.
все названия в ru_names.toml
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.
принято
тесты все упали |
знаю, это из-за харддела. но починить смогу только после пар |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Labels
🖌️ Спрайты
Вы заработали свою миска-рис и кошко-жена. Партия гордится вами!
📜 CL валиден
Этот чейнджлог будет успешно опубликован
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.
Что этот PR делает
Добавляет кальян!
В кальян можно залить любые реагенты или еду, которые и будут... куриться. Для работы кальяна требуются специальные угли, которые могут быть заказаны в карго вместе с кальяном в виде комплекта или куплены в премиум разделе автомата с сигаретами.
Однако, будьте аккуратны с тем, что курите...
Почему это хорошо для игры
Кальянчик - это шикарно. Кальянчик в тёмном углу бара как ничто сближает людей. А возможность попыхивать за беседой - это нереально атмосферно.
Изображения изменений
Скриншоты
Тестирование
Тестирование проведено на локалке
To-do list
Аттрибуция
Спрайт кальяна - dj34 (отредактирован мной)
Спрайт кубиков - ell_good
Changelog
🆑
add: Кальяны! Учёные врут, курите сейчас!
/:cl:
Summary by Sourcery
New Features: