fish-station/Content.Client/UserInterface
Vigers Ray 5c219f5105 Merge remote-tracking branch 'refs/remotes/wizards/master'
# Conflicts:
#	Content.Client/Administration/UI/Tabs/PlayerTab/PlayerTabEntry.xaml
#	Content.Client/Administration/UI/Tabs/PlayerTab/PlayerTabHeader.xaml
#	Content.Client/Administration/UI/Tabs/PlayerTab/PlayerTabHeader.xaml.cs
#	Content.Server/Administration/Systems/AdminSystem.cs
#	Content.Server/Connection/ConnectionManager.cs
#	Content.Server/Entry/EntryPoint.cs
#	Content.Server/Ghost/Roles/GhostRoleSystem.cs
#	Content.Server/IoC/ServerContentIoC.cs
#	Resources/Locale/en-US/_strings/administration/antag.ftl
#	Resources/Locale/en-US/_strings/advertisements/vending/pride.ftl
#	Resources/Locale/en-US/_strings/mind/role-types.ftl
#	Resources/Prototypes/Entities/Markers/Spawners/ghost_roles.yml
#	Resources/Prototypes/Entities/Mobs/Player/dragon.yml
#	Resources/Prototypes/Entities/Mobs/Player/silicon.yml
#	Resources/Prototypes/Entities/Objects/Devices/Syndicate_Gadgets/reinforcement_teleporter.yml
#	Resources/Prototypes/Entities/Objects/Specific/Robotics/mmi.yml
#	Resources/Textures/Interface/Misc/job_icons.rsi/meta.json
2025-01-14 18:46:45 +03:00
..
ControlExtensions Filtering reagents (#18211) 2023-07-26 02:05:09 -06:00
Controls Merge remote-tracking branch 'refs/remotes/wizards/master' 2024-10-30 13:26:32 +03: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 'refs/remotes/wizards/master' 2025-01-14 18:46:45 +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