Merge Upstream 01.02.2025 #1776
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
![ss220app[bot]](https://avatars.githubusercontent.com/u/131299570?s=60&v=4){kind=small}
* New CPU target for prod libs V2 * Build Rust library --------- Co-authored-by: paradisess13[bot] <165046124+paradisess13[bot]@users.noreply.github.com>
* Begone combat paper stun! * Removes do_after * Update code/modules/paperwork/paper.dm Signed-off-by: Burzah <[email protected]> --------- Signed-off-by: Burzah <[email protected]> Co-authored-by: Burzah <[email protected]>
…S13#28139) * Creation * Update firealarm.dm * Update firealarm.dm * Update code/game/objects/items/robot/cyborg_gripper.dm Co-authored-by: warriorstar-orion <[email protected]> Signed-off-by: CRUNCH <[email protected]> * Update cyborg_gripper.dm --------- Signed-off-by: CRUNCH <[email protected]> Co-authored-by: warriorstar-orion <[email protected]>
* Updated potted plants * Proper randomization and reorganization * Update Kirbyplants on maps * Remove redundant icon_state * Revert "Remove redundant icon_state" This reverts commit bf51470. * Update icon-state for generic kirbyplants * Fix Initialize argument * Typo fix * Typo fix 2 * Typo fix 3 * Update plants.dmi * Add typepath update script * Add hiding to medium plants and hiding feedback * add names indicating size * add 2 more medium plants to medium * typo fix
…3#28010) * fix runtime * handle all cases * move trait
…7921) * Places a limit on gas_coefficient to limit rad issues * formula
* Boom, headshot. * If spacing * Actually adds the hallucination to the list * Spacing, moved fire to async, images, second hallucination for blood on hit * Invisibility define * Bullet fires, image * Hit messages * Boom, headshot * Blood splatter has color now * Proc ref * Damage and target fix * More efficient bump check * Better List Appending Co-authored-by: DGamerL <[email protected]> Signed-off-by: PollardTheDragon <[email protected]> * Better list appending Co-authored-by: DGamerL <[email protected]> Signed-off-by: PollardTheDragon <[email protected]> * Knockdowm application Co-authored-by: DGamerL <[email protected]> Signed-off-by: PollardTheDragon <[email protected]> * Loc to turf Co-authored-by: DGamerL <[email protected]> Signed-off-by: PollardTheDragon <[email protected]> * Fixes knockdown * Proper knockdown Co-authored-by: DGamerL <[email protected]> Signed-off-by: PollardTheDragon <[email protected]> * Range_Edge_Turfs * Capital Var * Better target turf detection Co-authored-by: Luc <[email protected]> Signed-off-by: PollardTheDragon <[email protected]> * Better failure handling. Reverts change in RANGE_EDGE_TURFS * Somehow a xeno got in. Purged it. * Handles lack of client in target * Removed extraneous debug log --------- Signed-off-by: PollardTheDragon <[email protected]> Co-authored-by: DGamerL <[email protected]> Co-authored-by: Luc <[email protected]>
…3#28037) * fix lying angle * it's not even necessary
* minor test fixture improvements * make return values sane
github-actions
bot
added
Merge Conflict
![sourcery-ai[bot]](https://avatars.githubusercontent.com/in/48477?s=60&v=4){kind=small}
|
!build_rust |
github-actions
bot
removed
the
🗺️ Изменение Карты
github-actions
bot
added
Кибериада
m-dzianishchyts
force-pushed
the
merge-upstream
branch
from
26251cf to
3bdc01d
Compare
m-dzianishchyts
approved these changes
Feb 1, 2025
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.
This pull request merges upstream/master. Resolve possible conflicts manually and make sure all the changes are applied correctly.
Changelog
🆑 ParadiseSS13
fix: Показ листа бумаги больше не вызывает мгновенного открытия всплывающего окна, из-за чего игра теряла фокус. Теперь цель получает ссылку, по которой может кликнуть, чтобы прочитать содержимое бумаги.
fix: Исправлена бесконечная длительность событий СМ.
fix: Исправлены не анонсируемые события СМ.
fix: Манипуляторы боргов снова могут размещать световые панели.
fix: Манипуляторы боргов снова могут устанавливать батареи в зарядные устройства и АПЦ.
fix: Манипуляторы боргов больше не ударяют машины при вставке удерживаемых предметов.
fix: Манипуляторы боргов больше не гладят животных дважды за одну атаку.
fix: Остановлено повреждение коллекторов при вставке в них баллонов.
fix: Порталы от предметов, таких как ручные телепортеры, больше не дрейфуют в космосе.
imageadd: Комнатные растения на станции теперь больше по размеру и выглядят менее инопланетными.
tweak: Теперь нельзя прятаться за маленькими растениями, но их стало проще поднимать.
fix: Исправлен бесконечный цикл кода при смене вида на руках с жезлом Асклепия.
fix: Исправлено ошибка, из-за которой митоколид не восстанавливал органы при его наливании на них.
tweak: Установлено ограничение для gas_coefficient СМа, чтобы избежать радиационных проблем.
add: Добавлена новая галлюцинация.
fix: Исправлен лишний пиксель на спрайте грудного импланта вокса wardtakahashi.
fix: Галлюцинации ксеноморфов больше не сохраняются слишком долго.
fix: Исправлена проблема, из-за которой тела оставались в вертикальном положении после снятия с крюка.
tweak: Стоимость трейторов в режиме Dynamic увеличена с 5 до 7.
/:cl:
Summary by Sourcery
Update potted plants to come in small, medium, and large sizes. Allow hiding behind large potted plants.
New Features:
Bug Fixes:
Enhancements:
Tests: