Merge Upstream [17.06.2024] #1326
Closed
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
…ing death (#25623) * wow * forgot to push * oops * lewc review
Co-authored-by: NanoMap Generation <[email protected]>
* Fixes #25745 * More descriptive
Co-authored-by: FunnyMan3595 (Charlie Nolan) <[email protected]>
* Fixes a runtime and also makes it (very slightly) less dumb * Update code/modules/events/spacevine.dm Co-authored-by: DGamerL <[email protected]> Signed-off-by: BiancaWilkson <[email protected]> * Update code/modules/events/spacevine.dm Co-authored-by: DGamerL <[email protected]> Signed-off-by: BiancaWilkson <[email protected]> --------- Signed-off-by: BiancaWilkson <[email protected]> Co-authored-by: DGamerL <[email protected]>
* this is why you test things * Update code/modules/mob/mob_misc_procs.dm Co-authored-by: Ryan <[email protected]> Signed-off-by: chuga-git <[email protected]> --------- Signed-off-by: chuga-git <[email protected]> Co-authored-by: Ryan <[email protected]>
github-actions
bot
added
the
🖌️ Спрайты
* be whoo you areee for your prideeeee. don't hideee * nanotrasen pride nationwide * Update code/modules/mob/new_player/sprite_accessories/sprite_accessories.dm Signed-off-by: DGamerL <[email protected]> --------- Signed-off-by: DGamerL <[email protected]> Co-authored-by: DGamerL <[email protected]>
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
🆑
add: Генокрады получили возможность дефибрилляции во время фейк смерти.
fix: Семена Гатфрукта больше не говорят, что они вырастают в 357-й калибр.
fix: Исправлена ошибка, из-за которой все построенные ИИ, случайным образом сбрасывались на NT Default через неопределенное количество времени, не сообщая об этом.
tweak: Обновлён гайд в мануале по зомби вирусу.
fix: Предметы из карт Таро теперь снова появляются в луте с тендрилов.
fix: Blood drunk miner больше не боится лавы.
experiment: Фикс иконки искр.
fix: Catwalk тайлы теперь правильно разрушаются/съедаются сингой.
/:cl: