Skip to content

Upstream sync#4

Merged
TheShuEd merged 1562 commits intomasterfrom
ed-03-02-2026-upstream-sync
Feb 3, 2026
Merged

Upstream sync#4
TheShuEd merged 1562 commits intomasterfrom
ed-03-02-2026-upstream-sync

Conversation

@TheShuEd
Copy link
Owner

@TheShuEd TheShuEd commented Feb 2, 2026

About the PR

Why / Balance

Technical details

Media

Requirements

Breaking changes

Changelog

sowelipililimute and others added 30 commits January 14, 2026 05:57
* Decouple gibbing from the body system

* allow gibs that don't drop giblets

* pass through user

* prediction gon

* comment

* destructible

* playpvs

* very very very very very very very minor cleanup

---------

Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload
Replace DoorRemoteAll with DoorRemoteCustom
* add sprites

* update sprite

* repaired sprite

* repaired pinpointer

* different id

* piece of pinpointer core

* borgs drop the piece

* end of file new line

* typo

Co-authored-by: āda <ss.adasts@gmail.com>

* make the tape darker

* four variations

* same variation in the crafting menu

---------

Co-authored-by: āda <ss.adasts@gmail.com>
oh my god i've been overcomplicating this you don't want to know...
* allow shuttle to Scan for Objects while FTL is on cooldown

* cleanup

---------

Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com>
Refactor AirtightSystem to skip rotation checks for omnidirectional blocks on init

Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com>
* Move artifact random spawners to entity tables

* That's a pretty big thing to miss

* This is embarassing

* Apply review
* Update animals.yml

* That was a bit too much
* 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

* readd zapping interacting mobs
* Add CryoPodWindow (placeholder)

* Change HealthAnalyzerWindow: split off reusable HealthAnalyzerControl for cryo pod UI

* Improve CryoPodWindow: add health analyzer

* Improve CryoPodWindow: add eject button

This wasn't requested in the issue but I implemented it as practice with the UI system.

* Rewrote GasAnalyzerWindow, split off reusable gas mix viewer for cryo pod

* Change GasAnalyzerWindow: change back to three columns

With two rows you get a layouting bug when there's a lot of different gases, which looks somewhat bad. I didn't feel like fixing the layouting bug (it's an engine issue) so we're going back to three columns. That way you don't ever get two rows in practice.

* Change GasAnalyzerWindow: simplify by disabling Resizable

I added a lot of complexity to make resizable work nicely with a derived max & min size, but it's not necessary.

* Change GasAnalyzerWindow: file-wide namespace

* Change GasAnalyzerSystem: add GenerateGasMixEntry

* Split HealthAnalyzerUiState from HealthAnalyzerScannedUserMessage

* Rewrote CryoPodWindow, add atmos info

* Improve CryoPodWindow: add loading placeholder

* Improve CryoPodWindow: add internationalization support

* Fix GasAnalyzerControl: add missing translation

* Improve CryoPodWindow: add beaker info, high temperature warning

* Improve CryoPodWindow/System: inject button in window + necessary system changes

* Fix CryoPodWindow: Entering cryopod now closes window

This way you can't heal yourself with a cryopod.

* Change CryoPodWindow: add & update comments

* Change HealthAnalyzerComponent: remove `uiKey` property (no longer necessary)

* Tiny fixes

* Improve CryoPodUiMessage: replace string with enum

* Change GasAnalyzerWindow: simplify Measure code

* Change CryoPodComponent: rename Injecting to InjectionBuffer

* Change CryoPodBUI: tiny code simplification

* Fix HealthAnalyzerComponent: Removed stray import

* Improve CryoPodWindow: Prettier, concise atmos

* Improve CryoPodWindow: Chemicals bar chart

* Improve CryoPodWindow: Add Ruler to reagents

* Change CryoPodWindow: More horizontal layout

* Improve CryoPodWindow: Reduce height jiggling

The health analyzer's height changes a lot, which can be annoying with the buttons (for example when the oxygen damage label is popping in and out)

* Improve CryoPodWindow: Add setup checklist

This is mostly here to fill vertical space in the new horizontal layout.

* Improve CryoPodWindow: Eject beaker button

* Improve CryoPodWindow: Localization

* Improve CryoPodWindow: Add BeakerBarChart

An animated version of the chemicals chart

* Fix CryoPodSystem: Ejecting beaker no longer clears injection buffer

* Improve BeakerBarChart: Not animated on first frame

* Fix CryoPodWindow: Fix broken translation

* Improve CryoPodWindow: Reorder sections

* Fix BeakerBarChart: Tooltips now show up

* Change BeakerBarChart: Reorder functions

* Change CryoPodWindow: Reorder sections, change margins

* Change CryoPodWindow: Edit flavor text

* Revert changes to GasAnalyzerWindow

Since GasAnalyzerControl is no longer used in CryoPodWindow, these changes are no longer relevant to this PR.

* Tidy CryoPodWindow: Remove old workarounds

These are old layouting bug workarounds from the older version of CryoPodWindow that had a ScrollContainer in it. They're no longer necessary. Less ScrollContainers less problems.

* Tidy up: Remove unused imports

* Remove LabelledSplitBar

It was replaced by BeakerBarChart, which is a lot fancier.

* Tidy up: Tiny code style fix

* Change CryoPodSystem: Move code from server to shared

This is still without adding UI prediction

* move a ton of stuff to shared.

* one last thing

* Improve BeakerBarChart: Keep visual entry width when swapping beakers

* Improve BeakerBarChart: Respect beaker order of reagents

* Improve CryoPodWindow: Ensure space for injection buffer

 We need to keep space on the chart for the injection buffer after swapping to a full beaker.

* Improve CryoPodWindow: Prettier ejection error

* Improve CryoPodWindow: Add "Cooling patient" status

* BeakerBarChart: Fix UI scale bug

* BeakerBarChart: Fix bluespace beaker ugliness

* BeakerBarChart: Add more pod status strings

* HealthAnalyzerControl: Filewide namespace, sort imports

* Style fix: Replace `bool x = y` with `var x = y`

* CryoPodUiMessage: Split off separate class for inject

* SharedCryoPodSystem: Move message-related code into Subs.BuiEvents

---------

Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
Velken and others added 23 commits January 28, 2026 00:22
…tiles (#42682)

* bald man broke my tiles

* move it around

* shrink it

---------

Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
Health Analyzer reactivation
* Remove lizard_happy.ogg

* Lizard still unhappy.
Adding adming logger to log criminal status changes
* Initial commit

* Include uncertain crew and make it work for AI

* Add new definition to Silicon Rules 8

* Update based on review

* Remove Cluwne from job list

* ProtoIdify

* Update and also make monkey/corgi show IDs

* Remove unnecessary property

* Remove redundant code

* Carrrrd

* cleanup

* Nicer code

* Update to fix the spawn bug + agent ID

* Fix new icons

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
* literally 1984

* Don't need that anymore

* remove looc as well

---------

Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
fix(nix): Add fontconfig and pipewire to shell.nix

This fixes dev client crashing when running in a nix dev shell.
…ion for a store. (#42687)

* more admin qol prs

* mistakes were made at 3am

* mindshield check and cleanup

* address reviews

* typo
… gibbing. (#42699)

2 line fix

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

* sdasdsas

---------

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

Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
…26-upstream-sync

# Conflicts:
#	Content.IntegrationTests/Tests/PostMapInitTest.cs
#	Content.Shared/Roles/JobPrototype.cs
#	README.md
#	Resources/Prototypes/Maps/Pools/default.yml
#	Resources/Prototypes/Roles/Antags/wizard.yml
#	Resources/Prototypes/secret_weights.yml
@TheShuEd TheShuEd merged commit 7b96560 into master Feb 3, 2026
12 of 14 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.