rechka/fish-station
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
fish-station/Content.Client/UserInterface
History
VigersRay d2c1a1df88 Merge remote-tracking branch 'refs/remotes/wizards/master' 
# Conflicts:
#	Content.Client/Administration/UI/Tabs/ObjectsTab/ObjectsTab.xaml.cs
#	Content.Client/Power/PowerMonitoringWindow.xaml.cs
#	Content.Client/SurveillanceCamera/UI/SurveillanceCameraMonitorBoundUi.cs
#	Content.Client/VoiceMask/VoiceMaskBoundUserInterface.cs
#	Content.Client/VoiceMask/VoiceMaskNameChangeWindow.xaml.cs
#	Content.IntegrationTests/Tests/GameRules/NukeOpsTest.cs
#	Content.IntegrationTests/Tests/PostMapInitTest.cs
#	Content.Server/GameTicking/GameTicker.RoundFlow.cs
#	Content.Server/Ghost/Roles/GhostRoleSystem.cs
#	Content.Server/Players/PlayTimeTracking/PlayTimeTrackingSystem.cs
#	Content.Server/Station/Systems/StationJobsSystem.Roundstart.cs
#	Resources/Prototypes/Entities/Objects/Devices/Syndicate_Gadgets/reinforcement_teleporter.yml
#	Resources/ServerInfo/Guidebook/Mobs/SlimePerson.xml
#	Resources/Textures/Structures/Walls/mining.rsi/meta.json
2024-07-22 04:16:05 +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-22 04:16:05 +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