fish-station/Content.Client/UserInterface
VigersRay bee5d0410f Merge remote-tracking branch 'refs/remotes/wizards/master'
# Conflicts:
#	Content.Client/Lobby/LobbyUIController.cs
#	Resources/Locale/en-US/chemistry/components/mixing-component.ftl
#	Resources/Prototypes/Entities/Mobs/Species/base.yml
#	Resources/Prototypes/Recipes/Crafting/crates.yml
#	Resources/ServerInfo/Guidebook/Mobs/Diona.xml
#	Resources/ServerInfo/Guidebook/Mobs/Species.xml
#	Resources/ServerInfo/Guidebook/Science/Science.xml
#	Resources/ServerInfo/Guidebook/Science/Technologies.xml
#	Resources/Textures/Objects/Weapons/Melee/fireaxeflaming.rsi/icon.png
#	Resources/Textures/Structures/Wallmounts/intercom.rsi/base.png
#	Resources/Textures/Structures/Wallmounts/intercom.rsi/broadcasting.png
#	Resources/Textures/Structures/Wallmounts/intercom.rsi/build.png
#	Resources/Textures/Structures/Wallmounts/intercom.rsi/panel.png
#	Resources/Textures/Structures/Wallmounts/intercom.rsi/speaker.png
#	Resources/Textures/Structures/Wallmounts/intercom.rsi/unshaded.png
#	Resources/Textures/Tiles/attributions.yml
#	Resources/migration.yml
2024-07-11 14:05:37 +03:00
..
ControlExtensions Filtering reagents (#18211) 2023-07-26 02:05:09 -06:00
Controls Merge remote-tracking branch 'refs/remotes/wizards/master' 2024-07-04 09:23:18 +03: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/wizards/master' 2024-07-11 14:05:37 +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