Merge Upstream [10.10.2024] #1588
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
…ts and 2 condiments. (ParadiseSS13#26887) * LETS GO GAMBLING * double accepted * conflicts my hated * more requested changes * oops * Apply suggestions from code review Co-authored-by: Burzah <[email protected]> Signed-off-by: Qwertytoforty <[email protected]> * comma comma comma comma chamelion --------- Signed-off-by: Qwertytoforty <[email protected]> Co-authored-by: Burzah <[email protected]>
* recipe paths * splits frozen deserts * d320b12 Merge branch 'master' into cavitytime * agony * woe, food upon ye * edit * unhecks the .dme * unduplicates ur grape tart * da camel * whoops * give bungo a tang * da review * review 2, electric boogaloo * yogurt Co-authored-by: Contrabang <[email protected]> Signed-off-by: Mitchs98 <[email protected]> * yogurt, but for real this time. --------- Signed-off-by: Mitchs98 <[email protected]> Co-authored-by: Contrabang <[email protected]>
…seSS13#26979) * fixing depot * Update code/game/objects/effects/spawners/random/random_spawner.dm Co-authored-by: warriorstar-orion <[email protected]> Signed-off-by: kyunkyunkyun <[email protected]> --------- Signed-off-by: kyunkyunkyun <[email protected]> Co-authored-by: warriorstar-orion <[email protected]>
* Decrease Gamer loot in space * Update depot_spawners.dm * Update code/game/objects/items/weapons/melee/energy_melee_weapons.dm Co-authored-by: 1080pCat <[email protected]> Signed-off-by: Сиротка <[email protected]> * Update depot_spawners.dm * Update code/game/objects/effects/spawners/depot_spawners.dm Co-authored-by: DGamerL <[email protected]> Signed-off-by: Сиротка <[email protected]> * Update energy_melee_weapons.dm --------- Signed-off-by: Сиротка <[email protected]> Co-authored-by: 1080pCat <[email protected]> Co-authored-by: DGamerL <[email protected]>
…SS13#26923) * Adds Floor Lights * undef * remove TECHNICAL DEBT™ * remove more technical debt™ * mapping changes
* fuck it * these too * ooops * i did it again * moved some vars around * updates generics * rematch * oh shit i think this needs a break * agh * wall * updates comment * compile after 2 years * this might break things * typo fix * restores surgery sound to default * Misplaced thingy * support for some new ghetto surgery changes * organ2 * Update code/modules/surgery/bones.dm Co-authored-by: Luc <[email protected]> Signed-off-by: Bm0n <[email protected]> * Update code/modules/surgery/surgery.dm Co-authored-by: Luc <[email protected]> Signed-off-by: Bm0n <[email protected]> * review change --------- Signed-off-by: Bm0n <[email protected]> Co-authored-by: Bmon <[email protected]> Co-authored-by: Luc <[email protected]>
* Blocks any doubled wall mount placement * Fixes direction stuff * Remove old code
* refactor: barrier spawners. * set script PR number
* Adjusts logging for anoms * Cleans up game log messages * Adds logging for more anoms * DGamerL Review Co-authored-by: DGamerL <[email protected]> Signed-off-by: Burzah <[email protected]> * Lewc Review Co-authored-by: Luc <[email protected]> Signed-off-by: Burzah <[email protected]> * Added Blackbox Logging * Fixes and Adjusts Blackbox Logging * Line spacing * Blackbox ledger addition * Fixes blackbox logging --------- Signed-off-by: Burzah <[email protected]> Co-authored-by: DGamerL <[email protected]> Co-authored-by: Luc <[email protected]>
Co-authored-by: NanoMap Generation <[email protected]>
* Makes IPCs affected by Jestosterone * Make Jestosterone affect human and IPCs * human and carbon were the wrong way * Hopefully this successfully checks for an organic * Actually makes the check for Organic work * Removed unneeded variable define * Added some comments to make the code clearer * Forgot a bit on a comment * Stops Vox from taking damage that's for IPC * Moves a comment one space * Wrong variable for the pasted check * Apply suggestions from code review Removes a probably unneeded comment and moves another to the relevant line. Co-authored-by: 1080pCat <[email protected]> Signed-off-by: WenlockTheBritishHobo <[email protected]> * Apply suggestions from code review Checks for ability to take Toxin damage instead of organic-ness. Co-authored-by: Contrabang <[email protected]> Signed-off-by: WenlockTheBritishHobo <[email protected]> * Suggested change failed check, temp change. Signed-off-by: WenlockTheBritishHobo <[email protected]> * Apply suggestions from code review Makes it check for ability to apply tox instead of synthetic-ness, is good. Co-authored-by: Contrabang <[email protected]> Signed-off-by: WenlockTheBritishHobo <[email protected]> * Apply suggestions from code review Removes likely unneeded comments. Co-authored-by: Contrabang <[email protected]> Signed-off-by: WenlockTheBritishHobo <[email protected]> * Apply suggestions from code review Co-authored-by: Contrabang <[email protected]> Signed-off-by: WenlockTheBritishHobo <[email protected]> --------- Signed-off-by: WenlockTheBritishHobo <[email protected]> Co-authored-by: 1080pCat <[email protected]> Co-authored-by: Contrabang <[email protected]>
* Removes an unneeded proc * yeea * Update code/modules/mob/mob_misc_procs.dm Co-authored-by: DGamerL <[email protected]> Signed-off-by: Contrabang <[email protected]> --------- Signed-off-by: Contrabang <[email protected]> Co-authored-by: DGamerL <[email protected]>
* Disallows installing duplicate cyborg upgrades. * Prevent duplicate Cyborg modules * Unecessary spacing removed * Update code/game/objects/items/robot/robot_upgrades.dm Co-authored-by: CRUNCH <[email protected]> Signed-off-by: Adrer <[email protected]> * usr > user * Move nodrop check into do_install * ... Why did I do that? --------- Signed-off-by: Adrer <[email protected]> Co-authored-by: [email protected] <[email protected]> Co-authored-by: CRUNCH <[email protected]>
* modsuit powercell remove fix * renames proc * Update code/modules/mod/mod_core.dm Co-authored-by: DGamerL <[email protected]> Signed-off-by: Bm0n <[email protected]> --------- Signed-off-by: Bm0n <[email protected]> Co-authored-by: Bmon <[email protected]> Co-authored-by: DGamerL <[email protected]>
) * help intent with the saber slaps * fix if statements to make papa linter happy * misc code improvements suggested by contrabang --------- Signed-off-by: DGamerL <[email protected]> Co-authored-by: DGamerL <[email protected]>
* Makes RemoveComponent more sane * An even better wrapper * Update code/datums/components/surgery_initiator.dm Co-authored-by: Contrabang <[email protected]> Signed-off-by: DGamerL <[email protected]> * Update code/datums/components/_component.dm Co-authored-by: Contrabang <[email protected]> Signed-off-by: DGamerL <[email protected]> * Update code/datums/components/_component.dm Signed-off-by: DGamerL <[email protected]> * Update code/datums/components/_component.dm Co-authored-by: Contrabang <[email protected]> Signed-off-by: DGamerL <[email protected]> * Update code/datums/components/_component.dm Co-authored-by: Contrabang <[email protected]> Signed-off-by: DGamerL <[email protected]> --------- Signed-off-by: DGamerL <[email protected]> Co-authored-by: Contrabang <[email protected]>
…m dishes (ParadiseSS13#26901) * Allows kitchen utensils to be used on custom dishes. Also tweaks fork use grammar a bit. * if spacing. Whoopsie doo. * Update code/modules/food_and_drinks/food_base.dm Co-authored-by: Luc <[email protected]> Signed-off-by: Pidgey <[email protected]> --------- Signed-off-by: Pidgey <[email protected]> Co-authored-by: Luc <[email protected]>
* feat: Pizza bombs now disguise as any flavor. * Update code/modules/food_and_drinks/food/foods/pizza.dm Co-authored-by: Contrabang <[email protected]> Signed-off-by: warriorstar-orion <[email protected]> * no pizza bomb boxes OR subtypes in mimic box list * Apply suggestions from code review Co-authored-by: Contrabang <[email protected]> Signed-off-by: warriorstar-orion <[email protected]> * reorder fields * fix odds, reorder weights * Update code/game/objects/effects/spawners/depot_spawners.dm Co-authored-by: Contrabang <[email protected]> Signed-off-by: warriorstar-orion <[email protected]> --------- Signed-off-by: warriorstar-orion <[email protected]> Co-authored-by: Contrabang <[email protected]>
* Fixes candle boxes appearing empty on mapload * bad idea to blanket * Update code/game/objects/items/weapons/storage/fancy.dm Signed-off-by: 1080pCat <[email protected]> * contra review --------- Signed-off-by: 1080pCat <[email protected]>
* Rework Lavaland tunnel themes. * Fix deeprock mob density; ensure 1 vetus/bubblegum * goddamnit * bring spawn odds closer in line to head, fix tendril collapse range * Move define to global dir * don't need initial here * define magic number properly * make type of var clear * CHECK_TICK during procgen * less tendril cities, no tendrils in oasis centers * revert no_lava helpers for now * add NO_LAVA_GEN flag check back to safe_replace * add blackbox feedback for themes
github-actions
bot
added
НЕ МОДУЛЬНО
github-actions
bot
added
Кибериада
dj-34
added
📜 CL невалиден
🙏 Слияние с восходящим потоком
НЕ МОДУЛЬНО
dj-34
added
the
📃 Требуется изменение WIKI
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
🆑 ParadiseSS13
add: Сабле капитана добавлена атака (в хелп интенте) в виде пощечины. Достаточно, чтобы поставить неприятеля на место.
add: В холодильнике шеф-повара (тот, который напротив ботаников) теперь есть 3 стака по 3 растения (с редким шансом получить мясо на основе рыбы) и 2 бутылки с приправами. Это облегчит начало смены, а также даст вам возможность попробовать приготовить новые блюда!
add: Портировано 46 десертов с TG - пончики, пироги, торты, твороженные сырки и йогурты!
add: Портировано Дерево Банго, сливовое дерево и Spaceman's Trumpet с TG.
add: Добавлена возможность получить элитный модсьют в шкафчиках в оружейной Депо.
add: Добавлены напольные лампы, как настенные, но в полу. Их можно построить за 3 металла.
add: Добавлены звуки операций и различные другие исправления с TG. В микшере их возможно отключить, прибавить, или убавить.
imageadd: Светящийся слайм-экстракт обзавёлся новым спрайтом.
tweak: КПБ-клоуны теперь излечиваются Джестостероном.
tweak: КПБ не-клоуны теперь получают обычные эффекты Джестостерона.
tweak: КПБ-мимы теперь получают урон от ожогов, наносимых Джестостероном.
tweak: Вилки и другие предметы посуды теперь можно использовать на пользовательских блюдах.
tweak: Пицца-бомбы теперь можно маркировать с любой начинкой.
tweak: Туннели Лаваленда теперь выглядят гораздо более органично и естественно.
tweak: Заменены кроваво-красные модсьюты в шкафчике фабрики SyndyCake и в сейфе Onehalf на заряженные модсьюты шахтеров.
tweak: Холодильник шеф-повара теперь вмещает бутылки с приправами и не выращенную еду.
fix: Синди-депо теперь правильно создает шкафчики.
fix: Исправлено появление пустых ящиков для вечных свечей при их спавне.
fix: Вы больше не можете устанавливать дубликаты улучшений на киборгов.
fix: Усиленные полы теперь правильно разбираются, когда их вытягивает сингулярность.
fix: Исправлено извлечение батареек из модсьютов. Чтобы извлечь батарейку из модсьюта, нажмите Ctrl-Клик, когда панель открыта.
fix: Ремонт робомозга в КПБ теперь правильно возрождает его.
fix: Исправлена неспособность администраторов принудительно накладывать трейты станции на следующий раунд.
fix: Исправлена проблема, из-за которой функция импланта орган-экстрактора работала странно.
fix: Исправлены Charger Guardians.
del: Лампы больше не имеют случайного радиуса освещения.
del: Квартирмейстер Депо теперь не дропает лут в виде Elite Modsuit после смерти.
del: Energy Cutlass теперь не имеет дополнительных бонусов к пробиванию брони, метанию и нелегальным технологиям.
/:cl: