Morb0 2deb2ac88b Merge remote-tracking branch 'wizards/master' into upstream-sync ... # Conflicts: # Resources/Prototypes/GameRules/roundstart.yml # Resources/Prototypes/Loadouts/Miscellaneous/trinkets.yml # Resources/Prototypes/Roles/Jobs/Civilian/service_worker.yml # Resources/ServerInfo/Guidebook/Antagonist/Antagonists.xml # Resources/ServerInfo/Guidebook/Antagonist/MinorAntagonists.xml # Resources/ServerInfo/Guidebook/Antagonist/Nuclear Operatives.xml # Resources/ServerInfo/Guidebook/Antagonist/Revolutionaries.xml # Resources/ServerInfo/Guidebook/Antagonist/SpaceNinja.xml # Resources/Textures/Objects/Weapons/Melee/combat_knife.rsi/inhand-left.png # Resources/Textures/Objects/Weapons/Melee/combat_knife.rsi/inhand-right.png # Resources/Textures/Objects/Weapons/Melee/combat_knife.rsi/meta.json # Resources/Textures/Objects/Weapons/Melee/survival_knife.rsi/inhand-left.png # Resources/Textures/Objects/Weapons/Melee/survival_knife.rsi/inhand-right.png # Resources/Textures/Objects/Weapons/Melee/survival_knife.rsi/meta.json		2024-11-08 17:29:34 +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	Cap scramble tag (#28804)	2024-06-09 16:01:05 -04: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-11-08 17:29:34 +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