Vigers Ray a5a2bbd386 Merge remote-tracking branch 'space-wizards/master' ... # Conflicts: # Resources/Textures/Clothing/Hands/Gloves/Color/black.rsi/meta.json # Resources/Textures/Clothing/Hands/Gloves/Color/color.rsi/meta.json # Resources/Textures/Clothing/Hands/Gloves/captain.rsi/inhand-left.png # Resources/Textures/Clothing/Hands/Gloves/captain.rsi/inhand-right.png # Resources/Textures/Clothing/Hands/Gloves/captain.rsi/meta.json # Resources/Textures/Clothing/Hands/Gloves/combat.rsi/inhand-left.png # Resources/Textures/Clothing/Hands/Gloves/combat.rsi/inhand-right.png # Resources/Textures/Clothing/Hands/Gloves/combat.rsi/meta.json # Resources/Textures/Clothing/Hands/Gloves/fingerless.rsi/meta.json # Resources/Textures/Clothing/Hands/Gloves/fingerlessinsuls.rsi/meta.json # Resources/Textures/Clothing/Hands/Gloves/janitor.rsi/inhand-left.png # Resources/Textures/Clothing/Hands/Gloves/janitor.rsi/inhand-right.png # Resources/Textures/Clothing/Hands/Gloves/janitor.rsi/meta.json # Resources/Textures/Clothing/Hands/Gloves/latex.rsi/meta.json # Resources/Textures/Clothing/Hands/Gloves/leather.rsi/meta.json # Resources/Textures/Clothing/Hands/Gloves/mercfingerless.rsi/meta.json # Resources/Textures/Clothing/Hands/Gloves/nitrile.rsi/inhand-left.png # Resources/Textures/Clothing/Hands/Gloves/nitrile.rsi/inhand-right.png # Resources/Textures/Clothing/Hands/Gloves/nitrile.rsi/meta.json # Resources/Textures/Clothing/Hands/Gloves/robohands.rsi/meta.json # Resources/Textures/Clothing/Head/Hardsuits/cybersun.rsi/meta.json # Resources/Textures/Clothing/OuterClothing/Hardsuits/cybersun.rsi/meta.json # Resources/Textures/Mobs/Aliens/Xenos/purple_snake.rsi/meta.json		2025-04-17 06:26:03 +03:00
..
ControlExtensions	Filtering reagents (#18211)	2023-07-26 02:05:09 -06:00
Controls	Revert "Feature/shader radial menu" due to shader issue (#36470)	2025-04-11 23:30:52 +02: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	Нерф и фикс баннихопа	2025-01-06 23:48:07 +03:00
Systems	Merge remote-tracking branch 'space-wizards/master'	2025-04-17 06:26:03 +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