Skip to content

Апстрим. (Пока не мержить)#1087

Open
rhailrake wants to merge 1649 commits intomasterfrom
upstream-hell
Open

Апстрим. (Пока не мержить)#1087
rhailrake wants to merge 1649 commits intomasterfrom
upstream-hell

Conversation

@rhailrake
Copy link
Collaborator

No description provided.

Velken and others added 30 commits February 7, 2026 06:46
…zards#41569)

* cleanup

* fix fixtures

* prediction

* fix test

* review

* fix svalinn visuals

* fix chargers

* fix portable recharger and its unlit visuals

* fix borgs

* oomba review

* fix examination prediction

* predict holosign
* fixing fire locks

* ouch

* Revert "fixing fire locks"

This reverts commit d7c8f9a6e58daf4ba0ec58c38b951613574294bb.

* lol

* opts

---------

Co-authored-by: Dmitry <57028746+dimm00n@users.noreply.github.com>
Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com>
* tesloose alert

* forgot to remove this when I removed naming the unlocker

* and these too...

* migrate to Entity<T> and clarify emitter lines

---------

Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com>
…ace-wizards#41006)

* Containment fields only die if both sides lose power

Currently, if either side of a containment field loses power,
the field dies, even if the other side is still powered. This commit
changes the behavior to only destroy the field if neither side
of the field has enough power.

* discard

---------

Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com>
)

replaces pinpointer with universal pinpointer
* Initial commit

* formatting

---------

Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com>
…departments or jobs. (space-wizards#42820)

Solved space-wizards#42803
Syndie contra explicitly has no allowed departments or jobs.
Add prototype for empty crayon box
* Added Animated Vox Tails

* Extra cleanup

* Missing Pixels

* Missing Pixels

* fix

* Update vox.yml

* Update vox_parts.yml

* Update vox_parts.yml

---------

Co-authored-by: TrixxedHeart <46364955+TrixxedBit@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Changes: Audio Изменение затронуло файлы ".ogg". Changes: C# Изменение затронуло файлы ".cs". Changes: Localization Изменение затронуло файлы ".ftl". Changes: Map Изменение затронуло файлы ".yml" в неймспейсе "Maps". Changes: UI Изменение затронуло файлы ".xaml". size/M PR изменяет 100-999 строк.

Projects

None yet

Development

Successfully merging this pull request may close these issues.