Merge Upstream 18.10.2024 #1600
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
* Fixes picking things up through walls, windows, and doors. * Fixes picking things up through walls, windows, and doors.
* Adds animated closets * Remove unecessary icon states and fixes secure closets * Actually fixes secure closets * Please our linting overlords. * Fixes non-crate subtypes * Update code/game/objects/structures/crates_lockers/closets.dm Co-authored-by: Luc <[email protected]> Signed-off-by: Chap <[email protected]> * Moved legacy closet icons to seperate file * Remove some unused variables * GC * Moved to proper destroy * It's good when code compiles --------- Signed-off-by: Chap <[email protected]> Co-authored-by: [email protected] <[email protected]> Co-authored-by: Luc <[email protected]>
* Some animated closet fixes * Trailing newline --------- Co-authored-by: [email protected] <[email protected]>
* Draw guns before the doors * Added a comment. --------- Co-authored-by: [email protected] <[email protected]>
Co-authored-by: Bmon <[email protected]>
* Reorders the layering, again. Fixes lighting issue with eyes. * Update code/modules/mob/living/carbon/human/human_mob.dm Co-authored-by: Contrabang <[email protected]> Signed-off-by: Spaghetti-bit <[email protected]> --------- Signed-off-by: Spaghetti-bit <[email protected]> Co-authored-by: Contrabang <[email protected]>
Co-authored-by: Adrer <[email protected]>
…13#27109) * Changes the engi closet sprite to the right one * Wrong name --------- Co-authored-by: [email protected] <[email protected]>
…3#26881) * Remove the flying var, adds the flying trait * Remove flight when broomstick is unwielded * Adds some comments * tab indentation * Fix carp flight * Remove comment --------- Co-authored-by: Adrer <[email protected]>
…7126) * Spark overlay now disappears again * Icondifbott no diffing! --------- Co-authored-by: Adrer <[email protected]>
github-actions
bot
added
🗺️ Изменение Карты
|
там нужно спрайт наших шкафчиков обновить |
AyIong
force-pushed
the
merge-upstream
branch
from
2d7259c to
ad1b726
Compare
dj-34
approved these changes
Oct 18, 2024
Да, открыл, не было открытой двери, починил стейт, то что починил не тестил :clueless: |
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.
Мерге апстрима без конфликтов
Changelog
🆑
add: Двери шкафчиков теперь анимированные.
imageadd: Возвращён спрайт пролитого топлива.
imageadd: Возвращён спрайт шлема хардсьюта RED ЕРТ.
imageadd: Добавлен спрайт смерти blood-drunk miner'а.
imageadd: Респрайт более половины имплантов.
fix: Шахтёрские шелтеры вернули свои таблички на стенах.
fix: Светящиеся глаза больше не светятся поверх закрывающих глаза вещей.
fix: Языки снова имеют свой цвет в чате.
/:cl: