Morb0 75443d7fb6 Merge remote-tracking branch 'upstream/master' into upstream-sync ... # Conflicts: # Content.Server/Communications/CommunicationsConsoleSystem.cs # README.md # Resources/Prototypes/Entities/Mobs/Species/reptilian.yml # Resources/Prototypes/Roles/Jobs/Civilian/librarian.yml # Resources/Prototypes/secret_weights.yml # Resources/Textures/Clothing/Uniforms/Jumpsuit/librarian.rsi/equipped-INNERCLOTHING.png # Resources/Textures/Clothing/Uniforms/Jumpsuit/librarian.rsi/icon.png # Resources/Textures/Clothing/Uniforms/Jumpsuit/librarian.rsi/inhand-left.png # Resources/Textures/Clothing/Uniforms/Jumpsuit/librarian.rsi/inhand-right.png # Resources/Textures/Clothing/Uniforms/Jumpsuit/librarian.rsi/meta.json		2023-10-11 16:56:19 +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-11 16:56:19 +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