Merge Upstream 03.12.2024 #1677
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
…SS13#27436) * reviver * toxic * more changes * final changes * I lied one more * woe rename apon thee * Update code/modules/surgery/organs/augments_internal.dm Signed-off-by: DGamerL <[email protected]> --------- Signed-off-by: DGamerL <[email protected]> Co-authored-by: DGamerL <[email protected]>
* Port TG Resonator so this is not a trash anymore * fix defines * Update kinetic_accelerator.dm * yeah yeah linter i love you too * Update paradise.dme * fix for matrix * Update code/modules/mining/equipment/resonator.dm Co-authored-by: Luc <[email protected]> Signed-off-by: Сиротка <[email protected]> * Update code/modules/mining/equipment/resonator.dm Co-authored-by: Luc <[email protected]> Signed-off-by: Сиротка <[email protected]> * remove useless signal * Update code/modules/mining/equipment/resonator.dm Co-authored-by: Luc <[email protected]> Signed-off-by: Сиротка <[email protected]> * Update code/modules/mining/equipment/resonator.dm Co-authored-by: Luc <[email protected]> Signed-off-by: Сиротка <[email protected]> * Update code/modules/mining/equipment/resonator.dm Co-authored-by: Luc <[email protected]> Signed-off-by: Сиротка <[email protected]> * Update code/modules/mining/equipment/resonator.dm Co-authored-by: Luc <[email protected]> Signed-off-by: Сиротка <[email protected]> * Update code/modules/mining/equipment/resonator.dm Co-authored-by: DGamerL <[email protected]> Signed-off-by: Сиротка <[email protected]> * Update code/modules/mining/equipment/resonator.dm Co-authored-by: DGamerL <[email protected]> Signed-off-by: Сиротка <[email protected]> --------- Signed-off-by: Сиротка <[email protected]> Co-authored-by: Luc <[email protected]> Co-authored-by: DGamerL <[email protected]>
…SS13#27315) * added a beep beep to signaler receivers * new sound + attribution
…asmamen helmet dyeing (ParadiseSS13#27256) * Fixes dying not changing the color or description of the dyed item, making it appear unchanged when worn. * adds plasmaman helmet dyeing
…#27454) * Wrong branch again * Corrected comment * Requested changes * Updated comment * Update code/modules/mob/living/carbon/human/human_mob.dm Signed-off-by: DGamerL <[email protected]> --------- Signed-off-by: DGamerL <[email protected]> Co-authored-by: Adrer <[email protected]> Co-authored-by: DGamerL <[email protected]>
* Add_Decal_Painter * Seperate TGUI file * Decal painter DmIcon * Fix some merge errors * I don't know why this merge is so incredibly fucked * Update TGUI bundle * I swear to god * Fixes DmIcon * TGUI bundle build * Remove implicit var * Final cleanup * Add decal_painter sprite * Update code/game/objects/items/devices/painter/decal_painter.dm Co-authored-by: Luc <[email protected]> Signed-off-by: Chap <[email protected]> * Add helper proc for deleting all components of a type from a datum * Added comments to cycle_style * Elementized decal fixes * Use the new decal system * TGUI bundle --------- Signed-off-by: Chap <[email protected]> Co-authored-by: Adrer <[email protected]> Co-authored-by: Luc <[email protected]> Co-authored-by: Burzah <[email protected]>
* Adds janitor's overalls to the loadout menu * Adds ALL the overalls * Update code/modules/client/preference/loadout/loadout_uniform.dm Yay formatting Co-authored-by: Luc <[email protected]> Signed-off-by: Rowan Lea <[email protected]> --------- Signed-off-by: Rowan Lea <[email protected]> Co-authored-by: Luc <[email protected]>
…our soul and I DO want to kill it (ParadiseSS13#27381) * Updates Stools, Office Chairs, and Barber Chairs * Fix shade pixelstrips in stools * Fix Barber Chair mirroring * Fixes side views of office chairs, Thickness improvements * I accidentally added back in the pixel strip lol * Killed the highlight on the legs of the chairs because it was ugly and noisy
* woeuponspawners * begone blank space * Update code/modules/ruins/syndicate_space_base.dm Co-authored-by: Contrabang <[email protected]> Signed-off-by: Bm0n <[email protected]> --------- Signed-off-by: Bm0n <[email protected]> Co-authored-by: Bmon <[email protected]> Co-authored-by: Contrabang <[email protected]>
Bumps the npm_and_yarn group in /tgui with 2 updates: [webpack](https://github.com/webpack/webpack) and [cross-spawn](https://github.com/moxystudio/node-cross-spawn). Updates `webpack` from 5.95.0 to 5.96.0 - [Release notes](https://github.com/webpack/webpack/releases) - [Commits](webpack/webpack@v5.95.0...v5.96.0) Updates `cross-spawn` from 7.0.3 to 7.0.6 - [Changelog](https://github.com/moxystudio/node-cross-spawn/blob/master/CHANGELOG.md) - [Commits](moxystudio/node-cross-spawn@v7.0.3...v7.0.6) --- updated-dependencies: - dependency-name: webpack dependency-type: direct:production dependency-group: npm_and_yarn - dependency-name: cross-spawn dependency-type: indirect dependency-group: npm_and_yarn ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: NanoMap Generation <[email protected]>
…adiseSS13#27395) * Adds the Service rover cyborg Adds a "Rover" style cyborg for the Service module. * Update sprite Adds the finished service rover sprite. * No Hat Adds service rover to the unhattable list * Adds the medical rover module Adds the medical rover module to the same branch, since they both rely on the same service panel logic. * Update medical rover panels * Deconflict
…ns (ParadiseSS13#26585) * Basic card interactions * initial interactions sorted * nails down some interactions, radial menu * Some more qol and keybind changes * improves card interactions * Unum decks can be flipped, showing the top card * Decks can now be split and recombined * minor tweaks to multi-deck stuff * Clean up a bunch of interactions * more cleanups * more cleanups and documentation * remote attacking looks pretty good * minor cleanups * ci * parser errs * Remove some debug things, re-add signal after merge * Adds a whole bunch more qol. * Improves examine messages * ci * concealed cards will now show properly in radial * Fixes some weird proximity monitor and control issues * Address reviews, clean up examine a bit more * radial fixes * remove todos * Apply suggestions from code review Co-authored-by: Burzah <[email protected]> Signed-off-by: Luc <[email protected]> * better documentation, adds label of who did what * b etter grammar * augh * missing icon state * Update code/game/gamemodes/wizard/magic_tarot.dm Co-authored-by: Burzah <[email protected]> Signed-off-by: Luc <[email protected]> * Apply suggestions from code review Co-authored-by: DGamerL <[email protected]> Signed-off-by: Luc <[email protected]> * Add sleep on proximity monitor setup to hopefully avoid mapload issues * been writing too much c lately * Try late initialize * late init * 🧌 * map load --------- Signed-off-by: Luc <[email protected]> Co-authored-by: Burzah <[email protected]> Co-authored-by: DGamerL <[email protected]>
* Adds PDA ringtone to character preferences * Two fixes * Reset option * Contra request * DB update * linter fix * SQL update * file rename --------- Signed-off-by: Burzah <[email protected]> Co-authored-by: Burzah <[email protected]>
* Adds CI for missing icon_states * yeah * more fixes * more fixes * seems good * moar * fix * yea * hrtyhrt * yeah * WOE * Removes some non-existant typepaths * yes
Medical rovers can no longer wear hats, as the system doesn't allow hat offsets per-direction.
github-actions
bot
added
Керберос
m-dzianishchyts
force-pushed
the
merge-upstream
branch
2 times, most recently
from
66f68ba to
6190a67
Compare
m-dzianishchyts
force-pushed
the
merge-upstream
branch
from
6190a67 to
e440477
Compare
m-dzianishchyts
force-pushed
the
merge-upstream
branch
from
e440477 to
b28efbc
Compare
Co-authored-by: NanoMap Generation <[email protected]>
…o the Circuit Imprinter. (ParadiseSS13#27374) * NT Merch vendor can now be moved * Made the NT Merch vendor board printable in the Circuit Imprinter
Co-authored-by: Adrer <[email protected]>
* Adds hallucination managers * Contra + Lewc review * Contra review * Initial comment enhancement
…ParadiseSS13#26834) * refactor: Attack chain, initial setup. * migrate curtain to make dreamchecker happy * update thurible * don't call attacked_by separately for legacy attack chain * remove duplicate proc * condense similar code, put allowances for legacy code in new procs * update docs, include diagram source * add comment on how to update diagram * fix admonition * mindflayer updates * remove commented out code * clarify all steps * after_attack should be overridable * whoops * retrofit recent changes * duh, can't restrict this yet because of tool_acts * i hate ore bags with the fire of a thousand suns * return correct value for object attack logic * Various cleanups. We don't want to attempt to pull stuff out of `/obj/item/attackby`, because those pieces are part of the related objects' migrations, not `/obj/item` itself. Attempting to do this causes knockon effects where things expected to call e.g. `/obj/item/storage/attackby` in the call chain were not ferried over to the new item interaction code, because the related objects hadn't actually been migrated over yet. I've used refactoring /obj/vehicle as the example for migrating `attackby` methods instead. * simplify some argument names * fuck it * make it do the thing * Rename CI module call * Prove that CI works * improve test output * aaand fix it again * fix curtain tool interactions * fix compile error * fix compile error * Better docs, introduce migration plan tool.
Legendaxe
approved these changes
Dec 3, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
💿 SQL
Надо править БД.
💾 Изменение конфига
Ф-ф-фуриор...?
🎸 Инструменты
Мы выдаем себя за реальное сообщество разработчиков.
Документация
Улучшения и дополнения в документации
📃 Требуется изменение WIKI
Эти изменения необходимо внести на нашу WIKI.
🖌️ Спрайты
Вы заработали свою миска-рис и кошко-жена. Партия гордится вами!
🙏 Слияние с восходящим потоком
Боже, храни Короля!
📜 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 делает
Мергес апстрим.
Important
Надо обновить конфиг и применить:
Note
Вики:
Changelog
🆑 ParadiseSS13
add: Красильщик декалей - новый режим модульного красильщика, позволяющий наносить напольные знаки и разметку.
add: Игральные карты были переработаны и стали удобнее. Подробности тут.
add: Рингтон ПДА теперь является настройкой персонажа.
add: При телепортации гостом в руину теперь отображается ее имя и описание.
imageadd: Респрайт некоторых стульев и кресел.
imageadd: Борг Rover получил сервисную и медицинскую комплектации.
soundadd: Добавлен звуковой эффект нескольким датчикам, испускающим сигналы.
tweak: Имплант Reviver теперь может лечить после смерти и воскрешать.
tweak: Увеличен технологический уровень импланта Reviver.
tweak: Улучшенное кибернетическое сердце лучше лечит при крите и запускает сердце.
tweak: Надежда Пандоры теперь лечит лучше.
tweak: Шахтерский резонатор теперь вызывает резонирующую волну после взрыва. Улучшенная версия может размещать ловушки.
tweak: Костюмы плазмаменов теперь можно покрасить.
tweak: Спецодежда отделов добавлена в лодаут.
tweak: Интерфейс ИИ стал удобнее и лучше масштабируется.
tweak: Все мосты на Лаваленде теперь расположены над лавой.
tweak: Плата автомата NT Merch добавлена в Circuit Imprinter.
fix: Автомат NT Merch теперь можно открутить и двигать.
fix: Плащи теперь можно поместить в чехлы для одежды.
fix: Режим бога теперь допускает еще меньше урона.
fix: Покрашенные вещи теперь корректно меняют внешний вид и описание.
fix: Комбинезоны теперь повышают устойчивость к вирусам.
fix: Общение через разум улья теперь учитывает настройки рунчата.
fix: Записи в Crew monitor больше не должны дублироваться.
fix: Пончики с бунго теперь можно приготовить.
fix: Исправлено отсутствие пола под ложными стенами в космическом мотеле.
fix: Больше нельзя изменить направление деревянного телевизора мультитулом, сдвинув его спрайт на тайл.
fix: Тайлы астероидов больше нельзя открутить отверткой.
fix: Устройства МОДов больше не падают на землю при неудачной попытке их развернуть.
/:cl: