Morb0 6106783f01 Merge remote-tracking branch 'wizards/master' into upstream-sync ... # Conflicts: # .github/CODEOWNERS # .github/labeler.yml # Content.Server/Connection/ConnectionManager.cs # Resources/Prototypes/Datasets/Names/ai.yml # Resources/Prototypes/Datasets/Names/arachnid_first.yml # Resources/Prototypes/Datasets/Names/diona.yml # Resources/Prototypes/Datasets/Names/fake_human_first.yml # Resources/Prototypes/Datasets/Names/fake_human_last.yml # Resources/Prototypes/Datasets/Names/last.yml # Resources/Prototypes/Datasets/Names/vox.yml # Resources/Prototypes/Entities/Clothing/Shoes/specific.yml # Resources/Prototypes/Entities/Structures/Machines/lathe.yml # Resources/Prototypes/Loadouts/role_loadouts.yml # Resources/Prototypes/Maps/bagel.yml # Resources/Prototypes/SoundCollections/NukeMusic.yml # Resources/Prototypes/Voice/speech_emotes.yml # Resources/ServerInfo/Guidebook/Mobs/Vox.xml # Resources/ServerInfo/Guidebook/Science/APE.xml # Resources/Textures/Clothing/Head/Hats/warden.rsi/inhand-left.png # Resources/Textures/Clothing/Head/Hats/warden.rsi/inhand-right.png # Resources/Textures/Clothing/Head/Hats/warden.rsi/meta.json		2024-12-26 00:30:02 +03:00
..
ControlExtensions	Filtering reagents (#18211)	2023-07-26 02:05:09 -06:00
Controls	Fix separated game screen bumping (#33046)	2024-10-29 16:07:57 +11:00
Fragments	Refactor serialization copying to use source generators (#19412)	2023-08-22 18:14:33 -07:00
RichText	Monospace Support for Rich Text (#33830)	2024-12-13 15:24:34 +01:00
Screens	Fix separated game screen bumping (#33046)	2024-10-29 16:07:57 +11:00
Systems	Merge remote-tracking branch 'wizards/master' into upstream-sync	2024-12-26 00:30:02 +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
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