Merge Upstream 02.02.2025 #1781
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}
* [s] Fixes an exploit * oops
* null catch * put the sybsystem to bed
* holding change * Build Rust library * Remove silly diff --------- Co-authored-by: paradisess13[bot] <165046124+paradisess13[bot]@users.noreply.github.com>
* magic key go in backpack * better way --------- Co-authored-by: Toastical <toast@toaster.com>
Signed-off-by: Charlie Nolan <funnyman3595@gmail.com>
* fix two vermin infestation issues * Update code/modules/events/infestation.dm Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com> Signed-off-by: Burzah <116982774+Burzah@users.noreply.github.com> --------- Signed-off-by: Burzah <116982774+Burzah@users.noreply.github.com> Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com> Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
…adiseSS13#28209) * activate_self wrapper for puppet and NOT check for any_chatlog * fixed helper proc --------- Co-authored-by: Toastical <toast@toaster.com> Co-authored-by: Toastical <toastical@toaster.com>
…now (ParadiseSS13#28175) * tentacle beartrap works now, tentacle no longer causes runtimes on melee shots * yeah well lets do it that way * this should be here too * i am not stupid trust me * this name is better? * Update code/modules/antagonists/changeling/powers/mutations.dm Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com> Signed-off-by: HMBGERDO <61080616+HMBGERDO@users.noreply.github.com> --------- Signed-off-by: HMBGERDO <61080616+HMBGERDO@users.noreply.github.com> Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
…eSS13#28164) * Adds some more protection to SSD mobs with lwaps and snipers * sorry AA * Update code/datums/status_effects/neutral.dm Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com> Signed-off-by: 1080pCat <96908085+1080pCat@users.noreply.github.com> --------- Signed-off-by: 1080pCat <96908085+1080pCat@users.noreply.github.com> Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
ParadiseSS13#28134) * The detective is on the trail * are you for real * spelling * Linter didn't like that
ss220app
bot
added
the
📃 Требуется изменение WIKI
![sourcery-ai[bot]](https://avatars.githubusercontent.com/in/48477?s=60&v=4){kind=small}
|
!build_rust |
m-dzianishchyts
approved these changes
Feb 2, 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.
Note
Requires Wiki Update:
www.github.com/ParadiseSS13/Paradise/pull/28110
Changelog
🆑 ParadiseSS13
fix: Волшебный ключ снова можно положить в рюкзак.
add: Теперь можно высыпать содержимое сумки (или поднос) в пользовательский автомат, перетащив его из руки на автомат.
fix: События заражения вредителями теперь будут срабатывать более надежно.
fix: Киборги взрываются, если выбрасывают 5 на Кубике Судьбы.
fix: Проектор червоточин теперь может стрелять обоими типами порталов.
fix: Исправлена ошибка, из-за которой кристалл суперматерии (СМ) выходил из-под контроля, если был активен и подвергался воздействию очень малого (но ненулевого) количества газа.
fix: Щупальце генокрада активирует капкан, если выстрелить в цель в упор.
tweak: LWAP больше не помечает персонажей с состоянием SSD.
tweak: Снайперские винтовки и LWAP больше не задевают персонажей с состоянием SSD, если стреляете поверх них.
fix: Камеры могут фотографировать незапечатанные руны и культистские порталы. На ИИ это не влияет.
/:cl:
Summary by Sourcery
Update vending machines to allow transferring items from bags and trays, improve the reliability of vermin infestation events, fix various bugs related to changeling tentacles, supermatter crystals, wormhole projectors, cameras, LWAPs, and the Die of Fate. Allow cameras to photograph runes and cult portals.
Bug Fixes:
Enhancements: