Merge Upstream 23.08.2024 #1441
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
…3#26444) * Refactor createMessage out of message server * Change radio message * Add reminder * Fix linting errors * Fix more linting errors * Update priorities * Add low priority icon * Lower indent * Fix switch statement * Add low priority icon * No reminders for low priority messages * Update priorities in frontend * Build and update /tg/ui * Fix typo * Clarify purpose of return * [ci skip] * Build and update /tg/ui * [ci skip] * Build and update /tg/ui --------- Co-authored-by: Arthri <[email protected]> Co-authored-by: /tg/ui Builder <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Arthri <[email protected]>
* Using explosives at end round now gibs you * More tweaks * Tweaks
* Stops mice from eating cables during CI * WE TEST CI WITH THIS ONE * Revert "WE TEST CI WITH THIS ONE" This reverts commit e163eaf. * Comment * Charlie review
…nes (ParadiseSS13#26495) replace even more magic emp and ex numbers
…proc calls it makes throughout the round (ParadiseSS13#26447) * Updates disposal power changes * oop
* cere: Move APCs out of maints. * fix cable placement * cut rest of old viro cable * move maints apcs inside substations, move AI sat apc * cargo/med substation serves two maints, keep one APC in tunnels
Co-authored-by: Arthri <[email protected]>
…adiseSS13#26484) * Fixed + now its tgui_alert instead of alert * fixed as Aylong suggested * forgor to remove Cancel from first check * Update code/modules/paperwork/paperbin.dm missing whitespace Co-authored-by: Contrabang <[email protected]> Signed-off-by: npukoJl <[email protected]> * add a null check on P --------- Signed-off-by: npukoJl <[email protected]> Co-authored-by: npukoJl <[email protected]> Co-authored-by: Contrabang <[email protected]>
Co-authored-by: paradisess13[bot] <165046124+paradisess13[bot]@users.noreply.github.com>
…26265) * Washing Machine Updates * Dye Registry Improvement + Bug Fixes * a couple bug fixes + beanie dyeing * oopsie * removes washing blacklist, it is unused * Apply suggestions from Lewcc's code review Co-authored-by: Burzah <[email protected]> Signed-off-by: Ryan <[email protected]> * Apply suggestions from code review Co-authored-by: Contrabang <[email protected]> Signed-off-by: Ryan <[email protected]> * why is all my code fucking * Update code/modules/clothing/gloves/colored_gloves.dm Co-authored-by: Contrabang <[email protected]> Signed-off-by: Ryan <[email protected]> * cleanup * Update code/modules/clothing/gloves/colored_gloves.dm Co-authored-by: Contrabang <[email protected]> Signed-off-by: Ryan <[email protected]> * machine wash updates for simple animals * Update code/modules/clothing/clothing.dm Co-authored-by: Burzah <[email protected]> Signed-off-by: Ryan <[email protected]> * Apply suggestions from code review Co-authored-by: Luc <[email protected]> Signed-off-by: Ryan <[email protected]> * adds dyeing.dm documentation * optimizations & visible_messages * adds SIGNAL_HANDLER * Update code/game/machinery/washing_machine.dm Co-authored-by: Luc <[email protected]> Signed-off-by: Ryan <[email protected]> * update comment * cleans up cleaning_act() --------- Signed-off-by: Ryan <[email protected]> Co-authored-by: Burzah <[email protected]> Co-authored-by: Contrabang <[email protected]> Co-authored-by: Luc <[email protected]>
… Standardizes Solar Areas. (ParadiseSS13#26458) * Update cerestation.dmm * Update cerestation.dmm * Standardized Solar Icons and Names * Area Reconstruction * area correction * The other correction. * Update cerestation.dmm
* You can no longer parry while dead * Update code/datums/components/parry.dm Co-authored-by: DGamerL <[email protected]> Signed-off-by: Adrer <[email protected]> --------- Signed-off-by: Adrer <[email protected]> Co-authored-by: [email protected] <[email protected]> Co-authored-by: DGamerL <[email protected]>
ParadiseSS13#26507) * Fixed the last word pop up window instantly killing you if you are full health * Update code/modules/mob/living/living.dm Co-authored-by: Luc <[email protected]> Signed-off-by: DGamerL <[email protected]> --------- Signed-off-by: DGamerL <[email protected]> Co-authored-by: DGamerL <[email protected]> Co-authored-by: Luc <[email protected]>
…the description (ParadiseSS13#26439) * You can now feel how hot the damage medbeam is. and tweaks the description slightly * updates the description a little more * Update code/modules/projectiles/guns/medbeam.dm Co-authored-by: Ryan <[email protected]> Signed-off-by: 1080pCat <[email protected]> * Update code/modules/projectiles/guns/medbeam.dm Co-authored-by: Ryan <[email protected]> Signed-off-by: 1080pCat <[email protected]> --------- Signed-off-by: 1080pCat <[email protected]> Co-authored-by: Ryan <[email protected]>
* Adds extended descritoins to tarot cards. * formatting and a couple of fixes * Apply suggestions from code review Co-authored-by: Sheep <[email protected]> Signed-off-by: 1080pCat <[email protected]> * Update magic_tarot.dm * Apply suggestions from code review Co-authored-by: Adri <[email protected]> Signed-off-by: 1080pCat <[email protected]> * Update magic_tarot.dm * Apply suggestions from code review Co-authored-by: Ryan <[email protected]> Signed-off-by: 1080pCat <[email protected]> * Update magic_tarot.dm * Apply suggestions from code review Co-authored-by: DGamerL <[email protected]> Signed-off-by: 1080pCat <[email protected]> * Apply suggestions from code review Co-authored-by: DGamerL <[email protected]> Signed-off-by: 1080pCat <[email protected]> * rather be more descriptive with what this does * Update code/game/gamemodes/wizard/magic_tarot.dm Co-authored-by: DGamerL <[email protected]> Signed-off-by: 1080pCat <[email protected]> * Update code/game/gamemodes/wizard/magic_tarot.dm Co-authored-by: DGamerL <[email protected]> Signed-off-by: 1080pCat <[email protected]> * DGL review + formatting that wasn't needed --------- Signed-off-by: 1080pCat <[email protected]> Co-authored-by: Sheep <[email protected]> Co-authored-by: Adri <[email protected]> Co-authored-by: Ryan <[email protected]> Co-authored-by: DGamerL <[email protected]>
…ParadiseSS13#26544) * Adds interface to selectors for Info tab * Moves to OOC - Adjusts Voting Classes * Removes bolding
Signed-off-by: Faron <[email protected]>
…its pet bunny. (ParadiseSS13#26554) * syndicake factory has power again * Update code/modules/mob/living/simple_animal/friendly/bunny.dm Co-authored-by: DGamerL <[email protected]> Signed-off-by: 1080pCat <[email protected]> --------- Signed-off-by: 1080pCat <[email protected]> Co-authored-by: DGamerL <[email protected]>
github-actions
bot
added
Документация
|
Завтра
|
m-dzianishchyts
force-pushed
the
merge-upstream
branch
from
40817a5 to
22dc23d
Compare
github-actions
bot
added
Кибериада
Legendaxe
approved these changes
Aug 23, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
🎸 Инструменты
Мы выдаем себя за реальное сообщество разработчиков.
Документация
Улучшения и дополнения в документации
🖌️ Спрайты
Вы заработали свою миска-рис и кошко-жена. Партия гордится вами!
🙏 Слияние с восходящим потоком
Боже, храни Короля!
📜 CL валиден
TGUI
Кто-то решил потрогать интерфейсы.
Керберос
Этот ПР изменил что-то на Керберосе (DeltaStation)
Кибериада
Этот ПР изменил что-то на Кибериаде (BoxStation)
Цереброн
Этот ПР изменил что-то на Цереброне (MetaStation)
Документация
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 делает
Мергес апстрим.
Возможны конфликты с переводами (перевод зон).
Changelog
🆑 ParadiseSS13
add: Реворк стиральной машины.
add: Можно покрасить шапки, поясные сумки, юбки и другое.
tweak: Стиральные машины можно собрать и разобрать.
tweak: Маленьких животных теперь тоже можно постирать.
tweak: Кровавая стиральная машина сделает грязной всю одежду (это изменение абсолютно точно никак не связано с предыдущим).
fix: Худи теперь можно корректно очистить.
fix: Одежда больше не становится невидимой после покраски во время стирки.
fix: Боевые перчатки теперь можно покрасить.
fix: Патронташ обзавелся спрайтом в меню крафта.
fix: Обновленный спрайт сигналера теперь точно используется.
fix: Бумагу больше нельзя взять из контейнера бумаги с любого расстояния.
fix: Хозяин голопаразита теперь может отличить кнопки действий одну от другой.
fix: Парирование после смерти отключено.
fix: Произношение последних слов больше не приводит к смерти, если удались выйти из крита.
fix: Скелетов-надзирателей больше нельзя заспавнить ядром золотистого слайма.
fix: Больше нельзя раундстартом проснуться с похмелья у ядра ИИ.
fix: Пекарня синдиката больше не имеет проблем с питанием.
tweak: Печка карго теперь отправляет в консоли запросы с низким приоритетом, которые не повторяются.
tweak: Использование взрывчатки после гринтекста теперь приводит к гибу инициатора.
tweak: Хирургические подносы теперь вмещают хирургические драпировки.
tweak: Сломанный медлуч при перегреве теперь причиняет серьезные ожоги.
tweak: Карты таро получили расширенное описание на обратной стороне.
tweak: Сообщения о новом голосовании теперь относятся к группе OOC в TGUI чате.
/:cl: