Morb0 da4af61aee Merge remote-tracking branch 'refs/remotes/upstream/master' into upstream-sync ... # Conflicts: # Content.Shared/Preferences/Loadouts/Effects/GroupLoadoutEffect.cs # Content.Shared/Preferences/Loadouts/Effects/JobRequirementLoadoutEffect.cs # Content.Shared/Preferences/Loadouts/Effects/LoadoutEffect.cs # Content.Shared/Preferences/Loadouts/Effects/PointsCostLoadoutEffect.cs # Content.Shared/Preferences/Loadouts/Effects/SpeciesLoadoutEffect.cs # Resources/Prototypes/GameRules/events.yml # Resources/Textures/Objects/Devices/nuke.rsi/meta.json		2024-06-15 10:39:49 +03:00
..
ControlExtensions	Filtering reagents (#18211)	2023-07-26 02:05:09 -06:00
Controls	Give jobs & antags prototypes a guide field (#28614)	2024-06-06 05:05:58 -07:00
Fragments	Refactor serialization copying to use source generators (#19412)	2023-08-22 18:14:33 -07:00
RichText	Cap scramble tag (#28804)	2024-06-09 16:01:05 -04:00
Screens	Corner Clothing UI (#22883)	2023-12-22 23:32:23 -07:00
Systems	Merge remote-tracking branch 'refs/remotes/upstream/master' into upstream-sync	2024-06-15 10:39:49 +03:00
XamlExtensions	Revert "Update submodule to 175.0.0 (#21318)" (#21319)	2023-10-29 15:29:30 +11:00
BoundKeyHelpers.cs	Use different chatbox placeholder when dependent keys unbound (#22747)	2023-12-22 11:39:29 -08: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