forked from tgstation/tgstation
-
Notifications
You must be signed in to change notification settings - Fork 13
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
Build(deps): Bump json5 from 1.0.1 to 1.0.2 in /tgui #57
Open
dependabot
wants to merge
44
commits into
master220
Choose a base branch
from
dependabot/npm_and_yarn/tgui/json5-1.0.2
base: master220
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.
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
dependabot
bot
added
dependencies
Pull requests that update a dependency file
javascript
Pull requests that update Javascript code
labels
Jan 7, 2023
dependabot
bot
force-pushed
the
dependabot/npm_and_yarn/tgui/json5-1.0.2
branch
from
January 13, 2023 16:12
785be18
to
5ba4b22
Compare
Bizzonium
force-pushed
the
master220
branch
2 times, most recently
from
January 22, 2023 13:30
0ec3188
to
32b46b7
Compare
Bizzonium
force-pushed
the
master220
branch
2 times, most recently
from
February 3, 2023 09:51
bc951eb
to
58bec55
Compare
dependabot
bot
force-pushed
the
dependabot/npm_and_yarn/tgui/json5-1.0.2
branch
from
February 3, 2023 09:54
5ba4b22
to
2c26a51
Compare
dependabot
bot
force-pushed
the
dependabot/npm_and_yarn/tgui/json5-1.0.2
branch
from
February 8, 2023 17:01
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 <[email protected]> Co-authored-by: BeebBeebBoob <[email protected]> Co-authored-by: Vallat <[email protected]> Co-authored-by: Magic101lvl <[email protected]> Co-authored-by: Krashly <[email protected]> Co-authored-by: Holoo <[email protected]>
На оффах собаки стали basic, пришлось и на карте их делать basic. Нужно замёрджить если обновимся до оффов
**Добавляет новый сет брони для капелана по мотивам игры blasphemous** Иконка шлема: ![bp_head](https://user-images.githubusercontent.com/120047236/207939594-b520adbc-f32d-4692-9e41-f029bed8c640.png) Иконка брони: ![bp_armor](https://user-images.githubusercontent.com/120047236/207939668-755f6a34-1e6a-49b3-9a55-910e2d4e884a.png) И вид на мобе: ![all](https://user-images.githubusercontent.com/120047236/207939735-736be1ee-8bac-4c54-b758-3ddaf887e2a0.png) **БОЛЬШЕ ДРИПА БОГУ ДРИПА!** **БОЛЬШЕ ОТСЫЛОК БОГУ ОТСЫЛОК!** :cl: code: changed some code add: Added more things imageadd: added some icons and images :cl:
- Добавляет квас как реагент. (Пиво 1 часть. Сахар 2 части. Энзим 5 юнитов, как катализатор). Квас повышает настроение и медленно выводит токсины. - Добавляет бочку кваса на 1000 юнитов, в карго, в раздел канистр. ![2222](https://user-images.githubusercontent.com/104280915/204438336-658c2250-b882-4ad8-b70c-117f5bf25d8c.png) - Добавляет окрошку в категорию супов, как овощное и мясное блюдо. (20 юнитов кваса. 1 огурец. 1 сырая котлета). ![2323232](https://user-images.githubusercontent.com/104280915/204438283-cb621484-60e0-4fa1-8549-828b9fbab3f3.png) - Добавляет мемную пластиковую бутылку с квасом, для щитспавнов. ![22131231](https://user-images.githubusercontent.com/104280915/204438357-1b7a2872-83d7-4b9a-9b53-f7a5bdeaa4d2.png) Co-authored-by: Bizzonium <[email protected]> Co-authored-by: BeebBeebBoob <[email protected]> Co-authored-by: Vallat <[email protected]> Co-authored-by: Magic101lvl <[email protected]> Co-authored-by: VastKilleroOm <[email protected]> Co-authored-by: Krashly <[email protected]> Co-authored-by: Holoo <[email protected]>
This reverts commit 2766694.
Просто снова пофиксил пути вещей При обнове до оффов
Adds new emoji for ooc and pda message --------- Co-authored-by: Bizzonium <[email protected]> Co-authored-by: BeebBeebBoob <[email protected]> Co-authored-by: Vallat <[email protected]> Co-authored-by: Magic101lvl <[email protected]> Co-authored-by: Krashly <[email protected]> Co-authored-by: Holoo <[email protected]> Co-authored-by: RuByxarik <[email protected]> Co-authored-by: kawaiinick <[email protected]>
Фикс пабби, чтобы работал при обнове до оффов --------- Co-authored-by: Bizzonium <[email protected]> Co-authored-by: BeebBeebBoob <[email protected]> Co-authored-by: Vallat <[email protected]> Co-authored-by: Magic101lvl <[email protected]> Co-authored-by: Krashly <[email protected]> Co-authored-by: Holoo <[email protected]> Co-authored-by: RuByxarik <[email protected]> Co-authored-by: kawaiinick <[email protected]>
Russian translation to silicon Laws @Russnake1231 --------- Co-authored-by: Bizzonium <[email protected]> Co-authored-by: BeebBeebBoob <[email protected]> Co-authored-by: Vallat <[email protected]> Co-authored-by: Magic101lvl <[email protected]> Co-authored-by: Krashly <[email protected]> Co-authored-by: Holoo <[email protected]> Co-authored-by: RuByxarik <[email protected]> Co-authored-by: kawaiinick <[email protected]> Co-authored-by: Russnake1231 <[email protected]>
Ru characters mentor logs, server logs, AI laws fixes @Russnake1231 --------- Co-authored-by: Bizzonium <[email protected]> Co-authored-by: BeebBeebBoob <[email protected]> Co-authored-by: Vallat <[email protected]> Co-authored-by: Magic101lvl <[email protected]> Co-authored-by: Krashly <[email protected]> Co-authored-by: Holoo <[email protected]> Co-authored-by: RuByxarik <[email protected]> Co-authored-by: kawaiinick <[email protected]> Co-authored-by: Russnake1231 <[email protected]>
Dependabot couldn't find the original pull request head commit, f28310ad029e9275713e6bdd16a169f91dad166b.
dependabot
bot
force-pushed
the
dependabot/npm_and_yarn/tgui/json5-1.0.2
branch
from
February 23, 2023 14:44
f28310a
to
7d77ce8
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Labels
dependencies
Pull requests that update a dependency file
javascript
Pull requests that update Javascript code
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
a62db1e
1.0.2e0c23fe
docs: update CHANGELOG for v1.0.262a6540
fix: 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 rebase
will rebase this PR@dependabot recreate
will recreate this PR, overwriting any edits that have been made to it@dependabot merge
will merge this PR after your CI passes on it@dependabot squash and merge
will squash and merge this PR after your CI passes on it@dependabot cancel merge
will cancel a previously requested merge and block automerging@dependabot reopen
will reopen this PR if it is closed@dependabot close
will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually@dependabot ignore this major version
will 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 version
will 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 dependency
will 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 labels
will set the current labels as the default for future PRs for this repo and language@dependabot use these reviewers
will set the current reviewers as the default for future PRs for this repo and language@dependabot use these assignees
will set the current assignees as the default for future PRs for this repo and language@dependabot use this milestone
will 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.