Master banda our #9
Merged
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
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may not be viewable. --> <!-- You can view Contributing.MD for a detailed description of the pull request process. --> ## About The Pull Request <!-- Describe The Pull Request. Please be sure every change is documented or this can delay review and even discourage maintainers from merging your PR! --> В чейнджлоге ## Why It's Good For The Game <!-- Argue for the merits of your changes and how they benefit the game, especially if they are controversial and/or far reaching. If you can't actually explain WHY what you are doing will improve the game, then it probably isn't good for the game in the first place. --> Первый шаг к светлому будущему ## Changelog <!-- If your PR modifies aspects of the game that can be concretely observed by players or admins you should add a changelog. If your change does NOT meet this description, remove this section. Be sure to properly mark your PRs to prevent unnecessary GBP loss. You can read up on GBP and it's effects on PRs in the tgstation guides for contributors. Please note that maintainers freely reserve the right to remove and add tags should they deem it appropriate. You can attempt to finagle the system all you want, but it's best to shoot for clear communication right off the bat. --> :cl: code: Добавлена поддержка модпаков config: Добавлен файл конфига для модпаков code: Обновлен CI под модпаки code: Изменен метод обнаружения мердж конфликтов /:cl: <!-- Both :cl:'s are required for the changelog to work! You can put your name to the right of the first :cl: if you want to overwrite your GitHub username as author ingame. --> <!-- You can use multiple of the same prefix (they're only used for the icon ingame) and delete the unneeded ones. Despite some of the tags, changelogs should generally represent how a player might be affected by the changes rather than a summary of the PR's contents. -->
## About The Pull Request Чейнджлог ## Changelog :cl: code: Добавлены модпаки дефайнов, хелперов и сигналов add: Добавлен NT Default закон ИИ add: Добавлены барные вывески и их поддержка add: Добавлены шепот и LOOC balance: Ползание теперь заставляет "ходить", а не "бежать" fix: Поддержка кириллицы add: Добавлена поддержка дискорда и необходимость привязки balance: Трит при онлайне <10 теперь равен 0 balance: Настенный грибок только при >20 онлайна add: Счетчик патронов qol: Кейбинды по-умолчанию теперь Парадиза220 add: Пиксель-шифт add: Перевод для усов и гостей add: TTS220 add: Некоторые ворлд топики /:cl:
## About The Pull Request Default gameplay values for bandastation ## Changelog :cl: config: Default gameplay values for bandastation /:cl:
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may not be viewable. --> <!-- You can view Contributing.MD for a detailed description of the pull request process. --> ## About The Pull Request <!-- Describe The Pull Request. Please be sure every change is documented or this can delay review and even discourage maintainers from merging your PR! --> Добавляет эмоут панель в IC Перевод большей части эмоутов fixes ss220club#11 fixes ss220club#12 ## Why It's Good For The Game <!-- Argue for the merits of your changes and how they benefit the game, especially if they are controversial and/or far reaching. If you can't actually explain WHY what you are doing will improve the game, then it probably isn't good for the game in the first place. --> Иногда не хочется кейбиндить все эмоции ## Changelog <!-- If your PR modifies aspects of the game that can be concretely observed by players or admins you should add a changelog. If your change does NOT meet this description, remove this section. Be sure to properly mark your PRs to prevent unnecessary GBP loss. You can read up on GBP and it's effects on PRs in the tgstation guides for contributors. Please note that maintainers freely reserve the right to remove and add tags should they deem it appropriate. You can attempt to finagle the system all you want, but it's best to shoot for clear communication right off the bat. --> :cl: add: Панель эмоций qol: Перевод большей части эмоций /:cl: <!-- Both :cl:'s are required for the changelog to work! You can put your name to the right of the first :cl: if you want to overwrite your GitHub username as author ingame. --> <!-- You can use multiple of the same prefix (they're only used for the icon ingame) and delete the unneeded ones. Despite some of the tags, changelogs should generally represent how a player might be affected by the changes rather than a summary of the PR's contents. -->
## About The Pull Request Добавляет перевод кейбиндов fixes ss220club#10 ## Why It's Good For The Game Русскоязычный билд? ## Changelog :cl: qol: Перевод кейбиндов /:cl:
## About The Pull Request Порт упрощенной версии Examine Panel ## Why It's Good For The Game Флаворы круто ## Changelog :cl: add: Examine Panel /:cl:
## About The Pull Request Фиксит ТТС и путь конфига fixes ss220club#8 ## Why It's Good For The Game ## Changelog :cl: fix: TTS fix: config path /:cl:
## About The Pull Request Первая часть из перевода эстетики под новооффпару
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may not be viewable. --> <!-- You can view Contributing.MD for a detailed description of the pull request process. --> <!-- Describe The Pull Request. Please be sure every change is documented or this can delay review and even discourage maintainers from merging your PR! --> В чейнджлоге <!-- Argue for the merits of your changes and how they benefit the game, especially if they are controversial and/or far reaching. If you can't actually explain WHY what you are doing will improve the game, then it probably isn't good for the game in the first place. --> Первый шаг к светлому будущему <!-- If your PR modifies aspects of the game that can be concretely observed by players or admins you should add a changelog. If your change does NOT meet this description, remove this section. Be sure to properly mark your PRs to prevent unnecessary GBP loss. You can read up on GBP and it's effects on PRs in the tgstation guides for contributors. Please note that maintainers freely reserve the right to remove and add tags should they deem it appropriate. You can attempt to finagle the system all you want, but it's best to shoot for clear communication right off the bat. --> :cl: code: Добавлена поддержка модпаков config: Добавлен файл конфига для модпаков code: Обновлен CI под модпаки code: Изменен метод обнаружения мердж конфликтов /:cl: <!-- Both :cl:'s are required for the changelog to work! You can put your name to the right of the first :cl: if you want to overwrite your GitHub username as author ingame. --> <!-- You can use multiple of the same prefix (they're only used for the icon ingame) and delete the unneeded ones. Despite some of the tags, changelogs should generally represent how a player might be affected by the changes rather than a summary of the PR's contents. -->
## About The Pull Request Чейнджлог ## Changelog :cl: code: Добавлены модпаки дефайнов, хелперов и сигналов add: Добавлен NT Default закон ИИ add: Добавлены барные вывески и их поддержка add: Добавлены шепот и LOOC balance: Ползание теперь заставляет "ходить", а не "бежать" fix: Поддержка кириллицы add: Добавлена поддержка дискорда и необходимость привязки balance: Трит при онлайне <10 теперь равен 0 balance: Настенный грибок только при >20 онлайна add: Счетчик патронов qol: Кейбинды по-умолчанию теперь Парадиза220 add: Пиксель-шифт add: Перевод для усов и гостей add: TTS220 add: Некоторые ворлд топики /:cl:
## About The Pull Request Default gameplay values for bandastation ## Changelog :cl: config: Default gameplay values for bandastation /:cl:
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may not be viewable. --> <!-- You can view Contributing.MD for a detailed description of the pull request process. --> ## About The Pull Request <!-- Describe The Pull Request. Please be sure every change is documented or this can delay review and even discourage maintainers from merging your PR! --> Добавляет эмоут панель в IC Перевод большей части эмоутов fixes ss220club#11 fixes ss220club#12 ## Why It's Good For The Game <!-- Argue for the merits of your changes and how they benefit the game, especially if they are controversial and/or far reaching. If you can't actually explain WHY what you are doing will improve the game, then it probably isn't good for the game in the first place. --> Иногда не хочется кейбиндить все эмоции ## Changelog <!-- If your PR modifies aspects of the game that can be concretely observed by players or admins you should add a changelog. If your change does NOT meet this description, remove this section. Be sure to properly mark your PRs to prevent unnecessary GBP loss. You can read up on GBP and it's effects on PRs in the tgstation guides for contributors. Please note that maintainers freely reserve the right to remove and add tags should they deem it appropriate. You can attempt to finagle the system all you want, but it's best to shoot for clear communication right off the bat. --> :cl: add: Панель эмоций qol: Перевод большей части эмоций /:cl: <!-- Both :cl:'s are required for the changelog to work! You can put your name to the right of the first :cl: if you want to overwrite your GitHub username as author ingame. --> <!-- You can use multiple of the same prefix (they're only used for the icon ingame) and delete the unneeded ones. Despite some of the tags, changelogs should generally represent how a player might be affected by the changes rather than a summary of the PR's contents. -->
## About The Pull Request Добавляет перевод кейбиндов fixes ss220club#10 ## Why It's Good For The Game Русскоязычный билд? ## Changelog :cl: qol: Перевод кейбиндов /:cl:
## About The Pull Request Порт упрощенной версии Examine Panel ## Why It's Good For The Game Флаворы круто ## Changelog :cl: add: Examine Panel /:cl:
## About The Pull Request Фиксит ТТС и путь конфига fixes ss220club#8 ## Why It's Good For The Game ## Changelog :cl: fix: TTS fix: config path /:cl:
## About The Pull Request Первая часть из перевода эстетики под новооффпару
rebase update
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may not be viewable. --> <!-- You can view Contributing.MD for a detailed description of the pull request process. --> ## About The Pull Request <!-- Describe The Pull Request. Please be sure every change is documented or this can delay review and even discourage maintainers from merging your PR! --> Убирает эмоут панель ## Why It's Good For The Game <!-- Argue for the merits of your changes and how they benefit the game, especially if they are controversial and/or far reaching. If you can't actually explain WHY what you are doing will improve the game, then it probably isn't good for the game in the first place. --> Уже есть
## About The Pull Request Полная переделка эстетики, часть первая. Весь модуль был удалён и будет сделан по новой. Заменены: - Стены - Окна - Двери - Полы    ## Why It's Good For The Game ЭСТЕТИКА
…tgstation-master
## About The Pull Request Merge upstream
This pull request updates the server NanoMaps. Please review the diff images before merging. Co-authored-by: NanoMap Generation <[email protected]>
## About The Pull Request Merge upstream 16.06.2024
## About The Pull Request Добавил в модуль декали для ЦК ## Why It's Good For The Game 
## About The Pull Request Merge upstream [22.06.2024]
## About The Pull Request Merge upstream [29.06.2024]
Квас портированный с массметы. Щитспаун онли. :cl: add: Квас /:cl: --------- Co-authored-by: PhantornRU <[email protected]>
## About The Pull Request Merge upstream [30.06.2024]
## About The Pull Request Пофиксил возможность ходить через плазменные окна closes tgstation#265 ## Why It's Good For The Game Больше нельзя попасть в ловушку плазмажокера ## Changelog :cl: fix: фикс плазма и затемненных окон. /:cl:
This pull request updates the server NanoMaps. Please review the diff images before merging. Co-authored-by: NanoMap Generation <[email protected]>
## About The Pull Request Merge upstream [09.07.2024]
## About The Pull Request Порт кода с парадиза ParadiseSS13/Paradise#25182 Теперь оно не должно кидать ошибки при успехе (нет изменений карты)
This pull request updates the server NanoMaps. Please review the diff images before merging. Co-authored-by: NanoMap Generation <[email protected]>
<!-- Пишите **НИЖЕ** заголовков и **ВЫШЕ** комментариев, иначе что то может пойти не так. --> <!-- Вы можете прочитать Contributing.MD, если хотите узнать больше. --> ## Что этот PR делает <!-- Вкратце опишите изменения, которые вносите. --> <!-- Опишите **все** изменения, так как противное может сказаться на рассмотрении этого PR'а! --> <!-- Если вы исправляете Issue, добавьте "Fixes #xxxx" (где xxxx - номер Issue) где-нибудь в описании PR'а. Это автоматически закроет Issue после принятия PR'а. --> При изменении TTS с помощью VV теперь также обновляется и ДНК.
Я забыл, что нужно закрывать хттп клиент при отключении сервера :fortune:
## About The Pull Request Merge upstream [11.07.2024]
## About The Pull Request Удаляем все гендеры кроме Он/Она ## Why It's Good For The Game Всё равно их никто не будет использовать в нашем комьюнити, а некоторые и триггериться будут ## Changelog :cl: del: Убраны лишние гендеры и `body_type` из префов /:cl:
## About The Pull Request Перевод названий профессий ## Тесты * Карта при спавне * ПДА при спавне * В крю манифесте * В мессенджере * В редакторе карточек * Прок работает * Работает в префах * Работает в лейтжоине * Работает в синди-карте <details><summary>Скриншоты</summary>    </details> Необходимо в ветке translate внедрять прок job_title_ru(), например у тех же целей антага. ## Changelog :cl: add: Перевод профессий /:cl:
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.
yeah