Skip to content

Надо#1131

Closed
TheZuTi wants to merge 1605 commits intodead-space-server:masterfrom
TheZuTi:volosi-blat
Closed

Надо#1131
TheZuTi wants to merge 1605 commits intodead-space-server:masterfrom
TheZuTi:volosi-blat

Conversation

@TheZuTi
Copy link

@TheZuTi TheZuTi commented Mar 20, 2026

Ссылка на задачу

Медиа

Требования

  • PR полностью завершён и мне не нужна помощь чтобы его закончить.
  • Я внимательно просмотрел все свои изменения и багов в них не нашёл.
  • Я запускал локальный сервер со своими изменениями и всё протестировал.
  • Я добавил скриншот/видео демонстрации PR в игре, или этот PR этого не требует.

Критические изменения

Список изменений

ArtisticRoomba and others added 30 commits February 1, 2026 20:43
…en instructed not to. (space-wizards#37833)

* Fix the ability to hit overlapping walls.

* Revert "Fix the ability to hit overlapping walls."

This reverts commit f6866b6.

* Ensure that anomalies do not spawn multiple entities in the same tile when `CanSpawnOnEntities` is false.
fix

---------


(cherry picked from commit fd618775a2be5e66d32c6b4f66f3be882312228f)

Co-authored-by: Samur7 <asman102n@gmail.com>
* Make Ichor work in the bloodstream

* retun test

---------

Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
…pace-wizards#42756)

* Clean up Marking data structure, add tests for Zombie transformation

* empty

* AAAAAAAAAAAAAAAA

---------

Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
* syndimov kit

* attribution fix

* adjust prototype
…35211)

* Make volumetric pump limits inclusive

* Make volumetric devices respect pressure limits

* Improve pressure limit calculation comments

* Fix negative gas transfer in filters

* Extract to API

---------

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

* Hopefully fix subgamemodes from hard locking rounds

* You'd revert this change, you potato...
replace

Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
* Added Insulated Components to RK and Servants.

* Better comment for Rat Servants.
rhailrake and others added 18 commits February 27, 2026 14:02
- ServerDbBase: restore pre-nubody ConvertProfiles, remove nubody-only methods
- EntryPoint: remove FloatFlags (RT API removed)
- ServerPreferencesManager: restore pre-nubody profile conversion
- HumanoidProfileEditor: delete 7 nubody partial files, restore fields
- LobbyUIController: add missing usings
- ChatBox: remove unsupported tagsAllowed parameter
- ServerDbSqliteTests: simplify test
Add required markingCategory: Tail to 14 DS14 custom markings
(6 Vox animated tails + 7 Vulpkanin animated tails + VulpTailCoyote)
Fix Phase 5 runtime errors: supersoldier.yml conflict markers,
orphaned RSI states (125 removed from 42 meta.json files),
MarkingPicker double Loc.GetString, missing FTL keys (blob objective,
spider terror, marking-HumanHairTheZuTi case fix)
@github-actions github-actions bot added S: Needs Review Статус: PR ждёт ревью от разработчика. size/M PR изменяет 100-999 строк. labels Mar 20, 2026
@TheZuTi
Copy link
Author

TheZuTi commented Mar 20, 2026

ТВОЮ МАТЬ, ПОЧЕМУ ОНО ПОДТЯНУЛО АПСТРИМ

@TheZuTi TheZuTi closed this Mar 20, 2026
@github-actions github-actions bot added Changes: Audio Изменение затронуло файлы ".ogg". Changes: Map Изменение затронуло файлы ".yml" в неймспейсе "Maps". Changes: UI Изменение затронуло файлы ".xaml". Changes: Localization Изменение затронуло файлы ".ftl". Changes: C# Изменение затронуло файлы ".cs". and removed size/M PR изменяет 100-999 строк. S: Needs Review Статус: PR ждёт ревью от разработчика. labels Mar 20, 2026
@github-actions
Copy link

RSI Diff Bot; head commit 003188e merging into c4725a7
This PR makes changes to 1 or more RSIs. Here is a summary of all changes:

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".

Projects

None yet

Development

Successfully merging this pull request may close these issues.