Merge Upstream 30.10.2024 #1625
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
…7133) The new devdocs site is great, we should be directing users to it. Signed-off-by: Sean <[email protected]>
) * Tweak syndicate MMI and cyborg console interaction * tweak action icon * Apply suggestions from code review Co-authored-by: CRUNCH <[email protected]> Signed-off-by: datlo <[email protected]> * Apply suggestions from code review Co-authored-by: Henri215 <[email protected]> Signed-off-by: DGamerL <[email protected]> --------- Signed-off-by: datlo <[email protected]> Signed-off-by: DGamerL <[email protected]> Co-authored-by: CRUNCH <[email protected]> Co-authored-by: DGamerL <[email protected]> Co-authored-by: Henri215 <[email protected]>
* Fixes some shell box issues * Contra review * Renaming
* refactor/ci: enforce mapload in Initialize args * add new missing mapload arg * add yet another missing mapload arg * Update code/modules/power/engines/singularity/particle_accelerator/particle.dm Signed-off-by: DGamerL <[email protected]> --------- Signed-off-by: DGamerL <[email protected]> Co-authored-by: DGamerL <[email protected]>
ParadiseSS13#26974) * The syndicate depo closests actually use their sprites + door sprites * animated
* We can't have nice code * Trailing newline * Also fixes double closing sound * Move invalid ID check all the way up * Early return makes this if statement unnecessary. --------- Co-authored-by: [email protected] <[email protected]>
…radiseSS13#27183) * emerald: replace custom trash spawners with generic trash spawner * set script PR number
* fix: update spent casing root types on maps * set script PR number
* Anchor? I hardly know her! * biochip code my hated * yeah that's fair * Apply suggestions from code review Co-authored-by: Luc <[email protected]> Signed-off-by: Qwertytoforty <[email protected]> --------- Signed-off-by: Qwertytoforty <[email protected]> Co-authored-by: Luc <[email protected]>
…iseSS13#27203) * Silicons can once again change camera size * Changed description * Change verb name --------- Co-authored-by: Adrer <[email protected]>
* AI can no longer toggle floorbolts while dead. * Added a to_chat * Switch to the check_unable proc. * No need for the double to_chat * Actually nevermind --------- Co-authored-by: Adrer <[email protected]>
* Increase max pin number value to 99999 * Accidental tab --------- Co-authored-by: Adrer <[email protected]>
Co-authored-by: Bmon <[email protected]>
… of "the supermatter crystal" (ParadiseSS13#27176) * Makes the supermatter event speaker be "supermatter crystal" instead of "the supermatter crystal" * Supermatter events are now announced by "supermatter crystal" instead of "the supermatter crystal", now including supermatter shards
* removes extra holopads on delta * adds a maplint to prevent holopad stacking
…13#27009) * Makes Pizzabombs closeable, refactors their code * oops * Update code/modules/food_and_drinks/food/foods/pizza.dm Co-authored-by: Luc <[email protected]> Signed-off-by: Contrabang <[email protected]> --------- Signed-off-by: Contrabang <[email protected]> Co-authored-by: Luc <[email protected]>
* machine analyzer runtime * renaming * comment * the correct fix
* Black boxes his grace ascentions * Update code/game/objects/items/his_grace.dm Co-authored-by: Contrabang <[email protected]> Signed-off-by: 1080pCat <[email protected]> * more logging = better(thanks contra) * Update his_grace.dm --------- Signed-off-by: 1080pCat <[email protected]> Co-authored-by: Contrabang <[email protected]>
Added indestructible flags to warden gloves, since they're a high-value target
* Add UTF-8 Charset for watchlist * Move charset by review
* Makes powerfist and wallbashing not ignore armor * Safety for damage * Lewc review * Oops
* Morph spawns in vents * adds to wizard morphs * makes it work * Adds another sanity check
…ds. And if a morph mimics a non dense object(like a cigarette) the morph will become non dense (ParadiseSS13#27018) * Two morph buffs, and a fix. * bah woops * Update code/datums/spells/mimic.dm Co-authored-by: Luc <[email protected]> Signed-off-by: 1080pCat <[email protected]> --------- Signed-off-by: 1080pCat <[email protected]> Co-authored-by: Luc <[email protected]>
github-actions
bot
added
Документация
dj-34
approved these changes
Oct 30, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
🎸 Инструменты
Мы выдаем себя за реальное сообщество разработчиков.
Документация
Улучшения и дополнения в документации
🖌️ Спрайты
Вы заработали свою миска-рис и кошко-жена. Партия гордится вами!
🙏 Слияние с восходящим потоком
Боже, храни Короля!
📜 CL валиден
TGUI
Кто-то решил потрогать интерфейсы.
Кибериада
Этот ПР изменил что-то на Кибериаде (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: Добавлен новый имплант - Bluespace Anchor. Блокирует почти все способы телепортации носителя, за исключением вмешательств администрации и похищения контрактором. Можно заказать в карго и создать в РНД.
imageadd: Шкафчики в синди депоте получили собственные спрайты.
tweak: Борги, которые были подчинены синдикатовским MMI, могут отвязаться от систем станции и стать невосприимчивыми к удаленным блокировке и детонации.
tweak: Емагнутый борг, подчиненный синдикатовским MMI, снова становится восприимчивым к удаленным блокировке и детонации.
tweak: Силовой кулак и удар об стену теперь учитывают броню.
tweak: Члены экипажа, отмеченные галочкой, теперь будут отображаться вверху списка в Crew Monitor.
tweak: Разминированную пицца-бомбу теперь можно закрыть.
fix: Отмена ввода таймера пицца-бомбы теперь правильно деактивирует таймер и закрывает коробку.
fix: Спрайт коробки со святыми дротиками снова отображается.
fix: Личные шкафчики теперь нормально открываются и закрываются.
fix: Борги снова могут изменить размер фотоснимка у камеры.
fix: ИИ больше не может болтировать себя, будучи мертвым.
fix: Ввод пин-кода в консоли карго снова работает.
fix: Ассистенты больше не спавнятся в стандартных юбках.
fix: Генератор гравитации снова выходит из строя после коллапса гравитационной аномалии.
fix: Перчатки крав мага теперь неразрушимы.
fix: БСА теперь не перезаряжается при недостатке энергии.
fix: Морфы теперь спавнятся в вентиляции.
tweak: Морфы теперь не отображаются на худах при маскировке. Через них теперь также можно пройти, если они маскируются под небольшой предмет.
/:cl: