merge upstream 12.03.2024 #1089
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
* after all these years * Update code/game/machinery/deployable.dm Co-authored-by: DGamerL <[email protected]> * d-d-double? * Update code/game/machinery/deployable.dm --------- Co-authored-by: DGamerL <[email protected]> Co-authored-by: Luc <[email protected]>
…luding non-reproducing terrors. (#24206) * Improve staff/wand of change random distribution. * It's length() not .len Co-authored-by: DGamerL <[email protected]> * use 'as anything' * add terrors to potential picks * slightly better wording --------- Co-authored-by: DGamerL <[email protected]>
* beats me, saving for later * working now * desc * saw whitespace as i hit commit :( * guh * DGL review * forgor * Update code/__HELPERS/trait_helpers.dm Co-authored-by: DGamerL <[email protected]> * uhh --------- Co-authored-by: DGamerL <[email protected]>
* Custom food can now be renamed, as the tip indicates. * Descriptive variable names are good.
* basic framework * Moves shuttle loading out to subsystem * work out most of the ordering logic * better whitelisting * shuttle speed factor is a thing now * Better speed factor, renaming * try to fix some typing issues * Apply suggestions from code review Co-authored-by: Ryan <[email protected]> * Fixes some issues with multiple shuttle orders * add some basic prices * more minor price adjustments * Add cmag support * order of ops * Update code/controllers/subsystem/SSshuttles.dm Co-authored-by: Ryan <[email protected]> * Make necessary tgui tweaks * Whitespace suggestions Co-authored-by: DGamerL <[email protected]> * Update code/controllers/subsystem/SSshuttles.dm Co-authored-by: DGamerL <[email protected]> * addresses some review concerns * remove todo * Apply suggestions from code review Co-authored-by: DGamerL <[email protected]> * Update code/controllers/subsystem/SSshuttles.dm Co-authored-by: DGamerL <[email protected]> * ahh eto * cleaned up as per discord --------- Co-authored-by: Ryan <[email protected]> Co-authored-by: DGamerL <[email protected]> Co-authored-by: S34N <[email protected]>
* Change wrench, wirecutters, and powered wirecutters suicides. * Update code/game/objects/items/tools/wirecutters.dm Co-authored-by: Henri215 <[email protected]> * Update code/game/objects/items/tools/wrench.dm --------- Co-authored-by: Henri215 <[email protected]> Co-authored-by: Luc <[email protected]>
* just one more thing * gosh that was embarassing * Update code/game/objects/items/crayons.dm Co-authored-by: Luc <[email protected]> * Update code/game/objects/items/weapons/holosign_projector.dm Co-authored-by: Luc <[email protected]> * Update code/game/objects/items/weapons/holosign_projector.dm Co-authored-by: 1080pCat <[email protected]> --------- Co-authored-by: Luc <[email protected]> Co-authored-by: 1080pCat <[email protected]>
…#24114) * its been like this for how long? * woops wrong pr * i hate random chance * steel change * Update code/game/dna/mutations/_mutations.dm Co-authored-by: Henri215 <[email protected]> * Update code/game/dna/mutations/_mutations.dm Co-authored-by: Henri215 <[email protected]> * Works * woops space indentation --------- Co-authored-by: Henri215 <[email protected]>
* CI * undef * hooooly crap * yeah * false by default * fixes * alright, there we go * oops lmao * lol, lmao even * proper programming * fix * losin my mind * oops * yeah coloring * WE LOVE MULTIPLE DEFINES (ive lost my sanity)
* no, that is NOT solid snake * lol * more names * Update code/game/objects/items/weapons/storage/boxes.dm Co-authored-by: Henri215 <[email protected]> * Apply suggestions from code review Co-authored-by: Henri215 <[email protected]> * Update code/game/objects/items/weapons/storage/belt.dm Co-authored-by: Luc <[email protected]> --------- Co-authored-by: Henri215 <[email protected]> Co-authored-by: Luc <[email protected]>
* Wow this was easier than expected * Adds cult floors andwalls * Bit slower animation on floors * Contra review * Increases limit to 3, adds clockwork wall effect
#24355) * makes it clear that central command has called the shuttle when cancel shuttle is used from the admin panel. * DGamerL review Co-authored-by: DGamerL <[email protected]> * Furrior review Co-authored-by: Mikhail G. <[email protected]> * Furrior review part 2 * changeed all mentions of cancel(null, TRUE) to cancel(byCC = TRUE) * missed one --------- Co-authored-by: Code-Lyoko0 <[email protected]> Co-authored-by: DGamerL <[email protected]> Co-authored-by: Mikhail G. <[email protected]>
* Borg hats fixes * Update code/modules/mob/living/silicon/silicon_defense.dm Co-authored-by: GDN <[email protected]> --------- Co-authored-by: [email protected] <[email protected]> Co-authored-by: GDN <[email protected]>
* New cyborg skins * The other 4 sprites * fixing duplicate
* quartermasterdrip * Update code/modules/clothing/head/job_hats.dm Co-authored-by: Henri215 <[email protected]> * Apply suggestions from code review Co-authored-by: Henri215 <[email protected]> --------- Co-authored-by: Henri215 <[email protected]>
* storage items no longer bring up the turf panel on alt-click * these too
* sprite * color adjustment
* Let MMI brains commit suicide. * Update code/game/verbs/suicide.dm Co-authored-by: DGamerL <[email protected]> * Update code/game/verbs/suicide.dm Co-authored-by: Luc <[email protected]> --------- Co-authored-by: DGamerL <[email protected]> Co-authored-by: Luc <[email protected]>
* Refactor away the useless checks of moving_diagonally. * Single-directional windows and windoors now collide properly. * Update code/game/objects/structures/window.dm Co-authored-by: GDN <[email protected]> * Allow exiting fulltile windows to north and east again. --------- Co-authored-by: GDN <[email protected]>
… view (#24519) * Make admin and mentor tickets actually update their info in the table view. * Additional ticket hardening against null mob and client. * The initial chat message on ahelp/mhelp should include the name again now.
github-actions
bot
added
Merge Conflict
github-actions
bot
added
🖌️ Спрайты
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.
Что этот PR делает
Мержим оффов
Почему это хорошо для игры
Изображения изменений
Тестирование
Changelog
🆑
add: Мержим оффов
tweak: Деревянные баррикады теперь можно разобрать ломом.
tweak: Полиморф мага теперь более случайный.
tweak: Уборщик теперь никогда не промахивается, бросая что-то в мусорку.
add: Кастомная еда теперь может быть переименована с помощью ручки, как и гласила подсказка.
add: Альтернативные шаттлы эвакуации могут быть заказаны в карго.
tweak: Шаттлы эвакуации имеют разную скорость, что влияет на время транзита.
add: Взлом консоли в карго с помощью клоунского емага позволит заказать особый шаттл.
fix: Стандартные контроллеры серверов РНД теперь не могут управлять серверами на других Z-уровнях, воровать так технологии теперь не получится.
add: Детективу добавлен собственный голографический проектор.
add: Детектив при спавне получает кусочек мела.
tweak: Изменения генетической нестабильности для некоторых мутаций были скорректированы. Подробности тут.
tweak: Шанс активации мутации убран. Теперь мутации должны быть гарантированы.
tweak: Перезарядка перед печатью нового инжектора ДНК снижена с 30 до 10 секунд.
tweak: Урон, получаемый при генетической нестабильности, увеличен вдвое.
tweak: Дым теперь скрывает из виду. Термалы и X-ray позволяют видеть через дым.
fix: Неснимаемый пояс теперь нельзя переместить в руку.
add: Культистский пол теперь светится при ходьбе по нему.
add: Культистские стены светятся при попадании.
tweak: Сообщение об отмене эвакуационного шаттла изменено. Теперь понятно, когда его отменяет ЦК.
fix: Во время операции абдукторы теперь не будут пилить кости, если их нет.
fix: Исправлена ошибка, связанная с невозможностью снять головной убор с дронов и ИИ.
fix: При кувырке робот в шляпе уронит ее
add: новая одежда для квартирмейстера.
imageadd: Стандартная форма квартирмейстера была перерисована.
fix: Исправлена проблема, связанная с возможной генераций тайлов космоса на Лаваленде.
imageadd: Новый спрайт операционного стола.
fix: Исправлена проблема, при которой некоторые мобы могли по диагонали пройти через тонкие стекла и стеклянные двери.
fix: Панели тикетов для админов и менторов теперь отображают более актуальную информацию.
/:cl: