Merge Upstream [04.07.2024] #1353
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
* mob sprites * imcoder * i am too tired to name these commits * woof * who let the dogs out? * 3 > 1 * i hate git
…ments (#26111) * fixes bespoke elements with default indexes, adds unit test for detecting this * lewc review
* Fixes easy slaved non golems. Fixes syndicate MMI abuse * Update code/modules/surgery/robotics.dm Co-authored-by: CRUNCH <[email protected]> Signed-off-by: Qwertytoforty <[email protected]> --------- Signed-off-by: Qwertytoforty <[email protected]> Co-authored-by: CRUNCH <[email protected]>
…ood parry (#26061) * No more reflect, good parry instead * Remove this too
* Fix area poweredness for many ruins. * hivebot mothership too * and druglab, argh * give it a bump
* Fixes #26072 * Apply suggestions from code review Co-authored-by: CRUNCH <[email protected]> Co-authored-by: Luc <[email protected]> Signed-off-by: Spaghetti-bit <[email protected]> * Applies suggestions. --------- Signed-off-by: Spaghetti-bit <[email protected]> Co-authored-by: CRUNCH <[email protected]> Co-authored-by: Luc <[email protected]>
Co-authored-by: Adrer <[email protected]>
github-actions
bot
added
🗺️ Изменение Карты
Legendaxe
approved these changes
Jul 4, 2024
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: Добавлено 2 новых pimp coat'а - один в вендоре и один специально для КМа.
imageadd: Новые спрайты для существующего розового пальто.
tweak: Гусеницы Дион и Ниан при эволюции теряют "майндслейв/рабство" от зелья разума.
tweak: Вы больше не можете помещать MMI, позитронные или роботизированные мозги в аугментированный не IPC корпус. Теперь их можно помещать только в корпус IPC или IRC.
add: Добавлена новая повседневная униформа - Greyman Henley, доступная в лодауте и вендоре комбинезонов (контрабанда).
tweak: Титановая метла теперь не отражает дальнобойные снаряды.
tweak: Парирование титановой метлы теперь лучше.
fix: Теперь преобразование через Changeling Transform обновляет флавор текст.
fix: Несколько руин на Лаваленде теперь питаются надлежащим образом.
fix: Исправлено, что вендоры не сообщали, кто кого в них толкнул.
fix: Вещи можно снова перебрасывать через столы.
/:cl: