Morb0 55a91108c1 Merge remote-tracking branch 'upstream/master' into upstream-sync ... # Conflicts: # Content.Server/Chat/Managers/ChatManager.cs # Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml # Resources/Prototypes/Roles/Jobs/Wildcards/psychologist.yml # Resources/Textures/Structures/Power/Generation/Singularity/collector.rsi/ca_active.png # Resources/Textures/Structures/Power/Generation/Singularity/collector.rsi/ca_deactive.png # Resources/Textures/Structures/Power/Generation/Singularity/collector.rsi/ca_off.png # Resources/Textures/Structures/Power/Generation/Singularity/collector.rsi/ca_on.png # Resources/Textures/Structures/Power/Generation/Singularity/collector.rsi/meta.json		2023-10-15 17:52:02 +03:00
..
ControlExtensions	Filtering reagents (#18211)	2023-07-26 02:05:09 -06:00
Controls	Changes for SplitContainer Engine PR (#20383)	2023-10-09 03:28:04 +11:00
Fragments	Refactor serialization copying to use source generators (#19412)	2023-08-22 18:14:33 -07:00
Screens	Changes for SplitContainer Engine PR (#20383)	2023-10-09 03:28:04 +11:00
Systems	Merge remote-tracking branch 'upstream/master' into upstream-sync	2023-10-15 17:52:02 +03:00
XamlExtensions	Hud refactor (#7202)	2022-10-12 10:16:23 +02:00
BoundKeyHelpers.cs	Hud refactor (#7202)	2022-10-12 10:16:23 +02:00
ButtonHelpers.cs	Add ButtonHelpers and the SetButtonDisabledRecursive helper.	2021-07-29 12:55:37 +02:00
IEntityControl.cs	Improve vv /c/enthover and add keybind (#20127)	2023-09-16 14:09:51 +10:00
StatsWindow.xaml	Cargo economy balance (#11123)	2022-09-15 11:53:17 +10:00
StatsWindow.xaml.cs	Cargo economy balance (#11123)	2022-09-15 11:53:17 +10:00
StatValuesEui.cs	Cargo economy balance (#11123)	2022-09-15 11:53:17 +10:00