Build(deps): Bump json5 from 1.0.1 to 1.0.2 in /tgui#57
Open
dependabot[bot] wants to merge 44 commits intomaster220from
Open
Build(deps): Bump json5 from 1.0.1 to 1.0.2 in /tgui#57dependabot[bot] wants to merge 44 commits intomaster220from
dependabot[bot] wants to merge 44 commits intomaster220from
Conversation
785be18 to
5ba4b22
Compare
0ec3188 to
32b46b7
Compare
bc951eb to
58bec55
Compare
5ba4b22 to
2c26a51
Compare
2c26a51 to
f28310a
Compare
* add: mentorhelp * some tweaks
Scream emote can play sound if forced by player. Sound don't play if doll is muted.
* Возвращение музыки в тихое лобби * музыка для лобби
Симплмоб для ивентиков, чтобы наш миленький ГА лишний раз не тыкал по кнопочкам, чтобы сделать этих адских машин по убийствам. Если коротко, то это базированный симплмоб, в которого можно вселить госта и который умеет издавать характерный звук при ударе. При его убийстве - гибается на ошметки и ничего не дропает. Если нужно будет подкорректировать урон или ХП, то пишите соответственно.
* Cut your clothing Now you can cut clothes and get cloth * SCP Clothing SCP Clothing Chaos, MTF, Class D uniform * Revert "SCP Clothing" This reverts commit b86ff03.
Crew Manifest now available to all
* Pubbystation * minor fix * minor fix * fix fix fix * minor fix * minor fix * Добавил в дефайн как просил * Убрана автоматическая фигня Убрана автоматическая фигня * fix
* Cloak * кирпичный завод (Просто в вендорах починил)
* SCP clothing SCP Clothing Chaos, MTF and Class D uniform * изменил как сказал азиз * надеюсь я то сделал * ой ошибочка была Co-authored-by: Bizzonium <azizonkg@gmail.com> Co-authored-by: BeebBeebBoob <32985153+BeebBeebBoob@users.noreply.github.com> Co-authored-by: Vallat <vox.crit2013@gmail.com> Co-authored-by: Magic101lvl <90201598+Magic101lvl@users.noreply.github.com> Co-authored-by: Krashly <104254674+Krashly@users.noreply.github.com> Co-authored-by: Holoo <38228316+Holoo-1@users.noreply.github.com>
На оффах собаки стали basic, пришлось и на карте их делать basic. Нужно замёрджить если обновимся до оффов
**Добавляет новый сет брони для капелана по мотивам игры blasphemous** Иконка шлема:  Иконка брони:  И вид на мобе:  **БОЛЬШЕ ДРИПА БОГУ ДРИПА!** **БОЛЬШЕ ОТСЫЛОК БОГУ ОТСЫЛОК!** :cl: code: changed some code add: Added more things imageadd: added some icons and images :cl:
- Добавляет квас как реагент. (Пиво 1 часть. Сахар 2 части. Энзим 5 юнитов, как катализатор). Квас повышает настроение и медленно выводит токсины. - Добавляет бочку кваса на 1000 юнитов, в карго, в раздел канистр.  - Добавляет окрошку в категорию супов, как овощное и мясное блюдо. (20 юнитов кваса. 1 огурец. 1 сырая котлета).  - Добавляет мемную пластиковую бутылку с квасом, для щитспавнов.  Co-authored-by: Bizzonium <azizonkg@gmail.com> Co-authored-by: BeebBeebBoob <32985153+BeebBeebBoob@users.noreply.github.com> Co-authored-by: Vallat <vox.crit2013@gmail.com> Co-authored-by: Magic101lvl <90201598+Magic101lvl@users.noreply.github.com> Co-authored-by: VastKilleroOm <74047915+VastKilleroOm@users.noreply.github.com> Co-authored-by: Krashly <104254674+Krashly@users.noreply.github.com> Co-authored-by: Holoo <38228316+Holoo-1@users.noreply.github.com>
This reverts commit 2766694.
Просто снова пофиксил пути вещей При обнове до оффов
Adds new emoji for ooc and pda message --------- Co-authored-by: Bizzonium <azizonkg@gmail.com> Co-authored-by: BeebBeebBoob <32985153+BeebBeebBoob@users.noreply.github.com> Co-authored-by: Vallat <vox.crit2013@gmail.com> Co-authored-by: Magic101lvl <90201598+Magic101lvl@users.noreply.github.com> Co-authored-by: Krashly <104254674+Krashly@users.noreply.github.com> Co-authored-by: Holoo <38228316+Holoo-1@users.noreply.github.com> Co-authored-by: RuByxarik <120047236+RuByxarik@users.noreply.github.com> Co-authored-by: kawaiinick <104280915+kawaiinick@users.noreply.github.com>
Фикс пабби, чтобы работал при обнове до оффов --------- Co-authored-by: Bizzonium <azizonkg@gmail.com> Co-authored-by: BeebBeebBoob <32985153+BeebBeebBoob@users.noreply.github.com> Co-authored-by: Vallat <vox.crit2013@gmail.com> Co-authored-by: Magic101lvl <90201598+Magic101lvl@users.noreply.github.com> Co-authored-by: Krashly <104254674+Krashly@users.noreply.github.com> Co-authored-by: Holoo <38228316+Holoo-1@users.noreply.github.com> Co-authored-by: RuByxarik <120047236+RuByxarik@users.noreply.github.com> Co-authored-by: kawaiinick <104280915+kawaiinick@users.noreply.github.com>
Russian translation to silicon Laws @Russnake1231 --------- Co-authored-by: Bizzonium <azizonkg@gmail.com> Co-authored-by: BeebBeebBoob <32985153+BeebBeebBoob@users.noreply.github.com> Co-authored-by: Vallat <vox.crit2013@gmail.com> Co-authored-by: Magic101lvl <90201598+Magic101lvl@users.noreply.github.com> Co-authored-by: Krashly <104254674+Krashly@users.noreply.github.com> Co-authored-by: Holoo <38228316+Holoo-1@users.noreply.github.com> Co-authored-by: RuByxarik <120047236+RuByxarik@users.noreply.github.com> Co-authored-by: kawaiinick <104280915+kawaiinick@users.noreply.github.com> Co-authored-by: Russnake1231 <105020573+Russnake1231@users.noreply.github.com>
Ru characters mentor logs, server logs, AI laws fixes @Russnake1231 --------- Co-authored-by: Bizzonium <azizonkg@gmail.com> Co-authored-by: BeebBeebBoob <32985153+BeebBeebBoob@users.noreply.github.com> Co-authored-by: Vallat <vox.crit2013@gmail.com> Co-authored-by: Magic101lvl <90201598+Magic101lvl@users.noreply.github.com> Co-authored-by: Krashly <104254674+Krashly@users.noreply.github.com> Co-authored-by: Holoo <38228316+Holoo-1@users.noreply.github.com> Co-authored-by: RuByxarik <120047236+RuByxarik@users.noreply.github.com> Co-authored-by: kawaiinick <104280915+kawaiinick@users.noreply.github.com> Co-authored-by: Russnake1231 <105020573+russnake1231@users.noreply.github.com>
Dependabot couldn't find the original pull request head commit, f28310ad029e9275713e6bdd16a169f91dad166b.
f28310a to
7d77ce8
Compare
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
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.
Bumps json5 from 1.0.1 to 1.0.2.
Release notes
Sourced from json5's releases.
Changelog
Sourced from json5's changelog.
... (truncated)
Commits
a62db1e1.0.2e0c23fedocs: update CHANGELOG for v1.0.262a6540fix: add proto to objects and arraysDependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting
@dependabot rebase.Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR:
@dependabot rebasewill rebase this PR@dependabot recreatewill recreate this PR, overwriting any edits that have been made to it@dependabot mergewill merge this PR after your CI passes on it@dependabot squash and mergewill squash and merge this PR after your CI passes on it@dependabot cancel mergewill cancel a previously requested merge and block automerging@dependabot reopenwill reopen this PR if it is closed@dependabot closewill close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually@dependabot ignore this major versionwill close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself)@dependabot ignore this minor versionwill close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself)@dependabot ignore this dependencywill close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)@dependabot use these labelswill set the current labels as the default for future PRs for this repo and language@dependabot use these reviewerswill set the current reviewers as the default for future PRs for this repo and language@dependabot use these assigneeswill set the current assignees as the default for future PRs for this repo and language@dependabot use this milestonewill set the current milestone as the default for future PRs for this repo and languageYou can disable automated security fix PRs for this repo from the Security Alerts page.