Merge upstream 03.04.2024 #1149
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
…S13#23954) * choose your own brainventure * i kinda remember sql * lets try on Login() instead * wait its actually here * Revert "lets try on Login() instead" This reverts commit 6fd2691. * hold on i gotta sort this out * lol, lmao even * i apparently do not remember sql * Actually remember to switch to varchar * aaaaaaaaaaaaaaaaaaaa * does the comma fix it * i am so fucking stupid lmao * lmao i REALLY dont know sql, thanks AA Co-authored-by: AffectedArc07 <[email protected]> * the other place to fix a string * sql is now 54, happy birthday sql * autodoc whitespace fix Co-authored-by: Luc <[email protected]> * maybe using the defines i made is a good idea * AA's changes --------- Co-authored-by: AffectedArc07 <[email protected]> Co-authored-by: Luc <[email protected]>
… workflow actions (ParadiseSS13#24822) * Use GitHub App Token instead of built-in token * the important token location, and simplify * nanomap render * Update .github/workflows/merge_upstream_master.yml Co-authored-by: Arthri <[email protected]> * further updates * formatting --------- Co-authored-by: Arthri <[email protected]>
* Adds the Proto-Adrenaline Bio-chip * Apply suggestions from code review Co-authored-by: Contrabang <[email protected]> --------- Co-authored-by: Contrabang <[email protected]>
…k like a comdom hat. (ParadiseSS13#24661) * no comdoms * Update code/game/objects/items/weapons/soap.dm Co-authored-by: DGamerL <[email protected]> --------- Co-authored-by: DGamerL <[email protected]>
* moves errors to vscode style * OOOPS forgot to push
Co-authored-by: [email protected] <[email protected]> Co-authored-by: S34N <[email protected]>
Co-authored-by: S34N <[email protected]> Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: NanoMap Generation <[email protected]>
…ings (ParadiseSS13#24688) * access issue * maybe this will fix the access --------- Co-authored-by: S34N <[email protected]> Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com>
* Add job_globals sanitization, fix duplicate value * Remove 'support_positions' job category * Add Supply dept to jobban list
* Viruses cured by ethanol now accept any form of booze. * Apply suggestions from code review Co-authored-by: Luc <[email protected]> --------- Co-authored-by: Luc <[email protected]>
* fixes elite action buttons breaking entirely * fixes icons, maptext is still odd
…other workflows and adds better logging (ParadiseSS13#24839) * Tidy the code, better commenting when things go wrong * text! * stale labeller * get the labels right * avoid complications * Update .github/workflows/merge_upstream_master.yml * Update .github/workflows/merge_upstream_master.yml * Apply suggestions from code review Co-authored-by: Luc <[email protected]> * makes the merge upstream thingy comment, and approve its generated workflows * wow * remove this, paradise bot reigns supreme --------- Co-authored-by: Luc <[email protected]>
* ears * ears --------- Co-authored-by: S34N <[email protected]>
Co-authored-by: S34N <[email protected]>
…radiseSS13#24783) * Remove cave generation from mineral ore generation odds * use clearer vars
…os (ParadiseSS13#24838) * chairs * updated chairs
|
Полежит пока до 2 апреля #1150 |
m-dzianishchyts
force-pushed
the
merge-upstream
branch
from
6119fb7 to
c0ee1cc
Compare
* datumized spells * finished * last changes * conflict * Update code/datums/spells/alien_spells/transfer_plasma.dm * conflicts * shitty runtime fix until i get to this tomorrow * Update code/datums/spell.dm Co-authored-by: Burzah <[email protected]> * Update code/datums/spell_handler/alien_spell_handler.dm Co-authored-by: Burzah <[email protected]> * Update code/datums/spells/alien_spells/regurgitate.dm Co-authored-by: Burzah <[email protected]> * Update code/datums/spells/alien_spells/regurgitate.dm Co-authored-by: Burzah <[email protected]> * Update code/datums/spells/bloodcrawl.dm Co-authored-by: Burzah <[email protected]> * Update code/datums/spells/bloodcrawl.dm Co-authored-by: Burzah <[email protected]> * Update code/modules/antagonists/vampire/vampire_powers/hemomancer_powers.dm Co-authored-by: Burzah <[email protected]> * Update code/modules/antagonists/vampire/vampire_powers/vampire_powers.dm Co-authored-by: Burzah <[email protected]> * Update code/modules/awaymissions/mission_code/ruins/wizardcrash.dm Co-authored-by: Burzah <[email protected]> * Update code/modules/research/xenobiology/xenobiology.dm Co-authored-by: Burzah <[email protected]> * Update code/modules/mob/living/carbon/superheroes.dm Co-authored-by: Burzah <[email protected]> * Update code/datums/spells/conjure.dm Co-authored-by: Burzah <[email protected]> * Update code/datums/spells/ethereal_jaunt.dm Co-authored-by: Burzah <[email protected]> * Update code/datums/spells/emplosion.dm Co-authored-by: Burzah <[email protected]> * Update code/datums/spells/turf_teleport.dm Co-authored-by: Burzah <[email protected]> * Update code/datums/spells/wizard_spells.dm Co-authored-by: Burzah <[email protected]> * Update code/datums/spells/wizard_spells.dm Co-authored-by: Burzah <[email protected]> * Update code/game/dna/mutations/mutation_powers.dm Co-authored-by: Burzah <[email protected]> * Update code/datums/spells/wizard_spells.dm Co-authored-by: Burzah <[email protected]> * Update code/datums/spells/wizard_spells.dm Co-authored-by: Burzah <[email protected]> * Update code/game/dna/mutations/mutation_powers.dm Co-authored-by: Burzah <[email protected]> * Update code/game/gamemodes/miniantags/revenant/revenant_abilities.dm Co-authored-by: Burzah <[email protected]> * guess who just rework the entire malf ai actionsf ai * gc better --------- Co-authored-by: Burzah <[email protected]>
…n. (ParadiseSS13#24384) * Added an autoresponse system for mentorhelp, using the existing button. * Apply suggestions from code review Co-authored-by: Henri215 <[email protected]> * Review suggestions. * Add How to Objectives * Apply suggestions from code review Co-authored-by: Luc <[email protected]> * Build the response phrases lists only once. * Add Russian autoresponse. * Corrected Russian Paradise server name. --------- Co-authored-by: Henri215 <[email protected]> Co-authored-by: Luc <[email protected]>
* Extract requests console message sending code. * Add secondary goals * Converted supply shuttle to a signal-based system. * Lint. * Review suggestions. * Secondary goals can now check the supply shuttle for their requirements. * Remove redundant completion variable, undef what we define. * Made the request console refuse to issue a secondary goal until you finish the current one. * Made the shuttle blacklist error more specific, added locked/manifest-attached crates to blacklist. * Added round end secondary goal report. * Lint * Add tags to reagents for secondary goals to use. * Extracted the reagent logic from the bar goal, used reagent tags. * Added the Variety of Drinks Bar goal. * Added variety drinks goal for the Bar. * CC no longer complains about sending stuff in containers, but the shuttle will refuse lockboxes without goal items. * Allow unlocked lockboxes on the shuttle. * Added kitchen goals. * Lint * More lint * Add goals for scichem and medchem, pending reagent labelling. * Added Kudzu goal for botany. * I forgot to rename them, oops. * Lint * Made mechs sellable, configurable goal rewards. * Balancing changes. * Added random Ripley goal. * Add Clear Task Backlog station goal. * Lint * Oops. * did i even do this right * Lint * Excluded drinks available from upgraded booze dispenser. * Such bugs. Much fix. Wow. * Goal notice formatting. * Apply suggestions from code review Co-authored-by: Henri215 <[email protected]> * Made storage nesting better, improved consistency between storage types. * Out, er, space. * Added a proc for sending a requests console message. * Added error messages to Virology Goals. Backported a few small things from Secondary Goals to make this easier. * Extracted out the three-way reward code into a proc. * Update code/__DEFINES/dcs/signals.dm Co-authored-by: DGamerL <[email protected]> * Removed redundant SIGNAL_HANDLER labels. * Yes, that should be a proc. * Enforce important parent calls. * Thank you, DreamChecker * Undid accidental merge of ParadiseSS13#24699 * Removed a testing proc that wasn't intended for this PR. * Removed parts of ParadiseSS13#24750 that also crept in. * Made the variety of [x] goals more explicit that they want 50u of each. * Reduced Kudzu trait requirement to 1. * Request consoles now output the list of valid departments if you're at an unsupported one. * Added personal crates. * Added a supply pack of personal crates. * Added special cargo handling for personal crates. * Added automatic personal crate when requesting a goal. * Required personal crates for most secondary goals. * Add goal labels to the hand labeler, require them for mech goals. * Made secondary goals one-per-person, not one-per-department. * Added support for multi-line system messages to the request consoles. * Made the RC message for goals nicer. * Send goal crates even if no normal crates are ready, name and access-lock them properly. * Don't double-label. * Let's not use registered_account, names are fine. * Add a ton of blackbox data to cargo and secondary goals. * Fix a few bugs. * More bugfixing, couple more stats. * Even more stats. * Text fix. * Made cargo fines more consistent with other cargo feedback. * Fixed a bug that prevented non-top-level items from being checked for CARGO_REQUIRE_PRIORITY. * Blocked large crates from being sent back unopened. * Enum values should probably be different from each other. * Correct a bitflag mishap. * Removed redundant supply shuttle docking and buy/sell attempts. * Tweak message about personal crates to inlclude that they need to lock it. * Add /Crates to the Personal Lockers description. * Less pretty alignment, less complaining linters. * Corrected a bad name in stats tracking. * Reduced SciChem variety goal to 5 types. * Toned down Task Backlog a bit. * Fixed a bug that made unsellable items nested in containers be stolen by CC (qdeleted). * Don't require bluespace 8, that's silly. * Made secondary goals modifiable in the Modify Station Goals UI. * Whoops, that was supposed to be 600u. * i ded pls nerf --------- Co-authored-by: synthtee <[email protected]> Co-authored-by: Henri215 <[email protected]> Co-authored-by: DGamerL <[email protected]>
…it's big engines back (ParadiseSS13#24781) * 7 year old fix ™️ * whiteship multi * Apply suggestions from code review Co-authored-by: 1080pCat <[email protected]> * Update shuttle_rotate.dm * Update code/modules/shuttle/shuttle_rotate.dm Co-authored-by: Contrabang <[email protected]> * Update code/modules/shuttle/shuttle_rotate.dm Co-authored-by: Contrabang <[email protected]> --------- Co-authored-by: 1080pCat <[email protected]> Co-authored-by: Contrabang <[email protected]>
m-dzianishchyts
force-pushed
the
merge-upstream
branch
from
c0ee1cc to
b5ab69d
Compare
m-dzianishchyts
force-pushed
the
merge-upstream
branch
from
b5ab69d to
9151dcb
Compare
github-actions
bot
added
the
🎸 Инструменты
|
Можно ревьюить и мержить, короче, так уже делали |
m-dzianishchyts
force-pushed
the
merge-upstream
branch
from
b21c076 to
4128423
Compare
m-dzianishchyts
force-pushed
the
merge-upstream
branch
from
4128423 to
33a52a4
Compare
m-dzianishchyts
force-pushed
the
merge-upstream
branch
from
33a52a4 to
9427c19
Compare
* fixes being unable to build some resin structures * let's make these defines * Update code/datums/spells/alien_spells/build_resin_structure.dm
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
🆑 Maxiemar
add: Мержим оффов.
add: В меню создания персонажа появилась возможность выбрать тип мозга для КПБ.
add: Добавлен протоадреналиновый биочип (18 ТК). Снимает стан, восстанавливает стамину. Не ускоряет. Не лечит. Только несколько секунд антистана. 1 использование.
add: Клоунские ботинки можно закинуть в стиралку с мелком, чтобы придать им вид нормальных ботинок.
add: Борги научились изменять количество вещества, переливаемое за один клик из их емкостей.
add: Менторам добавлена пачка заготовленных ответов на тикеты.
add: Каждому главе добавлено по своей собственной ручке, появляются в ПДА. Также добавлена ручка в аплинк (1 ТК).
add: Добавлены вторичные цели. Запрашиваются через консоли запросов в отделах. Каждый человек может иметь одновременно не более одной цели. В данный момент доступны в Баре, Кухне, Ботанике, Робототехнике, Химии РНД и Химии меда.
add: Добавлены личные ящики. Как шкафчики, но ящики. Используются для отправки вторичных целей через карго, возвращаются на обратном пути. Можно заказать 6 ящиков в карго за 100 кредитов.
add: Добавлен режим этикетирования цели для ручного этикетировщика. Для активации режима проведите картой по этикетировщику. Используется для нанесения этикеток на вещи, которые слишком велики, для того чтобы влезть в личный ящик. Только так цель, например, на постройку Рипли, может быть выполнена.
add: Статистика карго и вторичных целей отслеживается и будет отображена в конце раундов.
tweak: Администрация может изменять вторичные цели тем же способом, что и основные цели на смену.
tweak: АВД, детектив, варден и библиотекарь начинают раунд с цветной ручкой в своих ПДА.
tweak: Тряпкой теперь можно протирать кухонную технику.
tweak: Вирусы, лечащиеся этанолом, теперь также лечатся употреблением любого алкоголя.
tweak: Шкафчик мима теперь беззвучен.
tweak: Кнопки действий снова можно заблокировать/разблокировать с помощью Ctrl+Click.
fix: Переключение между z-уровнями в Crew Monitor теперь должно работать исправно.
fix: Госты теперь могут переключаться между игроками через Crew Monitor.
fix: ГП больше не отмечен в идентификационной консоли дважды.
fix: Обновлен забытый спрайт гарнитуры отдела сервиса.
fix: Исправлены кнопки действий у мегафауны.
fix: Исправлена логика кровотечений во время операций. Бинт больше не прекращает кровотечение вскрытой части тела.
fix: Кибернетические уши, выбранные в меню создания персонажа, теперь применяются корректно.
fix: Те же последние слова больше не произносятся при следующей смерти.
fix: Автоклонерка греев из аплинка больше не превращает греев в людей.
fix: Мильтитайловые объекты теперь должны перевозиться на шаттлах без смещения.
imageadd: Спрайты всех ручек были перерисованы.
/:cl: